Merge branch 'master' of http://139.196.39.194:9021/yuansh/doors-windows-web

src/views/production/productionTotalOrder/modules/SurplusMaterials.vue

@@ -563,7 +563,7 @@
                        alertModal.closeLoading();
                       if (res.success) {
                           this.$emit('ok','1')
-                          this.$message.success('执行成功');
+                          this.$message.success('执行成功'+res.message);
                       } else {
                           this.$emit('ok','2')
                           this.$message.error(res.message);

src/views/production/productionTotalOrder/modules/materiaWaring.vue

@@ -1,7 +1,7 @@
-<!-- 材料入库 -->
+<!-- 材料出库 -->
 <template>
     <a-modal
-      title="材料入库"
+      title="材料出库"
        width="95%"
       :visible="visible"
       :maskClosable="false"

src/views/production/productionTotalOrder/modules/productionTotalOrderAdd.vue

@@ -93,7 +93,7 @@
             <a-button type="danger" size="small" :disabled="form.state!='开立'" @click="addList" >增行</a-button>
             <a-button size="small" @click="delectRow" :disabled="form.state!='开立'" >删行</a-button>
             <a-button size="small" @click="productWarehous" :disabled="activeKey!=='finishProduct'||defaultMethod=='add'||form.state=='开立'">成品入库</a-button>
-            <a-button size="small" @click="materiaWarehous" :disabled="activeKey!=='material'||defaultMethod=='add'||form.state=='开立'">材料入库</a-button>
+            <a-button size="small" @click="materiaWarehous" :disabled="activeKey!=='material'||defaultMethod=='add'||form.state=='开立'">材料出库</a-button>
             <a-button size="small" @click="KSWarehousing" :disabled="activeKey!=='finishProduct'||defaultMethod=='add'||form.state=='开立'">框/扇入库</a-button>
             <a-button size="small" @click="KSOutbound" :disabled="activeKey!=='finishProduct'||defaultMethod=='add'||form.state=='开立'">框/扇出库</a-button>
             <a-button size="small" @click="sendOrReceive('in')" :disabled="activeKey!=='SurplusMaterials'||defaultMethod=='add'||form.state=='开立'">余料入库</a-button>
@@ -473,7 +473,7 @@
                 this.$refs.KSOutbound.visible = true
                 this.$refs.KSOutbound.form.dataSource = this.originalProductDeatil
             },
-            //打开材料入库弹窗
+            //打开材料出库弹窗
             materiaWarehous(){
               
                   //材料明细
@@ -506,7 +506,7 @@
             sendOrReceive(data){
                  this.$refs.SurplusMaterials.sendOrReceive(data)
             },
-            //材料入库后重新获取材料明细列表
+            //材料出库后重新获取材料明细列表
             RefreshMateriaList(){
                 this.getMaterialData(this.form.id)
             },