Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

dsk-operate-ui/package.json

@@ -40,6 +40,7 @@
     "axios": "0.24.0",
     "clipboard": "2.0.8",
     "core-js": "^3.32.2",
+    "dayjs": "^1.11.10",
     "echarts": "^5.0.0",
     "el-table-horizontal-scroll": "^1.2.5",
     "element-resize-detector": "^1.2.4",

dsk-operate-ui/src/api/enterpriseData/enterpriseData.js

-import request from '@/utils/request'
+import request from '@/utils/request';
 // 资质json数据
-let aptitudeCode= function aptitudeCode(param) {
+let aptitudeCode = function aptitudeCode(param) {
   return request({
     url: 'https://files.jiansheku.com/file/json/common/aptitudeCode.json',
     method: 'get',
-  })
-}
+  });
+};
 // 人员json数据
-let personCert= function personCert(param) {
+let personCert = function personCert(param) {
   return request({
     url: 'https://files.jiansheku.com/file/json/common/personCert.json',
     method: 'get',
-  })
-}
+  });
+};
 // 备案网站
-let searchDic= function searchDic(param) {
+let searchDic = function searchDic(param) {
   return request({
     url: 'https://files.jiansheku.com/file/json/common/searchDic.json',
     method: 'get',
-  })
-}
+  });
+};
 // 备案网站
-let regionWebList= function regionWebList(param) {
+let regionWebList = function regionWebList(param) {
   return request({
     url: '/nationzj/enterprice/regionWebList',
     method: 'get',
-  })
-}
+  });
+};
 // 地区
-let region= function region(param) {
+let region = function region(param) {
   return request({
-    url: '/system/region/list/'+param,
+    url: '/system/region/list/' + param,
     method: 'get',
-  })
-}
+  });
+};
 // 查甲方选项
-let uipGroupData= function uipGroupData(param) {
+let uipGroupData = function uipGroupData(param) {
   return request({
     url: '/enterprise/uipGroupData',
     method: 'post',
     data: param
-  })
-}
+  });
+};
 // 查甲方列表
-let uipSerach= function uipSerach(param) {
+let uipSerach = function uipSerach(param) {
   return request({
     url: '/enterprise/uipSerach',
     method: 'post',
     data: param
-  })
-}
+  });
+};
 // 认领用户
-let claim= function claim(param) {
+let claim = function claim(param) {
   return request({
     url: '/customer/claim',
     method: 'post',
     data: param
-  })
-}
+  });
+};
 // 取消认领用户
-let cancelClaim= function cancelClaim(data) {
+let cancelClaim = function cancelClaim(data) {
   return request({
-    url: '/customer/cancelClaim/'+data,
+    url: '/customer/cancelClaim/' + data,
     method: 'put',
     // data: data
-  })
-}
+  });
+};
 // 历史认领用户
-let historyClaim= function historyClaim(data) {
+let historyClaim = function historyClaim(data) {
   return request({
-    url: '/customer/historyClaim/'+data,
+    url: '/customer/historyClaim/' + data,
     method: 'put',
     // data: data
-  })
-}
+  });
+};
 // 客户状态
-let customerStatus= function customerStatus(data) {
+let customerStatus = function customerStatus(data) {
   return request({
-    url: '/customer/status/'+data,
+    url: '/customer/status/' + data,
     method: 'get',
     // data: data
-  })
-}
+  });
+};
 // 查建筑企业
 
-let enterprisePage= function enterprisePage(param) {
+let enterprisePage = function enterprisePage(param) {
   return request({
     url: '/enterprise/page',
     method: 'post',
     data: param
-  })
-}
+  });
+};
 // 甲方详情-公司概要
-let infoHeader= function infoHeader(param) {
+let infoHeader = function infoHeader(param) {
   return request({
     url: '/enterprise/infoHeader',
     method: 'post',
     data: param
-  })
-}
+  });
+};
 // 搜索集团户
-let searchCentralEnterprse= function searchCentralEnterprse(param) {
+let searchCentralEnterprse = function searchCentralEnterprse(param) {
   return request({
     url: '/combine/info/index',
     method: 'post',
     data: param
-  })
-}
+  });
+};
 // 央企
-let centralEnterprse= function centralEnterprse(param) {
+let centralEnterprse = function centralEnterprse(param) {
   return request({
     url: '/combine/info/centralEnterprse',
     method: 'post',
     data: param
-  })
-}
+  });
+};
 // 央企子集团
-let centralEnterprseChild= function centralEnterprseChild(param) {
+let centralEnterprseChild = function centralEnterprseChild(param) {
   return request({
     url: '/combine/info/centralEnterprse/child',
     method: 'post',
     data: param
-  })
-}
+  });
+};
 // 央企子集团更多
