企业管理相关，费用功能优化

front-vue/src/api/service/company/company.js

@@ -80,4 +80,13 @@ export function removeCompany(scyId) {
     url: '/sc-service/company/' + scyId,
     method: 'delete'
   })
+}
+
+//查询链属
+export function listRel(query) {
+  return request({
+    url: '/sc-service/company/listRel',
+    method: 'get',
+    params: query
+  })
 }

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

@@ -92,7 +92,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-            v-if="scope.row.scyAuthStatus == '00' || scope.row.scyStatus == '00' || scope.row.scyStatus == '01'"
+            v-if="scope.row.scyStatus == '00' || scope.row.scyStatus == '01'"
             size="mini"
             type="text"
             @click="handleDetail(scope.row)"
@@ -419,7 +419,7 @@ export default {
       Cookies.set("/company/detailComPany/" + scyId + '/', this.$route.fullPath)
       this.$router.push("/company/detailComPany/" + scyId + '/');
       }else
-      if(scyAuthStatus == '00'){
+      if(scyAuthStatus == '00' || scyStatus == '01'){
       companyQuery(scyId).then(response => {
         this.form = response.data[0];
         this.openDetail = true;

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

@@ -293,10 +293,8 @@
 </template>
 <script>
 import {
-    companyQuery,
-    updateCompanyInfor,
+    companyQuery,updateCompanyInfor,listRel
 } from "@/api/service/company/company";
-import { listRel } from "@/api/service/rel/companyRel";
 import { getToken } from "@/utils/auth";
 export default {
     name: "detailComPany",
@@ -399,9 +397,11 @@ export default {
         //取消按钮
         cancel() {
             (this.form.scyIndustry = null),
-                (this.form.scyScale = null),
-                (this.form.scyOrganization = null),
-                (this.form.scyManager = null);
+            (this.form.scyScale = null),
+            (this.form.scyOrganization = null),
+            (this.form.scyManager = null);
+            this.$store.dispatch("tagsView/delView", this.$route);
+            this.$router.go(-1);
         },
         /* 下载 */
         handleFilePreview(fileUrl) {

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

@@ -298,9 +298,8 @@
 </template>
 <script>
 import {
-    queryExam, getElementStatus
+    queryExam, getElementStatus,listRel
 } from "@/api/service/company/company";
-import { listRel } from "@/api/service/rel/companyRel";
 import { getToken } from "@/utils/auth";
 export default {
     name: "detailComPanyExam",
@@ -413,10 +412,12 @@ export default {
         },
         //取消按钮
         cancel() {
-            (this.form.scyIndustry = null),
+                (this.form.scyIndustry = null),
                 (this.form.scyScale = null),
                 (this.form.scyOrganization = null),
                 (this.form.scyManager = null);
+            this.$store.dispatch("tagsView/delView", this.$route);
+            this.$router.go(-1);
         },
         /* 下载 */
         handleFilePreview(fileUrl) {

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

@@ -420,7 +420,7 @@ export default {
       Cookies.set("/company/detailComPany/" + scyId + '/', this.$route.fullPath)
       this.$router.push("/company/detailComPany/" + scyId + '/');
       }else
-      if(scyAuthStatus == '00'){
+      if(scyAuthStatus == '00' || scyStatus == '01'){
       companyQuery(scyId).then(response => {
         this.form = response.data[0];
         this.openDetail = true;

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

@@ -433,6 +433,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.openApply = false;
       this.reset();
     },
     // 表单重置
@@ -511,11 +512,9 @@ export default {
     handlePay(row){
       const zciId  = row.zciId || this.ids;
       const maney = row.zfrAmount || this.ids;
-      debugger
-      this.$confirm('是否缴费融资金额"' + maney + '"元?', "警告", {
+      this.$confirm('您需缴费融资金额"' + maney + '"元', {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
         }).then(function() {
           return changeZfiStatus(zciId);
         }).then(() => {

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

@@ -335,6 +335,27 @@
       </div>
     </el-dialog>
 
+    <!-- 企业详情对话框 -->
+    <el-dialog :title="titleDetail" :visible.sync="openDetail" width="800px" append-to-body >
+      <el-form ref="formDetail" :model="formDetail" label-width="140px" :inline="true">
+        <el-form-item label="企业名称" prop="scyName" >
+          <el-input v-model="formDetail.scyName" placeholder="请输入企业名称" disabled style="width:560px" maxlength="20" show-word-limit/>
+        </el-form-item>
+        <el-form-item label="企业统一代码" prop="scySocialCode">
+          <el-input v-model="formDetail.scySocialCode" placeholder="请输入企业统一代码" disabled maxlength="18" show-word-limit/>
+        </el-form-item>
+        <el-form-item label="联系人" prop="scyLegal">
+          <el-input v-model="formDetail.scyLegal" placeholder="请输入联系人" disabled maxlength="5" show-word-limit/>
+        </el-form-item>
+        <el-form-item label="联系人手机号" prop="scyPhone">
+          <el-input v-model="formDetail.scyPhone" placeholder="请输入联系人手机号" disabled maxlength="11" show-word-limit/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancelDetail">取 消</el-button>
+      </div>
+    </el-dialog>
+
     <!-- 导入窗口 -->
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
       <el-upload
@@ -418,9 +439,11 @@ export default {
       // 弹出层标题
       title: "",
       templateTitle:'',
+      titleDetail:'',
       // 是否显示弹出层
       open: false,
       templateOpen : false,
+      openDetail:false,
       idShow: true,
       // 导入参数
       upload: {
@@ -508,6 +531,12 @@ export default {
       templateForm:{
         scyId : null
       },
+      formDetail:{
+        scyName : null,
+        scySocialCode : null,
+        scyLegal : null,
+        scyPhone : null
+      },
       companyId:null,
       // 表单校验
       rules: {
@@ -767,10 +796,15 @@ export default {
       this.clearRemote();
       this.reset();
     },
+    cancelDetail(){
+      this.openDetail = false;
+      this.reset();
+    },
     // 表单重置
     reset() {
       this.clearRemote();
       this.resetForm("form");
+      this.resetForm("formDetail");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -804,12 +838,28 @@ export default {
       this.reset();
       if(row.receive == true){
       const scyId = row.launchCompanyId;
-      Cookies.set("/rel/detailComPany/" + scyId + '/', this.$route.fullPath)
-      this.$router.push("/rel/detailComPany/" + scyId + '/');
+      listCompanyQuery(scyId).then(response => {
+        if(response.data[0].scyStatus == '00'){
+          Cookies.set("/rel/detailComPany/" + scyId + '/', this.$route.fullPath)
+          this.$router.push("/rel/detailComPany/" + scyId + '/');
+        }else{
+          this.formDetail = response.data[0];
+          this.openDetail = true;
+          this.titleDetail = "详情企业信息";
+        }
+      });
       }else if(row.launch == true){
       const scyId = row.launchReceiveScrCompanyId;
-      Cookies.set("/rel/detailComPany/" + scyId + '/', this.$route.fullPath)
-      this.$router.push("/rel/detailComPany/" + scyId + '/');
+      listCompanyQuery(scyId).then(response => {
+        if(response.data[0].scyStatus == '00'){
+          Cookies.set("/rel/detailComPany/" + scyId + '/', this.$route.fullPath)
+          this.$router.push("/rel/detailComPany/" + scyId + '/');
+        }else{
+          this.formDetail = response.data[0];
+          this.openDetail = true;
+          this.titleDetail = "详情企业信息";
+        }
+      });
       }
     },
       

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

@@ -182,6 +182,27 @@
     />
   </el-tab-pane>
 
+    <!-- 企业详情对话框 -->
+    <el-dialog :title="titleDetail" :visible.sync="openDetail" width="800px" append-to-body >
+      <el-form ref="formDetail" :model="formDetail" label-width="140px" :inline="true">
+        <el-form-item label="企业名称" prop="scyName" >
+          <el-input v-model="formDetail.scyName" placeholder="请输入企业名称" disabled style="width:560px" maxlength="20" show-word-limit/>
+        </el-form-item>
+        <el-form-item label="企业统一代码" prop="scySocialCode">
+          <el-input v-model="formDetail.scySocialCode" placeholder="请输入企业统一代码" disabled maxlength="18" show-word-limit/>
+        </el-form-item>
+        <el-form-item label="联系人" prop="scyLegal">
+          <el-input v-model="formDetail.scyLegal" placeholder="请输入联系人" disabled maxlength="5" show-word-limit/>
+        </el-form-item>
+        <el-form-item label="联系人手机号" prop="scyPhone">
+          <el-input v-model="formDetail.scyPhone" placeholder="请输入联系人手机号" disabled maxlength="11" show-word-limit/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancelDetail">取 消</el-button>
+      </div>
+    </el-dialog>
+
     <!-- 导入窗口 -->
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
       <el-upload
@@ -219,9 +240,7 @@
             <el-select
                 v-model="templateForm.scyId"
                 filterable
-                remote
                 clearable
-                allow-create
                 reserve-keyword
                 @clear="clearBoth"
                 placeholder="请选择核心企业"
@@ -295,8 +314,10 @@ export default {
       // 弹出层标题
       title: "",
       templateTitle:'',
+      titleDetail : '',
       // 是否显示弹出层
       templateOpen : false,
+      openDetail : false,
       // 导入参数
       upload: {
         // 是否显示弹出层（导入）
@@ -387,6 +408,12 @@ export default {
       templateForm:{
         scyId : null
       },
+      formDetail:{
+        scyName : null,
+        scySocialCode : null,
+        scyLegal : null,
+        scyPhone : null
+      },
       companyId:null,
       templateRules: {
         scyId:[
@@ -467,17 +494,33 @@ export default {
     launchScrStatusFormat(row, column) {
       return this.selectDictLabel(this.scrStatusOptions, row.launchScrStatus);
     },
-    //查看企业详情
+    //查询企业详情
     handleCompanyQuery(row){
       this.reset();
-      if(row.launchScrLaunchType == "00"){
-        const scyId = row.launchCompanyId;
-        Cookies.set("/company/detailComPany/" + scyId + '/', this.$route.fullPath)
-        this.$router.push("/company/detailComPany/" + scyId + '/');
-      }else if(row.launchScrReceiveType == "00"){
-        const scyId = row.launchReceiveScrCompanyId;
-        Cookies.set("/company/detailComPany/" + scyId + '/', this.$route.fullPath)
-        this.$router.push("/company/detailComPany/" + scyId + '/');
+      if(row.receive == true){
+      const scyId = row.launchCompanyId;
+      listCompanyQuery(scyId).then(response => {
+        if(response.data[0].scyStatus == '00'){
+          Cookies.set("/rel/detailComPany/" + scyId + '/', this.$route.fullPath)
+          this.$router.push("/rel/detailComPany/" + scyId + '/');
+        }else{
+          this.formDetail = response.data[0];
+          this.openDetail = true;
+          this.titleDetail = "详情企业信息";
+        }
+      });
+      }else if(row.launch == true){
+      const scyId = row.launchReceiveScrCompanyId;
+      listCompanyQuery(scyId).then(response => {
+        if(response.data[0].scyStatus == '00'){
+          Cookies.set("/rel/detailComPany/" + scyId + '/', this.$route.fullPath)
+          this.$router.push("/rel/detailComPany/" + scyId + '/');
+        }else{
+          this.formDetail = response.data[0];
+          this.openDetail = true;
+          this.titleDetail = "详情企业信息";
+        }
+      });
       }
     },
 
@@ -583,6 +626,10 @@ export default {
     cancel() {
       this.reset();
     },
+    cancelDetail(){
+      this.openDetail = false;
+      this.reset();
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -595,6 +642,7 @@ export default {
         scrContarctEmail : null
       };
       this.resetForm("form");
+      this.resetForm("fromDetail");
     },
     /** 搜索按钮操作 */
     handleQuery() {

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

@@ -138,8 +138,8 @@
                         <el-option v-for="dict in scrStatusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="企业类型" prop="scrType">
-                    <el-select v-model="queryParams.scrType" placeholder="企业类型" clearable size="small" style="width: 215px">
+                <el-form-item label="链属关系" prop="scrType">
+                    <el-select v-model="queryParams.scrType" placeholder="链属关系" clearable size="small" style="width: 215px">
                         <el-option v-for="dict in scrTypeOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue"></el-option>
                     </el-select>
                 </el-form-item>
@@ -158,7 +158,7 @@
                         <span v-else>{{scope.row.launchScyName}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="企业类型" align="center" prop="companyType">
+                <el-table-column label="链属关系" align="center" prop="companyType">
                     <template slot-scope="scope">
                         <span v-if="scope.row.launch">{{companyTypeFormat(scope.row.launchScrReceiveType)}}</span>
                         <span v-else>{{companyTypeFormat(scope.row.launchScrLaunchType)}}</span>
@@ -281,9 +281,8 @@
 </template>
 <script>
 import {
-    companyQuery,
+    companyQuery,listRel
 } from "@/api/service/company/company";
-import { listRel } from "@/api/service/rel/companyRel";
 import { getToken } from "@/utils/auth";
 export default {
     name: "detailComPany",
@@ -386,10 +385,12 @@ export default {
         },
         //取消按钮
         cancel() {
-            (this.form.scyIndustry = null),
+                (this.form.scyIndustry = null),
                 (this.form.scyScale = null),
                 (this.form.scyOrganization = null),
                 (this.form.scyManager = null);
+            this.$store.dispatch("tagsView/delView", this.$route);
+            this.$router.go(-1);
         },
         /* 下载 */
         handleFilePreview(fileUrl) {