From 48d34b0def9f848d1b7f9ddd2cd0861341fb208d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 04 Dec 2021 17:15:30 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory_ys
---
src/views/licenseApproval/securityGuard.vue | 57 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 11 deletions(-)
diff --git a/src/views/licenseApproval/securityGuard.vue b/src/views/licenseApproval/securityGuard.vue
index 14c16bd..17a36ad 100644
--- a/src/views/licenseApproval/securityGuard.vue
+++ b/src/views/licenseApproval/securityGuard.vue
@@ -2,7 +2,7 @@
* @Author: liu
* @Date: 2021-08-26 16:57:58
* @Last Modified by: liu
- * @Last Modified time: 2021-12-02 17:04:32
+ * @Last Modified time: 2021-12-04 10:23:21
*/
@@ -98,18 +98,52 @@
>回执打印
</el-button>
</template>
- <template class="tdtype" slot-scope="{ row }" slot="type">
+ <template class="tdtype" slot-scope="{ row }" slot="papprove">
<el-tag class="dtype">
{{
- row.stateOur == "1"
+ row.papprove == "1"
? "通过"
- : row.stateOur == "2"
- ? "不通过"
- : "待审核"
+ : row.papprove == "0" || row.papprove == ""
+ ? "待审核"
+ : "不通过"
}}
- <i class="gz" v-if="row.stateOur == '0'"></i>
- <i class="yj" v-if="row.stateOur == '2'"></i>
- <i class="zc" v-if="row.stateOur == '1'"></i>
+ <i class="gz" v-if="row.papprove == '0' || row.papprove == ''"></i>
+ <i class="yj" v-if="row.papprove == '2'"></i>
+ <i class="zc" v-if="row.papprove == '1'"></i>
+ </el-tag>
+ </template>
+ <template class="tdtype" slot-scope="{ row }" slot="xapprove">
+ <el-tag class="dtype">
+ {{
+ row.papprove == "2"
+ ? "派出所未通过"
+ : row.xapprove == "1"
+ ? "通过"
+ : row.xapprove == "0" || row.xapprove == ""
+ ? "待审核"
+ : "不通过"
+ }}
+ <i class="gz" v-if="row.xapprove == '0' || row.xapprove == ''"></i>
+ <i class="yj" v-if="row.xapprove == '2'"></i>
+ <i class="zc" v-if="row.xapprove == '1'"></i>
+ </el-tag>
+ </template>
+ <template class="tdtype" slot-scope="{ row }" slot="sapprove">
+ <el-tag class="dtype">
+ {{
+ row.papprove == "2"
+ ? "派出所未通过"
+ : row.xapprove == "2"
+ ? "分局未通过"
+ : row.sapprove == "1"
+ ? "通过"
+ : row.sapprove == "0" || row.sapprove == ""
+ ? "待审核"
+ : "不通过"
+ }}
+ <i class="gz" v-if="row.sapprove == '0' || row.sapprove == ''"></i>
+ <i class="yj" v-if="row.sapprove == '2'"></i>
+ <i class="zc" v-if="row.sapprove == '1'"></i>
</el-tag>
</template>
</avue-crud>
@@ -129,7 +163,7 @@
<div class="head-tid">
编号
<span class="fontStyle">{{
- licenceData.row.organizationcode
+ licenceData.row.organizationcode || 378
}}</span>
<!-- 号 -->
</div>
@@ -407,6 +441,7 @@
// 市局审批
this.stateText = row.sopinion;
}
+ this.stateText = row.opinionOur;
},
closecc() {
@@ -479,7 +514,7 @@
// this.licenceData.chiden["注册资本"] = row.registeredcapital;
// this.licenceData.chiden["批准文号"] = row.registrationnumber;
- console.log(this.licenceData);
+ // console.log(this.licenceData);
if (val != 1) {
this.dialogVisible = true;
}
--
Gitblit v1.9.3