Browse Source

1.入库备案序号改为必填,并参数控制,入库后数据不可改
2.凯和增加提货EDI按钮
3.仓储费计算完毕后,如有提单号不可计算,则提示该提单号计费规则不存在

nzf 3 years ago
parent
commit
3c6cc93a13

+ 11 - 7
src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -601,6 +601,9 @@
                   v-model="form.fEmsSeqNo"
                   style="width: 80%"
                   placeholder="备案序号"
+                  :disabled="
+                browseStatus || current !== before || form.warehouseStatus > 3
+              "
                 />
               </el-form-item>
             </el-col>
@@ -6272,7 +6275,8 @@
     <el-dialog title="电子标签"
                :visible.sync="showElabelDialog"
                :close-on-click-modal="false"
-               width="40%">
+               width="40%"
+    >
     <span>
       <el-table :data="elabelList" element-loading-text="努力加载中">
       <el-table-column
@@ -6499,7 +6503,7 @@ export default {
         fbillingway: [{ required: true, message: ' ', trigger: 'blur' }],
         fTocorpid: [{ required: true, message: ' ', trigger: 'blur' }],
         fGoodsid: [{ required: true, message: ' ', trigger: 'blur' }],
-        fEmsSeqNo: [{ required: true, message: ' ', trigger: 'blur' }],
+        fEmsSeqNo: [{ required: true, message: ' ', trigger: 'blur' }]
         // fUnit: [{required: true, message: " ", trigger: "blur"}],
       },
       imporRules: {
@@ -6509,7 +6513,7 @@ export default {
         fBusinessType: [{ required: true, message: ' ', trigger: 'blur' }],
         fMarks: [{ required: true, message: ' ', trigger: 'blur' }],
         fPackagespecs: [{ required: false, message: ' ', trigger: 'blur' }],
-        fTruckno: [{ required: false, message: ' ', trigger: 'blur' }],
+        fTruckno: [{ required: false, message: ' ', trigger: 'blur' }]
       },
       browseStatus: false,
       goodsOptions: [],
@@ -6875,7 +6879,7 @@ export default {
       signature: null, //打印时候的电子签章
       showDataElabel: null,
       showElabelDialog: false,
-      elabelList: [],
+      elabelList: []
     }
   },
   async created() {
@@ -9227,11 +9231,11 @@ export default {
     },
     // 查看电子标签
     showElabel() {
-      this.showElabelDialog = true;
+      this.showElabelDialog = true
       if (this.form.fId) {
         listElabelByfGPid(this.form.fId).then((response) => {
-          this.elabelList = response.data.elabelList;
-        });
+          this.elabelList = response.data.elabelList
+        })
       }
     },
     //打印

+ 5 - 0
src/views/kaihe/domesticTrade/myOrder/index.vue

@@ -349,6 +349,11 @@
           :disabled="selection.length == 0 ? true : false"
           >转航次</el-button
         >
+        <el-button
+          type="warning"
+          size="mini">
+          提货EDI
+        </el-button>
       </div>
       <div class="tabSetting">
         <right-toolbar

+ 3 - 0
src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -2137,6 +2137,9 @@ export default {
         if (response.data.feesList) {
           this.fWbuOptions = response.data.feesList
         }
+        if (response.data.fMblnoMsg) {
+          this.$message.error(response.data.fMblnoMsg + "计费规则不存在")
+        }
         this.countstate = false
         this.showAgreementStatus = false
       },(error) => {