Merge remote-tracking branch 'origin/pre-release' into pre-release

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

@@ -221,8 +221,7 @@ export default {
           return time.getTime() <= Date.now()
         },
       },
-      isEdit: false,
-      queryParams: {},
+      isEdit: true,
       followTime: [],
       nextTime: [],
       queryParams: {
@@ -357,7 +356,7 @@ export default {
           return
         }
 
-        if (status == 0) {
+        if (status === 0) {
           this.saveSubmitData(status)
         } else {
           this.$confirm(this.$t('提交后无法修改'), this.$t('提示'), {
@@ -403,6 +402,7 @@ export default {
     },
     handleQuery() {
       this.pageNo = 1
+      this.queryParams.pageNo = 1
       this.followTime = []
       this.getCustomerFollowList()
     },
@@ -445,7 +445,7 @@ export default {
     },
     handleAdd() {
       this.isView = false
-      this.isEdit = false
+      this.isEdit = true
       this.customerFollow.dialogVisible = true
       this.reset()
     },

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

@@ -272,9 +272,10 @@
 
 <script>
 import { getCustomerPage, customerMergeCus } from "@/api/ecw/customer"
-import { getDictDatas, DICT_TYPE } from "@/utils/dict"
+import { getDictDatas, DICT_TYPE, getDictDatas2 } from "@/utils/dict"
 import Contacts from "./contacts.vue";
 import Template from "@/views/cms/template/index.vue";
+import {getProductTypeList} from "@/api/ecw/productType";
 export default {
   name: "CustomerMerge",
   components: {
@@ -399,7 +400,10 @@ export default {
     }
   },
   created() {
-    this.getList()
+    this.getList();
+    getProductTypeList().then((r) => {
+      this.productTypeList = r.data;
+    });
   },
   methods: {
     init() {

src/views/ecw/customer/query.vue

@@ -571,7 +571,7 @@
                 </el-table-column>
                 <el-table-column width="150px" :label="$t('操作')" align="center" fixed="right" class-name="small-padding fixed-width">
                   <template slot-scope="scope">
-                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCustomerFollow(scope.row, false)" v-hasPermi="['ecw:customer:follow-update']">{{ $t("编辑") }}</el-button>
+                      <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCustomerFollow(scope.row, scope.row.status === 0)" v-hasPermi="['ecw:customer:follow-update']">{{ $t("编辑") }}</el-button>
                     <el-button size="mini" type="text" icon="el-icon-collection" @click="handleCustomerFollow(scope.row, true)" v-has-permi="['ecw:customer:follow-add-plan']">{{ $t("增加计划") }}</el-button>
                   </template>
                 </el-table-column>
@@ -1004,7 +1004,7 @@ export default {
           this.destWarehouseId == ""
         ) {
           //获取当前城市值id，获取该城市下区域
-          
+
         } else if (
           this.destCountryId == "" &&
           this.objectiveId == "" &&
@@ -1305,7 +1305,7 @@ export default {
       this.destCountryId = null
       this.objectiveId = null
       this.destWarehouseId = null
-      this.queryParams = { rows:10,page:1}; 
+      this.queryParams = { rows:10,page:1};
       this.getorderList()
       this.rucangtime  = [];
     },
@@ -1333,7 +1333,7 @@ export default {
       this.destCountryId = null
       this.objectiveId = null
       this.destWarehouseId = null
-      this.infoListOfferFrom = { pageNo:1,pageSize:10}; 
+      this.infoListOfferFrom = { pageNo:1,pageSize:10};
       this.getInfoListOfferPage()
     },
     getCustomerFollowList() {

src/views/ecw/customerToBeAssigned/index.vue

@@ -623,7 +623,7 @@ import {
   exportCustomerExcel, getCustomerToBeAssigned, waitDistributionExportExcel,
   competitorListAll
 } from "@/api/ecw/customer";
-import { getDictDatas, DICT_TYPE } from '@/utils/dict';
+import { getDictDatas, DICT_TYPE, getDictDatas2 } from '@/utils/dict';
 import upload from '@/components/ImageUpload'
 import {listServiceUser, listAllSimpl} from "@/api/system/user";
 import {getCountryListAll} from "@/api/ecw/country";

src/views/ecw/myCustomerService/index.vue

@@ -738,7 +738,7 @@ import {
   mineExportExcel,
   competitorListAll
 } from "@/api/ecw/customer";
-import { getDictDatas, DICT_TYPE } from "@/utils/dict";
+import { getDictDatas, DICT_TYPE, getDictDatas2 } from "@/utils/dict";
 import upload from "@/components/ImageUpload";
 import customerFollowList from "../customer/components/customerFollow";
 import customerComplaints from "@/components/customerComplaints";

src/views/ecw/oceanCustomer/index.vue

@@ -711,7 +711,7 @@ import {
   publicExportExcel,
   competitorListAll
 } from "@/api/ecw/customer";
-import { getDictDatas, DICT_TYPE } from "@/utils/dict";
+import { getDictDatas, DICT_TYPE, getDictDatas2 } from "@/utils/dict";
 import upload from "@/components/ImageUpload";
 import { listServiceUser, listAllSimpl } from "@/api/system/user";
 import { getCountryListAll } from "@/api/ecw/country";

src/views/report/BankReceiptDetails/index.vue

@@ -516,7 +516,7 @@
           ></el-input>
         </el-form-item>
         <el-form-item :label="$t('最后更新人')" v-show="isEdit" prop="updater">
-          <el-input         
+          <el-input
             v-model="form.updater"
             style="width: 220px"
           ></el-input>
@@ -549,7 +549,7 @@
     </el-dialog>
   </div>
 </template>
-  
+
 <script>
 import { getPageList } from "@/api/report/bankReceiptDetail";
 import { getReceivableItem2 } from "@/api/ecw/financial";
@@ -598,7 +598,6 @@ export default {
       title: "",
       //是否显示弹出层
       open: false,
-      form: {},
       dialogVisible: false,
       reason: "", //审核理由
       cancelShow: false,
@@ -1158,4 +1157,3 @@ export default {
   },
 };
 </script>
-  
\ No newline at end of file