客户详情订单，报价搜索重置

src/components/FileUpload/fileUpload.vue

@@ -54,9 +54,7 @@
             <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
           </el-link>
           <div class="ele-upload-list__item-content-action">
-            <el-link :underline="false" @click="handleDelete(index)" type="danger"
-              >删除</el-link
-            >
+            <el-button size="mini" type="danger" :disabled="disabled" @click="handleDelete(index)">删除</el-button>
           </div>
         </div>
         

src/views/ecw/customer/components/customerFollow.vue

@@ -22,7 +22,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('跟进类型')" required>
-            <el-select v-model="form.followType" :placeholder="$t('请选择')" @change="handleFollowType">
+            <el-select v-model="form.followType" :placeholder="$t('请选择')" @change="handleFollowType" :disabled="isView">
               <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_FOLLOWUP_TYPE)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
             </el-select>
           </el-form-item>
@@ -36,12 +36,12 @@
         -->
         <el-col :span="12">
           <el-form-item :label="$t('跟进时间')" required>
-            <el-date-picker v-model="form.followTime" type="datetime" :placeholder="$t('请选择')"></el-date-picker>
+            <el-date-picker v-model="form.followTime" type="datetime" :placeholder="$t('请选择')" :disabled="isView"></el-date-picker>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('联系人')" required>
-            <el-select v-model="form.contactName" :placeholder="$t('请选择')">
+            <el-select v-model="form.contactName" :placeholder="$t('请选择')" :disabled="isView">
               <el-option v-for="(item, index) in customerContactsList" :key="index" :label="item.name" :value="item.name">
               </el-option>
             </el-select>
@@ -49,15 +49,15 @@
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('客户经理')" required>
-            <el-select v-model="form.followUserId" :placeholder="$t('请选择')">
+            <el-select v-model="form.followUserId" :placeholder="$t('请选择')" :disabled="isView">
               <el-option v-for="item in serviceUserList" :key="item.id" :label="item.nickname" :value="item.id">
               </el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item :label="$t('跟进方式')" required>
-            <dict-selector ref="dictMethod" v-model="form.followMethod" :type="DICT_TYPE.CUSTOMER_FOLLOWUP_METHOD"></dict-selector>
+          <el-form-item :label="$t('跟进方式')" required >
+            <dict-selector ref="dictMethod" v-model="form.followMethod" :disabled="isView" :type="DICT_TYPE.CUSTOMER_FOLLOWUP_METHOD"></dict-selector>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -67,35 +67,35 @@
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('跟进结果')" prop="followMethod">
-            <el-select v-model="form.resultType" :placeholder="$t('请选择')">
+            <el-select v-model="form.resultType" :placeholder="$t('请选择')" :disabled="isView">
               <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_FOLLOWUP_RESULT_TYPE)" :key="dict.value" :label="isChinese ? dict.label : dict.labelEn" :value="parseInt(dict.value)" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="20">
           <el-form-item :label="$t('目的')" prop="purpose">
-            <el-input type="textarea" :rows="2" v-model="form.purpose" :placeholder="$t('请输入目的')" maxlength="200" show-word-limit />
+            <el-input type="textarea" :rows="2" v-model="form.purpose" :placeholder="$t('请输入目的')" maxlength="200" show-word-limit :disabled="isView" />
           </el-form-item>
         </el-col>
         <el-col :span="20">
           <el-form-item :label="$t('跟进情况')">
-            <el-input rows="3" class="text_style" type="textarea" placeholder="" v-model="form.feedback" maxlength="500" show-word-limit />
+            <el-input rows="3" class="text_style" type="textarea" v-model="form.feedback" maxlength="500" show-word-limit :disabled="isView" />
           </el-form-item>
         </el-col>
         <el-col :span="20">
           <el-form-item :label="$t('附件')" prop="attatchment">
-            <FileUpload :limit="5" :isShowTip="false" v-model="form.attatchment" :fileType="fileType" />
+            <FileUpload :limit="5" :isShowTip="true" v-model="form.attatchment" :fileType="fileType" :disabled="isView" />
           </el-form-item>
         </el-col>
         <el-col :span="13">
           <el-form-item :label="$t('下次跟进时间')">
-            <el-date-picker v-model="form.nextTime" type="datetime" :placeholder="$t('请选择')">
+            <el-date-picker v-model="form.nextTime" type="datetime" :placeholder="$t('请选择')" :disabled="isView">
             </el-date-picker>
           </el-form-item>
         </el-col>
         <el-col :span="20">
           <el-form-item :label="$t('下一步计划')" prop="nextPlan">
-            <el-input type="textarea" :rows="3" v-model="form.nextPlan" :placeholder="$t('请输入下一步计划')" maxlength="500" show-word-limit />
+            <el-input type="textarea" :rows="3" v-model="form.nextPlan" :placeholder="$t('请输入下一步计划')" maxlength="500" show-word-limit :disabled="isView" />
           </el-form-item>
         </el-col> 
         <el-col :span="12">
@@ -128,7 +128,10 @@
         </el-col>
       </el-row>
     </el-form>
-    <div slot="footer" class="dialog-footer">
+    <div slot="footer" class="dialog-footer" v-if="isView">
+      <el-button type="warning" @click="customerFollowClose">{{$t('关 闭')}}</el-button>
+    </div>
+    <div slot="footer" class="dialog-footer" v-else>
       <el-button type="warning" @click="goBack">{{$t('返 回')}}</el-button>
       <el-button type="primary" @click="customerFollowSubmit(0)">{{$t('保 存')}}</el-button>
       <el-button type="success" @click="customerFollowSubmit(1)" v-if="isEdit">{{$t('提交结果')}}</el-button>
