Merge branch 'dev' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into dev

src/views/ecw/offer/edit.vue

@@ -418,7 +418,8 @@
             </div>
             <div class="form-section">
                 <el-form-item :label="$t('预计结束时间')" prop="stopTime">
-                    <el-date-picker v-model="form.stopTime" value-format="yyyy-MM-dd HH:mm:ss" class="w-200"></el-date-picker>
+                    <!-- <el-date-picker v-model="form.stopTime" value-format="yyyy-MM-dd HH:mm:ss" class="w-200"></el-date-picker> -->
+                    <el-date-picker v-model="form.stopTime" value-format="yyyy-MM-dd" class="w-200" :picker-options="stopDate" ></el-date-picker>
                 </el-form-item>
                 <el-form-item :label="$t('是否控货')" prop="control">
                     <dict-selector :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" v-model="form.control" form-type="radio" />
@@ -434,10 +435,12 @@
             </div>
             <div class="form-section">
                 <el-form-item :label="$t('价格有效时间')" prop="startTime">
-                    <el-date-picker v-model="form.startTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss" class="w-200"></el-date-picker>
+                    <!-- <el-date-picker v-model="form.startTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss" class="w-200"></el-date-picker> -->
+                    <el-date-picker v-model="form.startTime" placeholder="" value-format="yyyy-MM-dd" class="w-200" :picker-options="startDate"></el-date-picker>
                 </el-form-item>
                 <el-form-item label="" prop="endTime">
-                    <el-date-picker v-model="form.endTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss" class="w-200"></el-date-picker>
+                    <!-- <el-date-picker v-model="form.endTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss" class="w-200"></el-date-picker> -->
+                    <el-date-picker v-model="form.endTime" placeholder="" value-format="yyyy-MM-dd" class="w-200" :picker-options="endDate"></el-date-picker>
                 </el-form-item>
             </div>
 
@@ -591,7 +594,32 @@ export default {
       couponTotalAmountList: [], // 优惠总额
       contactChooseType: null, // 联系人选择对象consignor(发货人) 或者 consignee（收货人）
       quickCreateType: null, // 快速新建客户类型，1发货人，2收货人
-      getOpenedRouterListHandler: undefined
+      getOpenedRouterListHandler: undefined,
+      //预计结束时间，用于日历框校验
+      stopDate:{
+        disabledDate: time => {
+            return  Date.now() - 8.64e7 >= time.getTime()  // 加- 8.64e7则表示包当天
+          }
+      },
+      //有效起始时间
+      startDate: {
+          disabledDate: time => {
+            return  Date.now() - 8.64e7 >= time.getTime()  // 加- 8.64e7则表示包当天
+          }
+        },
+        //有效结束时间
+        endDate: {
+          disabledDate: time => {
+            if (this.form.startTime) {
+              return (
+                  new Date( this.form.startTime).getTime() - 8.64e7 >=time.getTime() 
+              )
+            } else {
+              return time.getTime() >= Date.now() - 8.64e7 // 加- 8.64e7则表示包当天
+            }
+          }
+        }
+
       
     };
   },
