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/securityTraining.vue | 252 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 233 insertions(+), 19 deletions(-)
diff --git a/src/views/licenseApproval/securityTraining.vue b/src/views/licenseApproval/securityTraining.vue
index b99f79d..bc24737 100644
--- a/src/views/licenseApproval/securityTraining.vue
+++ b/src/views/licenseApproval/securityTraining.vue
@@ -2,7 +2,7 @@
* @Author: liu
* @Date: 2021-08-26 16:55:25
* @Last Modified by: liu
- * @Last Modified time: 2021-11-04 19:31:06
+ * @Last Modified time: 2021-12-04 11:57:59
*/
@@ -55,8 +55,23 @@
:size="size"
:type="type"
@click.stop="rowDel(row)"
- v-if="row.type == '2'"
+ v-if="row.stateOur == '0'"
>许可审批
+ </el-button>
+ <el-button
+ icon="el-icon-edit"
+ :size="size"
+ :type="type"
+ v-if="
+ row.stateOur != '0' &&
+ !(
+ row.papprove == '1' &&
+ row.xapprove == '1' &&
+ row.sapprove == '1'
+ )
+ "
+ @click.stop="rowSee(row)"
+ >审批查询
</el-button>
<el-button
icon="el-icon-edit"
@@ -67,14 +82,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.type == "0" ? "通过" : row.type == "1" ? "不通过" : "待审核"
+ row.papprove == "1"
+ ? "通过"
+ : row.papprove == "0" || row.papprove == ""
+ ? "待审核"
+ : "不通过"
}}
- <i class="gz" v-if="row.type == '2'"></i>
- <i class="yj" v-if="row.type == '1'"></i>
- <i class="zc" v-if="row.type == '0'"></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>
@@ -146,7 +199,7 @@
<div class="head-tid">
洪公保服务
<span class="fontStyle">{{
- licenceData.row.organizationcode
+ licenceData.row.organizationcode || 998
}}</span>
号
</div>
@@ -206,6 +259,20 @@
</div>
</div>
</el-dialog>
+
+ <el-dialog
+ title=""
+ :visible.sync="dialogVisibleccsee"
+ width="30%"
+ :modal-append-to-body="false"
+ >
+ <div class="flots">
+ <div class="f_title">
+ 审批 {{ stateOur == "1" ? "通过" : stateOur == "2" ? "不通过" : "" }}
+ </div>
+ <div><span>审批意见：</span> {{ stateText }}</div>
+ </div>
+ </el-dialog>
</div>
</template>
@@ -223,6 +290,7 @@
export default {
data() {
return {
+ user_name: "",
classStyle: "print", //打印样式
dialogVisiblecc: false, //许可证审核抽屉
@@ -234,7 +302,7 @@
chiden: {},
},
textareaShenpi: "",
-
+ dialogVisibleccsee: false,
form: {},
query: {},
loading: true,
@@ -339,20 +407,71 @@
this.dialogVisiblecc = true;
this.xukezData = row;
},
+ rowSee(row) {
+ this.dialogVisibleccsee = true;
+ this.stateOur = row.stateOur;
+ if (this.user_name == "派") {
+ // 派出所审批
+ this.stateText = row.popinion;
+ } else if (this.user_name == "县") {
+ // 分局审批
+ this.stateText = row.xopinion;
+ } else if (this.user_name == "市") {
+ // 市局审批
+ this.stateText = row.sopinion;
+ }
+ this.stateText = row.opinionOur;
+ },
closecc() {
- this.xukezData.type = "0";
- this.dialogVisiblecc = false;
- this.xukezData["approve"] = this.textareaShenpi;
- console.log(this.xukezData);
- update(this.xukezData);
- this.textareaShenpi = "";
+ this.upsData("1", "0"); //通过
},
subcc() {
- this.xukezData.type = "1";
+ this.upsData("2", "1"); //不通过
+ },
+ upsData(state, type) {
+ let date = new Date(+new Date() + 8 * 3600 * 1000)
+ .toJSON()
+ .substr(0, 19)
+ .replace("T", " ");
+ console.log(this.user_name);
+ // return;
this.dialogVisiblecc = false;
- this.xukezData["approve"] = this.textareaShenpi;
- update(this.xukezData);
- this.textareaShenpi = "";
+ console.log(this.xukezData);
+ if (this.user_name == "派") {
+ // 派出所审批
+ this.xukezData.ptime = date;
+ this.xukezData.papprove = state;
+ this.xukezData.popinion = this.textareaShenpi;
+ this.xukezData.type = type == "0" ? "2" : "1"; // 为了保持审核系统识别
+ } else if (this.user_name == "县") {
+ // 分局审批
+ this.xukezData.xtime = date;
+ this.xukezData.xapprove = state;
+ this.xukezData.xopinion = this.textareaShenpi;
+ this.xukezData.type = type == "0" ? "2" : "1"; // 为了保持审核系统识别
+ } else if (this.user_name == "市") {
+ // 市局审批
+ this.xukezData.stime = date;
+ this.xukezData.sapprove = state;
+ this.xukezData.sopinion = this.textareaShenpi;
+ this.xukezData.permitime = new Date(+new Date() + 8 * 3600 * 1000)
+ .toJSON()
+ .substr(0, 19)
+ .replace("T", " ");
+ this.xukezData.type = type == "0" ? "0" : "1"; // 为了保持审核系统识别
+ }
+ console.log(this.xukezData);
+ // return;
+ console.log(this.xukezData);
+ update(this.xukezData).then((res) => {
+ console.log(res);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ this.refreshChange();
+ this.textareaShenpi = "";
+ });
},
viewLicense(row) {
@@ -428,9 +547,89 @@
refreshChange() {
this.onLoad(this.page, this.query);
},
+ getFenji(name) {
+ var d = {};
+ if (name == "派出所管理员") {
+ d = {
+ // papprove: 1,
+ };
+ this.user_name = "派";
+ } else if (name == "县局管理员") {
+ d = {
+ papprove: "1",
+ };
+ this.user_name = "县";
+ } else if (name == "市局管理员") {
+ d = {
+ xapprove: "1",
+ };
+ this.user_name = "市";
+ }
+ return d;
+ },
+ changeState(data) {
+ var b = {
+ ...data,
+ stateOur: "",
+ };
+ if (this.user_name == "派") {
+ // 派出所审批
+ b["stateOur"] =
+ b.papprove == "0" || b.papprove == ""
+ ? "0"
+ : b.papprove == "1"
+ ? "1"
+ : "2";
+ } else if (this.user_name == "县") {
+ // 分局审批
+ b["stateOur"] =
+ b.xapprove == "0" || b.xapprove == ""
+ ? "0"
+ : b.xapprove == "1"
+ ? "1"
+ : "2";
+ } else if (this.user_name == "市") {
+ // 市局审批
+ b["stateOur"] =
+ b.sapprove == "0" || b.sapprove == ""
+ ? "0"
+ : b.sapprove == "1"
+ ? "1"
+ : "2";
+ }
+ return b;
+ },
onLoad(page, params = {}) {
this.loading = true;
params["ptype"] = 1;
+ var gonganj = "";
+ console.log(this.userInfo);
+ if (this.userInfo.role_name == "公安管理员") {
+ let test = /派出所$/g;
+ if (test.test(this.userInfo.list.name)) {
+ gonganj = "派出所管理员";
+ }
+ test = /分局|公安局$/g;
+ if (test.test(this.userInfo.list.name)) {
+ gonganj = "县局管理员";
+ }
+ test = /市公安局$/g;
+ if (test.test(this.userInfo.list.name)) {
+ gonganj = "市局管理员";
+ }
+ }
+ // console.log(gonganj, 23);
+ this.userData =
+ gonganj == "派出所管理员" ? "2" : gonganj == "县局管理员" ? "1" : "0";
+ params = {
+ ...params,
+ ...this.getFenji(gonganj),
+ };
+ console.log(params, "params");
+ params["jurisdiction"] = this.userInfo.jurisdiction;
+ // params["usetype"] = this.userData;
+ // this.option.column[this.option.column.length - 2].prop = "opinionOur";
+ // return;
getList(
page.currentPage,
page.pageSize,
@@ -439,6 +638,21 @@
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
+ for (var k in this.data) {
+ // console.log(this.changeState(this.data[k]));
+ this.data[k] = this.changeState(this.data[k]);
+ let paichusuoyijian = this.data[k].popinion
+ ? "派出所意见：" + this.data[k].popinion + "；"
+ : "";
+ let fenjuijian = this.data[k].xopinion
+ ? "分局意见：" + this.data[k].xopinion + "；"
+ : "";
+ let shijuyijian = this.data[k].sopinion
+ ? "市局意见：" + this.data[k].sopinion + "；"
+ : "";
+ this.data[k]["opinionOur"] =
+ paichusuoyijian + fenjuijian + shijuyijian;
+ }
this.loading = false;
this.selectionClear();
});
--
Gitblit v1.9.3