页面调整

src/views/modules/ecss/codelnotifyConfirm.vue

@@ -366,9 +366,9 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="总Rolls(箱明细无rolls才可修改)">
-                <el-input 
-                  v-model="palletModelData.rolls" 
-                  type="number" 
+                <el-input
+                  v-model="palletModelData.rolls"
+                  type="number"
                   placeholder="箱明细无rolls才可修改"
                   :disabled="isTotalRollsDisabled"
                 ></el-input>
@@ -3120,6 +3120,7 @@
         // 使用相同的API，但传递maintenanceOnly标识
         savePalletMaintenance(saveData).then(({data}) => {
           if (data && data.code === 0) {
+            this.searchTable()
             this.refreshCurrentTabTable()
             this.palletMaintenanceModelFlag = false;
             this.$message({

src/views/modules/ecss/components/PackingDetailTab.vue

@@ -1195,6 +1195,17 @@ export default {
             }
           }, 0);
           sums[index] = sum.toFixed(3);
+        } else if (column.property === 'rolls') {
+          // 净重合计
+          const sum = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + value;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] = sum.toFixed(3);
         } else if (column.property === 'item_no') {
           // 序号列显示空
           sums[index] = '';

src/views/modules/ecss/createDeclaration.vue

@@ -317,6 +317,16 @@
               <el-input v-model="declarationData.otherPrice"  ></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item :label="'托盘重量（KG）'" >
+              <el-input v-model="declarationData.palletWeight"  ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item :label="'总毛重（KG）'" >
+              <el-input v-model="declarationData.allWeight"  ></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="4">
             <el-form-item :label="'特殊关系确认'" >
               <el-select v-model="declarationData.specialRelationshipComfirm"  style="width: 100%">
@@ -1304,6 +1314,8 @@
           priceInfluenceConfirm:'',
           royaltyPaymentsConfirm:'',
           delNo:'',
+          palletWeight:'',
+          allWeight:'',
         },
       }
     },
@@ -1445,7 +1457,7 @@
         if(this.saveLoading) {
           return false
         }
-        
+
         if(this.detailList==null|| this.detailList.length<1){
           this.$alert('不存在明细记录！', '错误', {
             confirmButtonText: '确定'
@@ -1460,11 +1472,11 @@
             return false
           }
         }
-        
+
         // 开始loading
         this.saveLoading = true
         this.declarationData.detailList=this.detailList
-        
+
         saveDeclaration(this.declarationData).then(({data}) => {
           //区分请求成功和失败的状况
           if (data && data.code === 0) {

src/views/modules/ecss/declaration.vue

@@ -1986,7 +1986,7 @@
       searchTemplateOne() {
         this.templateData.buNo = this.currentRow.buNo
         this.templateData.customName = this.currentRow.customName
-        this.templateData.shippingMode = this.currentRow.shippingMode
+        //this.templateData.shippingMode = this.currentRow.shippingMode
         searchTemplateList(this.templateData).then(({data}) => {
           if (data && data.code === 0){
             if (data.rows && data.rows.length > 0) {
@@ -2046,7 +2046,7 @@
         this.exportPaking.itemNo=this.currentRow.itemNo
         this.exportPaking.upc=this.currentRow.upc
         this.exportPaking.so=this.currentRow.so
-        this.exportPaking.shippingMark=this.currentRow.shippingMark
+        this.exportPaking.shippingMark=this.currentRow.cmcInvoice
         this.exportPaking.palletWeight=this.currentRow.palletWeight
         this.exportPaking.hsCodeDesc=this.currentRow.hsCodeDesc
         this.exportPaking.contractFlag=this.currentRow.contractFlag
@@ -2355,7 +2355,7 @@
         this.exportPaking.itemNo=this.currentRow.itemNo
         this.exportPaking.upc=this.currentRow.upc
         this.exportPaking.so=this.currentRow.so
-        this.exportPaking.shippingMark=this.currentRow.shippingMark
+        this.exportPaking.shippingMark=this.exportHeader.contractNo
         this.exportPaking.palletWeight=this.currentRow.palletWeight
         this.exportPaking.hsCodeDesc=this.currentRow.hsCodeDesc
         this.exportPaking.contractFlag=this.currentRow.contractFlag
@@ -2399,7 +2399,7 @@
               this.exportPaking.templateName=row.name
               this.exportPaking.upc=row.upc
               this.exportPaking.so=row.so
-              this.exportPaking.shippingMark=row.shippingMark
+              //this.exportPaking.shippingMark=row.shippingMark
               this.exportPaking.palletWeight=row.palletWeight
               this.exportPaking.boxChange=row.boxChange
               this.exportPaking.itemNo=row.itemNo
@@ -2446,6 +2446,7 @@
           if (this.packageUnit==='箱') {
             this.exportPaking.kgs=0.1
           }
+          this.exportPaking.shippingMark=this.exportHeader.contractNo
         this.exportAllFlag = true
         } finally {
           this.exportAllLoading = false
@@ -2575,7 +2576,7 @@
         this.templateData.type=type;
         this.templateData.buNo = this.currentRow.buNo
         this.templateData.customName = this.currentRow.customName
-        this.templateData.shippingMode = this.currentRow.shippingMode
+        //this.templateData.shippingMode = this.currentRow.shippingMode
         this.templateFlag = true;
       },
 
@@ -2616,7 +2617,7 @@
           this.exportPaking.templateName=row.name
           this.exportPaking.upc=row.upc
           this.exportPaking.so=row.so
-          this.exportPaking.shippingMark=row.shippingMark
+          //this.exportPaking.shippingMark=row.shippingMark
           this.exportPaking.palletWeight=row.palletWeight
           this.exportPaking.boxChange=row.boxChange
           this.exportPaking.itemNo=row.itemNo