6

.env.development

@@ -6,7 +6,7 @@ VUE_APP_TITLE = 捷道管理系统-测试站
 
 # 捷道管理系统/开发环境
 
-VUE_APP_BASE_API = 'https://apitest.groupage.cn'
+VUE_APP_BASE_API = 'https://devapi.jd.qipx.top'
 
 # VUE_APP_BASE_API = 'http://110.41.143.128:48080'
 # VUE_APP_BASE_API = 'http://127.0.0.1:48080'

src/views/ecw/offer/edit.vue

@@ -1192,6 +1192,7 @@ export default {
           }
 
           if (this.$route.query.copyId) {
+            formData.offerId = ""
             formData.startTime = ""
             formData.endTime = ""
             formData.stopTime = ""

src/views/ecw/offer/index.vue

@@ -18,31 +18,27 @@
         <el-input v-model.trim="queryParams.relationAreaCode" :placeholder="$t('请输入客户')" clearable @keyup.enter.native="handleQuery" @input="queryParams.relationAreaCode = queryParams.relationAreaCode.replace(/\s+/g, '')" />
       </el-form-item>
 
-      <el-form-item :label="$t('创建时间')" prop="orderNo"> <el-date-picker type="datetime" v-model="queryParams.beginCreateTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>{{ $t("到") }}<el-date-picker v-model="queryParams.endCreateTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> </el-form-item>
-
       <el-form-item :label="$t('始发地')" prop="departureId">
         <el-select v-model="queryParams.departureId" :placeholder="$t('请选择始发地')" clearable>
           <el-option v-for="item in exportCityList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
         </el-select>
       </el-form-item>
 
-      <div>
-        <el-form-item :label="$t('目的国')" prop="destCountryId">
-          <el-select v-model="destCountryId" multiple :label="destCountryId" :placeholder="$t('请选择目的国')" clearable @change="handleQuery">
-            <el-option v-for="item in AddressProvince" :key="item.guojia" :label="item.guojiaName" :value="item.guojia"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('目的城市')" prop="objectiveId">
-          <el-select v-model="objectiveId" multiple :placeholder="$t('请选择目的城市')" style="width: 200px" clearable @change="handleQuery">
-            <el-option v-for="item in AddressCity" :key="item.shi" :label="item.shiName" :value="item.shi"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('目的仓')" prop="destWarehouseId">
-          <el-select v-model="destWarehouseId" multiple :placeholder="$t('请选择目的仓')" style="width: 200px" clearable @change="handleQuery">
-            <el-option v-for="item in AddressTown" :key="item.id" :label="item.titleZh" :value="item.id"></el-option>
-          </el-select>
-        </el-form-item>
-      </div>
+      <el-form-item :label="$t('目的国')" prop="destCountryId">
+        <el-select v-model="destCountryId" multiple :label="destCountryId" :placeholder="$t('请选择目的国')" clearable @change="handleQuery">
+          <el-option v-for="item in AddressProvince" :key="item.guojia" :label="item.guojiaName" :value="item.guojia"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('目的城市')" prop="objectiveId">
+        <el-select v-model="objectiveId" multiple :placeholder="$t('请选择目的城市')" style="width: 200px" clearable @change="handleQuery">
+          <el-option v-for="item in AddressCity" :key="item.shi" :label="item.shiName" :value="item.shi"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('目的仓')" prop="destWarehouseId">
+        <el-select v-model="destWarehouseId" multiple :placeholder="$t('请选择目的仓')" style="width: 200px" clearable @change="handleQuery">
+          <el-option v-for="item in AddressTown" :key="item.id" :label="item.titleZh" :value="item.id"></el-option>
+        </el-select>
+      </el-form-item>
 
       <el-form-item :label="$t('客户经理')" prop="salesmanIds">
         <user-selector v-model="queryParams.salesmanIds" multiple clearable @change="handleQuery" />
@@ -56,10 +52,14 @@
         </el-select>
       </el-form-item>
 
+      <el-form-item :label="$t('创建时间')">
+        <el-date-picker v-model="queryTmp.createTime" type="datetimerange" 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="transportId" v-show="showSearch">
         <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportId" multiple formatter="number" clearable @change="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('出货渠道')" prop="channelIds">
+      <el-form-item :label="$t('出货渠道')" prop="channelIds" v-show="showSearch">
         <selector :clearable="true" :options="channelList" :label-field="$l('name')" value-field="channelId" v-model="queryParams.channelIds" multiple @change="handleQuery"></selector>
       </el-form-item>
       <el-form-item :label="$t('商品')" prop="prodTitle" v-show="showSearch">
@@ -83,20 +83,14 @@
         <dict-selector :type="DICT_TYPE.CUSTOMER_SOURCE" multiple v-model="queryParams.sourceIds" clearable @change="handleQuery" />
       </el-form-item>
       <el-form-item :label="$t('有效期开始')" v-show="showSearch">
-        <el-date-picker type="date" v-model="queryParams.beginStartTime" value-format="yyyy-MM-dd" @change="handleQuery"></el-date-picker>
-        {{ $t("到") }}
-        <el-date-picker v-model="queryParams.endStartTime" type="date" value-format="yyyy-MM-dd" @change="handleQuery"></el-date-picker>
+        <el-date-picker v-model="queryTmp.startTime" type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd" @change="handleQuery"> </el-date-picker>
       </el-form-item>
-
       <el-form-item :label="$t('有效期结束')" v-show="showSearch">
-        <el-date-picker type="date" v-model="queryParams.beginEndTime" value-format="yyyy-MM-dd" @change="handleQuery"></el-date-picker>
-        {{ $t("到") }}
-        <el-date-picker v-model="queryParams.endEndTime" type="date" value-format="yyyy-MM-dd" @change="handleQuery"></el-date-picker>
+        <el-date-picker v-model="queryTmp.endTime" type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd" @change="handleQuery"> </el-date-picker>
       </el-form-item>
 
       <el-form-item :label="$t('预计结束时间')" v-show="showSearch">
-        <el-date-picker type="datetime" v-model="queryParams.beginStopTime" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery"></el-date-picker>{{ $t("到") }}
-        <el-date-picker type="datetime" v-model="queryParams.endStopTime" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery"></el-date-picker>
+        <el-date-picker v-model="queryTmp.stopTime" type="datetimerange" 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>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t("搜索") }}</el-button>
@@ -239,6 +233,12 @@ export default {
         pageNo: 1,
         pageSize: 10
       },
