Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/box/indexSea.vue

@@ -124,7 +124,7 @@
               <el-dropdown-item command="error">{{$t('异常登记')}}</el-dropdown-item>
               <el-dropdown-item command="cost">{{$t('费用登记')}}</el-dropdown-item>
               <el-dropdown-item command="delete">{{$t('删除')}}</el-dropdown-item>
-              <el-dropdown-item v-if="scope.row.ldStatus>42" command="editLadingBill">{{$t('编辑提货单')}}</el-dropdown-item>
+              <el-dropdown-item :disabled="scope.row.ldStatus<42" command="editLadingBill">{{$t('编辑提货单')}}</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
           <el-dropdown trigger="click" @command="(command)=>handleCommand(scope.row, command)">

src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue

@@ -193,12 +193,24 @@
               <el-option v-for="item in orderItems" :label="item.prodTitleEn" :value="item.id" :key="item.id"></el-option>
             </el-select>
           </el-form-item>
+          <el-row>
+            <el-col :span="12">
               <el-form-item label="剩余箱数:">
                 {{shopForm.sum||0}}
               </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="剩余数量(个):">
+                {{shopForm.quantity||0}}
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-form-item label="放入箱数:" prop="num">
             <el-input-number v-model="shopForm.num" controls-position="right" :min="0" :max="shopForm.sum"></el-input-number>
           </el-form-item>
+          <el-form-item label="放入数量(个):" prop="putQuantity">
+            <el-input-number v-model="shopForm.putQuantity" controls-position="right" :min="0"></el-input-number>
+          </el-form-item>
           <el-form-item label="备注信息:">
             <el-input v-model="shopForm.remarks"></el-input>
           </el-form-item>
@@ -215,7 +227,7 @@
 <script>
 import {
   getSplitList,
-  createSplit,
+  quantitycheck,
   createSplitItem,
   deleteSplitItem,
 } from "@/api/ecw/orderHandle";
@@ -329,18 +341,16 @@ export default {
     /* 打开拆单 */
     getSplit() {
       this.orderItems = this.currRow.goodsList ?? [];
+      console.log(this.orderItems);
       const { shipmentObj } = this.$attrs;
       splitList({
         orderId: this.currRow.orderId,
         shipmentId: shipmentObj.id,
       }).then((res) => {
         const orderSplitBackVOList = res.data;
-        if (orderSplitBackVOList && orderSplitBackVOList.length) {
         // 取拆单项
-          this.splitData = orderSplitBackVOList.filter(
-            (item) => !item.isMaster
-          )[0];
-        }
+        this.splitData =
+          orderSplitBackVOList.filter((item) => !item.isMaster)?.[0] ?? {};
       });
     },
     /* 查询拆单项 */
@@ -350,16 +360,12 @@ export default {
         orderId: this.currRow.orderId,
         shipmentType: 1,
       }).then((res) => {
-        console.log(res)
-        const { orderSplitBackVOList } = res.data;
-        if (orderSplitBackVOList && orderSplitBackVOList.length) {
-          this.orderItems = this.currRow.goodsList ?? [];
-          console.log(this.orderItems);
-          // 取拆单项
-          this.splitData = orderSplitBackVOList.filter(
-            (item) => !item.isMaster
-          )[0];
-        }
+        const { orderSplitBackVOList } = res.data; // 取拆单项
+        const list =
+          orderSplitBackVOList.filter((item) => !item.isMaster)?.[0] ?? {};
+
+        this.splitData.orderSplitItemBackVOList =
+          list.orderSplitItemBackVOList ?? [];
       });
     },
     getOrderDetail() {
@@ -414,20 +420,6 @@ export default {
           leviteW,
         }
       );
-      /* "下单统计：" +
-        orderSum +
-        " 箱 " +
-        orderV +
-        " m³ " +
-        orderW +
-        " kg " +
-        " 入仓统计：" +
-        leviteSum +
-        " 箱 " +
-        leviteV +
-        " m³ " +
-        leviteW +
-        " kg"; */
 
       return sums;
     },
@@ -457,20 +449,44 @@ export default {
       this.shopOpen = true;
     },
     changeProdTitleZh() {
-      let list = [];
-      list = this.orderItems.filter((item) => item.id == this.shopForm.zhId);
-      this.shopForm.sum =
-        this.currRow.num - this.currRow.installNum - this.totalSplitNum();
-      this.shopForm.orderItemId = list[0].orderItemId;
-      this.shopForm.prodTitleEn = list[0].prodTitleEn;
+      const data = this.getSelectData("zhId");
+      this.shopForm.prodTitleEn = data.prodTitleEn;
     },
     changeProdTitleEn() {
+      const data = this.getSelectData("enId");
+      this.shopForm.prodTitleZh = data.prodTitleZh;
+    },
+    async getSelectData(key) {
       let list = [];
-      list = this.orderItems.filter((item) => item.id == this.shopForm.enId);
+      list = this.orderItems.filter((item) => item.id == this.shopForm[key]);
       this.shopForm.sum =
         this.currRow.num - this.currRow.installNum - this.totalSplitNum();
-      this.shopForm.orderItemId = list[0].orderItemId;
-      this.shopForm.prodTitleZh = list[0].prodTitleZh;
+
+      const data = list[0];
+      this.shopForm.orderItemId = data.orderItemId;
+      this.shopForm.quantity = data.quantity;
+      this.shopForm.putQuantity = Decimal.div(
+        data.quantity,
+        this.shopForm.sum
+      ).toFixed(0);
+      await quantitycheck({
+        seaFreightVolume: data.seaFreightVolume,
+        clearanceFreightVolume: data.clearanceFreightVolume,
+      }).then((res) => {
+        const { data } = res;
+        if (data) {
+          this.shopRules.putQuantity = [
+            {
+              required: true,
+              message: this.$t("请输入数量(个)"),
+              trigger: "change",
+            },
+          ];
+        } else {
+          delete this.shopRules.putQuantity;
+        }
+      });
+      return data;
     },
     shopAdd() {
       this.$refs["shopForm"].validate((valid) => {
@@ -490,9 +506,14 @@ export default {
             this.$message.error(this.$t("放入箱数不能为0"));
             return;
           }
+          if (this.shopForm.putQuantity === 0) {
+            this.$message.error(this.$t("放入数量(个)不能为0"));
+            return;
+          }
 
           let params = {
             num: this.shopForm.num,
+            quantity: this.shopForm.putQuantity,
             orderItemId: this.shopForm.orderItemId,
             orderSplitId: this.splitData.id,
             remarks: this.shopForm.remarks,
@@ -500,6 +521,7 @@ export default {
           createSplitItem(params).then((res) => {
             this.$message.success(this.$t("放入成功"));
             this.querySplitGoods();
+            this.$refs["shopForm"].resetFields();
           });
           this.shopOpen = false;
         }
@@ -528,6 +550,7 @@ export default {
       });
     },
     shopCancel() {
+      this.$refs["shopForm"].resetFields();
       this.shopOpen = false;
       this.shopForm = {};
     },