企业管理，链属及费用相关

front-vue/src/views/service/company/coreCompanyManage.vue

@@ -45,6 +45,7 @@
           v-model="queryParams.userName"
           placeholder="请输入联系电话"
           clearable
+          maxlength="11"
           size="small"
           @keyup.enter.native="handleQuery"
         />
@@ -87,6 +88,7 @@
       <el-table-column label="社会统一代码" align="center" prop="scySocialCode" v-if="uncheckList.scySocialCode"/>
       <el-table-column label="联系人" align="center" prop="nickName" v-if="uncheckList.nickName" />
       <el-table-column label="联系电话" align="center" prop="userName" v-if="uncheckList.userName"/>
+      <el-table-column label="四要素状态" align="center" prop="scyAuthStatus" :formatter="scyAuthStatusFormat" v-if="uncheckList.scyAuthStatus"/>
       <el-table-column label="状态" align="center" prop="scyStatus" :formatter="scyStatusFormat" v-if="uncheckList.scyStatus"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -105,7 +107,7 @@
             v-hasPermi="['service:company:update']"
           >修改</el-button>
           <el-button
-            v-if="scope.row.scyAuthStatus == '00'"
+            v-if="scope.row.scyStatus == '00' && (scope.row.scyAuthStatus == '00' || scope.row.scyAuthStatus == '02')"
             size="mini"
             type="text"
             @click="handleExamine(scope.row)"
@@ -234,6 +236,8 @@ export default {
       total: 0,
       // 公司表格数据
       companyList: [],
+      scyAuthStatusOptions:[],
+      scyStatusOptions:[],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -273,6 +277,10 @@ export default {
               value: '联系电话'
             },
             {
+              label: 'scyAuthStatus',
+              value: '四要素状态'
+            },
+            {
               label: 'scyStatus',
               value: '状态'
             },
@@ -312,7 +320,7 @@ export default {
         scySocialCode: [
           { required: true, message: "企业统一代码不能为空", trigger: "blur" },
           {
-            pattern: /[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}/,
+            pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})||([1-9]\d{15})$/,
             message: "企业统一代码格式不正确",
             trigger: "blur"
           }
@@ -320,17 +328,14 @@ export default {
       },
     };
   },
