需求95 报价单页面和列表调整

src/i18n/languages/en_US.json

@@ -4958,5 +4958,9 @@
   "上次跟进内容": "Last Follow-up Content",
   "所报价格": "Quoted Price",
   "厂家/电话": "Manufacturer/Phone",
-  "请输入等级": "Please enter the level"
+  "请输入等级": "Please enter the level",
+  "有效期开始": "Validity Start",
+  "有效期结束": "Validity End",
+  "上次跟进时间": "Last Follow-up Time",
+  "输单备注": "Lost Reason"
 }

src/views/ecw/offer/index.vue

@@ -34,12 +34,12 @@
         <dict-selector :type="DICT_TYPE.ECW_OFFER_CARGO_STATUS" multiple v-model="queryParams.cargoStatusList" clearable @change="handleQuery" />
       </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 :label="$t('运输方式')" prop="transportList" v-show="showSearch">
+        <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportList" multiple formatter="number" clearable @change="handleQuery" />
       </el-form-item>
 
-      <el-form-item :label="$t('始发仓')" prop="startWarehouseId">
-        <el-select v-model="queryParams.startWarehouseId" multiple :placeholder="$t('请选择始发仓')" clearable @change="handleQuery">
+      <el-form-item :label="$t('始发仓')" prop="startWarehouseIds">
+        <el-select v-model="queryParams.startWarehouseIds" multiple :placeholder="$t('请选择始发仓')" clearable @change="handleQuery">
           <el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
         </el-select>
       </el-form-item>
@@ -135,7 +135,7 @@
       </el-col>
       <el-col :span="15" style="font-size: 19px" v-if="statistics">
         <!-- 订单列表显示搜索条件对应箱数、仓库实测、收款方数、重量 -->
-        汇总：{{statistics.volume}}CBM/{{statistics.weight}}KG
+        {{$t('汇总')}}：{{statistics.volume}}CBM/{{statistics.weight}}KG
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -298,7 +298,7 @@
               <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="handleAddOffer(scope.row)" v-if="[1, 3, 7].indexOf(scope.row.status) > -1">{{ $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(`result?offerId=${scope.row.offerId}&number=${scope.row.number}&saleStage=${scope.row.saleStage}`)" 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>
               <el-dropdown-item @click.native="cancel(scope.row.offerId)" v-if="[1, 3, 7].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:cancel']">{{ $t("取消") }}</el-dropdown-item>
               <el-dropdown-item @click.native="recovery(scope.row.offerId)" v-if="[0].indexOf(scope.row.status) > -1" v-hasPermi="['ecw:offer:recovery']">{{ $t("恢复") }}</el-dropdown-item>
@@ -359,6 +359,7 @@ export default {
         importances: [],
         channelIds: [],
         sourceIds: [],
+        transportList: [],
         pageNo: 1,
         pageSize: 10
       },
@@ -731,6 +732,13 @@ export default {
         pageNo: 1,
         pageSize: 10
       }
+      this.queryTmp={
+        createTime: ["", ""],
+          stopTime: ["", ""],
+          estimatedShippingTime: ["", ""],
+          startTime: ["", ""],
+          endTime: ["", ""]
+      }
       this.handleQuery()
     },
     /** 新增按钮操作 */

src/views/ecw/offer/result.vue

@@ -7,7 +7,7 @@
       </el-form-item>
 
       <el-form-item :label="$t('结果')" prop="result">
-        <dict-selector form-type="radio" :type="DICT_TYPE.ECW_OFFER_RESULT" v-model="form.result" />
+        <dict-selector form-type="radio" :type="DICT_TYPE.ECW_OFFER_RESULT" v-model="form.result" :disabled="saleStage==11?true:false"/>
       </el-form-item>
 
       <template v-if="form.result==1">
@@ -83,7 +83,8 @@ export default {
         warehousingType: {required: true, message: this.$t('请选择入仓类型')}
       },
       selectLoading: false,
-      orderNoList: []
+      orderNoList: [],
+      saleStage: 0
     };
   },
   computed: {
@@ -99,7 +100,9 @@ export default {
     if(this.$route.query.offerId){
       this.form.offerId = this.$route.query.offerId
     }
-
+    if(this.$route.query.saleStage) {
+      this.saleStage = this.$route.query.saleStage
+    }
   },
   methods: {