Merge branch 'hjw-accountPermissions' of https://git.agilestar.cn/spfm/spfm-market-front into bing-xuguan

src/pages/main/accountPermissions/accountApplication.vue

@@ -924,56 +924,59 @@ export default {
             this.handleAccountStatus = true
         },
         delAccount() {
-            this.$confirm("即将删除数据, 是否删除?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    this.$http({
-                        url: "/market/BomcProcessAccount/delBatch",
-                        method: "post",
-                        headers: {
-                            "Content-Type": "application/json",
-                        },
-                        data: { delId: this.AccountdelId },
-                    }).then((res) => {
-                        this.getAccountTable({}, this.pageSizeAccount)
-                        this.handleAccountStatus = false
-                    })
+            if (this.AccountdelId.length > 0) {
+                this.$confirm("即将删除数据, 是否删除?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
                 })
-                .catch(() => { });
+                    .then(() => {
+                        this.$http({
+                            url: "/market/BomcProcessAccount/delBatch",
+                            method: "post",
+                            headers: {
+                                "Content-Type": "application/json",
+                            },
+                            data: { delId: this.AccountdelId },
+                        }).then((res) => {
+                            this.getAccountTable({}, this.pageSizeAccount)
+                            this.handleAccountStatus = false
+                        })
+                    })
+                    .catch(() => { });
+            }
         },
         delHost() {
-            this.$confirm("即将删除数据, 是否删除?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    this.$http({
-                        url: "/market/BomcProcessHost/delBatch",
-                        method: "post",
-                        headers: {
-                            "Content-Type": "application/json",
-                        },
-                        data: { delId: this.HostdelId },
-                    }).then((res) => {
-                        this.getHostTable({}, this.pageSizeHost)
-                        this.handleHostStatus = false
-                    })
+            if (this.HostdelId.length > 0) {
+                this.$confirm("即将删除数据, 是否删除?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
                 })