@@ -226,7 +229,8 @@ export default {
         pageSize: 10
       },
       offerList: [],
-      offerTotal: 0
+      offerTotal: 0,
+      isView: false
     }
   },
   computed: {
@@ -288,6 +292,7 @@ export default {
         nextTime: undefined,
         number: undefined,
         offerId: undefined,
+        parentId: undefined,
         parentNumber: undefined,
         purpose: undefined,
         resultType: undefined,
@@ -406,12 +411,19 @@ export default {
         })
       }
     },
+    handleView(row) {
+      this.isView = true
+      this.form = row
+      this.customerFollow.dialogVisible = true
+    },
     handleAdd() {
+      this.isView = false
       this.isEdit = false
       this.customerFollow.dialogVisible = true
       this.reset()
     },
     handleUpdate(row, flag) {
+      this.isView = false
       this.isEdit = flag
       this.customerFollow.dialogVisible = true
       if (flag) {

src/views/ecw/customer/query.vue

@@ -141,9 +141,7 @@
                   </el-form-item>
                   <el-form-item>
                     <el-button type="primary" @click="getorderList">{{$t('搜索')}}</el-button>
-                    <el-button type="primary" @click="()=>{
-                         queryParams = { rows:10,page:1}; getorderList();rucangtime  = [];
-                    }">{{$t('重置')}}</el-button>
+                    <el-button type="primary" @click="handleOrderReset">{{$t('重置')}}</el-button>
                   </el-form-item>
                 </el-form>
               </div>
@@ -286,9 +284,7 @@
                   </el-form-item>
                   <el-form-item>
                     <el-button type="primary" @click="getInfoListOfferPage">{{$t('搜索')}}</el-button>
-                    <el-button type="primary" @click="()=>{
-                      infoListOfferFrom = { pageNo:1,pageSize:10}; getInfoListOfferPage();rucangtime  = [];
-                    }">{{$t('重置')}}</el-button>
+                    <el-button type="primary" @click="handleOfferReset">{{$t('重置')}}</el-button>
                   </el-form-item>
                 </el-form>
               </div>
@@ -472,13 +468,16 @@
                 </el-form>
               </div>
               <el-table :data="customerFollowList" style="width: 100%">
-                <el-table-column prop="number" :label="$t('编号')"> </el-table-column>
+                <el-table-column prop="number" :label="$t('编号')" width="120">
+                  <template slot-scope="scope">
+                    <a href="javascript:void(0)" @click="handleCustomerFollowLink(scope.row)" class="link-type">{{scope.row.number}}</a>
+                  </template>
+                </el-table-column>
                 <el-table-column prop="followType" :label="$t('跟进类型')" :formatter="(row, column, cellValue) => getDictDataLabel(DICT_TYPE.CUSTOMER_FOLLOWUP_TYPE, cellValue)"></el-table-column>
                 <el-table-column prop="offerNumber" :label="$t('报价单号')"></el-table-column>
                 <el-table-column prop="followTime" :label="$t('跟进时间')" :formatter="(row, column, cellValue) => parseTime(cellValue)"></el-table-column>
                 <el-table-column prop="customerNumber" :label="$t('客户编号')"></el-table-column>
                 <el-table-column prop="contactName" :label="$t('联系人')"></el-table-column>
-                <el-table-column :label="$t('联系方式')"></el-table-column>
                 <el-table-column prop="followUserName" :label="$t('客户经理')"></el-table-column>
                 <el-table-column prop="followMethod" :label="$t('跟进方式')" :formatter="(row, column, cellValue) => getDictDataLabel(DICT_TYPE.CUSTOMER_FOLLOWUP_METHOD, cellValue)"></el-table-column>
                 <el-table-column prop="purpose" :label="$t('目的')"></el-table-column>
@@ -489,7 +488,7 @@
                     {{ parseTime(scope.row.nextTime) }}
                   </template>
                 </el-table-column>
-                <el-table-column :label="$t('关联跟进记录')" align="center"></el-table-column>
+                <el-table-column :label="$t('关联跟进记录')" align="center"  prop="parentNumber"></el-table-column>
                 <el-table-column prop="nextPlan" :label="$t('下次计划')" align="center"></el-table-column>
                 <el-table-column :label="$t('跟进状态')" align="center">
                   <template slot-scope="scope">
@@ -1230,8 +1229,11 @@ export default {
         this.$refs['customerFollow'].handleUpdate(row, flag)
       })
     },
-    handleCustomerFollowSelectOffer() {
-      this.$refs['customerFollowSelectOffer'].offerDialogVisible = true
+    handleCustomerFollowLink(row) {
+      this.customerFollowVisible = true
+      this.$nextTick(_ => {
+        this.$refs['customerFollow'].handleView(row)
+      })
     },
     checkPermi,
     userIdFormatter(row, column, cellValue){
@@ -1295,7 +1297,15 @@ export default {
         }
       })
     },
-  // 客户报价
+    handleOrderReset() {
+      this.destCountryId = null
+      this.objectiveId = null
+      this.destWarehouseId = null
+      this.queryParams = { rows:10,page:1}; 
+      this.getorderList()
+      this.rucangtime  = [];
+    },
+    // 客户报价
     getInfoListOfferPage(){
       let queryParams = {}
       //目的国
@@ -1315,6 +1325,13 @@ export default {
         this.infoListOfferTotal = r.data.total;
       })
     },
+    handleOfferReset() {
+      this.destCountryId = null
+      this.objectiveId = null
+      this.destWarehouseId = null
+      this.infoListOfferFrom = { pageNo:1,pageSize:10}; 
+      this.getInfoListOfferPage()
+    },
     getCustomerFollowList() {
       let queryParams = {}
       if (this.followTime && this.followTime.length == 2) {