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

src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -196,13 +196,14 @@
       </el-row>
       <el-row>
         <el-col :span="8">
-          <el-form-item label="调入仓库" prop="fWarehouseid">
+          <el-form-item label="原仓库" prop="fInwarehouseid">
             <el-select
-              v-model="form.fWarehouseid"
+              v-model="form.fInwarehouseid"
               filterable
               :disabled="browseStatus || detailList.length > 0"
               style="width: 80%"
               placeholder="请选择"
+              @change="fInwarehouseChange"
             >
               <el-option
                 v-for="(item, index) in warehouseOptions"
@@ -214,9 +215,9 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="调出仓库" prop="fInwarehouseid">
+          <el-form-item label="新仓库" prop="fWarehouseid">
             <el-select
-              v-model="form.fInwarehouseid"
+              v-model="form.fWarehouseid"
               filterable
               :disabled="browseStatus || detailList.length > 0"
               style="width: 80%"
@@ -244,7 +245,7 @@
       </el-row>
       <el-row>
         <el-col :span="8">
-          <el-form-item label="计划调拨件数" prop="fPlanqty">
+          <el-form-item label="计划通关件数" prop="fPlanqty">
             <el-input
               v-model.number="form.fPlanqty"
               style="width: 80%"
@@ -255,7 +256,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="计划调拨净重(kg)" prop="fPlannetweight">
+          <el-form-item label="计划通关净重(kg)" prop="fPlannetweight">
             <el-input
               v-model="form.fPlannetweight"
               style="width: 80%"
@@ -270,7 +271,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="计划调拨毛重(kg)" prop="fPlangrossweight">
+          <el-form-item label="计划通关毛重(kg)" prop="fPlangrossweight">
             <el-input
               v-model="form.fPlangrossweight"
               v-input-limit="2"
@@ -459,8 +460,8 @@
           <el-form-item label="原贸易方式" prop="fTrademodeid">
             <el-select
               v-model="form.fTrademodeid"
-              placeholder=""
-              :disabled="browseStatus"
+              placeholder="请选择原贸易方式"
+              :disabled="browseStatus || detailList.length > 0"
               clearable
               style="width: 80%"
             >
@@ -478,7 +479,7 @@
             <el-select
               v-model="form.fNewTrademodeid"
               placeholder="请选择新贸易方式"
-              :disabled="browseStatus"
+              :disabled="browseStatus || clearanceDisabled"
               clearable
               style="width: 80%"
             >
@@ -808,13 +809,13 @@
                 size="small"
                 :disabled="dataListSelection.length <= 0 || browseStatus || deliveryConfirmation"
                 @click="creditClick"
-                >调拨确认
+                >确认通关
               </el-button>
               <el-button
                 size="small"
                 :disabled="dataWithdrawList.length <= 0 || browseStatus || form.fBillstatus > 3 || cancelDelivery"
                 @click.prevent="withdrawClick"
-                >撤回调拨
+                >撤回通关
               </el-button>
               <el-dropdown @command="handleCommand" style="margin-left: 10px">
                 <el-button :disabled="browseStatus" size="small" type="success">
@@ -860,9 +861,9 @@
               <template slot-scope="scope">
                 <span v-if="item.label == 'fBillstatus'">
                   <span v-if="scope.row.fBillstatus === 10">计划</span>
-                  <span v-if="scope.row.fBillstatus === 20">待调拨</span>
-                  <span v-if="scope.row.fBillstatus === 30">调拨中</span>
-                  <span v-if="scope.row.fBillstatus === 40">已调拨</span>
+                  <span v-if="scope.row.fBillstatus === 20">待通关</span>
+                  <span v-if="scope.row.fBillstatus === 30">通关中</span>
+                  <span v-if="scope.row.fBillstatus === 40">已通关</span>
                 </span>
                 <span v-else-if="item.label == 'fBsdate'">
                   <el-date-picker
@@ -2043,11 +2044,12 @@
       </el-form>
       <el-table
         :data="whgenlegList"
-        ref="table"
+        ref="tableDialog"
         tooltip-effect="dark"
         width="100%"
         stripe
         @selection-change="whgenlegSelectionChange"
+        :height="tableHeight"
       >
         <el-table-column type="selection" width="50"> </el-table-column>
         <el-table-column
@@ -2430,7 +2432,7 @@
         >
           <div>
             <div>业务编号：{{ form.fCustomno }}</div>
-            <div>调拨日期：{{ form.fChargedate }}</div>
+            <div>通关日期：{{ form.fChargedate }}</div>
           </div>
           <div>
             <div>客户名称：{{ form.fCorpidName }}</div>
@@ -2438,7 +2440,7 @@
           </div>
           <div>
             <div>存放地址：{{ stockName }}</div>
-            <div>调拨：</div>
+            <div>通关：</div>
           </div>
         </div>
         <div class="print_table" style="display: flex">
