Merge branch 'dev' of http://git.echepei.com/zhujiawei/Warehouse_management_ui into dev

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -506,20 +506,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="8" v-if="showfCustomno">
-            <el-form-item
-              label="备案序号"
-              prop="fEmsSeqNo"
-            >
-              <el-input
-                v-model="form.fEmsSeqNo"
-                style="width: 80%"
-                placeholder="备案序号"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
       </div>
 
       <el-row>
@@ -606,6 +592,21 @@
             </el-row>
           </div>
           <el-row>
+            <el-col :span="12" v-if="showInstockFEmsSeqNo === '0'">
+              <el-form-item
+                label="备案序号"
+                prop="fEmsSeqNo"
+              >
+                <el-input
+                  v-model="form.fEmsSeqNo"
+                  style="width: 80%"
+                  placeholder="备案序号"
+                  :disabled="
+                browseStatus || current !== before || form.warehouseStatus > 3
+              "
+                />
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="备注" prop="remark">
                 <el-input
@@ -6274,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
@@ -6500,7 +6502,8 @@ export default {
         fWarehouseid: [{ required: true, message: ' ', trigger: 'blur' }],
         fbillingway: [{ required: true, message: ' ', trigger: 'blur' }],
         fTocorpid: [{ required: true, message: ' ', trigger: 'blur' }],
-        fGoodsid: [{ required: true, message: ' ', trigger: 'blur' }]
+        fGoodsid: [{ required: true, message: ' ', trigger: 'blur' }],
+        fEmsSeqNo: [{ required: true, message: ' ', trigger: 'blur' }]
         // fUnit: [{required: true, message: " ", trigger: "blur"}],
       },
       imporRules: {
@@ -6849,6 +6852,7 @@ export default {
       rkTime: null,
       lsTime: null,
       showfCustomno: false,
+      showInstockFEmsSeqNo: '1',
       showfBusinessAttribution: [],
       showfIfsampling: null,
       showfWeighingDate: null,
@@ -6875,7 +6879,7 @@ export default {
       signature: null, //打印时候的电子签章
       showDataElabel: null,
       showElabelDialog: false,
-      elabelList: [],
+      elabelList: []
     }
   },
   async created() {
@@ -6940,6 +6944,9 @@ export default {
     this.getConfigKey('show_fCustomno').then((response) => {
       this.showfCustomno = response.msg
     })
+    this.getConfigKey('show.instock_fEmsSeqNo').then((response) => {
+      this.showInstockFEmsSeqNo = response.msg
+    })
     this.getConfigKey('show_fBusinessAttribution').then((response) => {
       this.showfBusinessAttribution = response.msg
     })
@@ -9224,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
+        })
       }
     },
     //打印

src/views/Warehousing/inStock/noUpload.vue

@@ -194,6 +194,7 @@
                 v-model="scope.row.fPackagespecs"
                 style="width: 100%"
                 placeholder="包装规格"
+                @change="dateSelected(scope,'fPackagespecs')"
               />
             </span>
 <!--          <span v-else-if="item.label == 'fCntrno'">-->
@@ -561,6 +562,10 @@ export default {
         this.dataList.forEach(item => {
           if (!item.fNetweight) this.$set(item, 'fNetweight', scope.row.fNetweight)
         })
+      } else if (name === 'fPackagespecs') {
+        this.dataList.forEach(item => {
+          if (!item.fPackagespecs) this.$set(item, 'fPackagespecs', scope.row.fPackagespecs)
+        })
       }
     },
     getTreeselect(row) {

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

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -1188,7 +1188,7 @@
             prop="fContractno"
             header-align="center"
             align="center"
-            width="150"
+            min-width="150"
             label="合同编号"
           >
             <template slot-scope="scope">
@@ -1199,7 +1199,7 @@
             prop="tPackages"
             header-align="center"
             align="center"
-            width="140"
+            min-width="140"
             label="货物类别"
           >
             <template slot-scope="scope">
@@ -1226,13 +1226,13 @@
           </el-table-column>
         </el-table>
         <el-table v-loading="loading_s" border :data="agreementitemsList" @selection-change="handleSelectionChange" style="width: 70%;float:right;flex: 1.86;">
-          <el-table-column label="行号" align="center" type="index" fixed="left" width="100"/>
+          <el-table-column label="行号" align="center" type="index" fixed="left" min-width="150"/>
 
           <el-table-column
             prop="fFeeunitid"
             header-align="center"
             align="center"
-            width="125"
+            min-width="125"
             label="计价单位"
           >
             <template slot-scope="scope">
@@ -1312,7 +1312,7 @@
             prop="fFeeid"
             header-align="center"
             align="center"
-            width="160"
+            min-width="160"
             label="费用名称"
           >
             <template slot-scope="scope">
@@ -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) => {