Merge remote-tracking branch 'origin/dev' into dev

src/components/WarehouseAreaDialog/index.vue

@@ -285,8 +285,10 @@ export default {
   box-shadow: #8f8f8f 7px 5px 14px 0;
 }
 .warehouse-block-active{
-  box-shadow: #7e9dbd 7px 5px 14px 0;
+  box-shadow: #b1a4cb 7px 5px 14px 0;
   transform: scale(1.04);
+  background-color: #9ab7e1;
+  color: #ffffff;
 }
 .warehouse-block-selected{
   color: #ffffff;

src/views/ecw/coupon/edit.vue

@@ -407,6 +407,11 @@ export default {
 					if(this.form.type != 1){
 						this.getCouponSelect()
 					}
+
+					// 如果是复制，则需要去掉id
+					if(this.$route.query.action == 'copy'){
+						this.form.couponId = null
+					}
 				}
 			);
 		}

src/views/ecw/coupon/index.vue

@@ -159,10 +159,12 @@
           <dict-tag :type="DICT_TYPE.ECW_IS_DRAFT" :value="row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button v-if="scope.row.status != 1" size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['ecw:coupon:update']">修改</el-button>
+                     v-hasPermi="['ecw:coupon:update']">编辑</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCopy(scope.row)"
+                     v-hasPermi="['ecw:coupon:create']">复制</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                      v-hasPermi="['ecw:coupon:delete']">删除</el-button>
         </template>
@@ -257,45 +259,6 @@ export default {
         this.loading = false;
       });
     },