-let centralEnterprseChildPage= function centralEnterprseChildPage(param) {
+let centralEnterprseChildPage = function centralEnterprseChildPage(param) {
   return request({
     url: '/combine/info/centralEnterprse/child/page',
     method: 'post',
     data: param
-  })
-}
+  });
+};
 // 地方国企
-let centralEnterprselocal= function centralEnterprselocal(param) {
+let centralEnterprselocal = function centralEnterprselocal(param) {
   return request({
     url: '/combine/info/centralEnterprse/local',
     method: 'post',
     data: param
-  })
-}
+  });
+};
 // 地方国企更多
-let centralEnterprselocalPage= function centralEnterprselocalPage(param) {
+let centralEnterprselocalPage = function centralEnterprselocalPage(param) {
   return request({
     url: '/combine/info/centralEnterprse/local/page',
     method: 'post',
     data: param
-  })
-}
+  });
+};
 // 其他集团
-let centralEnterprsesocial= function centralEnterprsesocial(param) {
+let centralEnterprsesocial = function centralEnterprsesocial(param) {
   return request({
     url: '/combine/info/centralEnterprse/social',
     method: 'post',
     data: param
-  })
-}
+  });
+};
 // 其他集团更多
-let centralEnterprsesocialPage= function centralEnterprsesocialPage(param) {
+let centralEnterprsesocialPage = function centralEnterprsesocialPage(param) {
   return request({
     url: '/combine/info/centralEnterprse/social/page',
     method: 'post',
     data: param
-  })
-}
+  });
+};
 //企业标签
-let label= function label(param) {
+let label = function label(param) {
   return request({
     url: '/enterprise/label',
     method: 'post',
     data: param
-  })
-}
+  });
+};
+
+// 查业主单位
+export const searchOwnerUnitListApi = (data) => request({
+  url: '/enterprise/bossCompany',
+  method: 'post',
+  data
+});
 
 
-export default {label,centralEnterprsesocialPage,centralEnterprselocalPage,centralEnterprseChildPage,centralEnterprsesocial,centralEnterprselocal,centralEnterprseChild,searchCentralEnterprse,centralEnterprse,region,aptitudeCode,personCert,searchDic,regionWebList,uipGroupData,uipSerach,claim,cancelClaim,enterprisePage,infoHeader,historyClaim,customerStatus}
+export default { label, centralEnterprsesocialPage, centralEnterprselocalPage, centralEnterprseChildPage, centralEnterprsesocial, centralEnterprselocal, centralEnterprseChild, searchCentralEnterprse, centralEnterprse, region, aptitudeCode, personCert, searchDic, regionWebList, uipGroupData, uipSerach, claim, cancelClaim, enterprisePage, infoHeader, historyClaim, customerStatus, searchOwnerUnitListApi };

dsk-operate-ui/src/views/detail/party-a/index.vue

