diff --git a/src/store/index.js b/src/store/index.js index a9ea9360..7aa78407 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -59,7 +59,7 @@ export default new Vuex.Store({ UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地 FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地 // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) - WORKFLOWURL: "http://192.168.34.175:88/#/workspace/forms", //罗峰工作流地址(本地) + WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地) CONTRACTORURL: process.env.NODE_ENV == "development" ? "http://192.168.34.175:5173/#/contractorApply" : `${window.location.protocol}//${window.location.host}/contractorApply/index.html#/contractorApply`, //罗峰承包商入场地址(本地) // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 diff --git a/src/views/projectFront/configManage/personnelAccess.vue b/src/views/projectFront/configManage/personnelAccess.vue index 89b79f04..3d6c73e6 100644 --- a/src/views/projectFront/configManage/personnelAccess.vue +++ b/src/views/projectFront/configManage/personnelAccess.vue @@ -307,6 +307,7 @@ > @@ -662,7 +663,7 @@ export default { { required: true, message: "请选择", - trigger: "blur", + trigger: "change", }, ], userId: [ @@ -683,7 +684,7 @@ export default { { required: true, message: this.$t("message.personnelPosition.required"), - trigger: "blur", + trigger: "change", }, ], }, @@ -1166,7 +1167,7 @@ export default { this.selectTreeData = {}; this.selectVal = ""; this.defaultExpandArr = []; - this.$refs.groupTree.setCurrentKey(""); + // this.$refs.groupTree.setCurrentKey(""); }); }, edit(obj) { @@ -1189,6 +1190,7 @@ export default { this.selectVal = ""; this.defaultExpandArr = []; } + this.addEditForm.roleId = obj.roleId.split(','); this.handle("edit", true); this.$nextTick(() => { if (this.addEditForm.xzProjectOrgObj) { @@ -1234,6 +1236,7 @@ export default { if (this.selectVal) { params.xzProjectOrgObj = JSON.stringify(this.selectTreeData); } + params.roleId = this.addEditForm.roleId.join(","); if (this.Popup.type === "add") { addProjectUserApi(params).then((result) => { if (result.success) { diff --git a/src/views/projectFront/dangerousBigProject/checkTable.vue b/src/views/projectFront/dangerousBigProject/checkTable.vue index d5792826..f389512f 100644 --- a/src/views/projectFront/dangerousBigProject/checkTable.vue +++ b/src/views/projectFront/dangerousBigProject/checkTable.vue @@ -237,7 +237,7 @@
- + + { this.$nextTick(() => { for (let i = 0; i < this.workerList.length; i++) { @@ -783,7 +787,6 @@ export default { } }); }, 10); - this.dialogVisible3 = true; }, localSubmitBtn() { this.selectedWorkerList = this.$refs.multipleTable.selection; @@ -833,7 +836,7 @@ export default { }); }, 10); }, - async getWorkerInfoList() { + getWorkerInfoList() { // this.workerInfo.departmentAndTeam.gtMaterialDepartmentTeamId = '' let data = { workerName: this.workerInfo.workerName, @@ -869,10 +872,11 @@ export default { : ""; } } - await getWorkerInfoListApi(data).then((res) => { + getWorkerInfoListApi(data).then((res) => { if (res.code == 200) { console.log(res.result.records); this.workerList = res.result.records; + this.echoFn(); this.worker.total = res.result.total; } }); diff --git a/src/views/projectFront/safeSame/v2/projectSelfInspection.vue b/src/views/projectFront/safeSame/v2/projectSelfInspection.vue index 52ae2f98..76788324 100644 --- a/src/views/projectFront/safeSame/v2/projectSelfInspection.vue +++ b/src/views/projectFront/safeSame/v2/projectSelfInspection.vue @@ -116,6 +116,23 @@ {{ scope.row.startTime }} 至 {{ scope.row.endTime }} +