Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/api/ecw/order.js

@@ -181,6 +181,15 @@ export function orderWarehouseInUpdateLabel(data){
   })
 }
 
+// 入仓修改储位
+export function saveOrUpdateOrderLocation(data){
+  return request({
+    url: '/order/order-warehouse-in/save-or-update-order-location',
+    method: 'post',
+    data
+  })
+}
+
 // 获取入仓修改审批单详情-审批使用
 export function getWarehouseUpdateApprovalInfo(id) {
   return request({

src/components/WarehouseAreaDialog/index.vue

@@ -64,7 +64,8 @@
 </template>
 
 <script>
-import { getByWarehouseId } from '@/api/ecw/warehouseArea'
+import {getByWarehouseId} from '@/api/ecw/warehouseArea'
+import {saveOrUpdateOrderLocation} from "@/api/ecw/order"
 
 export default {
   name: 'WarehouseAreaDialog',
@@ -82,6 +83,11 @@ export default {
     warehouseId: {
       type: Number,
       default: undefined
+    },
+    // 是否入仓修改
+    isEditing: {
+      type: Boolean,
+      default: false
     }
   },
 
@@ -102,41 +108,57 @@ export default {
     visible(val) {
       if (val) {
         this.opened = true
+      } else {
+      }
+    },
+    opened(val) {
+      if (val) {
+      } else {
+        this.$emit('update:visible', false)
+      }
+    }
+  },
 
-        if (this.area.length === 0) getByWarehouseId({cityId: this.cityId,warehouseId: this.warehouseId }).then(r => {
+  methods: {
+    updateArea(){
+      this.initArea()
+    },
+    initArea(){
+      return getByWarehouseId({ cityId: this.cityId, warehouseId: this.warehouseId }).then(r => {
         const area = r.data
         area.forEach(e => {
           // 仓库
           e.children?.forEach(f => {
             // 区域
-              f.selected = false
+            f.selected = this.isSelected(e.id, f.id)
             if(f.positionList) f.positionList.forEach(g => {
               // 位置
-                g.selected = false
+              g.selected = this.isSelected(e.id, f.id, g.id)
               g.children?.forEach(k => {
                 // 子位置
-                  k.selected = false
+                k.selected = this.isSelected(e.id, f.id, k.id)
               })
             })
           })
         })
         this.area = area
       })
-      } else {
-      }
     },
-    opened(val) {
-      if (val) {
-      } else {
-        this.$emit('update:visible', false)
-      }
-    }
+    // 用于储位回显选中
+    isSelected(warehouse, area, position = 0){
+      return !!this.value.find(e => warehouse === e.wareId && area === e.areaId && position === e.locationId)
     },
-
-  methods: {
     handleSubmit() {
       this.$emit('input', this.inputValue)
       this.opened = false
+      if (this.isEditing) {
+        this.$nextTick(() => {
+          saveOrUpdateOrderLocation({
+            "orderId": this.orderId,
+            "orderLocationCreateReqVOList": this.inputValue
+          })
+        })
+      }
     },
     handleClose() {},
     handleSelectWarehouse(warehouse) {
@@ -146,7 +168,6 @@ export default {
         return
       } else if(this.activeWarehouseId !== warehouse.id) {
         this.activeWarehouseId = warehouse.id
-        console.log(this.inputValue.find(e => e.areaId === warehouse.id), warehouse.id)
         if (this.inputValue.find(e => e.areaId === warehouse.id)){
           return
         }
@@ -202,7 +223,6 @@ export default {
   },
 
   mounted() {
-    console.log('area dialog mounted')
   },
 
   computed: {

src/views/ecw/box/indexSea.vue

@@ -156,7 +156,7 @@
         <costForm v-if="dialogCfg.open" @closeDialog="closeDialog" :shipmentObj="currRow" />
       </template>
       <template v-if="dialogCfg.dialogType === 'error'">
-        <regError v-if="dialogCfg.open" @closeDialog="closeDialog" :shipmentObj="currRow" />
+        <regError v-if="dialogCfg.open" @closeDialog="closeDialog" :shipmentObj="currRow" :allUsers="allUsers"/>
       </template>
       <template v-if="dialogCfg.dialogType === 'editLadingBill'">
         <ladingBill v-if="dialogCfg.open" @closeDialog="closeDialog" :shipmentObj="currRow" :getCabinetName="getCabinetName" />
@@ -212,6 +212,7 @@ import costForm from "./costForm.vue";
 import regError from "./regError.vue";
 import editForm from "./editForm.vue";
 import ladingBill from "./ladingBill/index.vue";
+import { listUser } from "@/api/system/user";
 
 export default {
   name: "EcwBoxIndexsea",
@@ -266,6 +267,7 @@ export default {
       countryList: [],
       // 通知列表
       noticeList: [],
+      allUsers: [],
     };
   },
   computed: {
@@ -301,6 +303,11 @@ export default {
     this.getList();
     this.getCountryList();
     this.queryNotice();
+    // 用户
+    listUser({ pageNo: "1", pageSize: "10000" }).then((res) => {
+      const { data } = res;
+      this.allUsers = data.list ?? [];
+    });
   },
   methods: {
     formatDate,

src/views/ecw/box/indexSeaAir.vue

@@ -290,6 +290,7 @@
           v-if="dialogCfg.open"
           @closeDialog="closeDialog"
           :shipmentObj="currRow"
+          :allUsers="allUsers"
         />
       </template>
       <template v-if="dialogCfg.dialogType === 'editLadingBill'">
@@ -318,6 +319,7 @@ import costForm from './costForm.vue'
 import regError from './regError.vue'
 import editForm from './editSeaAirForm.vue'
 import ladingBill from "./ladingBill/index.vue";
+import { listUser } from "@/api/system/user";
 
 export default {
   name: 'EcwBoxIndexseaair',
@@ -379,6 +381,7 @@ export default {
       cabinetList: [],
       channelList: [],
       warehouseList: [],
+      allUsers: []
     }
   },
   computed: {
@@ -418,6 +421,11 @@ export default {
     }
   },
   created() {
+    // 用户
+    listUser({ pageNo: "1", pageSize: "10000" }).then((res) => {
+      const { data } = res;
+      this.allUsers = data.list ?? [];
+    });
     this.transportTypes = this.getDictDatas(
       this.DICT_TYPE.ECW_TRANSPORT_TYPE
     ).filter((item) => item.value == '4')

src/views/ecw/box/ladingBill/index.vue

@@ -26,7 +26,7 @@
         </el-table-column>
         <el-table-column :label="$t('控货')" align="center" prop="">
           <template slot-scope="scope">
-            {{scope.row.isCargoControl}}
+            {{scope.row.isCargoControl ? '是' : '否' }}
           </template>
         </el-table-column>
         <el-table-column :label="$t('计划箱数')" align="center" prop="loadNum">
@@ -158,7 +158,7 @@ export default {
       if (type === "query") {
         this.getBillList();
       }
-      if(type === 'close'){
+      if (type === "close") {
         this.$emit("closeDialog");
       }
     },

src/views/ecw/box/shippingSea/nodePage/cusDeclaration.vue

@@ -77,7 +77,7 @@
       <!-- <el-form-item :label="$t('装箱单')">
         <el-button type="primary">{{$t('下载装箱单')}}</el-button>
       </el-form-item> -->
-      <el-form-item :label="$t('报关单')">
+      <el-form-item :label="$t('报关单')" v-show="isDownload">
         <el-button type="primary" @click="downloadCusFile">{{$t('下载所有报关单')}}</el-button>
       </el-form-item>
 
@@ -228,6 +228,7 @@ export default {
       inspectionTimecustoms: this.getDictDatas(
         this.DICT_TYPE.BOX_INSPECTION_TIME_CUSTOMS
       )[0].value,
+      isDownload: false,
     };
   },
   created() {
@@ -533,6 +534,12 @@ export default {
     },
   },
   watch: {
+    "cusDeclarationObj.documentInfo"(val) {
+      this.isDownload = false;
+      if (val.includes("2")) {
+        this.isDownload = true;
+      }
+    },
     "cusDeclarationObj.dcBoxWgt"(dcBoxWgt) {
       this.calcVGM(dcBoxWgt, this.cusDeclarationObj.dcGoodsWgt);
     },

src/views/ecw/box/shippingSea/nodePage/tally/batchTally.vue

@@ -54,6 +54,9 @@ export default {
       warehouseId: this.$attrs.shipmentObj.startWarehouseId,
     };
   },
+  mounted() {
+    this.$refs.area.updateArea()
+  },
   methods: {
     getTotlContent,
     // 打开储位

src/views/ecw/box/shippingSea/nodePage/unloading/index.vue

@@ -2,7 +2,9 @@
   <div>
     <el-form ref="unloadingForm" :model="unloadingObj" label-width="100px">
       <el-form-item :label="$t('网点')">
-        <dockSelect v-model="unloadingObj.ulOutletsId" :placeholder="$t('请选择网点')" :allDocks="this.$attrs.allDocks" />
+        <el-select filterable v-model="unloadingObj.ulOutletsId" clearable>
+          <el-option v-for="node in nodes" :key="node.id" :label="$l(node, 'title')" :value="node.id"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item :label="$t('到仓时间')">
         <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="unloadingObj.ulWarehouseTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
@@ -30,7 +32,7 @@
 import startUnloading from "./startUnloading.vue";
 import { unloadCreate } from "@/api/ecw/boxSea";
 import { formatDateStr, serviceMsg } from "../../utils";
-import dockSelect from "../common/dockSelect.vue";
+import { getNodePage } from "@/api/ecw/node";
 
 /**
  * 卸柜
@@ -38,13 +40,14 @@ import dockSelect from "../common/dockSelect.vue";
 export default {
   name: "unloading",
   inheritAttrs: false,
-  components: { startUnloading, dockSelect },
+  components: { startUnloading },
   data() {
     return {
       // 清关对象
       unloadingObj: {},
       // 弹窗状态
       dialogVisible: false,
+      nodes: [],
     };
   },
   created() {
@@ -52,6 +55,10 @@ export default {
     let oldData = { ...this.$attrs.shipmentObj[voName] };
     oldData = formatDateStr(oldData, ["ulWarehouseTime", "ulBoxTime"]);
     this.unloadingObj = oldData;
+    getNodePage({ pageNo: 1, pageSize: 1000, status: 0 }).then((res) => {
+      const { data } = res;
+      this.nodes = data?.list ?? [];
+    });
   },
   methods: {
     /** 提交 */

src/views/ecw/order/warehousing/index.vue

@@ -147,7 +147,7 @@
     </el-form>
 
     <warehouse-area-dialog ref="area" :visible.sync="areaVisible" v-model="form.orderLocationCreateReqVOList"
-                           :order-id="orderId" :warehouse-id="warehouseId"></warehouse-area-dialog>
+                           :order-id="orderId" :warehouse-id="warehouseId" :is-editing="isEdit"></warehouse-area-dialog>
 
     <edit-dialog :title="title" :order-id="order.orderId" :visible.sync="warehousingVisible" :warehousing="warehousing" :edit="isEdit"></edit-dialog>
 
@@ -226,7 +226,12 @@ export default {
       this.getOrder()
       getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data.reverse())
       getSpecialListByOrderId(this.orderId).then(r => this.specialList = r.data)
-      listByOrderId({ orderId: this.orderId }).then(r => this.form.orderLocationCreateReqVOList = r.data)
+      listByOrderId({ orderId: this.orderId }).then(r => {
+        this.form.orderLocationCreateReqVOList = r.data
+        this.$nextTick(() => {
+          this.$refs.area.updateArea()
+        })
+      })
     }
     getCurrencyList().then(res => this.currencyList = res.data)
   },