Merge branch 'master' of http://git.minpay.cc/SupplyChain/front

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

@@ -113,7 +113,7 @@
             size="mini"
             type="text"
             @click="handlePay(scope.row)"
-            v-hasPermi="['service:cost:update']"
+            v-hasPermi="['service:cost:pay']"
           >去缴费</el-button>
           <el-button
             v-if="scope.row.zciInvoiceStatus == '0' && scope.row.zciStatus == '02'"

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

@@ -413,7 +413,6 @@ export default {
       scrStatusOptions: [],
       scrTypeOptions : [],
       scpStatusOptions : [],
-      scpTypeOptions : [],
       listCom : [],
       comlist : [],
       // 弹出层标题
@@ -558,9 +557,6 @@ export default {
     this.getDicts("sys_scp_status").then(response => {
       this.scpStatusOptions = response.data;
     });
-    this.getDicts("sys_scp_type").then(response => {
-      this.scpTypeOptions = response.data;
-    });
     this.getList();
     this.getSpare();
     this.getCompanyList();
@@ -576,9 +572,6 @@ export default {
     this.getDicts("sys_scp_status").then(response => {
       this.scpStatusOptions = response.data;
     });
-    this.getDicts("sys_scp_type").then(response => {
-      this.scpTypeOptions = response.data;
-    });
     this.getList();
     this.getSpare();
     this.getCompanyList();

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

@@ -292,7 +292,6 @@ export default {
       scrStatusOptions: [],
       scrTypeOptions : [],
       scpStatusOptions : [],
-      scpTypeOptions : [],
       // 弹出层标题
       title: "",
       templateTitle:'',
@@ -406,9 +405,6 @@ export default {
     this.getDicts("sys_scp_status").then(response => {
       this.scpStatusOptions = response.data;
     });
-    this.getDicts("sys_scp_type").then(response => {
-      this.scpTypeOptions = response.data;
-    });
     this.getList();
     this.getSpare();
     this.getCompanyIdList();
@@ -423,9 +419,6 @@ export default {
     this.getDicts("sys_scp_status").then(response => {
       this.scpStatusOptions = response.data;
     });
-    this.getDicts("sys_scp_type").then(response => {
-      this.scpTypeOptions = response.data;
-    });
     this.getList();
     this.getSpare();
     this.getCompanyIdList();