+      queryTmp: {
+        createTime: ["", ""],
+        stopTime: ["", ""],
+        startTime: ["", ""],
+        endTime: ["", ""]
+      },
       currencyList: [],
       tradeCityList: [],
       channelList: [],
@@ -489,11 +489,7 @@ export default {
           console.log(error)
         })
     },
-    /** 查询列表 */
-    getList() {
-      this.loading = true
-      let func = this.dept ? offerDeptPage : getOfferPage
-
+    formatQuery() {
       let obj = {}
       //目的国
       if (this.destCountryId != null && this.destCountryId != "") {
@@ -507,11 +503,25 @@ export default {
       if (this.destWarehouseId != null && this.destWarehouseId != "") {
         obj.destWarehouseIds = this.destWarehouseId
       }
+      obj.beginCreateTime = this.queryTmp.createTime[0]
+      obj.endCreateTime = this.queryTmp.createTime[1]
+      obj.beginStopTime = this.queryTmp.stopTime[0]
+      obj.endStopTime = this.queryTmp.stopTime[1]
+      obj.beginStartTime = this.queryTmp.startTime[0]
+      obj.endStartTime = this.queryTmp.startTime[1]
+      obj.beginEndTime = this.queryTmp.endTime[0]
+      obj.endEndTime = this.queryTmp.endTime[1]
+      return obj
+    },
+    /** 查询列表 */
+    getList() {
+      this.loading = true
+      let func = this.dept ? offerDeptPage : getOfferPage
 
       // 执行查询
       func({
         ...this.queryParams,
-        ...obj
+        ...this.formatQuery()
       }).then((response) => {
         this.list = response.data.list
         this.total = response.data.total