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

src/api/ecw/boxSea.js

@@ -150,6 +150,7 @@ export function getBoxLadingBillPdf(params) {
   return request({
     url: "/ecw/box-lading-bill/getBoxLadingBillPdf",
     method: "get",
+    responseType: 'arraybuffer',
     params,
   });
 }

src/components/WarehouseAreaSelect/index.vue

@@ -188,8 +188,10 @@ export default {
         this.$emit('input', data)
         this.dialogVisible = false
 
-        if (this.isEditing || this.orderItemId) {
-            updateWarehouseInLocation(data)
+        if (this.isEditing || this.warehouseInId) {
+            updateWarehouseInLocation(data).then(() => {
+              this.$message.success('储位修改成功')
+            })
         }
       })
     },

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

@@ -206,7 +206,7 @@
             </el-col>
           </el-row>
           <el-form-item :label="$t('放入箱数')+'：'">
-            {{shopForm.num||0}}
+            {{shopForm.putNum||0}}
           </el-form-item>
           <el-form-item :label="$t('放入数量(个)')+'：'" prop="putQuantity" v-show="isQuantity">
             <el-input-number v-model="shopForm.putQuantity" controls-position="right" :min="0"></el-input-number>
@@ -464,9 +464,10 @@ export default {
 
       const data = list[0];
       this.shopForm.orderItemId = data.orderItemId;
-      this.shopForm.quantity = data.quantity;
+      this.shopForm.putNum = data.num ?? 0;
+      this.shopForm.quantity = data.quantity ?? 0;
       this.shopForm.putQuantity = Decimal.div(
-        data.quantity,
+        data.quantity ?? 0,
         this.shopForm.num
       ).toFixed(0);
 

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

@@ -167,7 +167,7 @@ export default {
             operateType,
           }).then((res) => {
             serviceMsg(res, this).then(() => {
-              this.download()
+              if(operateType == 2) this.download()
               this.cancel("submit");
             });
           });

src/views/ecw/customer/customerLog.vue

@@ -81,14 +81,16 @@
      </el-table-column>
      <el-table-column label="新的预计入公海时间">
        <template v-slot="{row}">
-         {{parseTime(row.newEstimateEnterOpenSeaTime)}}
+         {{parseTime(row.newEstimateEnterOpenSeaTime) || '/'}}
        </template>
      </el-table-column>
      <el-table-column label="老的预计入公海时间" >
        <template v-slot="{row}">
-         {{parseTime(row.oldEstimateEnterOpenSeaTime)}}
+         {{parseTime(row.oldEstimateEnterOpenSeaTime || '/')}}
        </template>
      </el-table-column>
+     <el-table-column label="备注" prop="remark" >
+     </el-table-column>
      <el-table-column  label="操作">
        <template v-slot="{row}">
          <el-button type="text" @click="getCustomerLog(row.id)">
@@ -102,7 +104,7 @@
    <el-dialog title="客户日志" :visible.sync="show">
      <el-form>
        <el-form-item label="订单编号:">
-         {{dataLog.dataLog ? dataLog.dataLog :'/'}}
+         {{dataLog.orderNo ? dataLog.orderNo :'/'}}
        </el-form-item>
        <el-form-item label="客户编号:">
          {{dataLog.number}}
@@ -111,10 +113,10 @@
          {{dataLog.name}}
        </el-form-item>
        <el-form-item label="新客户经理:">
-         {{dataLog.newEstimateEnterOpenSeaTime ? dataLog.newEstimateEnterOpenSeaTime : '/'}}
+         {{dataLog.newCustomerService ? operatorFn(dataLog.newCustomerService) : '/'}}
        </el-form-item>
        <el-form-item label="老客户经理:">
-         {{dataLog.oldEstimateEnterOpenSeaTime ? dataLog.oldEstimateEnterOpenSeaTime : '/'}}
+         {{dataLog.oldCustomerService ? operatorFn(dataLog.oldCustomerService) : '/'}}
        </el-form-item>
        <el-form-item label="操作类型:">
          <dict-tag :type="DICT_TYPE.CUSTOMER_OPERATE_TYPE" :value="dataLog.operateType"></dict-tag>
