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

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);
 
@@ -514,7 +515,7 @@ export default {
           }
 
           let params = {
-            num: this.shopForm.num,
+            num: this.shopForm.putNum,
             quantity: this.shopForm.putQuantity,
             orderItemId: this.shopForm.orderItemId,
             orderSplitId: this.splitData.id,

src/views/ecw/messageLeave/index.vue

@@ -20,8 +20,8 @@
       </el-form-item>
 
       <el-form-item :label="$t('创建时间')">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
-                        type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
+        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" label-format="yyyy-MM-dd HH:mm:ss"
+                        type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
@@ -232,7 +232,7 @@ export default {
       this.loading = true;
       // 处理查询参数
       let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime',false);
       // 执行查询
       getMessageLeavePage(params).then(response => {
         this.list = response.data.list;

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,7 +200,7 @@
                 </template>
               </template>
             </el-table-column>
-            <el-table-column prop="" :label="$t('快递单号')">
+            <el-table-column prop="" :label="$t('填单快递单号')">
               <template slot-scope="{row}">
                 {{ row.expressNo }}
               </template>

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();
     },
     /** 新增按钮操作 */