-                .catch(() => { });
+                    .then(() => {
+                        this.$http({
+                            url: "/market/BomcProcessHost/delBatch",
+                            method: "post",
+                            headers: {
+                                "Content-Type": "application/json",
+                            },
+                            data: { delId: this.HostdelId },
+                        }).then((res) => {
+                            this.getHostTable({}, this.pageSizeHost)
+                            this.handleHostStatus = false
+                        })
+                    })
+                    .catch(() => { });
+            }
         },
         handleSelectionChangeHost(val) {
             this.HostdelId = []
             val.map((item) => {
                 this.HostdelId.push(item.id)
             })
-            console.log(this.HostdelId);
         },
         handleSelectionChangeAccount(val) {
-            this.HostdelId = []
+            this.AccountdelId = []
             val.map((item) => {
                 this.AccountdelId.push(item.id)
             })

src/pages/main/accountPermissions/accountdel.vue

@@ -578,25 +578,27 @@ export default {
         },
 
         delHost() {
-            this.$confirm("即将删除数据, 是否删除?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    this.$http({
-                        url: "/market/ZhscProcessHost/delBatch",
-                        method: "post",
-                        headers: {
-                            "Content-Type": "application/json",
-                        },
-                        data: { delId: this.HostdelId },
-                    }).then((res) => {
-                        this.getHostTable({}, this.pageSizeHost)
-                        this.handleHostStatus = false
-                    })
+            if (this.HostdelId.length > 0) {
+                this.$confirm("即将删除数据, 是否删除?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
                 })
-                .catch(() => { });
+                    .then(() => {
+                        this.$http({
+                            url: "/market/ZhscProcessHost/delBatch",
+                            method: "post",
+                            headers: {
+                                "Content-Type": "application/json",
+                            },
+                            data: { delId: this.HostdelId },
+                        }).then((res) => {
+                            this.getHostTable({}, this.pageSizeHost)
+                            this.handleHostStatus = false
+                        })
+                    })
+                    .catch(() => { });
+            }
         },
         handleSelectionChangeHost(val) {
             this.HostdelId = []

src/pages/main/accountPermissions/klhfsqList.vue

@@ -501,25 +501,27 @@ export default {
             this.handleSjkdbOwnerStatus = true
         },
         delAccount() {
-            this.$confirm("即将删除数据, 是否删除?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    this.$http({
-                        url: "/market/KlhfProcessAccount/delBatch",//KlhfProcessAccount
-                        method: "post",
-                        headers: {
-                            "Content-Type": "application/json",
-                        },
-                        data: { delId: this.AccountId },
-                    }).then((res) => {
-                        this.getTableAccount({}, this.pageSizeAccount)
-                        this.handleSjkdbOwnerStatus = false
-                    })
+            if (this.AccountId.length > 0) {
+                this.$confirm("即将删除数据, 是否删除?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
                 })
-                .catch(() => { });
+                    .then(() => {
+                        this.$http({
+                            url: "/market/KlhfProcessAccount/delBatch",//KlhfProcessAccount
+                            method: "post",
+                            headers: {
+                                "Content-Type": "application/json",
+                            },
+                            data: { delId: this.AccountId },
+                        }).then((res) => {
+                            this.getTableAccount({}, this.pageSizeAccount)
+                            this.handleSjkdbOwnerStatus = false
+                        })
+                    })
+                    .catch(() => { });
+            }
         },
         handleSelectionChange(val) {
             this.AccountId = []

src/pages/main/accountPermissions/rltzjlList.vue

@@ -178,7 +178,7 @@ export default {
                 // fresourceId: "7395620f-b33d-11ed-886f-d6cd97160e00", // 本地环境
                 // fresourceId: "canvas", // 生产环境
                 // fresourceId: "b9283efe-b33e-11ed-be6b-00505687dcd3", //测试91环境
-                fresourceId: getConfig().rltzjlList, 
+                fresourceId: getConfig().rltzjlList,
                 processDefinitionKey: "RLTZ_process",
             },
             dialogStatus: false, //dialog显示
@@ -761,6 +761,12 @@ export default {
                     console.log(this.$refs.form.model)
                     this.savestatusBtn = true
                     if (this.fromList.id) {
+                        this.fromList.accessoryIdList = []
+                        if (this.fromList.accessoryList) {
+                            this.fromList.accessoryList.map((item) => {
+                                this.fromList.accessoryIdList.push(item.id);
+                            })
+                        }
                         this.$http({
                             url: "/market/RltzProcess/update",
                             method: "post",

src/pages/main/accountPermissions/sjkdbList.vue

@@ -622,48 +622,59 @@ export default {
             this.handleSjkdbTableNameStatus = true
         },
         delSjkdbTableName() {
-            this.$confirm("即将删除数据, 是否删除?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    this.$http({
-                        url: "/market/SjkdbProcessOwnerTableName/delBatch",//SjkdbProcessOwnerTableName
-                        method: "post",
-                        headers: {
-                            "Content-Type": "application/json",
-                        },
-                        data: { delId: this.SjkdbTableNamedelId },
-                    }).then((res) => {
-                        this.getSjkdbTableNameTable({}, this.pageSizSjkdbTableName)
-                        this.handleSjkdbTableNameStatus = false
-                    })
+            if (this.SjkdbTableNamedelId.length > 0) {
+                this.$confirm("即将删除数据, 是否删除?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
                 })
-                .catch(() => { });
+                    .then(() => {
+                        this.$http({
+                            url: "/market/SjkdbProcessOwnerTableName/delBatch",//SjkdbProcessOwnerTableName
+                            method: "post",
+                            headers: {
+                                "Content-Type": "application/json",
+                            },
+                            data: { delId: this.SjkdbTableNamedelId },
+                        }).then((res) => {
+                            this.getSjkdbTableNameTable({}, this.pageSizSjkdbTableName)
+                            this.handleSjkdbTableNameStatus = false
+                        })
+                    })
+                    .catch(() => { });
+            }
         },
         delSjkdbOwner() {
-            this.$http({
-                url: "/market/SjkdbProcessOwner/delBatch",//SjkdbProcessOwner
-                method: "post",
-                headers: {
-                    "Content-Type": "application/json",
-                },
-                data: { delId: this.SjkdbOwnerdelId },
-            }).then((res) => {
-                this.getSjkdbOwnerTable({}, this.pageSizeSjkdbOwner)
-                this.handleSjkdbOwnerStatus = false
-            })
+            if (this.SjkdbOwnerdelId.length > 0) {
+                this.$confirm("即将删除数据, 是否删除?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                })
+                    .then(() => {
+                        this.$http({
+                            url: "/market/SjkdbProcessOwner/delBatch",//SjkdbProcessOwner
+                            method: "post",
+                            headers: {
+                                "Content-Type": "application/json",
+                            },
+                            data: { delId: this.SjkdbOwnerdelId },
+                        }).then((res) => {
+                            this.getSjkdbOwnerTable({}, this.pageSizeSjkdbOwner)
+                            this.handleSjkdbOwnerStatus = false
+                        })
+                    })
+                    .catch(() => { });
+            }
         },
         handleSelectionChangeSjkdbOwner(val) {
             this.SjkdbOwnerdelId = []
             val.map((item) => {
                 this.SjkdbOwnerdelId.push(item.id)
             })
-            console.log(this.SjkdbOwnerdelId);
         },
         handleSelectionChangeSjkdbTableName(val) {
-            this.SjkdbOwnerdelId = []
+            this.SjkdbTableNamedelId = []
             val.map((item) => {
                 this.SjkdbTableNamedelId.push(item.id)
             })

src/pages/main/internetAssessment/internetAssessment.vue

@@ -767,6 +767,12 @@ export default {
                     console.log(JSON.parse(item.value));
                     if (val == '1') {
                         this.fromList.content1 = JSON.parse(item.value)
+                        this.fromList.content1.tableData1.map((item) => {
+                            item.show = false;
+                        })
+                        this.fromList.content1.tableData2.map((item) => {
+                            item.show = false;
+                        })
                     } else {
                         let a = JSON.parse(item.value)
                         this.$set(this.fromList.content1, 'tableData1', a.tableData1)
@@ -774,6 +780,9 @@ export default {
                         this.$set(this.fromList.content1, 'tableData5', a.tableData3)
                         this.$set(this.fromList.content1, 'tableCol3', a.tableCol2)
                         this.$set(this.fromList.content1, 'tableCol5', a.tableCol3)
+                        this.fromList.content1.tableData1.map((item) => {
+                            item.show = false;
+                        })
                     }
                 }
             })
@@ -1064,6 +1073,14 @@ export default {
                     })
                 }
                 this.fromList.content1 = JSON.parse(this.fromList.content);
+                this.fromList.content1.tableData1.map((item) => {
+                    item.show = false;
+                })
+                if (this.fromList.content1.tableData2) {
+                    this.fromList.content1.tableData2.map((item) => {
+                        item.show = false;
+                    })
+                }
                 this.fromList.resourceId = e.resourceId
                 console.log(this.fromList);
             });
@@ -1561,7 +1578,15 @@ export default {
             this.$set(this.fromList.content1.tableData2, index, row)
         },
         delectv(index, row) {
-            this.fromList.content1.tableData1.splice(index, 1);
+            this.$confirm("即将删除数据, 是否删除?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    this.fromList.content1.tableData1.splice(index, 1);
+                })
+                .catch(() => { });
         },
         addNewHost1() {
             this.fromList.content1.tableData1.push({