1.安全承诺书增加输入岗位,并显示

2.安全承诺书恢复有效期限

src/views/security_commitment/promise_book_issued/components/add.vue

@@ -165,7 +165,7 @@
         <!--        </el-col>-->
       </el-row>
       <el-row v-for="(item,index) in form.coverpeople" :key="item.id">
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item
             :label="'部门' + (index + 1)"
             :prop="'coverpeople.' + index + '.DEPARTMENT_ID'"
@@ -187,7 +187,7 @@
           </el-form-item>
         </el-col>
         <template>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item
               :label="'人员' + (index + 1)"
               :prop="'coverpeople.' + index + '.USER_ID'"
@@ -207,6 +207,11 @@
             </el-form-item>
           </el-col>
         </template>
+        <el-col :span="8">
+          <el-form-item label="岗位名称">
+            <el-input v-model="item.NICKNAME" placeholder="请输入"/>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row>
         <el-col :span="24">
@@ -355,6 +360,7 @@ export default {
             DEPARTMENT_ID: null,
             POST_ID: '',
             USER_ID: [],
+            NICKNAMES: [],
             id: Math.random()
           }
         ],
@@ -459,6 +465,7 @@ export default {
             CORPINFO_ID: data.coverpeople[i].CORPINFO_ID,
             DEPARTMENT_ID: data.coverpeople[i].DEPARTMENT_ID,
             POST_ID: data.coverpeople[i].POST_ID,
+            NICKNAME: data.coverpeople[i].NICKNAME,
             USER_ID: [],
             id: data.coverpeople[i].PROMISEPEOPLE_ID
           })
@@ -616,6 +623,7 @@ export default {
           DEPARTMENT_ID: null,
           POST_ID: '',
           USER_ID: [],
+          NICKNAMES: [],
           id: Math.random()
         }
       )
@@ -702,7 +710,7 @@ export default {
             { DEPARTMENT_ID: item.DEPARTMENT_ID, POST_ID: item.POST_ID, USER_ID: item.USER_ID, CORPINFO_ID: item.CORPINFO_ID }
           ))
           const coverpeople = this.form.coverpeople.map(item => (
-            { DEPARTMENT_ID: item.DEPARTMENT_ID, POST_ID: item.POST_ID, USER_ID: item.USER_ID, CORPINFO_ID: item.CORPINFO_ID }
+            { DEPARTMENT_ID: item.DEPARTMENT_ID, POST_ID: item.POST_ID, USER_ID: item.USER_ID, CORPINFO_ID: item.CORPINFO_ID,NICKNAME: item.NICKNAME }
           ))
           let url
           if (this.$parent.PROMISE_ID) {
@@ -765,6 +773,7 @@ export default {
           DEPARTMENT_ID: null,
           POST_ID: '',
           USER_ID: [],
+          NICKNAMES: [],
           id: Math.random()
         }
       ]

src/views/security_commitment/promise_book_issued/components/details.vue

@@ -92,7 +92,10 @@ export default {
       ).then((data) => {
         const DETAIL = data.COLLATERAL.map(item => ({ value: item.COLLATERAL, id: item.PROMISEDETAIL_ID }))
         this.dialog.visible = true
-        this.dialog.data = { ...data.varList, DETAIL, FILEPATH: data.ISGN.FILEPATH, SIGNTIME: data.ISGN.SIGNTIME, COVERPEOPLE: data.COVERPEOPLE[0].USERNAME, ORDER: data.COVERPEOPLE }
+        this.dialog.data = { ...data.varList, DETAIL,
+          FILEPATH: data.ISGN.FILEPATH, SIGNTIME: data.ISGN.SIGNTIME,
+          COVERPEOPLE: data.COVERPEOPLE[0].USERNAME, ORDER: data.COVERPEOPLE ,
+          NICKNAME: data.COVERPEOPLE[0].NICKNAME,}
       }).catch((e) => {
       })
     },

src/views/security_commitment/promise_book_issued/components/promise_book_dialog.vue

@@ -9,7 +9,7 @@
         </div>
       </div>
       <h1 class="title">{{ dialogData.TYPE === '0' ? '安全生产承诺书' : '安全生产责任状' }}</h1>
-      <div v-if="dialogData.TYPE === '0'">{{ dialogData.COVERPEOPLE }}：</div>
+      <div v-if="dialogData.TYPE === '0'">{{ dialogData.COVERPEOPLE }}{{ dialogData.NICKNAME }}：</div>
       <div class="text">{{ dialogData.TEXT }}</div>
       <div class="collateral">
         <div v-for="(item,index) in dialogData.DETAIL" :key="index" class="item">
@@ -27,7 +27,7 @@
       <div :style="{alignItems:dialogData.FILEPATH ? 'flex-end' : 'flex-start'}" class="footer">
         <!--        <div v-if="dialogData.TYPE === '0'" :style="{marginBottom:dialogData.FILEPATH ? '50px' : '0px'}" class="hairdresser">承诺单位(盖章)：</div>-->
         <div v-if="dialogData.TYPE === '1'" class="hairdresser">
-          <div v-if="!dialogData.ORDER.FILEPATH" class="promiser">发状人：{{ dialogData.COVERPEOPLE }}</div>
+          <div v-if="!dialogData.ORDER.FILEPATH" class="promiser">发状人：{{ dialogData.COVERPEOPLE }}{{ dialogData.NICKNAME }}</div>
           <div v-if="dialogData.ORDER.FILEPATH" class="promiser">：
             <span :style="{marginRight:dialogData.ORDER.FILEPATH ? '0px' : '105px'}">
               发状人：
@@ -37,6 +37,11 @@
 <!--          <div class="time">{{ moment(dialogData.CREATTIME) }}</div>-->
         </div>
         <div class="respondent">
+          <div class="promiser">
+            <span :style="{marginRight:dialogData.FILEPATH ? '0px' : '105px'}">
+             承诺期限: {{ dialogData.PROMISE_TERM_START }} - {{ dialogData.PROMISE_TERM_END }}
+            </span>
+          </div>
           <div class="promiser">
             <span :style="{marginRight:dialogData.FILEPATH ? '0px' : '105px'}">
               {{ dialogData.TYPE === '0' ? '承诺人(本人签字)' : '受状人' }}：

src/views/security_commitment/promise_book_issued/components/see.vue

@@ -45,6 +45,8 @@
         <td>{{ item.DEPTNAME }}</td>
         <td class="bbg">{{ '人员' + (index + 1) }}</td>
         <td>{{ item.USERNAME && item.USERNAME.join('、') }}</td>
+        <td class="bbg">{{  '岗位' + (index + 1)  }}</td>
+        <td>{{ item.NICKNAME }}</td>
       </tr>
     </table>
     <el-divider v-if="form.TYPE != '1'" content-position="left">承诺内容</el-divider>
@@ -136,6 +138,7 @@ export default {
             DEPTNAME: data.coverpeople[i].DEPTNAME,
             POST_ID: data.coverpeople[i].POST_ID,
             POSTNAME: data.coverpeople[i].POSTNAME,
+            NICKNAME: data.coverpeople[i].NICKNAME,
             USER_ID: [],
             USERNAME: [],
             id: data.coverpeople[i].PROMISEPEOPLE_ID