-    /** 取消按钮 */
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    /** 表单重置 */
-    reset() {
-      this.form = {
-        couponId: undefined,
-        titleZh: undefined,
-        titleEn: undefined,
-        type: undefined,
-        cashCondition: undefined,
-        reduceAmount: undefined,
-        conditionCurrencyId: undefined,
-        startTime: undefined,
-        reduceCurrencyId: undefined,
-        endTime: undefined,
-        afterReceiveDays: undefined,
-        validDays: undefined,
-        costType: undefined,
-        discountDetailed: undefined,
-        isSimilarSuperposition: undefined,
-        couponIds: undefined,
-        suitableUserType: undefined,
-        suitableLineType: undefined,
-        suitableProdType: undefined,
-        limitNum: undefined,
-        overdueStatus: undefined,
-        putonStatus: undefined,
-        getWay: undefined,
-        orderAttr: undefined,
-        isSiteContent: undefined,
-        isCargoControl: undefined,
-        documentDeclaration: undefined,
-        status: undefined,
-      };
-      this.resetForm("form");
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNo = 1;
@@ -318,28 +281,8 @@ export default {
       const couponId = row.couponId;
       return this.$router.push('edit?id=' + couponId)
     },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (!valid) {
-          return;
-        }
-        // 修改的提交
-        if (this.form.couponId != null) {
-          updateCoupon(this.form).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.open = false;
-            this.getList();
-          });
-          return;
-        }
-        // 添加的提交
-        createCoupon(this.form).then(response => {
-          this.$modal.msgSuccess("新增成功");
-          this.open = false;
-          this.getList();
-        });
-      });
+    handleCopy(row){
+      this.$router.push('edit?action=copy&id=' + row.couponId)
     },
     /** 删除按钮操作 */
     handleDelete(row) {

src/views/ecw/order/cargoControl.vue

@@ -5,33 +5,32 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item :label="$t('日期筛选')">
         <dict-selector defaultable :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" v-model="dateFilterType" class="w-100 mr-10" />
-        <el-date-picker v-model="dateFilter" type="daterange" range-separator="-"  :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+        <el-date-picker v-model="dateFilter" type="daterange" range-separator="-"  :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery"></el-date-picker>
       </el-form-item>
       <el-form-item :label="$t('始发地')" prop="startWarehouseId">
-        <el-select v-model="queryParams.startWarehouseId" :placeholder="$t('请选择始发地')" clearable>
+        <el-select v-model="queryParams.startWarehouseId" :placeholder="$t('请选择始发地')" clearable  @change="handleQuery">
           <el-option v-for="item in expoerCityList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('目的地')" prop="destWarehouseId">
-        <el-select v-model="queryParams.destWarehouseId" :placeholder="$t('请选择目的地')" clearable>
+        <el-select v-model="queryParams.destWarehouseId" :placeholder="$t('请选择目的地')" clearable @change="handleQuery">
           <el-option v-for="item in importCityList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('运输方式')" prop="transportId">
-        <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model.number="queryParams.transportId" clearable />
+        <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model.number="queryParams.transportId" clearable  @change="handleQuery"/>
       </el-form-item>
       <el-form-item :label="$t('订单编号')" prop="orderNo">
         <el-input v-model="queryParams.orderNo" :placeholder="$t('订单编号')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item :label="$t('品名')" prop="prodId">
-        <product-selector v-model="queryParams.prodId" @keyup.enter.native="handleQuery" clearable/>
+        <product-selector v-model="queryParams.prodId" @keyup.enter.native="handleQuery" clearable  @change="handleQuery"/>
       </el-form-item>
       <el-form-item :label="$t('控货')" prop="isCargoControl">
-        <dict-selector v-model="queryParams.isCargoControl" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" clearable />
+        <dict-selector v-model="queryParams.isCargoControl" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" clearable  @change="handleQuery"/>
       </el-form-item>
       <el-form-item :label="$t('订单状态')" prop="status">
-        <dict-selector :type="DICT_TYPE.PAY_ORDER_STATUS" v-model="queryParams.status" clearable
-          @keyup.enter.native="handleQuery" />
+        <dict-selector :type="DICT_TYPE.PAY_ORDER_STATUS" v-model="queryParams.status" clearable  @change="handleQuery" />
       </el-form-item>
        <el-form-item :label="$t('提单号')" prop="tidanNo">
         <el-input v-model="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" />
@@ -45,8 +44,7 @@
       </el-form-item>
 
       <el-form-item :label="$t('报关方式')" prop="customsType">
-        <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="queryParams.customsType" clearable
-          @keyup.enter.native="handleQuery" />
+        <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="queryParams.customsType" clearable @change="handleQuery" />
       </el-form-item>
       
       <el-form-item :label="$t('唛头')" prop="marks">

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

@@ -257,8 +257,10 @@ export default {
   box-shadow: #8f8f8f 7px 5px 14px 0;
 }
 .warehouse-block-active{
-  box-shadow: #7e9dbd 7px 5px 14px 0;
+  box-shadow: #b1a4cb 7px 5px 14px 0;
   transform: scale(1.04);
+  background-color: #9ab7e1;
+  color: #ffffff;
 }
 .warehouse-block-selected{
   color: #ffffff;

src/views/ecw/order/detail.vue

@@ -151,7 +151,7 @@
 
                 <template v-if="row.charging ==1">
                   <template v-if="!row.seaFreight">未报价</template>
-                  <template>{{$t('全包价')}} {{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</template>
+                  <template v-else>{{$t('全包价')}} {{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</template>
                 </template>
                 <template v-else-if="!row.seaFreight && !row.clearanceFreight">未报价</template>
                 <template v-else>

src/views/ecw/order/edit.vue

@@ -899,6 +899,8 @@ export default {
         console.log(product)
         // row.goodsType = product ? product.typeId : null
         row.prodAttrArr = !product ? [] : product.attrId.split(',').filter(item => item !== '').map(item => +item)
+        row.prodTitleEn = product.titleEn
+        row.prodTitleZh = product.titleZh
         this.calculationPrice()
     },
     onAreaChange(type, val){

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

@@ -421,7 +421,7 @@ export default {
       opened: false,
       brandList: [],
       form: {
-        // "brand": "0",
+        "brand": "",
         // "brandType": 0,
         // "inTime": "",
         // "material": "",
@@ -487,7 +487,7 @@ export default {
     opened(val) {
       if (val) {
         this.form.material = this.warehousing.material
-        this.form.brand = this.warehousing.brand
+        this.form.brand = this.warehousing.brand.toString()
         this.handleBrandChange(this.form.brand)
       } else {
         this.$emit('update:visible', false)
@@ -605,7 +605,7 @@ export default {
             // 首次入仓
             return orderWarehouseIn({
               ...this.form,
-              brandType: this.form.brand ? 1 : 0,
+              brandType: (this.form.brand && this.form.brand !== '0') ? 1 : 0,
               orderId: this.warehousing.orderId,
               orderItemId: this.warehousing.orderItemId,
               orderNo: this.warehousing.orderNo,

src/views/ecw/productBrank/Empower/index.vue

@@ -252,7 +252,7 @@ export default {
           "customerContactsId": 0,
           "customerId": 0,
           "endTime": "",
-          "feeScale": 0,
+          "feeScale": '0',
           "fileUrl": "",
           "productBrandId": null,
           "startTime": "",