From 8e5f77b0c482f62a0c9fbe94be59acb7e5f7b38c Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 22 Aug 2022 17:50:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E8=BF=9B=E5=BA=A6=20=E5=BD=93=E5=89=8D=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectManagement/components/TaskList.vue    | 16 ++++++++++++----
 .../components/batchChangeModel.vue              |  7 +++----
 .../projectManagement/components/batchModel.vue  |  7 +++----
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index 6c6f978eb..2400716d3 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -186,8 +186,8 @@
     <certificationDirectory :isDisplayNum="isDisplayNum" :url="url" ref="certificationDirectoryRef"/>
     <TaskListModel @TaskListModelList="TaskListModelList" ref="TaskListModelRef"/>
     <taskBatSetting @taskBatSettingForm="taskBatSettingForm" ref="taskBatSettingRef"></taskBatSetting>
-    <batchChangeModel ref="batchChangeModelRef"/>
-    <batchModel ref="batchModelRef"/>
+    <batchChangeModel @batchChangeModel="batchChangeModel" ref="batchChangeModelRef"/>
+    <batchModel @batchModel="batchModel" ref="batchModelRef"/>
     <!--    错误数据提示-->
     <a-modal
       :title="$t('operationFailed')"
@@ -393,6 +393,12 @@
       taskBatSettingForm() {
         this.getList()
       },
+      batchChangeModel() {
+        this.getList()
+      },
+      batchModel() {
+        this.getList()
+      },
       onSelectChange(value, selectionRows) {
         this.selectedRowKeys = value
         this.selectionRowsArray = selectionRows
@@ -542,9 +548,10 @@
           })
           query = {
             roleCodes: roleCodes.join(','),
+            operation:'1',
             projectLawsInventoryIds: projectLawsInventoryIds.join(',')
           }
-          getAction(this.url.list, query).then((res) => {
+          postAction('/project/projectTaskInventoryEO/verifyRoleCode', query).then((res) => {
             if (res.success) {
               this.$refs.batchModelRef.getData(this.selectedRowKeys)
             } else {
@@ -572,9 +579,10 @@
           })
           query = {
             roleCodes: roleCodes.join(','),
+            operation:'2',
             projectLawsInventoryIds: projectLawsInventoryIds.join(',')
           }
-          getAction(this.url.list, query).then((res) => {
+          postAction('/project/projectTaskInventoryEO/verifyRoleCode', query).then((res) => {
             if (res.success) {
               this.$refs.batchChangeModelRef.getData(this.selectionRowsArray)
             } else {
diff --git a/jero-web/src/views/projectManagement/components/batchChangeModel.vue b/jero-web/src/views/projectManagement/components/batchChangeModel.vue
index 31de148ef..6e7fcfa7c 100644
--- a/jero-web/src/views/projectManagement/components/batchChangeModel.vue
+++ b/jero-web/src/views/projectManagement/components/batchChangeModel.vue
@@ -87,6 +87,7 @@ export default {
       projectLawsInventoryIds:[],
       roleCodes:[],
       visible: false,
+      title:'',
       confirmLoading: false,
       studioList: [],
       disabled: false,
@@ -134,7 +135,6 @@ export default {
           let query = {}
           let projectLawsInventoryIds = []
           let roleCodes = []
-          let url = ''
           let Action
           this.selectionRowsArray.forEach((item,index) => {
             projectLawsInventoryIds.push(item.projectLawsInventoryId)
@@ -146,15 +146,14 @@ export default {
               conditionAssessment: this.formInline.conditionAssessment,
               projectLawsInventoryIds: projectLawsInventoryIds.join(',')
             }
-            url = this.url.addOrUpdate
             Action = postAction
           this.confirmLoading = true
-          Action(url, query).then((res) => {
+          Action('/project/projectTaskInventoryConditionAssessmentEO/addOrUpdateBatch', query).then((res) => {
             if (res.success) {
               this.visible = false
               this.confirmLoading = false
               this.$message.success(this.$t('OperationSuccessful'))
-              this.$emit('TaskListModelList')
+              this.$emit('batchChangeModel')
             } else {
               this.$message.warning(this.$t('operationFailed'))
               this.confirmLoading = false
diff --git a/jero-web/src/views/projectManagement/components/batchModel.vue b/jero-web/src/views/projectManagement/components/batchModel.vue
index 0d0252290..34a3cb7fa 100644
--- a/jero-web/src/views/projectManagement/components/batchModel.vue
+++ b/jero-web/src/views/projectManagement/components/batchModel.vue
@@ -57,6 +57,7 @@ export default {
       formInline: {},
       selectionRowsArray:[],
       rules: {},
+      title:'',
       visible: false,
       confirmLoading: false,
       studioList: [],
@@ -104,21 +105,19 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           let query = {}
-          let url = ''
           this.ids = this.selectionRowsArray.join(',')
             query = {
               ids: this.ids,
               certificationProgress: this.formInline.certificationProgress,
               certificationProgressRemark: this.formInline.certificationProgressRemark
             }
-            url = this.url.edit
           this.confirmLoading = true
-          postAction(url, query).then((res) => {
+          postAction('/project/projectTaskInventoryEO/editBatch', query).then((res) => {
             if (res.success) {
               this.visible = false
               this.confirmLoading = false
               this.$message.success(this.$t('OperationSuccessful'))
-              this.$emit('TaskListModelList')
+              this.$emit('batchModel')
             } else {
               this.$message.warning(this.$t('operationFailed'))
               this.confirmLoading = false