Browse Source

2023-5-31

codeMan 2 years ago
parent
commit
bad95f8abb

+ 16 - 3
src/HDrpManagement/workReport/modules/reportSet/components/edit.vue

@@ -286,7 +286,9 @@ export default {
         },
       })
       this.tool.showMessage(res,() => {
-        this.getSelectPeople()
+        setTimeout(() => {
+          this.getSelectPeople()
+        },1000)
       })
     },
     async selectOptionFun (data) {
@@ -332,11 +334,22 @@ export default {
         this.selectOption.splice(this.selectOption.findIndex(item => item.sys_workreportpresetid == data.sys_workreportpresetid),1)
       })
     },
-    onSubmit(){
+    async onSubmit(){
       this.form.sys_workreportpresetids = this.selectOption.map((item) => {
         return {id:item.sys_workreportpresetid,sequence:item.sequence}
       })
-      this.form.hrids = this.selectPeople.map(item => item.hrid)
+      let res2 = await this.$api.requested({
+        "id": "20230522140702",
+        "content": {
+            "sys_workreportmodelid": this.data.sys_workreportmodelid,
+            "pageNumber": 1,
+            "pageSize": 999999,
+            "where": {
+                "condition": ""
+            }
+        },
+      })
+      this.form.hrids = res2.data.map(item => item.hrid)
       this.form.reporttohrids = this.selectReport.map(item => item.hrid)
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false

+ 8 - 3
src/HManagement/personalTarget/target/modules/edit/index.vue

@@ -162,9 +162,14 @@ export default {
       } else {
         this.errorurl = null
       }
-      this.tool.showMessage(res1,()=>{
-        this.mainData()
-      })
+      if (this.errorurl) {
+        this.$message('导入失败请查看错误文件')
+      } else {
+        this.tool.showMessage(res1,()=>{
+          this.mainData()
+        })
+      }
+      
     }
   },
   mounted () {