调整安全责任书

src/views/resumption/plan/dialog.edit.vue

@@ -217,6 +217,20 @@
             :selectable="handleSelectable"
           ></el-table-column>
 
+
+          <el-table-column prop="ruleName" label="履职手册">
+          </el-table-column>
+          <el-table-column prop="itemName" label="履职项"> </el-table-column>
+          <el-table-column prop="pointName" label="履职内容" width="300px">
+            <template slot-scope="scope">
+              <pre>{{ scope.row.pointName }}</pre>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="false" prop="ofOrgId" label="所属机构id">
+          </el-table-column>
+          <el-table-column prop="areaName" label="履职区域"> </el-table-column>
+          <el-table-column prop="checkName" label="履职点位" v-if="false">
+          </el-table-column>
           <el-table-column label="是否扫描">
             <template v-slot="{ row }">
               <el-switch
@@ -240,19 +254,6 @@
               </el-switch>
             </template>
           </el-table-column>
-          <el-table-column prop="ruleName" label="履职手册">
-          </el-table-column>
-          <el-table-column prop="itemName" label="履职项"> </el-table-column>
-          <el-table-column prop="pointName" label="履职内容" width="300px">
-            <template slot-scope="scope">
-              <pre>{{ scope.row.pointName }}</pre>
-            </template>
-          </el-table-column>
-          <el-table-column v-if="false" prop="ofOrgId" label="所属机构id">
-          </el-table-column>
-          <el-table-column prop="areaName" label="履职区域"> </el-table-column>
-          <el-table-column prop="checkName" label="履职点位" v-if="false">
-          </el-table-column>
           <el-table-column label="操作">
             <template v-slot="{ row }">
               <el-button

src/views/safetyBook/dialog.des.vue

@@ -4,7 +4,7 @@
       :title="id ? '安全责任书存档记录详情' : '新增安全责任书存档记录'"
       :visible.sync="isShow"
       @close="onHide"
-      width="800px"
+      width="1200px"
     >
       <div class="page-body">
         <el-form
@@ -85,14 +85,18 @@
           style="width: 100%; margin-top: 10px"
           height="500px"
         >
-          <el-table-column prop="names" label="签署人">
+          <!-- <el-table-column prop="names" label="签署人">
             <template slot-scope="scope">
               <template v-for="item in scope.row.names">
                 {{ item }}
                 <br />
               </template>
             </template>
-          </el-table-column>
+          </el-table-column> -->
+          <el-table-column prop="partyA" label="甲方"> </el-table-column>
+          <el-table-column prop="partyAOrg" label="甲方机构"> </el-table-column>
+          <el-table-column prop="partyB" label="乙方"> </el-table-column>
+          <el-table-column prop="partyBOrg" label="乙方机构"> </el-table-column>
           <el-table-column prop="time" label="签署时间">
             <template slot-scope="r">
               {{ r.row.time ? dayjs(r.row.time).format("YYYY年MM月DD日") : "" }}

src/views/safetyBook/dialog.edit.vue

@@ -4,7 +4,7 @@
       :title="id ? '编辑安全责任书存档记录' : '新增安全责任书存档记录'"
       :visible.sync="isShow"
       @close="onHide"
-      width="800px"
+      width="1200px"
     >
       <div class="page-body">
         <el-form
@@ -16,14 +16,14 @@
           label-width="180px"
           label-prefix=":"
         >
-          <el-form-item prop="orgId" label="签署人所在机构:">
+          <el-form-item prop="orgId" label="乙方所属机构:">
             <tree-select
               v-model="formData.orgId"
               :options="deptOptions"
               :show-count="true"
               :normalizer="tenantIdnormalizer"
               :props="{ checkStrictly: true, label: 'shortName' }"
-              placeholder="请选择签署人所在机构"
+              placeholder="请选择乙方所属机构"
             />
           </el-form-item>
           <el-form-item label="所属年度:" prop="year">
@@ -58,14 +58,18 @@
           style="width: 100%; margin-top: 10px"
           height="500px"
         >
-          <el-table-column prop="names" label="签署人">
+          <!-- <el-table-column prop="names" label="签署人">
             <template slot-scope="scope">
               <template v-for="item in scope.row.names">
                 {{ item }}
                 <br />
               </template>
             </template>
-          </el-table-column>
+          </el-table-column> -->
+          <el-table-column prop="partyA" label="甲方"> </el-table-column>
+          <el-table-column prop="partyAOrg" label="甲方机构"> </el-table-column>
+          <el-table-column prop="partyB" label="乙方"> </el-table-column>
+          <el-table-column prop="partyBOrg" label="乙方机构"> </el-table-column>
           <el-table-column prop="time" label="签署时间">
             <template slot-scope="r">
               {{ r.row.time ? dayjs(r.row.time).format("YYYY年MM月DD日") : "" }}

src/views/safetyBook/dialog.sign.vue

@@ -16,7 +16,39 @@
           label-width="130px"
           label-prefix=":"
         >
-          <el-form-item prop="userIds" label="签署人:">
+        <el-form-item prop="partyA" label="甲方:">
+            <div>
+              <el-input
+                v-model="formData.partyA"
+                placeholder="请输入甲方:"
+              ></el-input>
+            </div>
+          </el-form-item>
+          <el-form-item prop="partyAOrg" label="甲方机构:">
+            <div>
+              <el-input
+                v-model="formData.partyAOrg"
+                placeholder="请输入甲方机构:"
+              ></el-input>
+            </div>
+          </el-form-item>
+          <el-form-item prop="partyB" label="乙方:">
+            <div>
+              <el-input
+                v-model="formData.partyB"
+                placeholder="请输入乙方:"
+              ></el-input>
+            </div>
+          </el-form-item>
+          <el-form-item prop="partyBOrg" label="乙方机构:">
+            <div>
+              <el-input
+                v-model="formData.partyBOrg"
+                placeholder="请输入乙方机构:"
+              ></el-input>
+            </div>
+          </el-form-item>
+          <!-- <el-form-item prop="userIds" label="签署人:">
             <div>
               <el-input
                 :readonly="true"
@@ -25,7 +57,7 @@
               ></el-input>
               <el-button @click="selectUser">选择</el-button>
             </div>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item prop="time" label="签署时间:">
             <el-date-picker
               v-model="formData.time"
@@ -81,6 +113,10 @@ export default {
       isShow: false,
       formData: this.reset(),
       formDataRules: {
+        partyA: [{ required: true, message: "请输入甲方" }],
+        partyAOrg: [{ required: true, message: "请输入甲方机构" }],
+        partyB: [{ required: true, message: "请输入乙方" }],
+        partyBOrg: [{ required: true, message: "请输入乙方机构" }],
         userIds: [{ required: true, message: "请选择用户" }],
         time: [{ required: true, message: "请选择时间" }],
         files: [{ required: true, message: "请上传责任书" }],
@@ -128,6 +164,10 @@ export default {
         time: null,
         files: [],
         names: [],
+        partyA:null,
+        partyAOrg:null,
+        partyB:null,
+        partyBOrg:null,
       };
     },
     async show(row) {