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

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

@@ -30,14 +30,14 @@
             {{scope.row.isCargoControl ? '是' : '否' }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('计划箱数')" align="center" prop="loadNum">
+        <el-table-column :label="$t('计划箱数')" align="center" prop="num">
           <template slot-scope="scope">
-            {{ scope.row.loadNum }}{{$t('箱')}}
+            {{ scope.row.num }}{{$t('箱')}}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('实装箱数')" align="center" prop="num">
+        <el-table-column :label="$t('实装箱数')" align="center" prop="loadNum">
           <template slot-scope="scope">
-            {{ scope.row.num }}{{$t('箱')}}
+            {{ scope.row.loadNum }}{{$t('箱')}}
           </template>
         </el-table-column>
         <el-table-column :label="$t('提货点')" align="center" prop="destWarehouse" />

src/views/ecw/box/query.vue

@@ -154,7 +154,7 @@
               </el-table-column>
               <el-table-column prop="billAbnId" :label="$t('异常')" align="center">
                 <template slot-scope="scope">
-                  <dict-tag :type="DICT_TYPE.BOX_SHIPPING_TICKET_EXCEPTION" :value="scope.row.opStep" />
+                  <dict-tag :type="DICT_TYPE.BOX_SHIPPING_TICKET_EXCEPTION" :value="scope.row.billAbnId" />
                 </template>
               </el-table-column>
               <el-table-column prop="abnDetail" :label="$t('异常描述')" align="center" width="700"></el-table-column>
@@ -605,13 +605,11 @@ export default {
     getBoxSum() {
       return (boxStatistics) => {
         if (boxStatistics) {
-          return this.$t("{num}箱 {volum}m³", {
+          return this.$t("{num}箱 {volume}m³ {weight}kg", {
             num: boxStatistics.num ?? 0,
-            volume: boxStatistics.weight ?? 0,
+            volume: boxStatistics.volume ?? 0,
+            weight: boxStatistics.weight ?? 0,
           });
-          /* `${boxStatistics.num ?? 0}箱 ${boxStatistics.volume ?? 0}m3 ${
-            boxStatistics.weight ?? 0
-          }kg`; */
         }
         return;
       };

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

@@ -153,8 +153,9 @@
                       </template>
                     </el-table-column>
                     <el-table-column :label="$t('备案')" align="center" prop="productRecord" width="100">
-                      <template slot-scope="scope">
-                        <dict-tag :type="DICT_TYPE.BOX_SHIPPING_BRAND_TYPE" :value="scope.row.productRecord" />
+                      <template slot-scope="{row}">
+                        <template v-if="row.brandName">{{row.brandName}}</template>
+                        <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.feeType" />
                       </template>
                     </el-table-column>
                     <el-table-column :label="$t('操作')" align="center" width="160" class-name="small-padding fixed-width" fixed="right">

src/views/ecw/coupon/edit.vue

@@ -509,7 +509,7 @@ export default {
 						currencyId = this.currencyList[0].id
 					}
 					this.$set(item, 'reduceCurrencyId', currencyId)
-				}
+				}else this.$set(item, 'reduceCurrencyDisabled', false)
 				
 				return
 			}

src/views/ecw/customer/edit.vue

@@ -535,7 +535,7 @@ export default {
         type: [{ required: true, message: this.$t('客户类别不能为空'), trigger: "blur" }],
         createTime: [{ required: true, message: this.$t('创建时间不能为空'), trigger: "blur" }],
         source: [{ required: true, message: this.$t('客户来源不能为空'), trigger: "blur" }],
-        customerService: [{ required: true, message: this.$t('客户经理不能为空'), trigger: "blur" }],
+        customerService: [{ required:this.customerId === '0', message: this.$t('客户经理不能为空'), trigger: "blur" }],
         status: [{ required: true, message: this.$t('客户状态不能为空'), trigger: "blur" }],
 
 

src/views/ecw/product/index.vue

@@ -54,6 +54,10 @@
         <el-button type="primary" plain icon="el-icon-setting" size="mini" @click="handleEdit" v-hasPermi="['ecw:product:attr']">{{$t('批量设置商品属性')}}</el-button>
       </el-col>
 
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" >{{$t('导出')}}</el-button>
+      </el-col>
+
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -92,14 +96,11 @@
         </template>
       </el-table-column>
 
-      <el-table-column prop="status" align="center" :label="$t('状态')" width="120">
+      <!-- <el-table-column prop="status" align="center" :label="$t('状态')" width="120">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
-          <!-- <el-select v-model="scope.row.status" @change="handleStatusChange(scope.row, 'status')">
-            <el-option v-for="statusItem in statusDictDatas" :key="statusItem.id" :label="statusItem.value == CommonStatusEnum.ENABLE + '' ? '已上架' : '已下架'" :value="parseInt(statusItem.value)" />
-          </el-select> -->
         </template>
-      </el-table-column>
+      </el-table-column> -->
 
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -385,6 +386,7 @@ export default {
       this.loading = true;
       // 处理查询参数
       let params = { ...this.queryParams };
+	  params.filter=false;
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
       getProductPage(params).then(response => {
@@ -502,7 +504,7 @@ export default {
         this.exportLoading = true;
         return exportProductExcel(params);
       }).then(response => {
-        this.$download.excel(response, '${table.classComment}.xls');
+        this.$download.excel(response, '商品.xlsx');
         this.exportLoading = false;
       }).catch(() => { });
     },

src/views/ecw/productPrice/index.vue

@@ -77,7 +77,7 @@
         <el-button  v-if="!$route.query.product_id" type="primary" plain icon="el-icon-setting" size="mini" @click="batchBlock" :disabled="multiple">{{$t('批量加入黑名单')}}</el-button>
         <el-button  v-if="!$route.query.product_id" type="primary" plain icon="el-icon-setting" size="mini" @click="batchOff" :disabled="multiple">{{$t('批量下架')}}</el-button>
 
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" >{{$t('导出')}}</el-button>
+        <el-button v-if="!$route.query.product_id" type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" >{{$t('导出')}}</el-button>
       </el-col>
 
         <!--指定商品-->