From 990357092ad03247f147fc3858d6575504baa4cd Mon Sep 17 00:00:00 2001
From: zhaoyu <zhaoyu>
Date: Thu, 18 Jan 2024 11:09:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=9A=90=E6=82=A3=E8=80=83=E8=AF=84bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../branch_hazard_assessment/components/evaluation.vue        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue b/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue
index 7039d49..1324c69 100644
--- a/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue
+++ b/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue
@@ -168,7 +168,7 @@
             v-if="USER_ID=='1'"
             type="danger"
             icon="el-icon-view"
-            @click="fnDelvaluation(row.HIDDEN_ID)">删除
+            @click="fnDelvaluation(row.HIDDEN_ID)">重置考评
           </el-button>
         </template>
       </el-table-column>
@@ -428,7 +428,7 @@ export default {
       })
     },
     fnDelvaluation(hiddenId) {
-      this.$confirm('确定要删除选中的评审记录吗?', {
+      this.$confirm('确定要重置选中的评审记录吗?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

From dda1af7787c35c92f34000767848a2b2618e5367 Mon Sep 17 00:00:00 2001
From: zhaoyu <zhaoyu>
Date: Thu, 18 Jan 2024 14:58:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E7=8A=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../promise_book_issued/components/add.vue    | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/views/security_commitment/promise_book_issued/components/add.vue b/src/views/security_commitment/promise_book_issued/components/add.vue
index ad55ba3..97d9dd7 100644
--- a/src/views/security_commitment/promise_book_issued/components/add.vue
+++ b/src/views/security_commitment/promise_book_issued/components/add.vue
@@ -3,7 +3,10 @@
     <el-form ref="form" :rules="rules" :model="form" label-width="120px">
       <el-row>
         <el-col :span="24">
-          <el-form-item label="承诺书名称" prop="PROMISE_NAME">
+          <el-form-item v-if="form.TYPE!='1'" label="承诺书名称" prop="PROMISE_NAME">
+            <el-input v-model="form.PROMISE_NAME" placeholder="请输入"/>
+          </el-form-item>
+          <el-form-item v-if="form.TYPE =='1'" label="责任状名称" prop="PROMISE_NAME">
             <el-input v-model="form.PROMISE_NAME" placeholder="请输入"/>
           </el-form-item>
         </el-col>
@@ -43,9 +46,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-divider content-position="left">承诺人</el-divider>
+          <el-divider v-if="form.TYPE!='1'" content-position="left">承诺人</el-divider>
+          <el-divider v-if="form.TYPE=='1'" content-position="left">受状人</el-divider>
         </el-col>
-        <el-col v-if="form.DISTRIBUTIONOBJECT" :span="24">
+        <el-col v-if="form.DISTRIBUTIONOBJECT&&form.TYPE!='1'" :span="24">
           <el-form-item style="text-align: right">
             <el-button type="primary" @click="addPeople">添加</el-button>
           </el-form-item>
@@ -148,7 +152,8 @@
       </el-row>
       <el-row>
         <el-col :span="24">
-          <el-divider content-position="left">被承诺人</el-divider>
+          <el-divider v-if="form.TYPE!='1'" content-position="left">被承诺人</el-divider>
+          <el-divider v-if="form.TYPE=='1'" content-position="left">发状人</el-divider>
         </el-col>
         <!--        <el-col :span="24">-->
         <!--          <el-form-item style="text-align: right">-->
@@ -649,6 +654,21 @@ export default {
         this.form.TYPE = row.TYPE
         this.dialog.visible = false
         this.isSelectTemplate = true
+        if (this.form.TYPE == '1') {
+          this.form.people = [
+            {
+              treeData: [],
+              postList: [],
+              userList: [],
+              CORPINFO_ID: '',
+              DEPARTMENT_ID: null,
+              POST_ID: '',
+              USER_ID: [],
+              id: Math.random()
+            }
+          ]
+          this.$forceUpdate()
+        }
       }).catch((e) => {
       })
     },