Merge remote-tracking branch 'origin/master'

src/api/crm/customer.js

@@ -151,3 +151,17 @@ export function delCustomer(customerId) {
     method: 'delete'
   })
 }
+
+export function getCustomerDetails1(data) {
+  return request({
+    url: '/crm/customer/query/' + data.customerId,
+    method: 'get'
+  })
+}
+
+export function getCustomer1(customerId) {
+  return request({
+    url: '/crm/customer/query2/' + customerId,
+    method: 'get'
+  })
+}

src/api/hisStore/city.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询城市列表
 export function listCity(query) {
   return request({
-    url: '/store/city/list',
+    url: '/his/city/list',
     method: 'get',
     params: query
   })
@@ -18,7 +18,7 @@ export function getAllList(query) {
 
 export function getCitys() {
   return request({
-    url: '/store/city/getCitys',
+    url: '/his/city/getCitys',
     method: 'get'
   })
 }
@@ -28,7 +28,7 @@ export function getCitys() {
 // 查询城市详细
 export function getCity(id) {
   return request({
-    url: '/store/city/' + id,
+    url: '/his/city/' + id,
     method: 'get'
   })
 }
@@ -36,7 +36,7 @@ export function getCity(id) {
 // 新增城市
 export function addCity(data) {
   return request({
-    url: '/store/city',
+    url: '/his/city',
     method: 'post',
     data: data
   })
@@ -45,7 +45,7 @@ export function addCity(data) {
 // 修改城市
 export function updateCity(data) {
   return request({
-    url: '/store/city',
+    url: '/his/city',
     method: 'put',
     data: data
   })
@@ -54,7 +54,7 @@ export function updateCity(data) {
 // 删除城市
 export function delCity(id) {
   return request({
-    url: '/store/city/' + id,
+    url: '/his/city/' + id,
     method: 'delete'
   })
 }
@@ -62,7 +62,7 @@ export function delCity(id) {
 // 导出城市
 export function exportCity(query) {
   return request({
-    url: '/store/city/export',
+    url: '/his/city/export',
     method: 'get',
     params: query
   })

src/api/hisStore/menu.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询用户端菜单管理列表
 export function listMenu(query) {
   return request({
-    url: '/store/menu/list',
+    url: '/store/store/menu/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listMenu(query) {
 // 查询用户端菜单管理详细
 export function getMenu(menuId) {
   return request({
-    url: '/store/menu/' + menuId,
+    url: '/store/store/menu/' + menuId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getMenu(menuId) {
 // 新增用户端菜单管理
 export function addMenu(data) {
   return request({
-    url: '/store/menu',
+    url: '/store/store/menu',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addMenu(data) {
 // 修改用户端菜单管理
 export function updateMenu(data) {
   return request({
-    url: '/store/menu',
+    url: '/store/store/menu',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateMenu(data) {
 // 删除用户端菜单管理
 export function delMenu(menuId) {
   return request({
-    url: '/store/menu/' + menuId,
+    url: '/store/store/menu/' + menuId,
     method: 'delete'
   })
 }
@@ -46,7 +46,7 @@ export function delMenu(menuId) {
 // 导出用户端菜单管理
 export function exportMenu(query) {
   return request({
-    url: '/store/menu/export',
+    url: '/store/store/menu/export',
     method: 'get',
     params: query
   })

src/api/hisStore/storeActivity.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询活动列表
 export function listStoreActivity(query) {
   return request({
-    url: '/hisStore/fsStoreActivityScrm/list',
+    url: '/store/storeActivity/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listStoreActivity(query) {
 // 查询活动详细
 export function getStoreActivity(activityId) {
   return request({
-    url: '/hisStore/fsStoreActivityScrm/' + activityId,
+    url: '/store/storeActivity/' + activityId,
     method: 'get'
   })
 }
@@ -38,7 +38,7 @@ export function updateStoreActivity(data) {
 // 删除活动
 export function delStoreActivity(activityId) {
   return request({
-    url: '/hisStore/fsStoreActivityScrm/' + activityId,
+    url: '/store/storeActivity/' + activityId,
     method: 'delete'
   })
 }
@@ -46,7 +46,7 @@ export function delStoreActivity(activityId) {
 // 导出活动
 export function exportStoreActivity(query) {
   return request({
-    url: '/hisStore/fsStoreActivityScrm/export',
+    url: '/store/storeActivity/export',
     method: 'get',
     params: query
   })

src/api/store/city.js

@@ -18,7 +18,7 @@ export function getAllList(query) {
 
 export function getCitys() {
   return request({
-    url: '/store/city/getCitys',
+    url: '/his/city/getCitys',
     method: 'get'
   })
 }
@@ -54,7 +54,7 @@ export function updateCity(data) {
 // 删除城市
 export function delCity(id) {
   return request({
-    url: '/his/city' + id,
+    url: '/his/city/' + id,
     method: 'delete'
   })
 }
@@ -62,7 +62,7 @@ export function delCity(id) {
 // 导出城市
 export function exportCity(query) {
   return request({
-    url: '/his/cityexport',
+    url: '/his/city/export',
     method: 'get',
     params: query
   })

src/api/store/menu.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询列表
 export function listApi(query) {
   return request({
-    url: '/store/menu/list',
+    url: '/store/store/menu/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listApi(query) {
 // 查询详细
 export function getApi(id) {
   return request({
-    url: '/store/menu/' + id,
+    url: '/store/store/menu/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getApi(id) {
 // 新增
 export function addApi(data) {
   return request({
-    url: '/store/menu',
+    url: '/store/store/menu',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addApi(data) {
 // 修改
 export function updateApi(data) {
   return request({
-    url: '/store/menu',
+    url: '/store/store/menu',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateApi(data) {
 // 删除
 export function delApi(id) {
   return request({
-    url: '/store/menu/' + id,
+    url: '/store/store/menu/' + id,
     method: 'delete'
   })
 }

src/api/store/store/city.js

@@ -3,14 +3,14 @@ import request from '@/utils/request'
 // 查询城市列表
 export function listCity(query) {
   return request({
-    url: '/store/city/list',
+    url: '/his/city/list',
     method: 'get',
     params: query
   })
 }
 export function getCitys(query) {
   return request({
-    url: '/store/city/getCitys',
+    url: '/his/city/getCitys',
     method: 'get',
     params: query
   })
@@ -21,7 +21,7 @@ export function getCitys(query) {
 // 查询城市详细
 export function getCity(id) {
   return request({
-    url: '/store/city/' + id,
+    url: '/his/city/' + id,
     method: 'get'
   })
 }
@@ -29,7 +29,7 @@ export function getCity(id) {
 // 新增城市
 export function addCity(data) {
   return request({
-    url: '/store/city',
+    url: '/his/city',
     method: 'post',
     data: data
   })
@@ -38,7 +38,7 @@ export function addCity(data) {
 // 修改城市
 export function updateCity(data) {
   return request({
-    url: '/store/city',
+    url: '/his/city',
     method: 'put',
     data: data
   })
@@ -47,7 +47,7 @@ export function updateCity(data) {
 // 删除城市
 export function delCity(id) {
   return request({
-    url: '/store/city/' + id,
+    url: '/his/city/' + id,
     method: 'delete'
   })
 }
@@ -55,8 +55,8 @@ export function delCity(id) {
 // 导出城市
 export function exportCity(query) {
   return request({
-    url: '/store/city/export',
+    url: '/his/city/export',
     method: 'get',
     params: query
   })
-}
+}

src/api/store/storeActivity.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询列表
 export function listApi(query) {
   return request({
-    url: '/hisStore/fsStoreActivityScrm/list',
+    url: '/store/storeActivity/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listApi(query) {
 // 查询详细
 export function getApi(id) {
   return request({
-    url: '/hisStore/fsStoreActivityScrm/' + id,
+    url: '/store/storeActivity/' + id,
     method: 'get'
   })
 }
@@ -38,7 +38,7 @@ export function updateApi(data) {
 // 删除
 export function delApi(id) {
   return request({
-    url: '/hisStore/fsStoreActivityScrm/' + id,
+    url: '/store/storeActivity/' + id,
     method: 'delete'
   })
 }

src/api/store/user.js

@@ -87,7 +87,7 @@ export function getAllUserListLimit(query) {
 // 获取小黑屋用户列表
 export function darkRoomList(query) {
   return request({
-    url: '/store/store/user/darkRoomListList',
+    url: '/his/user/darkRoomList',
     method: 'get',
     params: query
   })
@@ -96,7 +96,7 @@ export function darkRoomList(query) {
 // 批量解禁
 export function enabledUsers(data) {
   return request({
-    url: '/store/user/enabledUsers',
+    url: '/his/user/enabledUsers',
     method: 'post',
     data: data
   })

src/views/chat/chatRole/index.vue

@@ -166,15 +166,13 @@
 import { listChatRole, getChatRole, delChatRole, addChatRole, updateChatRole, exportChatRole } from "@/api/chat/chatRole";
 import { getUrl } from "@/api/chat/chatUpload";
 import QRCode from 'qrcodejs2'
-import { getUserProfile } from "@/api/company/companyUser";
 
 export default {
   name: "ChatRole",
   data() {
     return {
-      user:null,
       qrOpen:false,
-      uploadUrl:process.env.VUE_APP_BASE_API+"/chat/upload/uploadFile/",
+      uploadUrl:process.env.VUE_APP_BASE_API+"/common/uploadOSS",
       modeOptions:[],
       typeOptions:[],
       // 遮罩层
@@ -236,14 +234,15 @@ export default {
     this.getDicts("chat_role_mode").then((response) => {
       this.modeOptions = response.data;
     });
-    this.getUser();
     this.getList();
   },
   methods: {
-    getUser() {
-      getUserProfile().then(response => {
-        this.user = response.data;
-        this.uploadUrl=this.uploadUrl+this.user.companyId;
+    getList() {
+      this.loading = true;
+      listChatRole(this.queryParams).then(response => {
+        this.chatRoleList = response.rows;
+        this.total = response.total;
+        this.loading = false;
       });
     },
     handleShowQr(row){
@@ -294,15 +293,6 @@ export default {
       }
       return   isLt1M;
     },
-    /** 查询聊天角色列表 */
-    getList() {
-      this.loading = true;
-      listChatRole(this.queryParams).then(response => {
-        this.chatRoleList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
     // 取消按钮
     cancel() {
       this.open = false;

src/views/company/companyProfit/index.vue

@@ -1,15 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="" v-if="company!=null" >
-          <span style="font-weight:bold;" >{{company.companyName}}</span>
-      </el-form-item>
-      <el-form-item label="推广佣金" v-if="company!=null" >
-          <span style="font-size:20px;color:red;">{{company.tuiMoney.toFixed(2)}}</span>元
-      </el-form-item>
-      <el-form-item label="可提现金额" v-if="company!=null" >
-          <span style="font-size:20px;color:red;">{{company.money.toFixed(2)}}</span>元
-      </el-form-item>
       <el-form-item label="提现状态" prop="profitStatus">
          <el-select v-model="queryParams.profitStatus" placeholder="请选择状态" clearable size="small">
               <el-option
@@ -130,12 +121,10 @@
 
 <script>
 import { profit,cancel,listCompanyProfit, getCompanyProfit, delCompanyProfit, addCompanyProfit, updateCompanyProfit, exportCompanyProfit } from "@/api/company/companyProfit";
-import { getCompanyInfo } from "@/api/company/company";
 export default {
   name: "CompanyProfit",
   data() {
     return {
-      company:null,
       statusOptions:[],
       // 遮罩层
       loading: true,
@@ -197,16 +186,10 @@ export default {
     this.getDicts("sys_company_profit_status").then((response) => {
       this.statusOptions = response.data;
     });
-    this.getCompanyInfo();
     this.getList();
     
   },
   methods: {
-    getCompanyInfo(){
-      getCompanyInfo().then(response => {
-        this.company = response.data;
-      });
-    },
     /** 查询提现列表 */
     getList() {
       this.loading = true;

src/views/crm/components/customerDetails.vue

@@ -564,7 +564,7 @@ export default {
             getCustomerDetails1(data).then(response => {
                 this.item = response.customer
                 this.isReceive = response.isReceive
-                if (this.item.extJson != null) {
+                if (this.item && this.item.extJson != null) {
                     var extList = JSON.parse(this.item.extJson)
                     that.exts.forEach(item => {
                         extList.forEach(element => {
@@ -574,10 +574,12 @@ export default {
                         })
                     })
                 }
-                this.activeName = 'visit'
-                setTimeout(() => {
-                    that.$refs.visit.getData(customerId)
-                }, 500)
+                if (this.item) {
+                    this.activeName = 'visit'
+                    setTimeout(() => {
+                        that.$refs.visit.getData(customerId)
+                    }, 500)
+                }
             })
         },
         initDuplicate(isDuplicate, dCustomerId) {

src/views/fastGpt/fastGptChatReplaceWords/index.vue

@@ -43,7 +43,7 @@
 </template>
 
 <script>
-import { listFastgptFastgptchatreplacewords, getFastgptFastgptchatreplacewords, delFastgptFastgptchatreplacewords, addFastgptFastgptchatreplacewords, updateFastgptFastgptchatreplacewords, exportFastgptFastgptchatreplacewords } from "@/api/fastGpt/fastGptChatReplaceWords";
+import { listFastGptChatReplaceWords, getFastGptChatReplaceWords, delFastGptChatReplaceWords, addFastGptChatReplaceWords, updateFastGptChatReplaceWords, exportFastGptChatReplaceWords } from "@/api/fastGpt/fastGptChatReplaceWords";
 
 export default {
   name: "FastgptFastgptchatreplacewords",
@@ -69,7 +69,7 @@ export default {
   methods: {
     getList() {
       this.loading = true;
-      listFastgptFastgptchatreplacewords(this.queryParams).then(response => {
+      listFastGptChatReplaceWords(this.queryParams).then(response => {
         this.list = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -96,14 +96,16 @@ export default {
     },
     handleDelete(row) {
       this.$modal.confirm("是否确认删除?").then(() => {
-        return delFastgptFastgptchatreplacewords(row.id || this.ids);
+        return delFastGptChatReplaceWords(row.id || this.ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
     handleExport() {
-      this.download("fastGpt/fastGptChatReplaceWords/export", { ...this.queryParams }, `违规词语.xlsx`);
+      exportFastGptChatReplaceWords(this.queryParams).then(response => {
+        this.download(response.msg);
+      });
     }
   }
 };

src/views/fastGpt/fastgptChatArtificialWords/index.vue

@@ -43,7 +43,7 @@
 </template>
 
 <script>
-import { listFastgptFastgptchatartificialwords, getFastgptFastgptchatartificialwords, delFastgptFastgptchatartificialwords, addFastgptFastgptchatartificialwords, updateFastgptFastgptchatartificialwords, exportFastgptFastgptchatartificialwords } from "@/api/fastGpt/fastgptChatArtificialWords";
+import { listFastgptChatArtificialWords, getFastgptChatArtificialWords, delFastgptChatArtificialWords, addFastgptChatArtificialWords, updateFastgptChatArtificialWords, exportFastgptChatArtificialWords } from "@/api/fastGpt/fastgptChatArtificialWords";
 
 export default {
   name: "FastgptFastgptchatartificialwords",
@@ -69,7 +69,7 @@ export default {
   methods: {
     getList() {
       this.loading = true;
-      listFastgptFastgptchatartificialwords(this.queryParams).then(response => {
+      listFastgptChatArtificialWords(this.queryParams).then(response => {
         this.list = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -96,14 +96,16 @@ export default {
     },
     handleDelete(row) {
       this.$modal.confirm("是否确认删除?").then(() => {
-        return delFastgptFastgptchatartificialwords(row.id || this.ids);
+        return delFastgptChatArtificialWords(row.id || this.ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
     handleExport() {
-      this.download("fastGpt/fastgptChatArtificialWords/export", { ...this.queryParams }, `转人工提示词.xlsx`);
+      exportFastgptChatArtificialWords(this.queryParams).then(response => {
+        this.download(response.msg);
+      });
     }
   }
 };

src/views/hisStore/components/productOrder.vue

@@ -759,7 +759,7 @@ export default {
       try {
         const res = await getCitys();
         this.citys = res.data;
-        this.province = res.data.filter(item => item.pid === 0);
+        this.province = res.data.filter(item => item.pid == 0);
         // 可选：返回数据以便链式调用
         return res.data;
       } catch (error) {
@@ -810,7 +810,7 @@ export default {
 
         // 获取城市列表
         if (Array.isArray(province.children)) {
-          this.city = province.children.filter(item => item.pid === province.value);
+          this.city = province.children.filter(item => item.pid == province.value);
 
           // 解析城市
           const cityName = addressParts[1];
@@ -821,7 +821,7 @@ export default {
 
             // 获取区县列表
             if (Array.isArray(city.children)) {
-              this.district = city.children.filter(item => item.pid === city.value);
+              this.district = city.children.filter(item => item.pid == city.value);
 
               // 解析区县
               const districtName = addressParts[2];

src/views/qw/externalContact/customerDetails.vue

@@ -465,7 +465,7 @@
                 getCustomerDetails1(data).then(response => {
                     this.item = response.customer;
                     this.isReceive=response.isReceive;
-                    if(this.item.extJson!=null){
+                    if(this.item && this.item.extJson!=null){
                         var extList=JSON.parse(this.item.extJson);
                         that.exts.forEach(item => {
                             extList.forEach(element => {
@@ -476,10 +476,12 @@
 
                         });
                     }
-                    this.activeName="visit"
-                    setTimeout(() => {
-                        that.$refs.visit.getData(customerId);
-                    }, 500);
+                    if (this.item) {
+                        this.activeName="visit"
+                        setTimeout(() => {
+                            that.$refs.visit.getData(customerId);
+                        }, 500);
+                    }
                 });
             },
             initDuplicate(isDuplicate,dCustomerId){