@@ -2756,6 +2758,7 @@ export default {
         fSbu: [{ required: true, message: " ", trigger: "blur" }],
         fBusinessType: [{ required: true, message: " ", trigger: "blur" }],
         fStorekeeper: { required: true, message: " ", trigger: "blur" },
+        fInwarehouseid: [{ required: true, message: " ", trigger: "blur" }],
         fWarehouseid: [{ required: true, message: " ", trigger: "blur" }],
         fbillingway: [{ required: true, message: " ", trigger: "blur" }],
         fTocorpid: [{ required: true, message: " ", trigger: "blur" }],
@@ -2826,6 +2829,7 @@ export default {
       doNot: false,
       fCartypeOptions: [],
       fIfdamageOptions: [],
+      tableHeight: '600',
       whgenlegList: [],
       releaseList: [
         { dictLabel: "已放行", dictValue: "T" },
@@ -2860,7 +2864,7 @@ export default {
         {
           surface: "1",
           label: "fBsdate",
-          name: "调拨日期",
+          name: "通关日期",
           checked: 0,
           width: 200,
           fixed: "left",
@@ -2932,21 +2936,21 @@ export default {
         {
           surface: "11",
           label: "fQty",
-          name: "调拨件数",
+          name: "通关件数",
           checked: 0,
           width: 100,
         },
         {
           surface: "12",
           label: "fGrossweight",
-          name: "调拨毛重(kg)",
+          name: "通关毛重(kg)",
           checked: 0,
           width: 120,
         },
         {
           surface: "13",
           label: "fNetweight",
-          name: "调拨净重(kg)",
+          name: "通关净重(kg)",
           checked: 0,
           width: 120,
         },
@@ -3182,6 +3186,7 @@ export default {
       entryPrinting: 1,
       cancelDelivery: false, //
       deliveryConfirmation: false, //
+      clearanceDisabled: false, //明细是否有通关
     };
   },
   created() {
@@ -3267,6 +3272,14 @@ export default {
     this.getRow();
     this.getRow2();
   },
+  mounted() {
+    this.$nextTick(() => {
+      // 监听浏览器高度变化，改变表格高度
+      window.onresize = () => {
+        this.tableHeight = window.innerHeight - this.$refs.tableDialog.$el.offsetTop
+      }
+    })
+  },
   activated() {
     this.getDicts("st_trans_type").then((response) => {
       this.businessTypeOption = response.data;
@@ -3360,7 +3373,7 @@ export default {
     getRow() {
       let that = this;
       this.data = {
-        tableName: "调拨明细",
+        tableName: "通关明细",
         userId: Cookies.get("userName"),
       };
       select(this.data).then((res) => {
@@ -3384,7 +3397,7 @@ export default {
     //重置列表
     delRow() {
       this.data = {
-        tableName: "调拨明细",
+        tableName: "通关明细",
         userId: Cookies.get("userName"),
       };
       resetModule(this.data).then((res) => {
@@ -3399,7 +3412,7 @@ export default {
     save() {
       this.showSetting = false;
       this.data = {
-        tableName: "调拨明细",
+        tableName: "通关明细",
         userId: Cookies.get("userName"),
         sysTableSetList: this.setRowList,
       };
@@ -3426,7 +3439,7 @@ export default {
     getRow2() {
       let that = this;
       this.data = {
-        tableName: "调拨总账",
+        tableName: "通关总账",
         userId: Cookies.get("userName"),
       };
       select(this.data).then((res) => {
@@ -3450,7 +3463,7 @@ export default {
     //重置列表
     delRow2() {
       this.data = {
-        tableName: "调拨总账",
+        tableName: "通关总账",
         userId: Cookies.get("userName"),
       };
       resetModule(this.data).then((res) => {
@@ -3465,7 +3478,7 @@ export default {
     save2() {
       this.showSetting2 = false;
       this.data = {
-        tableName: "调拨总账",
+        tableName: "通关总账",
         userId: Cookies.get("userName"),
         sysTableSetList: this.setRowList2,
       };
@@ -3494,11 +3507,11 @@ export default {
         fGrossweight = row.fGrossweight;
       }
       if (row.fPlannetweight < fNetweight) {
-        this.$message({ message: "调拨净重超出结余净重", type: "warning" });
+        this.$message({ message: "通关净重超出结余净重", type: "warning" });
         return false;
       }
       if (row.fPlangrossweight < fGrossweight) {
-        this.$message({ message: "调拨毛重超出结余毛重", type: "warning" });
+        this.$message({ message: "通关毛重超出结余毛重", type: "warning" });
         return false;
       }
     },
@@ -3791,7 +3804,11 @@ export default {
       }
     },
     creditClick() {
-      console.log(this.Printinglist);
+      if (this.form.fNewTrademodeid == this.form.fTrademodeid) {
+        return this.$alert('新旧贸易方式相同，请做调拨单处理', '提示', {
+          confirmButtonText: '确定'
+        })
+      }
       for (let item in this.Printinglist) {
         if (!this.Printinglist[item].fId) {
           return this.$message.error("请存在未保存的数据");
@@ -3801,9 +3818,9 @@ export default {
             return this.$message.error("请存在未打印的作业单");
           }
         }
-        if (!this.Printinglist[item].fTruckno) {
-          return this.$message.error("车号不能为空");
-        }
+        // if (!this.Printinglist[item].fTruckno) {
+        //   return this.$message.error("车号不能为空");
+        // }
         if (!this.Printinglist[item].fTransferWarehouselocid) {
           return this.$message.error("调入库位不能为空");
         }
@@ -3885,7 +3902,8 @@ export default {
               }
             });
           });
-          this.msgSuccess("调拨成功");
+          this.msgSuccess("通关成功");
+          this.clearanceDisabled = true;
           this.$set(this.form, "fItemsStatus", 4);
         }
       });
@@ -4002,12 +4020,14 @@ export default {
       );
       formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
       formData.append("tCntr", JSON.stringify(this.CntrTable));
+      this.clearanceDisabled = false;
       updateCredit(formData).then((response) => {
         this.Printinglist.map((e) => {
           this.detailList.map((item, index) => {
             if (e.fId == item.fId) {
               this.$set(this.detailList[index], "fBillstatus", 10);
             }
+            if (item.fBillstatus == 40) this.clearanceDisabled = true;
           });
         });
         this.msgSuccess("撤回成功");
@@ -4085,6 +4105,9 @@ export default {
               e.fBsdate = Date.parse(e.fBsdate);
               e.fBusinessType = e.fBusinessType.toString();
               e.fLntype = e.fLntype ? e.fLntype.toString() : null;
+              if (e.fBillstatus == 40) {
+                this.clearanceDisabled = true;
+              };
             });
             this.detailList = response.data.warehouseBillsItem;
           } else {
@@ -4281,6 +4304,11 @@ export default {
     saveForm(status) {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          if (this.form.fNewTrademodeid == this.form.fTrademodeid) {
+            return this.$alert('新旧贸易方式相同，请做调拨单处理', '提示', {
+              confirmButtonText: '确定'
+            })
+          }
           this.updateDeduplication();
           this.form.fBillingway = this.form.fFeetUnit;
           this.form.fFeetunit = this.form.fFeetUnit;
@@ -5214,6 +5242,10 @@ export default {
         this.changeFeeUnit(row)
       })
     },
+    // 原仓库和新仓库一样
+    fInwarehouseChange() {
+      if (this.form.fInwarehouseid) this.$set(this.form, 'fWarehouseid', this.form.fInwarehouseid)
+    },
   },
   watch: {
     // 监听 addOrUpdateVisible 改变

src/views/Warehousing/cargoClearance/index.vue

@@ -58,7 +58,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="调拨日期" prop="timeInterval">
+            <el-form-item label="通关日期" prop="timeInterval">
               <el-date-picker
                 v-model="queryParams.timeInterval"
                 type="daterange"
@@ -110,16 +110,16 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="调拨状态" prop="fItemsStatus">
+                <el-form-item label="通关状态" prop="fItemsStatus">
                   <el-select
                     style="width: 200px"
                     v-model="queryParams.fItemsStatus"
-                    placeholder="请选择调拨状态"
+                    placeholder="请选择通关状态"
                   >
                     <el-option label="计划" value="1" />
-                    <el-option label="待调拨" value="2" />
-                    <el-option label="调拨中" value="3" />
-                    <el-option label="已调拨" value="4" />
+                    <el-option label="待通关" value="2" />
+                    <el-option label="通关中" value="3" />
+                    <el-option label="已通关" value="4" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -565,7 +565,7 @@ export default {
         {
           surface: "3",
           label: "fItemsStatus",
-          name: "调拨状态",
+          name: "通关状态",
           checked: 0,
           width: 100,
         },
@@ -593,7 +593,7 @@ export default {
         {
           surface: "8",
           label: "fBsdate",
-          name: "调拨日期",
+          name: "通关日期",
           checked: 0,
           width: 100,
         },
@@ -614,28 +614,28 @@ export default {
         {
           surface: "11",
           label: "fPlanqty",
-          name: "计划调拨件数",
+          name: "计划通关件数",
           checked: 0,
           width: 180,
         },
         {
           surface: "12",
           label: "fQty",
-          name: "调拨件数",
+          name: "通关件数",
           checked: 0,
           width: 100,
         },
         {
           surface: "13",
           label: "fGrossweight",
-          name: "调拨毛重(KG)",
+          name: "通关毛重(KG)",
           checked: 0,
           width: 180,
         },
         {
           surface: "14",
           label: "fNetweight",
-          name: "调拨净重(kg)",
+          name: "通关净重(kg)",
           checked: 0,
           width: 180,
         },
@@ -798,7 +798,7 @@ export default {
     getRow() {
       let that = this;
       this.data = {
-        tableName: "调拨",
+        tableName: "通关",
         userId: Cookies.get("userName"),
       };
       select(this.data).then((res) => {
@@ -822,7 +822,7 @@ export default {
     //重置列表
     delRow() {
       this.data = {
-        tableName: "调拨",
+        tableName: "通关",
         userId: Cookies.get("userName"),
       };
       resetModule(this.data).then((res) => {
@@ -837,7 +837,7 @@ export default {
     save() {
       this.showSetting = false;
       this.data = {
-        tableName: "调拨",
+        tableName: "通关",
         userId: Cookies.get("userName"),
         sysTableSetList: this.setRowList,
       };