@@ -279,11 +279,11 @@ export default {
           cityIds: [this.companyInfo.cityId],
         };
         urbanInvestmentPage(data).then(res => {
-          if(res.code==200){
-            if(res.data.totalCount<1){
-              let arr = JSON.parse(JSON.stringify(this.$refs.sidebar.sideRoute))
+          if (res.code == 200) {
+            if (res.data.totalCount < 1) {
+              let arr = JSON.parse(JSON.stringify(this.$refs.sidebar.sideRoute));
               arr[4].children[2].disabled = true;
-              this.$refs.sidebar.sideRoute = arr
+              this.$refs.sidebar.sideRoute = arr;
             }
           }
         });

dsk-operate-ui/src/views/detail/party-a/opport/announcement.vue

@@ -23,9 +23,9 @@
 </template>
 
 <script>
-import mixin from '../mixins/mixin'
-import skeleton from '@/views/project/projectList/component/skeleton'
-import {bidNoticeArea, bidNoticeTenderStage,bidNoticeProjectCategory, bidNoticePage} from '@/api/detail/party-a/opport'
+import mixin from '../mixins/mixin';
+import skeleton from '@/views/project/projectList/component/skeleton';
+import { bidNoticeArea, bidNoticeTenderStage, bidNoticeProjectCategory, bidNoticePage } from '@/api/detail/party-a/opport';
 export default {
   name: 'Announcement',
   props: ['companyId'],
@@ -76,90 +76,90 @@ export default {
     this.handleQuery();
   },
   methods: {
-    async handleOption(){
-      let [area, tender,project] = await Promise.all([
-        bidNoticeArea({cid: this.companyId}),
-        bidNoticeTenderStage({cid: this.companyId}),
-        bidNoticeProjectCategory({cid: this.companyId}),
-      ])
-      if(area.code==200){
+    async handleOption() {
+      let [area, tender, project] = await Promise.all([
+        bidNoticeArea({ cid: this.companyId }),
+        bidNoticeTenderStage({ cid: this.companyId }),
+        bidNoticeProjectCategory({ cid: this.companyId }),
+      ]);
+      if (area.code == 200) {
         let region = area.data.map(item => {
-          let province = {label:item.province+'('+item.count+')',value:item.provinceId}
-          if(item.citys&&item.citys.length>0){
-            let city = [], citem = {}
-            for(let i=0;i<item.citys.length;i++){
-              citem = {label:item.citys[i].city, value:item.citys[i].cityId}
-              if(item.citys[i].areas&&item.citys[i].areas.length>0){
-                let area = [], aitem = {}
-                for(let j=0;j<item.citys[i].areas.length;j++){
-                  aitem = {label:item.citys[i].areas[j].area, value:item.citys[i].areas[j].areaId}
-                  area.push(aitem)
-                  citem.children = area
+          let province = { label: item.province + '(' + item.count + ')', value: item.provinceId };
+          if (item.citys && item.citys.length > 0) {
+            let city = [], citem = {};
+            for (let i = 0; i < item.citys.length; i++) {
+              citem = { label: item.citys[i].city, value: item.citys[i].cityId };
+              if (item.citys[i].areas && item.citys[i].areas.length > 0) {
+                let area = [], aitem = {};
+                for (let j = 0; j < item.citys[i].areas.length; j++) {
+                  aitem = { label: item.citys[i].areas[j].area, value: item.citys[i].areas[j].areaId };
+                  area.push(aitem);
+                  citem.children = area;
                 }
               }
-              city.push(citem)
+              city.push(citem);
             }
-            city.length>0 ? province.children = city : ''
+            city.length > 0 ? province.children = city : '';
           }
-          return province
-        })
-        this.setFormData('province', region)
+          return province;
+        });
+        this.setFormData('province', region);
       }
-      if(tender.code==200){
+      if (tender.code == 200) {
         let tenderStage = tender.data.map(item => {
-          let it = {name:item.tenderStage+'('+item.count+')',value:item.tenderStage}
-          return it
-        })
-        this.setFormData('tenderStage', tenderStage)
+          let it = { name: item.tenderStage + '(' + item.count + ')', value: item.tenderStage };
+          return it;
+        });
+        this.setFormData('tenderStage', tenderStage);
       }
-      if(project.code==200){
+      if (project.code == 200) {
         let projectCategory = project.data.map(item => {
-          let it = {name:item.projectCategory+'('+item.count+')',value:item.projectCategory}
-          return it
-        })
-        this.setFormData('projectCategory', projectCategory)
+          let it = { name: item.projectCategory + '(' + item.count + ')', value: item.projectCategory };
+          return it;
+        });
+        this.setFormData('projectCategory', projectCategory);
       }
     },
     async handleQuery(params) {
-      this.tableLoading = true
-      let param = this.getAreaList(params || this.queryParams)
-      let res = await bidNoticePage(param)
-      this.tableLoading = false
-      if(res.code==200){
+      this.tableLoading = true;
+      let param = this.getAreaList(params || this.queryParams);
+      let res = await bidNoticePage(param);
+      this.tableLoading = false;
+      if (res.code == 200) {
         this.isSkeleton = false;
-        this.tableData = res.rows
+        this.tableData = res.rows;
       }
-      this.tableDataTotal = res.total
+      this.tableDataTotal = res.total;
     },
-    getAreaList(params){
-      if(params.province&&params.province.length>0){
-        let arr = this.$refs.headForm.$refs.cascader[0].getCheckedNodes()
-        let provinceIds = [], cityIds = [], areaIds = []
+    getAreaList(params) {
+      if (params.province && params.province.length > 0) {
+        let arr = this.$refs.headForm.$refs.cascader[0].getCheckedNodes();
+        let provinceIds = [], cityIds = [], areaIds = [];
         for (var i in arr) {
           if (arr[i].parent) {
             if (!arr[i].parent.checked) {
-              if(arr[i].hasChildren || arr[i].level==2){
-                cityIds.push(arr[i].value)
-              }else{
-                areaIds.push(arr[i].value)
+              if (arr[i].hasChildren || arr[i].level == 2) {
+                cityIds.push(arr[i].value);
+              } else {
+                areaIds.push(arr[i].value);
               }
             }
           } else {
-            provinceIds.push(arr[i].value)
+            provinceIds.push(arr[i].value);
           }
         }
-        delete params.province
-        provinceIds.length>0?params.provinceIds = provinceIds:''
-        cityIds.length>0?params.cityIds = cityIds:''
-        areaIds.length>0?params.areaIds = areaIds:''
+        delete params.province;
+        provinceIds.length > 0 ? params.provinceIds = provinceIds : '';
+        cityIds.length > 0 ? params.cityIds = cityIds : '';
+        areaIds.length > 0 ? params.areaIds = areaIds : '';
       }
-      return params
+      return params;
     }
   }
 }
 </script>
 <style lang="scss" scoped>
-.detail-container{
+.detail-container {
   background: #ffffff;
   border-radius: 4px;
   padding: 16px;