Quellcode durchsuchen

成本分配表-面料/.辅料sheet-弹窗关闭后总成本计算

jbb vor 2 Jahren
Ursprung
Commit
d479f35ebd

+ 9 - 2
src/views/cost-allocation-total/modal/fabInQuaModal.vue

@@ -6,7 +6,8 @@
     :confirmLoading="confirmLoading"
     width="86%"
     style="top:330px;left:100px;"
-    :footer="null"
+    @cancel="cancel"
+    :footer="null" 
   >
     <!-- tabel  -->
     <a-spin :spinning="confirmLoading">
@@ -97,6 +98,7 @@ export default {
       data: [],
       loading: false,
       confirmLoading: false,
+      record:'',
       planNum:'',
       fabInQuaModVis: false
     }
@@ -156,7 +158,12 @@ export default {
     cancel() {
       console.log('返回成本分配统计表')
       this.fabInQuaModVis = false
-    }
+      var allCost  = 0
+      this.data.map(item=>{
+        allCost +=item.cost
+      })
+      this.$emit('close',allCost,this.record)
+    },
   }
 }
 </script>

+ 7 - 0
src/views/cost-allocation-total/modal/ingInQuaModal.vue

@@ -6,6 +6,7 @@
     :confirmLoading="confirmLoading"
     width="86%"
     style="top:330px;left:100px;"
+    @cancel="cancel"
     :footer="null"
   >
     <!-- tabel 加载 -->
@@ -87,6 +88,7 @@ export default {
       data: [],
       loading: false, // 表格加载
       planNum:'',
+      record:'',
       // orderDataform: this.$form.createForm(this),
       confirmLoading: false,
       ingInQuaModVis: false
@@ -141,6 +143,11 @@ export default {
     cancel() {
       console.log('返回成本分配统计表')
       this.ingInQuaModVis = false
+      var allCost  = 0
+      this.data.map(item=>{
+        allCost +=item.cost
+      })
+      this.$emit('close',allCost,this.record)
     }
   }
 }

+ 22 - 7
src/views/reportForms/cost-allocation-table/tabs.vue

@@ -25,7 +25,7 @@
             </span>
             <!-- 面料 -转入数量 弹框-->
             <span slot="fabInQuaSlot" slot-scope="text">
-              <a>{{ Number(text).toFixed(4) }}</a>
+              <a>{{ Number(text).toFixed(4)}}</a>
             </span>
 
             <!-- 余下数量-->
@@ -178,13 +178,13 @@
     <!-- tabs内弹框 -->
     <div>
       <!-- 面料 转入数量 -->
-      <fabInQua-modal ref="fabInQuaModal" :father="aa"  :planNum="this.planNum"></fabInQua-modal>
+      <fabInQua-modal ref="fabInQuaModal" :father="aa"  :planNum="this.planNum"  @close="closeFabInQua"></fabInQua-modal>
 
       <!-- 余下数量 -->
-      <fabRemQua-modal ref="fabRemQuaModal" :father="bb" :planNum="this.planNum"></fabRemQua-modal>
+      <fabRemQua-modal ref="fabRemQuaModal" :father="bb" :planNum="this.planNum" ></fabRemQua-modal>
 
       <!-- 辅料 转入数量 -->
-      <ingInQua-modal ref="ingInQuaModal" :father="cc" :planNum="this.planNum"></ingInQua-modal>
+      <ingInQua-modal ref="ingInQuaModal" :father="cc" :planNum="this.planNum" @close="closeIngInQua"></ingInQua-modal>
       <!-- 余下数量 -->
       <ingRemQua-modal ref="ingRemQuaModal" :father="bb" :planNum="this.planNum"></ingRemQua-modal>
       <pilosity-fewer-list-modal ref="pilosityFewerListModal" :planNum="this.planNum"></pilosity-fewer-list-modal>
@@ -245,7 +245,7 @@ export default {
           width: '8%',
           className: 'replacecolor',
           customRender: (text, record, index) => {
-            if(text!==''&&text){
+            if(text!==''&&text!==undefined&&text!==null){
               return Number(text).toFixed(2)
             }
           },
@@ -383,7 +383,7 @@ export default {
           width: '6%',
           className: 'replacecolor',
           customRender: (text, record, index) => {
-            if(text!==''&&text){
+            if(text!==''&&text!==undefined&&text!==null){
               return Number(text).toFixed(2)
             }
           },
@@ -687,6 +687,7 @@ export default {
           click: event => {
             console.log('面料 - 转入数量')
             this.$refs.fabInQuaModal.fabInQuaModVis = true
+            this.$refs.fabInQuaModal.record = record
             record.syTransfers.map(item=>{
               if(item.unitCost){
                  item.unitCost =  Number(item.unitCost).toFixed(3)
@@ -697,7 +698,20 @@ export default {
         }
       }
     },
-
+    closeFabInQua(data,record){
+      this.fabData.map(item=>{
+        if(item.goodsName = record.goodsName){
+          item.transferCost = data
+        }
+      })
+    },
+    closeIngInQua(data,record){
+      this.ingData.map(item=>{
+        if(item.goodsName = record.goodsName){
+          item.transferCost = data
+        }
+      })
+    },
     // 面料 -余下数量 弹框
     fabRemQuaCustomCell(record) {
       return {
@@ -732,6 +746,7 @@ export default {
             console.log('辅料 - 转入数量')
             this.$refs.ingInQuaModal.ingInQuaModVis = true
             this.$refs.ingInQuaModal.planNum = this.planNum
+            this.$refs.ingInQuaModal.record = this.record
             record.syTransfers.map(item=>{
               if(item.unitCost){
                item.unitCost =  (item.unitCost).toFixed(3)