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

src/views/ecw/coupon/edit.vue

@@ -662,7 +662,7 @@ export default {
 					}
 				})
 
-				
+				this.$set(this.form, 'suitableProdType', this.isAllProduct ? 0 : 1)
 
 
                 let data = Object.assign({}, this.form, {discountDetailedVOs})
@@ -681,6 +681,7 @@ export default {
 				if(this.form.type != 1 && !this.isAllProduct && !this.form.prodIds){
 					return this.$message.error('请选择商品')
 				}
+				this.$set(this.form, 'suitableProdType', this.isAllProduct ? 0 : 1)
 
 				// 修改的提交
 				if (data.couponId != null) {

src/views/ecw/customer/query.vue

@@ -40,6 +40,7 @@
             <el-descriptions-item :label="$t('公司名称')">{{ customer.company }}</el-descriptions-item>
             <el-descriptions-item :label="$t('联系地址')">{{ customer.address }}</el-descriptions-item>
             <el-descriptions-item :label="$t('创建时间')">{{ parseTime(customer.createTime) }}</el-descriptions-item>
+            <el-descriptions-item :label="$t('创建人')">{{ customer.founderName }}</el-descriptions-item>
             <el-descriptions-item :label="$t('状态')">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_STATUS, customer.status) }}</el-descriptions-item>
             <el-descriptions-item :label="$t('主营类别')">{{ productType }}</el-descriptions-item>
             <el-descriptions-item :label="$t('常提货网点')">{{ pickupPoint }}</el-descriptions-item>

src/views/ecw/order/cargoControl.vue

@@ -35,12 +35,12 @@
        <el-form-item :label="$t('提单号')" prop="tidanNo">
         <el-input v-model="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('发货人')" prop="consignorId">
-        <el-input v-model="queryParams.consignorId" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item :label="$t('发货人')" prop="consignorKey">
+        <el-input v-model="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
 
-      <el-form-item :label="$t('收货人')" prop="consigneeId">
-        <el-input v-model="queryParams.consigneeId" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item :label="$t('收货人')" prop="consigneeKey">
+        <el-input v-model="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
 
       <el-form-item :label="$t('报关方式')" prop="customsType">

src/views/ecw/order/cargoControlDetail.vue

@@ -42,7 +42,11 @@
                 <template slot-scope="scope">{{scope.$index + 1}}</template>
             </el-table-column>
             <el-table-column :label="$t('收货人')" prop="consigneeName" />
-            <el-table-column :label="$t('收货人电话')" prop="consigneePhone" />
+            <el-table-column :label="$t('收货人电话')" prop="consigneePhone">
+                <template slot-scope="{row}">
+                    +{{row.consigneeCountryCode}} {{row.consigneePhone}}
+                </template>
+            </el-table-column>
             <el-table-column :label="$t('控货箱数')" prop="controlNum"></el-table-column>
             <el-table-column :label="$t('放货箱数')" prop="pickNum"></el-table-column>
             <el-table-column :label="$t('体积') + '(m³)'" prop="pickVolume"></el-table-column>
@@ -67,7 +71,7 @@
                     <el-button v-if="scope.row.status == 3" type="danger" size="mini" @click="fallbackIndex=scope.$index">{{$t('反复核')}}</el-button>
                     <el-button v-if="scope.row.status == 3" type="success" size="mini" @click="cargoControlPickId=scope.row.id">{{$t('调货')}}</el-button>
                     
-                    <el-button v-if="[2,4, 5, 6].indexOf(scope.row.status) > -1" type="primary" size="mini" @click="showApprovalDetail(scope.row.id)">{{$t('审核详情')}}</el-button>
+                    <el-button v-if="[2,4, 5, 6].indexOf(scope.row.status) > -1" type="primary" size="mini" @click="showApprovalDetail(scope.row.formId)">{{$t('审核详情')}}</el-button>
                     <el-button v-if="[2,4, 5, 6].indexOf(scope.row.status) > -1" type="danger" size="mini" @click="cancelApproval(scope.row.id)">{{$t('取消审核')}}</el-button>
                 </template>
             </el-table-column>
