6

src/views/ecw/offer/edit.vue

@@ -1100,6 +1100,9 @@ export default {
     if (this.form.offerId != this.$route.query.id) {
       this.getOffer()
     }
+    if (this.$route.query.copyId && this.form.copyId != this.$route.query.copyId) {
+      this.getOffer()
+    }
   },
   async created() {
     await this.getChannelList()
@@ -1154,7 +1157,7 @@ export default {
     getOffer() {
       //加了是否从全部客户列表中报价按钮进来的判断
       if (this.$route.query !== 1) {
-        getOffer(this.$route.query.id).then((res) => {
+        getOffer(this.$route.query.id || this.$route.query.copyId).then((res) => {
           let formData = res.data
           formData.type = formData.type ? formData.type.split(",").filter((item) => item != "") : []
           formData.prodCreateReqVOList = []
@@ -1187,6 +1190,13 @@ export default {
               })
             })
           }
+
+          if (this.$route.query.copyId) {
+            formData.startTime = ""
+            formData.endTime = ""
+            formData.stopTime = ""
+          }
+
           this.$set(this, "form", formData)
           // 接口只返回了发货人和收货人ID，还需要调用接口获取详细信息回显
           getCustomerContactsSelect({

src/views/ecw/offer/index.vue

@@ -82,17 +82,26 @@
       <el-form-item :label="$t('客户来源')" prop="sourceIds" v-show="showSearch">
         <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-form-item>
 
-      <div>
-        <el-form-item :label="$t('预计结束时间')" prop="orderNo">
-          <el-date-picker type="datetime" v-model="queryParams.beginStopTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>{{ $t("到") }}
-          <el-date-picker type="datetime" v-model="queryParams.endStopTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t("搜索") }}</el-button>
-          <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t("重置") }}</el-button>
-        </el-form-item>
-      </div>
+      <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-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-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t("搜索") }}</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t("重置") }}</el-button>
+      </el-form-item>
     </el-form>
 
     <!-- 操作工具栏 -->
@@ -114,7 +123,7 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('订单编号')" align="left" prop="orderNo" />
-      <el-table-column :label="$t('联系人')" align="left" prop="relationName" />
+      <el-table-column :label="$t('联系人')" align="left" prop="relationName" width="180" />
       <el-table-column :label="$t('联系电话')" align="left" prop="relationPhone" />
       <el-table-column :label="$t('重要程序')" align="center" prop="importance" />
       <el-table-column :label="$t('始发地')" align="left" prop="departureName" />
@@ -124,12 +133,12 @@
           {{ $l(transportTypes[row.transportType], "label") }}
         </template>
       </el-table-column>
-      <el-table-column :label="$t('销售阶段')" align="left" width="180">
+      <el-table-column :label="$t('销售阶段')" align="left" width="100">
         <template slot-scope="{ row }">
           <dict-tag :type="DICT_TYPE.ECW_OFFER_STATUS" :value="row.status" />
         </template>
       </el-table-column>
-      <el-table-column :label="$t('预计结束时间')" align="left">
+      <el-table-column :label="$t('预计结束时间')" align="left" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.stopTime, "{y}-{m}-{d}") }}</span>
         </template>
@@ -140,7 +149,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column :label="$t('预计销售额')" align="left" prop="estCost">
+      <el-table-column :label="$t('预计销售额')" align="left" prop="estCost" width="160">
         <template slot-scope="{ row }">
           <div class="" v-for="(item, feeIndex) in row.estCostVO.feeDtoList" :key="feeIndex">
             <dict-tag :type="DICT_TYPE.ECW_COST_FEE_TYPE" :value="item.feeType" />
@@ -149,14 +158,15 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('客户经理')" align="left" prop="creatorName"> </el-table-column>
-      <el-table-column :label="$t('创建时间')" align="left">
+      <el-table-column :label="$t('创建时间')" align="left" width="120">
         <template slot-scope="{ row }">
           <span>{{ parseTime(row.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('有效期')" align="left">
+      <el-table-column :label="$t('有效期')" align="left" width="120">
         <template slot-scope="{ row }">
-          <span>{{ parseTime(row.endTime, "{y}-{m}-{d} {h}:{i}:{s}") }}</span>
+          <div>{{ parseTime(row.startTime, "{y}-{m}-{d}") }}</div>
+          {{ parseTime(row.endTime, "{y}-{m}-{d}") }}
         </template>
       </el-table-column>
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
@@ -176,6 +186,7 @@
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item @click.native="$router.push('detail?offerId=' + scope.row.offerId)" v-hasPermi="['ecw:offer:show']">{{ $t("详情") }}</el-dropdown-item>
               <el-dropdown-item @click.native="$router.push('edit?id=' + scope.row.offerId)" v-if="[1, 2, 3, 7].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:update']">{{ $t("编辑") }}</el-dropdown-item>
+              <el-dropdown-item @click.native="$router.push('create?copyId=' + scope.row.offerId)" v-if="[1, 2, 3, 7].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:update']">{{ $t("复制") }}</el-dropdown-item>
               <el-dropdown-item @click.native="$router.push('logList?offerId=' + scope.row.offerId)" v-if="[1, 3, 7].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:loglist']">{{ $t("跟进") }}</el-dropdown-item>
               <el-dropdown-item @click.native="$router.push(`result?offerId=${scope.row.offerId}&number=${scope.row.number}`)" v-if="[3, 7].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:result']">{{ $t("结果") }}</el-dropdown-item>
               <el-dropdown-item @click.native="$router.push('/offer/special?offerId=' + scope.row.offerId)" v-if="[1, 3, 7].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:discount', 'ecw:offer:commission']">{{ $t("特价") }}</el-dropdown-item>
@@ -213,7 +224,7 @@ export default {
       // 导出遮罩层
       exportLoading: false,
       // 显示搜索条件
-      showSearch: true,
+      showSearch: false,
       // 总条数
       total: 0,
       // 报价单管理列表