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

 Conflicts:
	src/views/ecw/order/detail.vue

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/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,21 +200,9 @@
                 </template>
               </template>
             </el-table-column>
-            <el-table-column prop="" :label="$t('储位')">
+            <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('快递单号')">
-              <template slot-scope="{row}">
-                {{ row.warehouseInInfoVO.expressNo }}
+                {{ row.expressNo }}
               </template>
             </el-table-column>
           </el-table>
@@ -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>
 
@@ -347,7 +312,7 @@
           </div>
         </el-col>
       </el-row>
-
+      
       <div v-if="feeDetail && feeDetail.coupons && feeDetail.coupons.length" class="page-title">优惠详情</div>
       <el-table v-if="feeDetail && feeDetail.coupons && feeDetail.coupons.length" :data="feeDetail.coupons">
         <el-table-column label="优惠ID" prop="couponId"></el-table-column>
@@ -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();
     },
     /** 新增按钮操作 */