diff --git a/src/views/components/assetsType/index.vue b/src/views/components/assetsType/index.vue index 60ce2e5..3e0d4e2 100644 --- a/src/views/components/assetsType/index.vue +++ b/src/views/components/assetsType/index.vue @@ -3942,7 +3942,278 @@ 数据资产 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 添加数据资产 + + + + - + - + --> 业务系统拓扑图 @@ -4330,6 +4594,12 @@ export default { checkStrictly: true, }, ruleForm: { + sjzcList: [ + { + sjzcSjkmc: "", + sjzcSjklx: "", + }, + ], // 新监管业务形态 xjgywxt: { remark: "", @@ -4527,6 +4797,15 @@ export default { } }, methods: { + addSjzcList() { + this.ruleForm.sjzcList.push({ + sjzcSjkmc: "", + sjzcSjklx: "", + }); + }, + removeSjzcList(index) { + this.ruleForm.sjzcList.splice(index, 1); + }, changeState(e) { if (e != 5) { this.ruleForm.bfyy = ""; @@ -4936,4 +5215,19 @@ export default { padding-left: 10px; } } +::v-deep .listFormItem { + position: relative; + margin-bottom: 0; + & > .el-form-item__content { + margin-left: 0 !important; + .el-form-item { + margin-bottom: 22px; + } + } + .removeRow { + position: absolute; + bottom: 0; + right: 0; + } +} diff --git a/src/views/components/myAssetsType/index.vue b/src/views/components/myAssetsType/index.vue index 2bfb53d..df562d7 100644 --- a/src/views/components/myAssetsType/index.vue +++ b/src/views/components/myAssetsType/index.vue @@ -4574,422 +4574,286 @@ 数据资产 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 添加数据资产 + @@ -5213,6 +5077,39 @@ export default { callback(); } }; + const changeSjzcList = (rule, value, callback) => { + if (value.length > 0) { + let sum = 0; + value.forEach((item) => { + if (hasEmptyValues(item)) { + sum++; + } + }); + console.log(sum, "dddddd"); + if (sum > 0) { + callback(new Error("数据资产存在空值")); + } else { + callback(); + } + } + }; + const hasEmptyValues = (obj) => { + for (const key in obj) { + if (Object.hasOwn(obj, key)) { + // 检查对象自身的属性 + const value = obj[key]; + // 检查 null 或 undefined + if (value === null || value === undefined) { + return true; + } + // 检查字符串是否为空或全空格 + if (typeof value === "string" && value.trim() === "") { + return true; + } + } + } + return false; + }; return { accept: [ "xls", @@ -5237,6 +5134,12 @@ export default { checkStrictly: true, }, ruleForm: { + sjzcList: [ + { + sjzcSjkmc: "", + sjzcSjklx: "", + }, + ], // 新监管业务形态 xjgywxt: { remark: "", @@ -5397,6 +5300,7 @@ export default { xtfhqkFls: [], rules: { + sjzcList: [{ validator: changeSjzcList, trigger: "blur" }], bfyy: [{ validator: changeSateTetx, trigger: "blur" }], xtmc: [{ required: true, message: "请输入系统名称", trigger: "blur" }], dwmc: [{ required: true, message: "请输入单位名称", trigger: "blur" }], @@ -5491,6 +5395,15 @@ export default { } }, methods: { + addSjzcList() { + this.ruleForm.sjzcList.push({ + sjzcSjkmc: "", + sjzcSjklx: "", + }); + }, + removeSjzcList(index) { + this.ruleForm.sjzcList.splice(index, 1); + }, changeState(e) { if (e != 5) { this.ruleForm.bfyy = ""; @@ -6185,7 +6098,13 @@ export default { // 通过按钮 btnPass() { this.loading = true; - assetAudit({ currentId: Number(this.id), auditState: "2", xzType: 1 }) + assetAudit({ + currentId: Number(this.id), + auditState: "2", + xzType: 1, + dwmc: this.ruleForm.dwmc, + xtmc: this.ruleForm.xtmc, + }) .then((res) => { this.$modal.msgSuccess("审核通过"); // this.$router.go(-1); @@ -6216,4 +6135,19 @@ export default { padding-left: 10px; } } +::v-deep .listFormItem { + position: relative; + margin-bottom: 0; + & > .el-form-item__content { + margin-left: 0 !important; + .el-form-item { + margin-bottom: 22px; + } + } + .removeRow { + position: absolute; + bottom: 0; + right: 0; + } +} diff --git a/src/views/components/renwuType/webType1.vue b/src/views/components/renwuType/webType1.vue index 4db1f74..13e4c41 100644 --- a/src/views/components/renwuType/webType1.vue +++ b/src/views/components/renwuType/webType1.vue @@ -4464,216 +4464,133 @@ 数据资产 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 添加数据资产 + + @@ -5069,6 +4972,12 @@ export default { checkStrictly: true, }, ruleForm: { + sjzcList: [ + { + sjzcSjkmc: "", + sjzcSjklx: "", + }, + ], // 新监管业务形态 xjgywxt: { remark: "", @@ -5277,6 +5186,15 @@ export default { } }, methods: { + addSjzcList() { + this.ruleForm.sjzcList.push({ + sjzcSjkmc: "", + sjzcSjklx: "", + }); + }, + removeSjzcList(index) { + this.ruleForm.sjzcList.splice(index, 1); + }, importClose() {}, // 关闭新增弹窗 resetForm() { @@ -5741,4 +5659,19 @@ export default { padding-left: 10px; } } +::v-deep .listFormItem { + position: relative; + margin-bottom: 0; + & > .el-form-item__content { + margin-left: 0 !important; + .el-form-item { + margin-bottom: 22px; + } + } + .removeRow { + position: absolute; + bottom: 0; + right: 0; + } +} diff --git a/src/views/components/renwuType/webType2DW.vue b/src/views/components/renwuType/webType2DW.vue index c55c126..7eac449 100644 --- a/src/views/components/renwuType/webType2DW.vue +++ b/src/views/components/renwuType/webType2DW.vue @@ -4571,216 +4571,133 @@ 数据资产 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 添加数据资产 + + @@ -5176,6 +5077,12 @@ export default { checkStrictly: true, }, ruleForm: { + sjzcList: [ + { + sjzcSjkmc: "", + sjzcSjklx: "", + }, + ], // 新监管业务形态 xjgywxt: { remark: "", @@ -5397,6 +5304,15 @@ export default { } }, methods: { + addSjzcList() { + this.ruleForm.sjzcList.push({ + sjzcSjkmc: "", + sjzcSjklx: "", + }); + }, + removeSjzcList(index) { + this.ruleForm.sjzcList.splice(index, 1); + }, importClose() {}, // 关闭新增弹窗 resetForm() { @@ -5854,4 +5770,19 @@ export default { padding-left: 10px; } } +::v-deep .listFormItem { + position: relative; + margin-bottom: 0; + & > .el-form-item__content { + margin-left: 0 !important; + .el-form-item { + margin-bottom: 22px; + } + } + .removeRow { + position: absolute; + bottom: 0; + right: 0; + } +}