@@ -604,17 +632,14 @@ export default {
       switch (this.form.relation) {
         case 1:
           if(this.$route.query.customer.defaultContactName !=null){
-            // document.getElementById("defaultContactName2").value="";
-            // document.getElementById("defaultContactName").value=this.$route.query.customer.defaultContactName
-            //this.form.consignorName = this.$route.query.customer.defaultContactName
+            
             this.form.consignorName = this.$route.query.customer.defaultContactName
             this.form.consigneeName = ""
             this.form.consignorId = this.$route.query.customer.defaultContactId
           }
           if(this.$route.query.customer.company !=null){
             
-            // document.getElementById("company").value =this.$route.query.customer.company;
-            // document.getElementById("company2").value="";
+           
             this.form.consignorCompany = this.$route.query.customer.company
             this.form.consigneeCompany = ""
           }
@@ -622,28 +647,24 @@ export default {
             this.form.consignorPhone = this.$route.query.customer.defaultContactPhone
             this.form.consigneePhone = ""
             this.form.consigeeCountryCode =""
-            // document.getElementById("defaultContactPhone").value =this.$route.query.customer.defaultContactPhone;
-            // document.getElementById("defaultContactPhone2").value="";
+           
           }
           if(this.$route.query.customer.defaultEmail!=null){
             this.form.consignorEmail = this.$route.query.customer.defaultEmail;
             this.form.consigneeEmail = ""
-            // document.getElementById("defaultEmail2").value="";
-            // document.getElementById("defaultEmail").value =this.$route.query.customer.defaultEmail;
+           
           }
           return;
           
         case 2:
         if(this.$route.query.customer.defaultContactName !=null){
-             //document.getElementById("defaultContactName").value="";
-            // document.getElementById("defaultContactName2").value =this.$route.query.customer.defaultContactName;
+           
             this.form.consignorName = ""
             this.form.consigneeName = this.$route.query.customer.defaultContactName
             this.form.consigneeId = this.$route.query.customer.defaultContactId
           }
           if(this.$route.query.customer.company !=null){
-            // document.getElementById("company").value="";
-            // document.getElementById("company2").value =this.$route.query.customer.company;
+           
             this.form.consignorCompany = ""
             this.form.consigneeCompany = this.$route.query.customer.company
           }
@@ -651,14 +672,12 @@ export default {
             this.form.consignorPhone = ""
             this.form.consignorCountryCode =""
             this.form.consigneePhone =  this.$route.query.customer.defaultContactPhone
-            // document.getElementById("defaultContactPhone").value="";
-            // document.getElementById("defaultContactPhone2").value =this.$route.query.customer.defaultContactPhone;
+           
           }
           if(this.$route.query.customer.defaultEmail!=null){
             this.form.consignorEmail = ""
             this.form.consigneeEmail = this.$route.query.customer.defaultEmail;
-            // document.getElementById("defaultEmail").value="";
-            // document.getElementById("defaultEmail2").value =this.$route.query.customer.defaultEmail;
+            
           }
           return ;
        
@@ -1165,6 +1184,21 @@ export default {
             this.form.transportVO.packageType = this.form.transportVO.packageTypeArr.join(',')
         }
 
+        let endTime = new Date(this.form.endTime)
+        let startTime = new Date(this.form.startTime)
+       
+
+        if(endTime.getTime()<startTime.getTime()){
+        
+          return  this.$message.error(this.$t('价格有效结束时间不能小于开始时间'));
+        }
+         
+         let  time2 =    new Date().setDate(new Date().getDate() + 30) ;
+         
+        if(endTime> time2){
+            return  this.$message.error(this.$t('价格有效结束时间不能超过当前时间30天'));
+        }
+
         // 修改的提交
         if (this.form.offerId != null) {
             let data = Object.assign({}, this.form, {

src/views/ecw/productPrice/index.vue

@@ -16,59 +16,59 @@
         </el-form-item>
 
         <el-form-item :label="$t('商品类型')" prop="typeId" v-if="!$route.query.product_id">
-          <el-select v-model="queryParams.typeId" :placeholder="$t('选择商品类型')" clearable>
+          <el-select v-model="queryParams.typeId" :placeholder="$t('选择商品类型')" clearable @change="handleQuery">
             <el-option v-for="type in typeList" :key="type.id" :label="$l(type, 'titleZh')" :value="type.id"/>
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('商品属性')" prop="typeId" v-if="!$route.query.product_id">
-          <el-select v-model="queryParams.attrId" :placeholder="$t('选择商品类型')" clearable>
+          <el-select v-model="queryParams.attrId" :placeholder="$t('选择商品类型')" clearable @change="handleQuery">
             <el-option v-for="attr in attrList" :key="attr.id" :label="$l(attr, 'attrName')" :value="attr.id"/>
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('运输方式')" prop="transportType" v-if="!transportType">
-          <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportType" formatter="number" clearable />
+          <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportType" formatter="number" clearable @change="handleQuery"/>
         </el-form-item>
         <!--海运不显示渠道-->
         <el-form-item :label="$t('出货渠道')" prop="shippingChannelId" v-if="type !== 'sea'">
-          <el-select v-model="queryParams.shippingChannelId" clearable>
+          <el-select v-model="queryParams.shippingChannelId" clearable @change="handleQuery">
             <el-option v-for="item in channelList" :key="item.id" :label="$l(item, 'name')" :value="item.channelId" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('始发地')" prop="startCityId">
-          <el-select v-model="queryParams.startCityId" clearable>
+          <el-select v-model="queryParams.startCityId" clearable @change="handleQuery">
             <el-option v-for="city in startCityList" :key="city.id" :label="$l(city, 'title')" :value="city.id" />
           </el-select>
         </el-form-item>
 
       <el-form-item :label="$t('目的地')" prop="destCityId">
-        <el-select v-model="queryParams.destCityId" clearable>
+        <el-select v-model="queryParams.destCityId" clearable @change="handleQuery">
           <el-option v-for="city in destCityList" :key="city.id" :label="$l(city, 'title')" :value="city.id" />
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('是否预付')" prop="needPay">
-        <el-select v-model="queryParams.needPay" :placeholder="$t('请选择')" clearable>
+        <el-select v-model="queryParams.needPay" :placeholder="$t('请选择')" clearable @change="handleQuery">
           <el-option :label="$t('是')" value="1"></el-option>
           <el-option :label="$t('否')" value="0"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('上架状态')" prop="auditStatus">
-          <dict-selector :type="DICT_TYPE.ECW_PRICE_AUDIT_STATUS" v-model="queryParams.auditStatus" clearable/>
+          <dict-selector :type="DICT_TYPE.ECW_PRICE_AUDIT_STATUS" v-model="queryParams.auditStatus" clearable @change="handleQuery"/>
       </el-form-item>
       <el-form-item :label="$t('状态')" prop="combStatus">
-        <el-select v-model="queryParams.combStatus" :placeholder="$t('请选择状态')" clearable>
+        <el-select v-model="queryParams.combStatus" :placeholder="$t('请选择状态')" clearable @change="handleQuery">
           <el-option :label="$t('未设置价格')" value="setPrice_1"></el-option>
             <el-option :label="$t('未过期')" value="setPrice_2"></el-option>
           <el-option :label="$t('黑名单')" value="blacklist_1"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('是否单询')" prop="needOrderInquiry">
-        <el-select v-model="queryParams.needOrderInquiry" :placeholder="$t('请选择')" clearable>
+        <el-select v-model="queryParams.needOrderInquiry" :placeholder="$t('请选择')" clearable @change="handleQuery">
           <el-option :label="$t('是')" value="1"></el-option>
           <el-option :label="$t('否')" value="0"></el-option>
         </el-select>
       </el-form-item>
         <el-form-item :label="$t('单价模式')" prop="priceType">
-          <el-select v-model="queryParams.priceType" :placeholder="$t('请选择')" clearable>
+          <el-select v-model="queryParams.priceType" :placeholder="$t('请选择')" clearable @change="handleQuery">
             <el-option :label="$t('运费+清关费')" value="0"></el-option>
             <el-option :label="$t('全包价')" value="1"></el-option>
           </el-select>
@@ -168,9 +168,61 @@
 
       <el-table-column prop="price" :label="$t('价格')" align="center">
           <template slot-scope="scope">
-            <template v-if="scope.row.stepPrice == 1">
+            <template v-if="scope.row.needOrderInquiry==1">
+              <div v-if="scope.row.needOrderInquiry==1">{{$t('单询无价格，请联系市场部')}}</div> 
+            </template>
+            <template v-else>
+              <template v-if="scope.row.stepPrice == 1">
+                <!--全包价-->
+                <div v-if="scope.row.priceType">
+                  <div v-if="!scope.row.fullPriceStepList || !scope.row.fullPriceStepList.length">{{$t('未设置全包价阶梯价')}}</div>
+                  <div v-else>
+                    {{$t("第{no}阶梯（{start}~{end}{weightUnit}）", {
+                      no: 1,
+                      start: scope.row.fullPriceStepList[0].startNum,
+                      end: scope.row.fullPriceStepList[0].endNum,
+                      weightUnit:  getUnitTitle(scope.row.fullPriceStepList[0].weightUnit),
+                    })}}<br/>
+                    {{$t('全包价')}}:{{ getCurrencySymbol(scope.row.fullPriceStepList[0].allPriceUnit) + scope.row.fullPriceStepList[0].allPrice}}&nbsp;
+                    {{ getCurrencyTitle(scope.row.fullPriceStepList[0].allPriceUnit) + '/' + getUnitTitle(scope.row.fullPriceStepList[0].allVolumeUnit)}}
+                  </div>
+                </div>
+                <template v-else>
+                  <div v-if="!scope.row.freightPriceStepList || !scope.row.freightPriceStepList.length">{{$t('未设置运费阶梯价')}}</div>
+                  <div v-else>
+                    {{$t("第{no}阶梯（{start}~{end}{weightUnit}）", {
+                      no: 1,
+                      start: scope.row.freightPriceStepList[0].startNum,
+                      end: scope.row.freightPriceStepList[0].endNum,
+                      weightUnit:  getUnitTitle(scope.row.freightPriceStepList[0].weightUnit),
+                    })}}<br/>
+  
+                    <div>
+                      {{$t('运费')}}:{{ getCurrencySymbol(scope.row.freightPriceStepList[0].transportPriceUnit) + scope.row.freightPriceStepList[0].transportPrice}}&nbsp;
+                      {{ getCurrencyTitle(scope.row.freightPriceStepList[0].transportPriceUnit) + '/' + getUnitTitle(scope.row.freightPriceStepList[0].transportVolumeUnit)}}
+                    </div>
+                  </div>
+                </template>
+                <el-button type="text" @click="showMoreStepPriceItem=scope.row">{{$t('查看更多')}}</el-button>
+              </template>
+  
+              <template v-else>
+                <div v-if="scope.row.priceType == 0">
+                  {{$t('运费')}}:{{ getCurrencySymbol(scope.row.transportPriceUnit) + scope.row.transportPrice}}&nbsp;
+                  {{ getCurrencyTitle(scope.row.transportPriceUnit) + '/' + getUnitTitle(scope.row.transportVolumeUnit)}}
+                  <br />
+                  {{$t('清关费')}}:{{ getCurrencySymbol(scope.row.clearancePriceUnit) + scope.row.clearancePrice}}&nbsp;
+                  {{ getCurrencyTitle(scope.row.clearancePriceUnit) + '/' + getUnitTitle(scope.row.clearanceVolumeUnit)}}
+                </div>
+                <div v-if="scope.row.priceType == 1">
+                  {{$t('全包价')}}:{{ getCurrencySymbol(scope.row.allPriceUnit) + scope.row.allPrice}}&nbsp;
+                  {{ getCurrencyTitle(scope.row.allPriceUnit) + '/' + getUnitTitle(scope.row.allVolumeUnit)}}
+                </div>
+              </template>
+            </template>
+            <!-- <template v-if="scope.row.stepPrice == 1">
               <!--全包价-->
-              <div v-if="scope.row.priceType">
+              <!-- <div v-if="scope.row.priceType">
                 <div v-if="!scope.row.fullPriceStepList || !scope.row.fullPriceStepList.length">{{$t('未设置全包价阶梯价')}}</div>
                 <div v-else>
                   {{$t("第{no}阶梯（{start}~{end}{weightUnit}）", {
@@ -214,7 +266,7 @@
                 {{$t('全包价')}}:{{ getCurrencySymbol(scope.row.allPriceUnit) + scope.row.allPrice}}&nbsp;
                 {{ getCurrencyTitle(scope.row.allPriceUnit) + '/' + getUnitTitle(scope.row.allVolumeUnit)}}
               </div>
-            </template>
+            </template>  -->
 
           </template>
       </el-table-column>