-  created() {
-    this.getList();
-    this.getDicts("ser_scy_status").then(response => {
-      this.scyStatusOptions = response.data;
-    });
-  },
   activated(){
     this.getList();
     this.getDicts("ser_scy_status").then(response => {
       this.scyStatusOptions = response.data;
     });
+    this.getDicts("ser_scy_authStatus").then(response => {
+      this.scyAuthStatusOptions = response.data;
+    });
   },
   mounted() {
     this.columnQuery();
@@ -539,7 +544,7 @@ export default {
     handleDelete(row) {
       const scyId = row.scyId || this.ids;
       const scyName = row.scyName;
-      this.$confirm('是否确认删除公司名称为"' + scyName + '"的数据?', "警告", {
+      this.$confirm('是否确认删除企业名称为"' + scyName + '"的数据?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -565,6 +570,9 @@ export default {
         return this.selectDictLabel(this.scyStatusOptions, row.scyStatus);
       }
     },
+    scyAuthStatusFormat(row, column) {
+        return this.selectDictLabel(this.scyAuthStatusOptions, row.scyAuthStatus);
+    },
 
   }
 };

front-vue/src/views/service/company/detailCompany.vue

@@ -194,7 +194,11 @@
                 <el-col :span="8" v-if="licenShow" style="margin-top:2%;line-height: 34px; text-align: right;">
                     营业执照:
                 </el-col>
-                <el-upload v-if="licenShow" ref="licenImg" class="Img-demo" action="" multiple list-type="picture-card" :file-list="licenseFileList" :class="{ uoloadSty: showBtnImg, disUoloadSty: noBtnImg }" :auto-upload="false">
+                <el-upload v-if="licenShow" ref="licenImg" class="Img-demo" action="" 
+                    multiple list-type="picture-card" 
+                    :file-list="licenseFileList" 
+                    :class="{ uoloadSty: showBtnImg, disUoloadSty: noBtnImg }"
+                    :auto-upload="false">
                     <i slot="default" class="el-icon-plus"></i>
                     <div slot="file" slot-scope="{file}">
                         <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
@@ -428,6 +432,14 @@ export default {
             this.dialogImageUrl = file.url + "/" + getToken();
             this.dialogVisible = true;
         },
+        handleImgDownload(file) {
+            var a = document.createElement('a');
+            var event = new MouseEvent('click');
+            a.download = file.name;
+            a.href = file.url+'/'+getToken();
+            a.dispatchEvent(event);
+            console.log(file)
+        },
         /** 搜索按钮操作 */
         handleQuery() {
             this.queryParams.pageNum = 1;
@@ -476,13 +488,10 @@ export default {
                     const licenseImgId = response.data.licenseList[0].pfiFileId;
                     if (licenseImg != "" && licenseImgId != "") {
                         this.licenShow = true;
-                        let imgUrl = licenseImg.split(",");
-                        let imgUrlId = licenseImgId.split(",");
+                        let imgUrl = (licenseImg).split(",");
+                        let imgUrlId = (licenseImgId).split(",");
                         for (let i = 0; i < imgUrl.length; i++) {
-                            this.licenseFileList.push({
-                                url: imgUrl[i] + "/" + getToken(),
-                                uid: imgUrlId[i],
-                            });
+                            this.licenseFileList.push({url: imgUrl[i] + "/" + getToken(),uid: imgUrlId[i]});
                         }
                     } else {
                         this.licenShow = false;
@@ -494,14 +503,15 @@ export default {
                     const legalImgId = response.data.legalList[0].pfiFileId;
                     if (legalImg != "" && legalImgId != "") {
                         this.legalShow = true;
-                        let imgUrl = legalImg.split(",");
-                        let imgUrlId = legalImgId.split(",");
+                        let imgUrl = (legalImg).split(",");
+                        let imgUrlId = (legalImgId).split(",");
                         for (let i = 0; i < imgUrl.length; i++) {
                             this.legalFileList.push({
                                 url: imgUrl[i] + "/" + getToken(),
-                                uid: imgUrlId[i],
+                                uid: imgUrlId[i]
                             });
                         }
+                        console.log(this.legalFileList,"营业执照")
                     } else {
                         this.legalShow = false;
                     }
@@ -513,12 +523,12 @@ export default {
                         response.data.legalBackList[0].pfiFileId;
                     if (legalBackImg != "" && legalBackImgId != "") {
                         this.legalBackShow = true;
-                        let imgUrl = legalBackImg.split(",");
-                        let imgUrlId = legalBackImgId.split(",");
+                        let imgUrl = (legalBackImg).split(",");
+                        let imgUrlId = (legalBackImgId).split(",");
                         for (let i = 0; i < imgUrl.length; i++) {
                             this.legalBackFileList.push({
                                 url: imgUrl[i] + "/" + getToken(),
-                                uid: imgUrlId[i],
+                                uid: imgUrlId[i]
                             });
                         }
                     } else {
@@ -533,12 +543,12 @@ export default {
                         response.data.handlerPositiveList[0].pfiFileId;
                     if (handlerPositiveImg != "" && handlerPositiveId != "") {
                         this.handlerPositiveShow = true;
-                        let imgUrl = handlerPositiveImg.split(",");
-                        let imgUrlId = handlerPositiveImgId.split(",");
+                        let imgUrl = (handlerPositiveImg).split(",");
+                        let imgUrlId = (handlerPositiveImgId).split(",");
                         for (let i = 0; i < imgUrl.length; i++) {
                             this.handlerPositiveList.push({
                                 url: imgUrl[i] + "/" + getToken(),
-                                uid: imgUrlId[i],
+                                uid: imgUrlId[i]
                             });
                         }
                     } else {
@@ -556,12 +566,12 @@ export default {
                         handlerNegativeImgId != ""
                     ) {
                         this.handlerNegativeShow = true;
-                        let imgUrl = handlerNegativeImg.split(",");
-                        let imgUrlId = handlerNegativeImgId.split(",");
+                        let imgUrl = (handlerNegativeImg).split(",");
+                        let imgUrlId = (handlerNegativeImgId).split(",");
                         for (let i = 0; i < imgUrl.length; i++) {
                             this.handlerNegativeList.push({
                                 url: imgUrl[i] + "/" + getToken(),
-                                uid: imgUrlId[i],
+                                uid: imgUrlId[i]
                             });
                         }
                     } else {
@@ -578,14 +588,14 @@ export default {
                         response.data.authorizationList[0].pfiFileId;
                     if (authorizationFile != "" && authorizationFileId != "") {
                         this.authorizationShow = true;
-                        let fileName = authorizationFileName.split(",");
-                        let fileUrl = authorizationFile.split(",");
-                        let fileUrlId = authorizationFileId.split(",");
+                        let fileName = (authorizationFileName).split(",");
+                        let fileUrl = (authorizationFile).split(",");
+                        let fileUrlId = (authorizationFileId).split(",");
                         for (let i = 0; i < fileUrl.length; i++) {
                             this.authorizationFileList.push({
                                 name: fileName[i],
                                 url: fileUrl[i] + "/" + getToken(),
-                                uid: fileUrlId[i],
+                                uid: fileUrlId[i]
                             });
                         }
                     } else {
@@ -602,14 +612,14 @@ export default {
                         response.data.commitmentList[0].pfiFileId;
                     if (commitmentFile != "" && commitmentFileId != "") {
                         this.commitmentShow = true;
-                        let fileName = commitmentFileName.split(",");
-                        let fileUrl = commitmentFile.split(",");
-                        let fileUrlId = commitmentFileId.split(",");
+                        let fileName = (commitmentFileName).split(",");
+                        let fileUrl = (commitmentFile).split(",");
+                        let fileUrlId = (commitmentFileId).split(",");
                         for (let i = 0; i < fileUrl.length; i++) {
                             this.commitmentFileList.push({
                                 name: fileName[i],
                                 url: fileUrl[i] + "/" + getToken(),
-                                uid: fileUrlId[i],
+                                uid: fileUrlId[i]
                             });
                         }
                     } else {

front-vue/src/views/service/company/detailCompanyExam.vue

@@ -444,6 +444,14 @@ export default {
             this.dialogImageUrl = file.url + "/" + getToken();
             this.dialogVisible = true;
         },
+        handleImgDownload(file) {
+            var a = document.createElement('a');
+            var event = new MouseEvent('click');
+            a.download = file.name;
+            a.href = file.url+'/'+getToken();
+            a.dispatchEvent(event);
+            console.log(file)
+        },
         /** 搜索按钮操作 */
         handleQuery() {
             this.queryParams.pageNum = 1;

front-vue/src/views/service/company/supCompanyManage.vue

@@ -77,6 +77,7 @@
       <el-table-column label="社会统一代码" align="center" prop="scySocialCode" v-if="uncheckList.scySocialCode"/>
       <el-table-column label="联系人" align="center" prop="nickName" v-if="uncheckList.nickName" />
       <el-table-column label="联系电话" align="center" prop="userName" v-if="uncheckList.userName"/>
+      <el-table-column label="四要素状态" align="center" prop="scyAuthStatus" :formatter="scyAuthStatusFormat" v-if="uncheckList.scyAuthStatus"/>
       <el-table-column label="状态" align="center" prop="scyStatus" :formatter="scyStatusFormat" v-if="uncheckList.scyStatus"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -88,7 +89,7 @@
             v-hasPermi="['service:company:query']"
           >详情</el-button>
           <el-button
-            v-if="scope.row.scyAuthStatus == '00'"
+            v-if="scope.row.scyStatus == '00' && (scope.row.scyAuthStatus == '00' || scope.row.scyAuthStatus == '02')"
             size="mini"
             type="text"
             @click="handleExamine(scope.row)"
@@ -235,6 +236,8 @@ export default {
       total: 0,
       // 公司表格数据
       companyList: [],
+      scyAuthStatusOptions:[],
+      scyStatusOptions:[],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -274,6 +277,10 @@ export default {
               value: '联系电话'
             },
             {
+              label: 'scyAuthStatus',
+              value: '四要素状态'
+            },
+            {
               label: 'scyStatus',
               value: '状态'
             },
@@ -303,7 +310,7 @@ export default {
         scySocialCode: [
           { required: true, message: "企业统一代码不能为空", trigger: "blur" },
           {
-            pattern: /[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}/,
+            pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})||([1-9]\d{15})$/,
             message: "企业统一代码格式不正确",
             trigger: "blur"
           }
@@ -311,17 +318,14 @@ export default {
       },
     };
   },
-  created() {
-    this.getList();
-    this.getDicts("ser_scy_status").then(response => {
-      this.scyStatusOptions = response.data;
-    });
-  },
   activated(){
     this.getList();
     this.getDicts("ser_scy_status").then(response => {
       this.scyStatusOptions = response.data;
     });
+    this.getDicts("ser_scy_authStatus").then(response => {
+      this.scyAuthStatusOptions = response.data;
+    });
   },
   mounted() {
     this.columnQuery();
@@ -490,6 +494,9 @@ export default {
         return this.selectDictLabel(this.scyStatusOptions, row.scyStatus);
       }
     },
+    scyAuthStatusFormat(row, column) {
+        return this.selectDictLabel(this.scyAuthStatusOptions, row.scyAuthStatus);
+    },
 
   }
 };

front-vue/src/views/service/cost/costManage.vue

@@ -889,7 +889,7 @@ export default {
     //获取操作员Id
     getUser(){
       getUser().then(response => {
-          this.userId = response.data;
+          this.userId = response.data.userId;
         })
     }
   }

front-vue/src/views/service/cost/userCostManage.vue

@@ -578,7 +578,7 @@ export default {
     //获取操作员Id
     getUser(){
       getUser().then(response => {
-          this.userId = response.data;
+          this.userId = response.data.userId;
         })
     }
   }

front-vue/src/views/service/rel/companyRel.vue

@@ -126,24 +126,22 @@
             v-hasPermi="['service:rel:query']"
           >详情</el-button>
           <el-button
-            v-if="scope.row.launch && scope.row.launchScrReceiveType == '00' && scope.row.launchScrStatus =='01'"
-            v-else="scope.row.launchScrLaunchType == '00' && scope.row.launchScrStatus =='01'"
+            v-if="scope.row.launch && scope.row.launchScrReceiveType == '01' && scope.row.launchScrStatus =='01'"
+            v-else="scope.row.launchScrLaunchType == '01' && scope.row.launchScrStatus =='01'"
             size="mini"
             type="text"
             @click="handleDelete(scope.row)"
             v-hasPermi="['service:rel:delete']"
           >解绑</el-button>
           <el-button
-            v-if="scope.row.launch && scope.row.launchScrReceiveType == '00' && scope.row.launchScrStatus =='00'"
-            v-else="scope.row.launchScrLaunchType == '00' && scope.row.launchScrStatus =='00'"
+            v-if="handleRel && scope.row.launchScrStatus =='00' && scope.row.receive"
             size="mini"
             type="text"
             @click="handleSuccess(scope.row)"
             v-hasPermi="['service:rel:update']"
           >确认链属</el-button>
           <el-button
-            v-if="scope.row.launch && scope.row.launchScrReceiveType == '00' && scope.row.launchScrStatus =='00'"
-            v-else="scope.row.launchScrLaunchType == '00' && scope.row.launchScrStatus =='00'"
+            v-if="handleRel && scope.row.launchScrStatus =='00' && scope.row.receive"
             size="mini"
             type="text"
             @click="handleRefuse(scope.row)"
@@ -409,6 +407,8 @@ export default {
       //操作员企业Id
       loginId : '',
       userId : "",
+      scyTypeNow : '',
+      handleRel:false,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -556,7 +556,7 @@ export default {
         scySocialCode: [
           { required: true, message: "企业统一代码不能为空", trigger: ["blur", "change"] },
           {
-            pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/,
+            pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})||([1-9]\d{15})$/,
             message: "企业统一代码格式不正确",
             trigger: "blur"
           }
@@ -576,21 +576,6 @@ export default {
       },
     };
   },
-  created() {
-    this.getDicts("sys_scr_status").then(response => {
-      this.scrStatusOptions = response.data;
-    });
-    this.getDicts("sys_scr_type").then(response => {
-      this.scrTypeOptions = response.data;
-    });
-    this.getDicts("sys_scp_status").then(response => {
-      this.scpStatusOptions = response.data;
-    });
-    this.getList();
-    this.getSpare();
-    this.getCompanyList();
-    this.getUser();
-  },
   activated() {
     this.getDicts("sys_scr_status").then(response => {
       this.scrStatusOptions = response.data;
@@ -1082,7 +1067,13 @@ submitForm() {
     //获取操作员Id
     getUser(){
       getUser().then(response => {
-          this.userId = response.data;
+          this.userId = response.data.userId;
+          this.scyTypeNow = response.data.scyType;
+          if(this.scyTypeNow == '01'){
+            this.handleRel = true;
+          }else {
+            this.handleRel = false;
+          }
         })
     }
   }

front-vue/src/views/service/rel/companyRelManage.vue

@@ -422,20 +422,6 @@ export default {
       },
     };
   },
-  created() {
-    this.getDicts("sys_scr_status").then(response => {
-      this.scrStatusOptions = response.data;
-    });
-    this.getDicts("sys_scr_type").then(response => {
-      this.scrTypeOptions = response.data;
-    });
-    this.getDicts("sys_scp_status").then(response => {
-      this.scpStatusOptions = response.data;
-    });
-    this.getList();
-    this.getSpare();
-    this.getCompanyIdList();
-  },
   activated() {
     this.getDicts("sys_scr_status").then(response => {
       this.scrStatusOptions = response.data;

front-vue/src/views/service/rel/detailCompany.vue

@@ -417,6 +417,14 @@ export default {
             this.dialogImageUrl = file.url + "/" + getToken();
             this.dialogVisible = true;
         },
+        handleImgDownload(file) {
+            var a = document.createElement('a');
+            var event = new MouseEvent('click');
+            a.download = file.name;
+            a.href = file.url+'/'+getToken();
+            a.dispatchEvent(event);
+            console.log(file)
+        },
         /** 搜索按钮操作 */
         handleQuery() {
             this.queryParams.pageNum = 1;