|
|
@@ -99,16 +99,16 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="cateCode" label="服务分类" width="140" show-overflow-tooltip>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="audit" label="审核状态" width="140">
|
|
|
+ <el-table-column prop="audit" label="审核状态" width="100">
|
|
|
<template #default="scope">
|
|
|
<div style="text-align: center;display: flex;" v-if="scope.row.audit=='4'">
|
|
|
<el-tag class="ml-2" type="success">已审核</el-tag>
|
|
|
</div>
|
|
|
- <div style="text-align: center;display: flex;" v-if="scope.row.audit=='3'">
|
|
|
- <el-tag class="ml-2" type="success">未审核</el-tag>
|
|
|
+ <div style="text-align: center;display: flex;" v-if="scope.row.audit=='3'||scope.row.audit==null">
|
|
|
+ <el-tag class="ml-2" type="danger">未审核</el-tag>
|
|
|
</div>
|
|
|
<div style="text-align: center;display: flex;" v-if="scope.row.audit=='0'">
|
|
|
- <el-tag class="ml-2" type="success">驳回</el-tag>
|
|
|
+ <el-tag class="ml-2" type="warning">驳回</el-tag>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -184,7 +184,7 @@
|
|
|
</span>
|
|
|
</template>
|
|
|
</el-dialog>
|
|
|
- <el-dialog @close="clearAdd" v-model="dialogVisibleTest" title="" width="40%" destroy-on-close :key="tableKey">
|
|
|
+ <el-dialog @close="clearAdd" v-model="dialogVisibleTest" :title="titleShen" width="40%" destroy-on-close :key="tableKey">
|
|
|
<el-form size="mini" :key="tableKey" style="margin-top: 1%;width: 90%;" label-position="right" label-width="120px" :rules="rulesLev">
|
|
|
<el-form-item label="是否通过:" prop="" style="">
|
|
|
<el-radio-group v-model="audit" style="margin-top: -0.5%;">
|
|
|
@@ -192,11 +192,18 @@
|
|
|
<el-radio value="0" size="large">不通过</el-radio>
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="说明:" prop="" style="">
|
|
|
+ <el-form-item label="*说明:" prop="" style="">
|
|
|
<el-input v-model="auditRemark" style="width: 100%;" type="textarea"/>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
-
|
|
|
+ <div style="display: flex;font-size: 13px;align-items: center;line-height: 1.5;margin-left: 1%;margin-top: 5%;">
|
|
|
+ <div style="">
|
|
|
+ 当前审核人：
|
|
|
+ </div>
|
|
|
+ <div>
|
|
|
+ {{userName}}
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
<template #footer>
|
|
|
<span class="dialog-footer">
|
|
|
<el-button size="mini" @click="dialogVisibleTest = false">取消</el-button>
|
|
|
@@ -206,7 +213,7 @@
|
|
|
</span>
|
|
|
</template>
|
|
|
</el-dialog>
|
|
|
- <el-dialog @close="clearFromLev" title="" v-model="dialogVisibleLevel" width="30%" destroy-on-close :key="tableKey">
|
|
|
+ <el-dialog @close="clearFromLev" draggable :title="titleShen" v-model="dialogVisibleLevel" width="50%" destroy-on-close :key="tableKey">
|
|
|
<el-table
|
|
|
style="margin-top: 1%;width: 98%;"
|
|
|
:data="tableDataLog"
|
|
|
@@ -218,6 +225,19 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="createTime" label="审核时间">
|
|
|
</el-table-column>
|
|
|
+ <el-table-column prop="audit" label="审核状态" width="100">
|
|
|
+ <template #default="scope">
|
|
|
+ <div style="text-align: center;display: flex;" v-if="scope.row.audit=='4'">
|
|
|
+ <el-tag class="ml-2" type="success">已审核</el-tag>
|
|
|
+ </div>
|
|
|
+ <div style="text-align: center;display: flex;" v-if="scope.row.audit=='3'||scope.row.audit==null">
|
|
|
+ <el-tag class="ml-2" type="danger">未审核</el-tag>
|
|
|
+ </div>
|
|
|
+ <div style="text-align: center;display: flex;" v-if="scope.row.audit=='0'">
|
|
|
+ <el-tag class="ml-2" type="warning">驳回</el-tag>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column prop="remark" label="审核备注" show-overflow-tooltip>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -237,6 +257,7 @@ import { reactive } from 'vue'
|
|
|
import { changeSerShenhe } from "@/api/register/regCom";
|
|
|
import { modelTreeSelect,getSerDe,addService,shenheLog,editService,editParam,addServiceParam,delService,getTreeDe,addTree,deTree,getServiceInfo,testService } from "@/api/service/info";
|
|
|
import { ref, onMounted, onUnmounted, nextTick,onBeforeMount } from 'vue';
|
|
|
+import { getUserProfile } from "@/api/system/user";
|
|
|
import JsonViewer from 'vue-json-viewer'
|
|
|
import 'vue-json-viewer/style.css'
|
|
|
import JsonEditorVue from 'json-editor-vue3'
|
|
|
@@ -254,10 +275,12 @@ const detail = ref({
|
|
|
rptype:''
|
|
|
})
|
|
|
const audit = ref()
|
|
|
-const auditRemark = ref()
|
|
|
+const titleShen = ref()
|
|
|
+const auditRemark = ref(null)
|
|
|
const show1Lev = ref(true)
|
|
|
const inputNode =ref('')
|
|
|
const isEdit = ref(true)
|
|
|
+const userName = ref()
|
|
|
const dataReturn = ref('')
|
|
|
const optionsCan = ref([
|
|
|
{
|
|
|
@@ -451,24 +474,37 @@ const parShenhe = ref({})
|
|
|
function showLog(row){
|
|
|
dialogVisibleLevel.value = true
|
|
|
var par = {
|
|
|
- proId:row.srvId
|
|
|
+ proId:row.srvId,
|
|
|
+ proType:'AUDIT'
|
|
|
}
|
|
|
shenheLog(par).then(res=>{
|
|
|
tableDataLog.value = res.data
|
|
|
})
|
|
|
}
|
|
|
function saveShenhe(){
|
|
|
+
|
|
|
parShenhe.value.audit = audit.value
|
|
|
- parShenhe.value.auditRemark = auditRemark.value
|
|
|
- changeSerShenhe(par).then(res=>{
|
|
|
- if(res.code===200){
|
|
|
- proxy.$modal.msgSuccess("已审核！");
|
|
|
- handleNodeClick(parMdid.value)
|
|
|
- }
|
|
|
- dialogVisibleTest.value = false
|
|
|
- })
|
|
|
+ if(audit.value==='0'&&!auditRemark.value){
|
|
|
+ proxy.$modal.msgWarning("未通过时请填写说明！");
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ parShenhe.value.auditRemark = auditRemark.value
|
|
|
+ console.log(parShenhe.value)
|
|
|
+ changeSerShenhe(parShenhe.value).then(res=>{
|
|
|
+ if(res.code===200){
|
|
|
+ proxy.$modal.msgSuccess(res.msg);
|
|
|
+ var par1 = {
|
|
|
+ data:{id:parMdid.value}
|
|
|
+ }
|
|
|
+ handleNodeClick(null,par1,null)
|
|
|
+ }
|
|
|
+ dialogVisibleTest.value = false
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
function shenhe(row){
|
|
|
+ titleShen.value = row.name
|
|
|
dialogVisibleTest.value = true
|
|
|
parShenhe.value = {
|
|
|
srvIds:row.srvId,
|
|
|
@@ -693,7 +729,6 @@ async function handleNodeClick(node,data,event){
|
|
|
console.log(parOptions.value)
|
|
|
for(var i = 0; i < parOptions.value.length; i++){
|
|
|
for(var i1 = 0; i1 < tableData.value.length; i1++){
|
|
|
- console.log(i1);
|
|
|
if(parOptions.value[i].value === tableData.value[i1].cateCode){
|
|
|
tableData.value[i1].cateCode = parOptions.value[i].label
|
|
|
}
|
|
|
@@ -708,7 +743,7 @@ async function handleNodeClick(node,data,event){
|
|
|
value:'2',
|
|
|
label:'XML'
|
|
|
},
|
|
|
- {
|
|
|
+ {
|
|
|
value:'3',
|
|
|
label:'HTML'
|
|
|
}
|
|
|
@@ -734,7 +769,6 @@ async function getTreeLeft(){
|
|
|
|
|
|
})
|
|
|
optionsMdid.value = filterModelNodes(par)
|
|
|
- console.log(optionsMdid.value)
|
|
|
}
|
|
|
function renameTreeProperties(tree) {
|
|
|
// 深拷贝避免修改原始数据（可选，根据需求）
|
|
|
@@ -764,6 +798,9 @@ function renameTreeProperties(tree) {
|
|
|
return newTree;
|
|
|
}
|
|
|
function fetchData() {
|
|
|
+ getUserProfile().then(response => {
|
|
|
+ userName.value = response.data.userName
|
|
|
+ });
|
|
|
getCatalog().then((r) => {
|
|
|
parOptions.value = r.data
|
|
|
cascaderOptions.value = renameTreeProperties(buildTree(r.data))
|
