Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eom into dev

src/BIZComponents/processSubmitDialog/processSubmitDialog.vue

@@ -488,7 +488,9 @@
             this.cancel();
           }
           
-        } catch (error) {}
+        } catch (error) {
+          console.error('提交审批失败', error);
+        }
         this.loading = false;
       },
       async submit1() {
@@ -513,4 +515,4 @@
     }
   };
 </script>
-<style scoped lang="scss"></style>
+<style scoped lang="scss"></style>

src/views/contractManage/contractBook/components/addDialog.vue

@@ -1177,16 +1177,8 @@
       }
     },
     created() {
-      this.getGroupAll();
-      enterprisePage({
-        pageNum: 1,
-        size: 200
-      }).then((res) => {
-        console.log('企业列表', res);
-        console.log('企业列表第一个', this.$store.state.user.info);
-        this.companyInfo = res.list[0] || {};
-        this.enterprisePage = [];
-        this.enterprisePage.push(...res.list);
+      Promise.all([this.getGroupAll(), this.getEnterprisePage()]).then(() => {
+        this.companyInfo = this.getCurrentEnterprise() || {};
         this.getEnterprise();
       });
       //交易方式//1 先票后款 2 先款后票
@@ -1207,7 +1199,7 @@
       },
       // 获取公司数据
       getGroupAll() {
-        listOrganizations().then((list) => {
+        return listOrganizations().then((list) => {
           this.groupData = list;
           this.groupTreeData = this.$util.toTreeData({
             data: list,
@@ -1519,21 +1511,45 @@
           this.form[keyArr[4]] = data.address;
           return;
         }
-        if (this.enterprisePage.length > 0) {
+        const enterprise = this.getCurrentEnterprise();
+        if (enterprise) {
           this.form[keyArr[0]] =
-            this.form[keyArr[0]] || this.enterprisePage[0].name;
+            this.form[keyArr[0]] || enterprise.name;
           this.form[keyArr[1]] =
-            this.form[keyArr[1]] || this.enterprisePage[0].id;
+            this.form[keyArr[1]] || enterprise.id;
           this.form[keyArr[2]] =
             this.form[keyArr[2]] ||
-            this.enterprisePage[0].unifiedSocialCreditCode;
-          this.form[keyArr[2]] =
-            this.form[keyArr[2]] || this.enterprisePage[0].fax;
+            enterprise.unifiedSocialCreditCode;
           this.form[keyArr[3]] =
-            this.form[keyArr[3]] || this.enterprisePage[0].fax;
+            this.form[keyArr[3]] || enterprise.fax;
           this.form[keyArr[4]] =
-            this.form[keyArr[4]] || this.enterprisePage[0].address;
+            this.form[keyArr[4]] || enterprise.address;
+        }
+      },
+      getEnterprisePage() {
+        return enterprisePage({
+          pageNum: 1,
+          size: 200
+        }).then((res) => {
+          this.enterprisePage = [];
+          this.enterprisePage.push(...res.list);
+        });
+      },
+      getCurrentEnterprise() {
+        let groupId = this.$store.state.user.info?.groupId;
+        const visitedGroupIds = [];
+        while (groupId && !visitedGroupIds.includes(groupId)) {
+          const enterprise = this.enterprisePage.find(
+            (item) => item.groupId == groupId
+          );
+          if (enterprise) {
+            return enterprise;
+          }
+          visitedGroupIds.push(groupId);
+          const group = this.groupData.find((item) => item.id == groupId);
+          groupId = group?.parentId;
         }
+        return this.enterprisePage.length === 1 ? this.enterprisePage[0] : null;
       },
 
       // 交易方式改变
@@ -1703,6 +1719,13 @@
         this.create = create;
         this.source = source;
         this.contractBookTypeList = copyObj(this.categoryTreeList[0].children);
+        if (this.groupData.length == 0) {
+          await this.getGroupAll();
+        }
+        if (this.enterprisePage.length == 0) {
+          await this.getEnterprisePage();
+        }
+        this.companyInfo = this.getCurrentEnterprise() || {};
         console.log('contractBookTypeList!!!', this.contractBookTypeList);
         if (type == 'add') {
           console.log(
@@ -1712,6 +1735,7 @@
           let userInfo = this.$store.getters.user.info;
           this.form.transactionMode = this.defaultTransactionMode;
           this.isUpdate = false;
+          this.getEnterprise();
           userInfo.id = userInfo.userId;
           this.changePersonel();
           this.form.contractStartDate = new Date();

src/views/purchasingManage/purchaseOrder/components/addDialogNew.vue

@@ -1756,7 +1756,7 @@
       },
       // 获取公司数据
       getGroupAll() {
-        listOrganizations().then((list) => {
+        return listOrganizations().then((list) => {
           this.groupData = list;
           this.groupTreeData = this.$util.toTreeData({
             data: list,
@@ -2247,6 +2247,9 @@
         this.rawDetailListCache = [];
         this.outputDetailListCache = [];
         this.visible = true;
+        if (this.groupData.length == 0) {
+          await this.getGroupAll();
+        }
         if (this.enterprisePage.length == 0) {
           await this.getEnterprisePage();
         }
@@ -2254,23 +2257,21 @@
           // console.log('enterprisePage~~~~~', this.enterprisePage);
           this.form.transactionMode = this.defaultTransactionMode;
           this.isUpdate = false;
-          if (this.enterprisePage.length > 0) {
-            this.form.partaName = this.enterprisePage[0]?.name;
-            this.form.partaUnifiedSocialCreditCode =
-              this.enterprisePage[0]?.unifiedSocialCreditCode;
-            this.form.partaFax = this.enterprisePage[0]?.fax;
-            this.form.partaAddress = this.enterprisePage[0]?.address;
-            this.form.purchaseDeptId = this.enterprisePage[0]?.groupId || '';
-            this.form.purchaseDeptName = this.enterprisePage[0]?.name || '';
-            this.form.purchaseUserId = this.$store.state.user.info?.id || '';
-            this.form.purchaseUserName = this.$store.state.user.info?.name || '';
-            this.$nextTick(() => {
-              this.issueNumberChange(this.form.issueNumber);
-              if(this.form.purchaseDeptId) {
-                this.getPurchaseUser(this.form.purchaseDeptId);
-              }
-            })
+          const userInfo = this.$store.state.user.info || {};
+          const enterprise = this.getCurrentEnterprise();
+          this.form.purchaseDeptId = userInfo.groupId || '';
+          this.form.purchaseDeptName = userInfo.groupName || '';
+          this.form.purchaseUserId = userInfo.id || '';
+          this.form.purchaseUserName = userInfo.name || '';
+          if (enterprise) {
+            this.getEnterprise(enterprise);
           }
+          this.$nextTick(() => {
+            this.issueNumberChange(this.form.issueNumber);
+            if (this.form.purchaseDeptId) {
+              this.getPurchaseUser(this.form.purchaseDeptId);
+            }
+          });
           this.form.contractStartDate = formatDate(new Date(), 'yyyy-MM-dd');
           this.form.isGeneratePaymentPlan = +this.isGenReceiptPlan;
         } else {
@@ -2279,7 +2280,7 @@
         }
       },
       getEnterprisePage() {
-        enterprisePage({
+        return enterprisePage({
           pageNum: 1,
           size: 100
         }).then((res) => {
@@ -2287,11 +2288,28 @@
           this.enterprisePage.push(...res.list);
         });
       },
-      getEnterprise() {
-        let data = this.enterprisePage.find(
-          (item) => item.name == this.form.quoteName
-        );
+      getCurrentEnterprise() {
+        let groupId = this.$store.state.user.info?.groupId;
+        const visitedGroupIds = [];
+        while (groupId && !visitedGroupIds.includes(groupId)) {
+          const enterprise = this.enterprisePage.find(
+            (item) => item.groupId == groupId
+          );
+          if (enterprise) {
+            return enterprise;
+          }
+          visitedGroupIds.push(groupId);
+          const group = this.groupData.find((item) => item.id == groupId);
+          groupId = group?.parentId;
+        }
+        return this.enterprisePage.length === 1 ? this.enterprisePage[0] : null;
+      },
+      getEnterprise(enterprise) {
+        let data =
+          enterprise ||
+          this.enterprisePage.find((item) => item.name == this.form.partaName);
         this.form.partaName = data.name;
+        this.form.partaId = data.id;
         this.form.partaUnifiedSocialCreditCode = data.unifiedSocialCreditCode;
         this.form.partaFax = data.fax;
         this.form.partaAddress = data.address;

src/views/saleManage/contact/components/parentList.vue

@@ -192,9 +192,7 @@
           pageNum: page,
           size: limit,
           type: this.classType,
-          ...where,
-          status: '1',
-          assignStatus:0
+          ...where
         }).then(res => {
           console.log(res);
           if(!this.pageList.has(page)) {

src/views/saleManage/quotation/components/addDialog.vue

@@ -305,6 +305,7 @@ import {
 } from '@/api/saleManage/businessOpportunity';
 import { getTableList } from '@/api/saleManage/businessOpportunity';
 import { enterprisePage } from '@/api/contractManage/contractBook';
+import { listOrganizations } from '@/api/system/organization';
 import { getcontactlink } from '@/api/saleManage/businessFollow';
 import headList from '@/BIZComponents/user-select/user-select.vue';
 import { copyObj } from '@/utils/util';
@@ -472,6 +473,7 @@ export default {
     };
   },
   created() {
+    this.getGroupAll();
     this.getEnterprisePage();
   },
 
@@ -632,6 +634,9 @@ export default {
       this.editType = type;
       this.row = row;
       this.visible = true;
+      if (this.groupData.length == 0) {
+        await this.getGroupAll();
+      }
       if (this.enterprisePage.length == 0) {
         await this.getEnterprisePage();
       }
@@ -641,11 +646,9 @@ export default {
         userInfo.id = userInfo.userId;
         this.form.settlementMode = '3';
         this.changePersonel(userInfo);
-        if (this.enterprisePage.length > 0) {
-          this.form.quoteName = this.enterprisePage[0].name;
-          // this.form.quoteTel = this.enterprisePage[0].tel;
-          this.form.quoteFax = this.enterprisePage[0].fax;
-          this.form.quoteAddress = this.enterprisePage[0].address;
+        const enterprise = this.getCurrentEnterprise();
+        if (enterprise) {
+          this.getEnterprise(enterprise);
         }
         if (this.contactData.id) {
           this.changeParent({ id: this.contactData.id }, 'init');
@@ -670,8 +673,13 @@ export default {
         await this.getDetailData(row.id);
       }
     },
+    getGroupAll() {
+      return listOrganizations().then((list) => {
+        this.groupData = list;
+      });
+    },
     getEnterprisePage() {
-      enterprisePage({
+      return enterprisePage({
         pageNum: 1,
         size: 100
       }).then((res) => {
@@ -679,10 +687,26 @@ export default {
         this.enterprisePage.push(...res.list);
       });
     },
-    getEnterprise() {
-      let data = this.enterprisePage.find(
-        (item) => item.name == this.form.quoteName
-      );
+    getCurrentEnterprise() {
+      let groupId = this.$store.state.user.info?.groupId;
+      const visitedGroupIds = [];
+      while (groupId && !visitedGroupIds.includes(groupId)) {
+        const enterprise = this.enterprisePage.find(
+          (item) => item.groupId == groupId
+        );
+        if (enterprise) {
+          return enterprise;
+        }
+        visitedGroupIds.push(groupId);
+        const group = this.groupData.find((item) => item.id == groupId);
+        groupId = group?.parentId;
+      }
+      return this.enterprisePage.length === 1 ? this.enterprisePage[0] : null;
+    },
+    getEnterprise(enterprise) {
+      let data =
+        enterprise ||
+        this.enterprisePage.find((item) => item.name == this.form.quoteName);
       this.form.quoteName = data.name;
 
       // this.form.quoteTel = data.tel;

src/views/saleManage/saleOrder/components/addDialogNew.vue

@@ -1274,7 +1274,7 @@
                 deptIds: ['1998632792148717569', '1998632872721297409']
               })
             : listOrganizations();
-        apiRequest.then((list) => {
+        return apiRequest.then((list) => {
           // console.log('listOrganizations', list);
           this.groupData = list;
           this.groupTreeData = this.$util.toTreeData({
@@ -1918,6 +1918,9 @@
         // this.clientEnvironmentId =
         //   this.$store.state.user.info.clientEnvironmentId;
         this.row = row;
+        if (this.groupData.length == 0) {
+          await this.getGroupAll();
+        }
         if (this.enterprisePage.length == 0) {
           await this.getEnterprisePage();
         }
@@ -1926,13 +1929,9 @@
         if (type == 'add') {
           this.form.transactionMode = this.defaultTransactionMode;
           this.isUpdate = false;
-          if (this.enterprisePage.length > 0) {
-            this.form.partbName = this.enterprisePage[0].name;
-            this.form.partbId = this.enterprisePage[0].id;
-            this.form.partbUnifiedSocialCreditCode =
-              this.enterprisePage[0].unifiedSocialCreditCode;
-            this.form.partbFax = this.enterprisePage[0].fax;
-            this.form.partbAddress = this.enterprisePage[0].address;
+          const enterprise = this.getCurrentEnterprise();
+          if (enterprise) {
+            this.getEnterprise(enterprise);
           }
           if (this.contactData.id) {
             this.changeParent({ id: this.contactData.id });
@@ -1988,23 +1987,22 @@
         this.title = '新增';
         this.visible = true;
         this.isUpdate = false;
+        if (this.groupData.length == 0) {
+          await this.getGroupAll();
+        }
         if (this.enterprisePage.length == 0) {
           await this.getEnterprisePage();
         }
-        if (this.enterprisePage.length > 0) {
-          this.form.partbName = this.enterprisePage[0].name;
-          this.form.partbId = this.enterprisePage[0].id;
-          this.form.partbUnifiedSocialCreditCode =
-            this.enterprisePage[0].unifiedSocialCreditCode;
-          this.form.partbFax = this.enterprisePage[0].fax;
-          this.form.partbAddress = this.enterprisePage[0].address;
+        const enterprise = this.getCurrentEnterprise();
+        if (enterprise) {
+          this.getEnterprise(enterprise);
         }
         this.form.createDeptName = this.user.info.groupName;
         this.form.isGenerateReceiptPlan = +this.isGenReceiptPlan;
         await this.changeContract(row);
       },
       getEnterprisePage() {
-        enterprisePage({
+        return enterprisePage({
           pageNum: 1,
           size: 100
         }).then((res) => {
@@ -2012,10 +2010,26 @@
           this.enterprisePage.push(...res.list);
         });
       },
-      getEnterprise() {
-        let data = this.enterprisePage.find(
-          (item) => item.name == this.form.partbName
-        );
+      getCurrentEnterprise() {
+        let groupId = this.$store.state.user.info?.groupId;
+        const visitedGroupIds = [];
+        while (groupId && !visitedGroupIds.includes(groupId)) {
+          const enterprise = this.enterprisePage.find(
+            (item) => item.groupId == groupId
+          );
+          if (enterprise) {
+            return enterprise;
+          }
+          visitedGroupIds.push(groupId);
+          const group = this.groupData.find((item) => item.id == groupId);
+          groupId = group?.parentId;
+        }
+        return this.enterprisePage.length === 1 ? this.enterprisePage[0] : null;
+      },
+      getEnterprise(enterprise) {
+        let data =
+          enterprise ||
+          this.enterprisePage.find((item) => item.name == this.form.partbName);
         this.form.partbName = data.name;
         this.form.partbId = data.id;
         this.form.partbUnifiedSocialCreditCode = data.unifiedSocialCreditCode;

src/views/saleManage/saleOrder/invoice/components/addInvoiceDialog.vue

@@ -1172,31 +1172,31 @@
             UpdateSendInformation(commitData)
               .then((res) => {
                 this.loading = false;
-                this.$message.success('修改成功');
                 if (type === 'sub') {
-                  this.sendSubmit(res);
-                  return;
+                  return this.sendSubmit(res);
                 }
+                this.$message.success('修改成功');
                 this.cancel();
                 this.$emit('done');
               })
               .catch((e) => {
-                //this.loading = false;
+                this.loading = false;
+                console.error('修改发货单失败', e);
               });
           } else {
             addSendInformation(commitData)
               .then((res) => {
                 this.loading = false;
-                this.$message.success('新增成功');
                 if (type === 'sub') {
-                  this.sendSubmit(res);
-                  return;
+                  return this.sendSubmit(res);
                 }
+                this.$message.success('新增成功');
                 this.cancel();
                 this.$emit('done');
               })
               .catch((e) => {
-                // this.loading = false;
+                this.loading = false;
+                console.error('新增发货单失败', e);
               });
           }
         } catch (error) {
@@ -1255,11 +1255,14 @@
       },
 
       async specialesubmit(params) {
-        console.log('params~~~~~~', params);
-        await specialSubmit(params.businessId, params);
-        this.$message('提交审核成功');
-        this.processSubmitDialogFlag = false;
-        this.reload();
+        try {
+          await specialSubmit(params.businessId, params);
+          this.$message('提交审核成功');
+          this.processSubmitDialogFlag = false;
+          this.reload();
+        } catch (error) {
+          console.error('提交发货单审核失败', error);
+        }
       },
       reload() {
         this.cancel();

src/views/saleManage/saleOrder/invoice/index.vue

@@ -812,11 +812,14 @@
         });
       },
       async specialesubmit(params) {
-        console.log('params~~~~~~', params);
-        await specialSubmit(params.businessId, params);
-        this.$message('提交审核成功');
-        this.processSubmitDialogFlag = false;
-        this.reload();
+        try {
+          await specialSubmit(params.businessId, params);
+          this.$message('提交审核成功');
+          this.processSubmitDialogFlag = false;
+          this.reload();
+        } catch (error) {
+          console.error('提交发货单审核失败', error);
+        }
       },
       //查看详情
       openorderDetail(row, type, index) {