@@ -123,17 +125,14 @@
          {{operatorFn(dataLog.operator)}}
        </el-form-item>
        <el-form-item label="新预计进入公海时间:">
-         {{parseTime(dataLog.newEstimateEnterOpenSeaTime)}}
+         {{parseTime(dataLog.newEstimateEnterOpenSeaTime) || '/'}}
        </el-form-item>
        <el-form-item label="老的预计进入公海时间:">
-         {{parseTime(dataLog.oldEstimateEnterOpenSeaTime)}}
+         {{parseTime(dataLog.oldEstimateEnterOpenSeaTime) || '/'}}
        </el-form-item>
        <el-form-item label="备注:">
          {{dataLog.remark}}
        </el-form-item>
-       <el-form-item label="更新json:">
-         {{dataLog.updateBody}}
-       </el-form-item>
      </el-form>
    </el-dialog>
  </div>
@@ -160,7 +159,7 @@ export default {
     },
     operatorFn(){
       return (val)=>{
-        return this.allSimplList.find(item => item.id == val)?.nickname
+        return this.allSimplList.find(item => item.id == val)?.nickname || '/'
       }
     }
   },

src/views/ecw/customer/query.vue

@@ -428,7 +428,7 @@
            </el-table>
             <pagination @pagination="getCustomerGrade" :page.sync="getCustomerGradeFrom.pageNo" :limit.sync="getCustomerGradeFrom.pageSize"  :total="getCustomerGradeFrom.total" ></pagination>
           </el-tab-pane>
-          <el-tab-pane name="operationLog" v-if="permissions.includes('ecw:customer:operation-log')" :label="$t('操作日志')" >
+          <el-tab-pane name="operationLog" v-show="checkPermi('ecw:customer:operation-log')" :label="$t('操作日志')" >
             <customer-log  :customerId="id" v-if="'operationLog' === activeName"></customer-log>
           </el-tab-pane>
         </el-tabs>
@@ -490,6 +490,7 @@ import {getCreditRulePage} from "@/api/customer/creditRule";
 import {getCountry} from "@/api/ecw/country"
 import {getCurrencyList} from "@/api/ecw/currency";
 import customerLog from "@/views/ecw/customer/customerLog.vue";