@@ -181,8 +185,8 @@ export default {
             this.loadData()
         },
         // 查看审核详情
-        showApprovalDetail(id){
-            this.$router.push('/bpm/process-instance/detail?id=' + this.getApproval(id, 'formId'))
+        showApprovalDetail(formId){
+            this.$router.push('/bpm/process-instance/detail?id=' + formId)
         },
         // 取消审核
         cancelApproval(id){

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

@@ -6,7 +6,7 @@
                 <p style="padding-bottom:10px;font-size:16px;">
                     {{$t('订单号')}}：{{detail.orderNo}}
                     &nbsp;&nbsp;&nbsp;{{$t('发货人电话')}}：{{detail.consignorVO.countryCode}} {{detail.consignorVO.phone}}
-                    &nbsp;&nbsp;&nbsp;{{$t('提货地点')}}：{{objective.titleZh}}
+                    &nbsp;&nbsp;&nbsp;{{$t('提货地点')}}：{{$l(objective, 'title')}}
                     <img :src="qrcode" style="margin-left: 10px;width:17mm;vertical-align:middle" />
                 </p>
                 <div id="table1" width="205mm">
@@ -100,10 +100,14 @@ export default {
             return t
         },
         objective(){
-            if(this.detail && this.detail.orderObjectiveVO && this.detail.orderObjectiveVO.objective){
+            return {
+                titleZh: this.detail.logisticsInfoDto.destTitleZh,
+                titleEn: this.detail.logisticsInfoDto.destTitleEn
+            }
+            /* if(this.detail && this.detail.orderObjectiveVO && this.detail.orderObjectiveVO.objective){
                 return JSON.parse(this.detail.orderObjectiveVO.objective)
             }
-            return {}
+            return {} */
         },
         items(){
             let arr = []

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

@@ -31,7 +31,11 @@
           :label="$t('入库货物属性')">
           <template v-slot="{row}">
             <template v-if="row.warehouseInInfoVO">
-              {{$t('品牌')}}：<dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.feeType" /><br>
+              {{$t('品牌')}}：
+              <!-- 23-03-27 根据需求方要求，按照详情页一样的规则显示 -->
+              <template v-if="row.brandName">{{row.brandName}}</template>
+              <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
+              <!-- <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.feeType" /> --><br>
               {{$t('箱数')}}：{{ row.warehouseInInfoVO.cartonsNum }}<br>
               {{$t('体积')}}：{{ row.warehouseInInfoVO.volume }}m³<br>
               {{$t('重量')}}：{{ row.warehouseInInfoVO.weight }}Kg

src/views/ecw/productPrice/edit.vue

@@ -700,7 +700,8 @@ export default {
       this.$set(this.form, 'clearancePriceUnit', priceUnit)
       this.$set(this.form, 'allPriceUnit', priceUnit)
     },
-    submitForm() {
+    // force 为是否强制提交，在价格过期的时候需要确认后强制提交
+    submitForm(force = false) {
       this.$refs["form"].validate(valid => {
         if (!valid) {
           return;
@@ -747,6 +748,20 @@ export default {
           }
         }
 
+        // 设置了有效期，且已过期则给提示
+        if(this.form.validateEndDate && force !== true){
+          let validateEndDate = new Date(this.form.validateEndDate)
+          if(validateEndDate.getTime() < Date.now()){
+            return this.$confirm('您设置的线路价格已过期，确定提交吗?', '提示', {
+              confirmButtonText: '确认提交',
+              cancelButtonText: '取消提交',
+              type: 'warning'
+            }).then(res => {
+              this.submitForm(true)
+            })
+          }
+        }
+
         // 修改单条路线
         if (this.$route.query.action == 'update') {
           this.loading = true