Merge remote-tracking branch 'origin/dev' into dev

src/components/UserSelector/index.vue

@@ -17,11 +17,15 @@
 </template>
 <script>
 import {getCustomerContactsSelect, getCustomerContacts} from '@/api/ecw/customerContacts'
-import {listSimpleUsers} from '@/api/system/user'
+import {listServiceUser, listSimpleUsers} from '@/api/system/user'
 export default {
     props:{
         value: [String, Number],
-        clearable: Boolean
+        clearable: Boolean,
+        manage:{
+          type:Boolean,
+          default:false
+        }
     },
     data(){
         return {
@@ -44,9 +48,18 @@ export default {
         }
     },
     created(){
+      if(this.manage){
+        // 客户经理
+        listServiceUser().then(r=>{
+          this.list = r.data;
+        })
+      }else {
+        // 全部客户
         listSimpleUsers().then(res => {
           this.list = res.data
         })
+      }
+
         // this.init()
     },
     methods:{

src/views/ecw/channel/index.vue

@@ -126,7 +126,7 @@
 import { createChannel, updateChannel, deleteChannel, getChannel, getChannelPage, exportChannelExcel } from "@/api/ecw/channel";
 
 export default {
-  name: "Channel",
+  name: "EcwChannelIndex",
   components: {
   },
   data() {
@@ -163,6 +163,9 @@ export default {
   created() {
     this.getList();
   },
+  activated() {
+    this.getList();
+  },
   methods: {
     /** 查询列表 */
     getList() {

src/views/ecw/customer/query.vue

@@ -50,7 +50,7 @@
               <el-image v-show="!!customer.picture" :src="customer.picture" style="width: 100px;height: 100px"></el-image>
             </el-descriptions-item>
             <el-descriptions-item :label="$t('备注')">{{ customer.remarks  }}</el-descriptions-item>
-            <el-descriptions-item :label="$t('新老客户')">{{ customer.isNew ?$t('新客户') : $t('老客户')  }}</el-descriptions-item>
+            <el-descriptions-item :label="$t('业绩类型')">{{ customer.isNew ?$t('新客户') : $t('老客户')  }}</el-descriptions-item>
             <el-descriptions-item :label="$t('付款人姓名')">{{ customer.payerName  }}</el-descriptions-item>
             <el-descriptions-item v-if="permissions.includes('ecw:customer:query-card')"  :label="$t('身份证姓名')">{{ customer.carName }}</el-descriptions-item>
             <el-descriptions-item v-if="permissions.includes('ecw:customer:query-card')"  :label="$t('身份证号码')">{{ customer.carNo }}</el-descriptions-item>

src/views/ecw/deptTarget/allAchievement.vue

@@ -131,7 +131,7 @@
     import {listServiceUser} from "@/api/system/user";
 
     export default {
-        name: "DeptTarget",
+        name: "EcwDepttargetAllachievement",
         components: {},
         data() {
             return {
@@ -220,6 +220,10 @@
                 }
             }
         },
+      activated() {
+        this.getChannelList();
+        this.getList();
+      },
       created() {
             this.getChannelList();
             this.getList();

src/views/ecw/deptTarget/index.vue

@@ -154,7 +154,7 @@
 import { parseTime } from '@/utils/ruoyi';
 
     export default {
-        name: "DeptTarget",
+        name: "EcwDepttargetIndex",
         components: {},
         data() {
             return {
@@ -266,6 +266,10 @@ import { parseTime } from '@/utils/ruoyi';
             this.getChannelList();
             this.getList();
         },
+      activated() {
+        this.getChannelList();
+        this.getList();
+      },
       methods: {
           /** 查询部门列表 */
           getDeptList(){

src/views/ecw/deptTarget/myAchievement.vue

@@ -127,7 +127,7 @@
     import {listServiceUser} from "@/api/system/user";
 
     export default {
-        name: "DeptTarget",
+        name: "EcwDepttargetMyachievement",
         components: {},
         data() {
             return {
@@ -216,6 +216,10 @@
                 }
             }
         },
+      activated() {
+        this.getChannelList();
+        this.getList();
+      },
       created() {
             this.getChannelList();
             this.getList();

src/views/ecw/deptTarget/myDeptAchievement.vue

@@ -127,7 +127,7 @@
     import {listServiceUser} from "@/api/system/user";
 
     export default {
-        name: "DeptTarget",
+        name: "EcwDepttargetMydeptachievement",
         components: {},
         data() {
             return {

src/views/ecw/deptTarget/myDeptTarget.vue

@@ -155,7 +155,7 @@
 import { parseTime } from '@/utils/ruoyi';
 
     export default {
-        name: "DeptTarget",
+        name: "EcwDepttargetMydepttarget",
         components: {},
         data() {
             return {
@@ -267,13 +267,17 @@ import { parseTime } from '@/utils/ruoyi';
             this.getChannelList();
             this.getList();
         },
+      activated() {
+        this.getChannelList();
+        this.getList();
+      },
       methods: {
           /** 查询部门列表 */
           getDeptList(){
             this.loading = true;
             myListDept(this.queryParams).then(response => {
               this.deptList = this.handleTree(response.data, "id");
-              console.log("this.deptList:"+JSON.stringify(this.deptList));
+              // console.log("this.deptList:"+JSON.stringify(this.deptList));
               this.deptList.forEach((item) => {
                 this.normalizer(item);
                 // this.deptData.push(item);

src/views/ecw/order/index.vue

@@ -64,7 +64,7 @@
         <dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="queryParams.warehouseType"  clearable/>
       </el-form-item>
       <el-form-item :label="$t('客户经理')" >
-        <user-selector v-model="queryParams.salesmanId" clearable @change="handleQuery"/>
+        <user-selector manage v-model="queryParams.salesmanId" clearable @change="handleQuery"/>
       </el-form-item>
       <el-form-item :label="$t('订单状态')" prop="status">
         <dict-selector :type="DICT_TYPE.ORDER_STATUS" v-model="queryParams.status"