+import {checkPermi} from "@/utils/permission";
 
 export default {
   name: 'query',
@@ -722,6 +723,7 @@ export default {
     }
   },
   methods:{
+    checkPermi,
     userIdFormatter(row, column, cellValue){
       const member = this.memberList.find(e => e.id === cellValue)
       if (member) {

src/views/ecw/financial/commission-Payment.vue

@@ -100,7 +100,7 @@
             :type="DICT_TYPE.ECW_PAYMENT_STATE"
             :value="scope.row.state"
           />
-          <span v-if="scope.row.state == 2 " :title="scope.row.remark"><i class="el-icon-question"></i></span>
+          <span v-if="[2,4,6].includes(scope.row.state) && scope.row.comment" :title="scope.row.comment"><i class="el-icon-question"></i></span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('操作')">

src/views/ecw/financial/commission-requestFunds.vue

@@ -188,7 +188,7 @@
           size="mini"
           @click="handleAdd"
           style="padding: 10px; margin-bottom: 10px"
-        >{{ $t('加未付客户款项') }}
+        >{{ $t('添加未付客户款项') }}
         </el-button
         >
       </el-col>

src/views/ecw/financial/components/commissionPaymentDetails.vue

@@ -6,6 +6,7 @@
     <el-descriptions-item label="创建时间">{{parseTime(record.createTime)}}</el-descriptions-item>
     <el-descriptions-item label="业务员">{{record.salesmanName}}</el-descriptions-item>
     <el-descriptions-item label="付款金额">{{record.totalAmount}}rmb</el-descriptions-item>
+    <el-descriptions-item v-if="record.bmpStatus === 3" label="驳回原因">{{record.comment}}</el-descriptions-item>
   </el-descriptions>
   <router-link :to="{path:'/financial/commission-requestFunds',query:{lookId: this.record.id}}">
     <el-button type="primary">查看详情</el-button>

src/views/ecw/financial/paymentVoucher.vue

@@ -134,6 +134,7 @@
             :type="DICT_TYPE.ECW_PAYMENT_STATE"
             :value="scope.row.state"
           />
+          <span v-if="[2,4,6].includes(scope.row.state) && scope.row.comment" :title="scope.row.comment"><i class="el-icon-question"></i></span>
         </template>
       </el-table-column>
       <el-table-column

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

@@ -8,7 +8,7 @@
                         <div>{{$t('注：单号之间使用逗号或空格隔开')}}</div>
                     </el-form-item>
                     <el-form-item :label="$t('提货时间')" prop="pickTime">
-                        <el-date-picker v-model="form.pickTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+                        <el-date-picker type="datetime" v-model="form.pickTime" placeholder="" label-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
                     </el-form-item>
                 </el-tab-pane>
                 <el-tab-pane :label="$t('分批提货')" name="createSplitBatch">
@@ -18,7 +18,7 @@
                         <div>{{$t('注：单号之间使用逗号或空格隔开')}}</div>
                     </el-form-item>
                     <el-form-item :label="$t('提货时间')" prop="pickTime">
-                        <el-date-picker v-model="form.pickTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+                        <el-date-picker type="datetime" v-model="form.pickTime" placeholder="" label-format="yyyy-MM-dd HH:mm:ss"  value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
                     </el-form-item>
                     <el-form-item label="">
                         <el-table :data="orderList">

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

@@ -32,7 +32,7 @@
           <el-table-column :label="$t('体积') + '(m³)'" prop="volume" />
           <el-table-column :label="$t('重量') + '(kg)'" prop="weight" />
           <el-table-column :label="$t('数量（个）')" prop="quantityAll" />
-          <el-table-column :label="$t('快递单号')" prop="expressNo" />
+          <el-table-column :label="$t('入仓快递单号')" prop="expressNo" />
           <el-table-column :label="$t('入仓时间')" prop="inTime" >
             <template slot-scope="{row}">{{row.inTime|parseTime}}</template>
           </el-table-column>

src/views/ecw/order/detail.vue

@@ -200,19 +200,7 @@
                 </template>
               </template>
             </el-table-column>
-            <el-table-column prop="" :label="$t('储位')">
-              <template slot-scope="{row}">
-                <!-- <warehouse-area-select
-                  v-if="row.warehouseInInfoVO"
-                  v-model="row.warehouseInInfoVO.orderLocationBackVOList"
-                  readonly
-                  :order-id="orderId"></warehouse-area-select> -->
-                  <template v-if="row.warehouseInInfoVO">
-                    {{getLocationName(row.warehouseInInfoVO.orderLocationMergeVOSet)}}
-                  </template>
-              </template>
-            </el-table-column>
-            <el-table-column prop="" :label="$t('快递单号')">
+            <el-table-column prop="" :label="$t('填单快递单号')">
               <template slot-scope="{row}">
                 {{ row.expressNo }}
               </template>
@@ -282,29 +270,6 @@
             </el-table-column>
           </el-table>
         </el-tab-pane>
-        <!-- 这个地方v-hasPermi不生效，所以换checkPermi函数检查 -->
-        <el-tab-pane :label="$t('操作日志')" name="five" v-if="checkPermi(['ecw:order:logs'])">
-          <el-table :data="logs">
-            <el-table-column :label="$t('时间')" width="150">
-              <template slot-scope="{row}">{{ parseTime(row.createTime) }}</template>
-            </el-table-column>
-            <el-table-column :label="$t('操作人')" prop="creatorName" width="150"> </el-table-column>
-            <el-table-column :label="$t('操作人类型')" width="100">
-              <template slot-scope="{row}">{{ row.userType == 1 ? $t('会员') : $t('管理员') }}</template>
-            </el-table-column>
-            <el-table-column :label="$t('操作类型')" prop="type" width="150"></el-table-column>
-            <el-table-column :label="$t('操作描述')" prop="msg" width="300"></el-table-column>
-            <el-table-column :label="$t('备注')" prop="note">
-              <template slot-scope="{row}">
-                <div v-if="row.note">
-                  <div v-for="item in parseLogNote(row.note)">
-                    {{$t('【{name}】从【{orgValue}】修改为【{newValue}】',  item)}}
-                  </div>
-                </div>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-tab-pane>
       </el-tabs>
     </el-card>
 
@@ -379,7 +344,7 @@
 </template>
 
 <script>
-import { getOrder, operateLogPage } from '@/api/ecw/order'
+import { getOrder } from '@/api/ecw/order'
 import { getDictDatas, DICT_TYPE } from '@/utils/dict';
 import PrintWarehouseReceipt from './components/PrintWarehouseReceipt'
 import PrintLadingBill from './components/PrintLadingBill'
@@ -391,12 +356,11 @@ import {listByIds} from '@/api/ecw/region'
 import WarehouseDetail from './components/WarehouseDetail';
 import {getProductBrank} from '@/api/ecw/productBrank'
 import { parseTime } from '@/utils/ruoyi';
-import WarehouseAreaSelect from "@/components/WarehouseAreaSelect"
-import {checkPermi} from '@/utils/permission'
+
 export default {
   name: "detail",
   components: {
-    PrintWarehouseReceipt, PrintLadingBill, WarehouseDetail, WarehouseAreaSelect
+    PrintWarehouseReceipt, PrintLadingBill, WarehouseDetail
   },
   filters: {
     customsTypeFilter(e, customsTypeList) {
@@ -434,8 +398,6 @@ export default {
       showWarehouseInItemId: null, // 当前显示的入仓
       showFeeDetailDialog: null, // 是否显示费用详情弹层
       feeDetail: null, // 费用详情
-
-      logs: [], // 操作日志
     }
   },
   computed:{
@@ -471,9 +433,6 @@ export default {
       if(!this.feeList.length && val == 'four'){
         this.loadFeeList()
       }
-      if(!this.logs.length && val == 'five'){
-        this.loadLogs()
-      }
     },
     'order.channelId'(){
       this.getChannel()
@@ -498,18 +457,10 @@ export default {
 
     getCurrencyList().then(res => this.currencyList = res.data)
     getUnitList().then(res => this.unitList = res.data)
+
+    console.log('2023-01-14 23:23 看到此消息则表示代码最新')
   },
   methods: {
-    checkPermi, // 检查权限
-    // 获取储位名称
-    getLocationName(locationArr){
-      if(!locationArr || !locationArr.length) return ''
-      let arr = []
-      locationArr.forEach(item => {
-        arr.push(`${item.areaName}${item.locationName || ''}`)
-      })
-      return Array.from(new Set(arr)).join(",")
-    },
     // 显示费用详情
     showFeeDetail(row, type){
       this.showFeeDetailDialog = true
@@ -631,12 +582,6 @@ export default {
         this.feeList = res.data
       })
     },
-    // 加载操作日志
-    loadLogs(){
-      operateLogPage({orderId: this.orderId, page: 1, rows: 10000}).then(res => {
-        this.logs = res.data.list
-      })
-    },
     downloadPackingList(){
       window.open(this.order.packingListUrl)
     },
@@ -648,11 +593,6 @@ export default {
       getOrderWarehouseIn(this.order.id).then(res => {
         this.orderWarehouseIn = res.data
       })
-    },
-    // 解析日志node字段
-    parseLogNote(note){
-      if(!note) return []
-      return JSON.parse(note)
     }
   }
 };

src/views/ecw/order/edit.vue

@@ -100,8 +100,8 @@
         <el-card  class="mt-10">
             <div slot="header" class="card-title">
                 <div class="card-name">{{$t('商品信息')}}</div>
-                <el-button type="primary" size="mini" @click="addProduct(null)" :disabled="!canAddProduct">{{$t('添加货物')}}</el-button>
-                <el-button type="primary" size="mini" @click="showBatchImportDialog=true" :disabled="!canAddProduct">{{$t('批量添加货物')}}</el-button>
+                <el-button type="primary" size="mini" @click="addProduct(null)" :disabled="!canAddProduct || !productEditable">{{$t('添加货物')}}</el-button>
+                <el-button type="primary" size="mini" @click="showBatchImportDialog=true" :disabled="!canAddProduct || !productEditable">{{$t('批量添加货物')}}</el-button>
             </div>
             <el-table :data="form.orderItemVOList" border class="product-list" v-if="!initing">
               <el-table-column :label="$t('序号')" width="60px" fixed>
@@ -253,7 +253,7 @@
               </el-table-column>
               <el-table-column :label="$t('操作')" width="80px" fixed="right">
                 <template slot-scope="scope">
-                    <el-button size="mini" type="danger" @click="delProduct(scope.$index)">{{$t('删除')}}</el-button>
+                    <el-button size="mini" type="danger" @click="delProduct(scope.$index)" :disabled="!productEditable">{{$t('删除')}}</el-button>
                 </template>
               </el-table-column>
 

src/views/ecw/order/index.vue

@@ -801,6 +801,7 @@ export default {
         page: 1,
         rows: 10
       }
+      this.dateFilter = []
       this.handleQuery();
     },
     /** 新增按钮操作 */

src/views/ecw/order/warehousing/components/Warehouse.vue

@@ -253,7 +253,7 @@
                       <el-input v-else v-model="form1.table[$index].cartonsNum" placeholder="">
                         <span slot="append">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGING_TYPE, form1.table[$index].unit) }}</span>
                       </el-input>
-                      <dict-selector :type="DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE" v-model="form1.table[$index].specificationType" @change="handleVolume($index)"></dict-selector>
+                      <dict-selector :type="DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE" v-model="form1.table[$index].specificationType" @change="handleVolume($index, 1)"></dict-selector>
                     </el-form-item>
                   </template>
                 </el-table-column>
@@ -532,7 +532,7 @@ export default {
         prodTitleEn: undefined,
         prodTitleZh: undefined,
         prodType: undefined,
-        type: undefined,
+        type: 1,
         feeType: undefined
       },
       brandList: [],
@@ -561,6 +561,11 @@ export default {
   },
 
   mounted() {
+    this.init()
+  },
+
+  methods: {
+    init(){
       this.form.table = this.warehousing.orderWarehouseInBackItemDoList
       this.form.brandType = this.warehousing.brandType
       this.form.orderId = this.warehousing.orderId
@@ -589,9 +594,12 @@ export default {
           e.boxGauge3 = boxGauge[2]
         }
       })
-  },
 
