Merge branch 'release2.2' of...

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

src/api/ecw/box.js

@@ -343,3 +343,10 @@ export function updateUrl(data) {
     data,
   });
 }
+
+export function dealCustomsSplitNotify(notifyId){
+  return request({
+    url: `/shipment/box/dealCustomsSplitNotify?notifyId=${notifyId}`,
+    method: "get",
+  })
+}

src/api/ecw/exchangeRate.js

@@ -45,7 +45,7 @@ export function getExchangeRatePage(query) {
 // 汇率日志查询
 export function getExchangeRateLogList(params){
   return request({
-      url:'/ecw/exchange-rate-log/list',
+      url:'/ecw/exchange-rate-log/page',
       method:'get',
       params,
   })

src/views/ecw/box/indexSea.vue

@@ -210,7 +210,7 @@ import {
   getbox,
   getboxPage,
   exportboxExcel,
-  getNoticeList,
+  getNoticeList, dealCustomsSplitNotify,
 } from "@/api/ecw/box";
 import {
   downloadFile,
@@ -443,7 +443,7 @@ export default {
       }
     },
     /** 查看按钮操作 */
-    handleCommand(row, command) {
+    async handleCommand(row, command) {
       this.$set(this.dialogCfg, "fullscreen", false);
 
       switch (command) {
@@ -530,6 +530,9 @@ export default {
           if ([5, 6, 7].includes(noticeType)) {
             this.$router.push("/boxSea/query/" + row.id);
           }
+          if([9].includes(noticeType)){
+            await dealCustomsSplitNotify(row.notifyId)
+          }
           this.closeDialog();
           break;
       }

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

@@ -828,8 +828,8 @@ export default {
             remarks: this.shopForm.remarks,
             volume: this.putin.volume,
             weight: this.putin.weight,
-            chargeWeight: this.putin.chargeWeight,
-            chargeVolume: this.putin.chargeVolume,
+            chargeWeight: this.shopForm.chargeWeight,
+            chargeVolume: this.shopForm.chargeVolume,
             worth: this.shopForm.worth || 0,
             specsRecordVOList:this.shopForm.specsRecordVOList,
             shipmentSplit: true
@@ -962,8 +962,17 @@ export default {
       // 根据比例计算默认的收费方数和收费重量
       const orderItem = this.orderData.orderItemVOList.find(item => item.orderItemId == this.shopForm.orderItemId)
       const rate = this.putin.num / orderItem.warehouseInInfoVO.cartonsNum
-      this.$set(this.shopForm, 'chargeVolume', (orderItem.chargeVolume*rate).toFixed(2))
-      this.$set(this.shopForm, 'chargeWeight', (orderItem.chargeWeight*rate).toFixed(2))
+
+      /*
+      * 1 普货 2 重货 3 泡货
+      * 普货 收费数据=入仓数据
+      * 泡货 收费方数=入仓方数 收费重量 = 品名收费重量*比例
+      * 重货 收费方数=品名收费方数*比例 收费重量 = 入仓重量
+      * */
+      const chargeVolume = orderItem.itemType === 2 ? (orderItem.chargeVolume*rate).toFixed(2) : this.putin.volume
+      const chargeWeight = orderItem.itemType === 3 ? (orderItem.chargeWeight*rate).toFixed(2) : this.putin.weight
+      this.$set(this.shopForm, 'chargeVolume', chargeVolume)
+      this.$set(this.shopForm, 'chargeWeight', chargeWeight)
       this.$set(this.shopForm, 'worth', (orderItem.worth*rate).toFixed(2))
     }
   },

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

@@ -360,17 +360,23 @@ export default {
               this.$confirm(res.msg+this.$t('是否需要一起预装?'), this.$t("提示"), {
                 dangerouslyUseHTMLString: true,
                 type: "warning",
+                confirmButtonText: '预装关联单',
+                cancelButtonText: '仅当前订单'
               })
                 .then((_) => {
-                  createGoods({ ...params, relationStatus: 2 }).then((res) => {
+                  createGoods({ ...params, relationStatus: 2, singleLoad: false }).then((res) => {
                     serviceMsg(res, this).then(() => {
                       this.queryAllData();
                     });
                   });
                 })
                 .catch((_) => {
+                  createGoods({ ...params, relationStatus: 2, singleLoad: true }).then((res) => {
+                    serviceMsg(res, this).then(() => {
                       this.queryAllData();
                     });
+                  });
+                });
             }
           });
     },

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

@@ -264,6 +264,7 @@ export default {
   },
   methods: {
     getCustomsOrderList(dcCustomsType) {
+      if(dcCustomsType) dcCustomsType = ''
       customsOrderList({
         shipmentId: this.shipmentObj.id,
         customsTypes: dcCustomsType === "3" ? "2,3" : dcCustomsType,

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

@@ -699,7 +699,7 @@ export default {
                 type: "warning",
               })
                 .then((_) => {
-                  createGoods({ ...params, relationStatus: 1 }).then((res) => {
+                  createGoods({ ...params, relationStatus: 1, singleLoad: true }).then((res) => {
                     serviceMsg(res, this).then(() => {
                       this.queryAllData();
                     });
@@ -714,17 +714,23 @@ export default {
               this.$confirm(res.msg+this.$t('是否需要一起预装?'), this.$t("提示"), {
                 dangerouslyUseHTMLString: true,
                 type: "warning",
+                confirmButtonText: '预装关联单',
+                cancelButtonText: '仅当前订单'
               })
                 .then((_) => {
-                  createGoods({ ...params, relationStatus: 2 }).then((res) => {
+                  createGoods({ ...params, relationStatus: 2, singleLoad: false }).then((res) => {
                     serviceMsg(res, this).then(() => {
                       this.queryAllData();
                     });
                   });
                 })
                 .catch((_) => {
+                  createGoods({ ...params, relationStatus: 2, singleLoad: true }).then((res) => {
+                    serviceMsg(res, this).then(() => {
                       this.queryAllData();
                     });
+                  });
+                });
             }
           });
       } else {

src/views/ecw/exchangeRate/index.vue

@@ -140,6 +140,8 @@
              </template>
            </el-table-column>
          </el-table>
+       <pagination v-show="totalLog > 0" :total="totalLog" :page.sync="formLog.page" :limit.sync="form.rows"
+                   @pagination="handleLog"/>
      </el-dialog>
   </div>
 </template>
@@ -200,7 +202,12 @@ export default {
         targetCurrencyId: [{ required: true, message: this.$t('币种2不能为空'), trigger: "change" }],
         targetCurrencyCode: [{ required: true, message: this.$t('目标种代码不能为空'), trigger: "blur" }],
         currencyRate: [{ required: true, message: this.$t('汇率不能为空'), trigger: "blur" }],
-      }
+      },
+      formLog:{
+        rows:10,
+        page:1
+      },
+      totalLog: 0,
     };
   },
   created() {
@@ -216,8 +223,9 @@ export default {
     },
     handleLog(row){
       this.openLog = true;
-      getExchangeRateLogList({ids:row.id}).then(r => {
-        this.listLog = r.data;
+      getExchangeRateLogList({rateId:row.id,...this.formLog}).then(r => {
+        this.listLog = r.data.list;
+        this.totalLog = r.data.total;
       })
     },
     getOperator(val){

src/views/ecw/order/components/WarehouseDetail.vue

@@ -41,6 +41,15 @@
               {{getLocationName(row.orderLocationBackVOList)}}
             </template>
           </el-table-column>
+          <el-table-column :label="$t('入仓影像')" prop="orderLocationBackVOList" >
+            <template slot-scope="{row}">
+              <image-display :pictureUrls="warehouseItem.pictureUrls" :type="5">
+                <el-button type="text">
+                  查看
+                </el-button>
+              </image-display>
+            </template>
+          </el-table-column>
         </el-table>
     </el-dialog>
 </template>
@@ -49,8 +58,10 @@ import { getOrder, getOrderWarehouseIn } from '@/api/ecw/order'
 import { DICT_TYPE } from '@/utils/dict'
 import { parseTime } from '@/utils/ruoyi'
 import WarehouseAreaSelect from "@/components/WarehouseAreaSelect"
+import ImageDisplay from "@/views/ecw/order/components/imageDisplay.vue";
 export default {
   components: {
+    ImageDisplay,
     WarehouseAreaSelect
   },
     filters: {parseTime},

src/views/ecw/order/components/imageDisplay.vue

@@ -10,7 +10,7 @@
       :visible.sync="visible"
       width="80%">
       <div style="display: flex;flex-wrap: wrap;">
-        <el-image style="width: 200px;height: 200px;margin-right: 10px;margin-bottom: 10px" v-for="(item) in list"  :src="item.url"></el-image>
+        <el-image style="width: 200px;height: 200px;margin-right: 10px;margin-bottom: 10px" v-for="(item) in list"  :src="bizId ? item.url : item"></el-image>
       </div>
     </el-dialog>
   </div>
@@ -23,6 +23,10 @@ export default {
   props:{
     bizId:[String, Number],
     type:[Number],
+    pictureUrls:{
+      type: Array,
+      default:()=>[]
+    }
   },
   name: "imageDisplay",
   data(){
@@ -44,7 +48,12 @@ export default {
   watch:{
     visible(val){
       if(val){
+        if(this.bizId){
           this.getList()
+        }else {
+          this.list = this.pictureUrls
+        }
+
       }
     }
   }

src/views/ecw/order/splitApply/components/PutIn.vue

@@ -94,7 +94,8 @@
           </template>
           <template v-slot="{row,$index}">
             <el-form-item  label-width="0">
-              <el-input-number controls-position="right" :min="0" class="w-100 tight"  v-model="row.boxGauge1" @blur="calcVolume(row)"/>
+              <input class="input" v-model="row.boxGauge1" type="number" @keyup="calcVolume(row)" @change="calcVolume(row)" :min="0"></input>
+              <!--<el-input-number controls-position="right" :min="0" class="w-100 tight"  v-model="row.boxGauge1" @blur="calcVolume(row)"/>-->
             </el-form-item>
           </template>
         </el-table-column>
@@ -104,7 +105,8 @@
           </template>
           <template v-slot="{row,$index}">
             <el-form-item  label-width="0">
-              <el-input-number controls-position="right" :min="0" class="w-100 tight" v-model="row.boxGauge2" @blur="calcVolume(row)" />
+              <input class="input" v-model="row.boxGauge2" type="number" @keyup="calcVolume(row)" @change="calcVolume(row)" :min="0"></input>
+              <!--<el-input-number controls-position="right" :min="0" class="w-100 tight" v-model="row.boxGauge2" @blur="calcVolume(row)" />-->
             </el-form-item>
           </template>
         </el-table-column>
@@ -114,7 +116,8 @@
           </template>
           <template v-slot="{row,$index}">
             <el-form-item  label-width="0">
-              <el-input-number controls-position="right" :min="0" class="w-100 tight" v-model="row.boxGauge3" @blur="calcVolume(row)"/>
+              <input class="input" v-model="row.boxGauge3" type="number" @keyup="calcVolume(row)" @change="calcVolume(row)" :min="0"></input>
+              <!--<el-input-number controls-position="right" :min="0" class="w-100 tight" v-model="row.boxGauge3" @blur="calcVolume(row)"/>-->
             </el-form-item>
           </template>
         </el-table-column>
@@ -338,12 +341,15 @@ export default {
     },
     // 计算体积
     calcVolume(row){
+      // 改了规格后按照规格计算体积
+      this.$set(row, 'calcVolumeByBoxGauge', 1)
+
       let volume = Decimal(row.boxGauge1 || 0)
         .times(Decimal(row.boxGauge2 || 0))
         .times(Decimal(row.boxGauge3 || 0)).div(1000000)
       // 如果是箱的单位要乘以箱数
-      if(row.specificationType === 1) {
-        row.volume = volume.times(Decimal(row.num || 0))
+      if(+row.specificationType === 1) {
+        volume = volume.times(Decimal(row.num || 0))
       }
 
       // 最低0.01
@@ -355,16 +361,22 @@ export default {
       if(!locationArr || !locationArr.length) return ''
       let arr = []
       locationArr.forEach(item => {
-        arr.push(`${item.areaName}${item.locationName || ''}`)
+        arr.push(`${item.areaName || ''}${item.locationName || ''}`)
       })
       return Array.from(new Set(arr)).join(",")
     },
     // 根据箱数计算体积，重量,数量
     calc(row){
       const rate = row.num / this.warehouseRecord.cartonsNum
+
       row.volume = (this.warehouseRecord.volume * rate).toFixed(2)
       row.weight = (this.warehouseRecord.weight * rate).toFixed(2)
       row.quantity = (this.warehouseRecord.quantityAll * rate).toFixed(0)
+
+      // 如果是按照规格计算体积，则重新计算
+      if(row.calcVolumeByBoxGauge){
+        this.calcVolume(row)
+      }
     },
     closeDialog(){
       this.show = false

src/views/ecw/order/splitApply/components/WarehouseRecord.vue

@@ -33,9 +33,9 @@
       <el-table-column :label="$t('重量') + '(kg)'" prop="weight" />
       <el-table-column :label="$t('数量（个）')" prop="quantity" />
       <el-table-column :label="$t('入仓快递单号')" prop="expressNo" />
-      <!--<el-table-column :label="$t('首次入仓时间')" prop="inTime" >
+      <el-table-column :label="$t('首次入仓时间')" prop="inTime" >
         <template slot-scope="{row}">{{row.inTime|parseTime}}</template>
-      </el-table-column>-->
+      </el-table-column>
       <el-table-column :label="$t('储位')" prop="orderLocationBackVOList" >
         <template slot-scope="{row}">
           <!--{{getLocationName(row.orderLocationList)}}-->
@@ -52,10 +52,12 @@
 
 <script>
 import WarehouseAreaSelect from "@/components/WarehouseAreaSelect/index.vue";
+import {parseTime} from "@/utils/ruoyi";
 
 export default {
   name: "WarehouseRecord",
   components: {WarehouseAreaSelect},
+  filters: {parseTime},
   props:{
     list:{
       type: Array,
@@ -73,6 +75,7 @@ export default {
     this.show = true
   },
   methods:{
+    parseTime,
     // 获取储位名称
     getLocationName(locationArr){
       if(!locationArr || !locationArr.length) return ''

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

@@ -920,21 +920,6 @@ export default {
       }
       this.open = true
     },
-    /*changeProdTitleZh(val){
-        var list = []
-        list = this.splitData[0].orderSplitItemBackVOList.filter(item=>item.id == val)
-        this.shopForm.sum = list[0].num
-        this.quantitySum = list[0].quantity
-        this.shopForm.orderItemId = list[0].orderItemId
-        this.shopForm.prodTitleEn = list[0].prodTitleEn
-        this.shopForm.prodTitleZh = list[0].prodTitleZh
-        // 默认给一个
-        if(!this.shopForm.specsRecordVOList || !this.shopForm.specsRecordVOList.length){
-          this.addRow()
-        }
-
-        this.numcheck()
-    },*/
     // 查询数量是否必填
     numcheck(){
       quantityRequired(this.orderData.lineId).then(res=>{