-  methods: {
+      if (!this.edit){
+        this.handleAdd()
+        this.handleAdd(1)
+      }
+    },
     handleClose() {
       this.$emit('close')
       this.visible = false
@@ -627,7 +635,7 @@ export default {
                 return {
                   ...e,
                   boxGauge: e.boxGauge1 + '*' + e.boxGauge2 + '*' + e.boxGauge3,
-                  orderLocationCreateReqVOList: e.table
+                  orderLocationCreateReqVOList: e.orderLocationBackVOList
                 }
               })
             }).then(r => {
@@ -662,7 +670,7 @@ export default {
                   return {
                     ...e,
                     boxGauge: e.boxGauge1 + '*' + e.boxGauge2 + '*' + e.boxGauge3,
-                    orderLocationCreateReqVOList: e.table
+                    orderLocationCreateReqVOList: e.orderLocationBackVOList
                   }
                 }),
                 copyUserId: this.selectedUsers
@@ -686,7 +694,7 @@ export default {
                   return {
                     ...e,
                     boxGauge: e.boxGauge1 + '*' + e.boxGauge2 + '*' + e.boxGauge3,
-                    orderLocationCreateReqVOList: e.table
+                    orderLocationCreateReqVOList: e.orderLocationBackVOList
                   }
                 }),
               }).then(r => {

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

@@ -165,7 +165,7 @@
       width="300px">
       <div style="text-align: center">{{$t('在完成入仓前，您还可以')}}</div>
       <div style="text-align: center;padding: 15px 0">
-        <el-button type="info" @click="areaVisible = true">{{$t('选择储位')}}</el-button>
+<!--        <el-button type="info" @click="areaVisible = true">{{$t('选择储位')}}</el-button>-->
         <el-button type="info" @click="isShowPrintTag = true">{{$t('打印标签')}}</el-button>
       </div>
       <div style="text-align: center">