安全责任书变更

.env.development

@@ -6,7 +6,7 @@ ENV = 'development'
 
 # 开发环境
 #测试地址
-VUE_APP_BASE_API = 'http://47.92.229.224:8080'
+# VUE_APP_BASE_API = 'http://47.92.229.224:8080'
 #罗俊
 #VUE_APP_BASE_API = 'http://10.87.21.60:8080'
 #罗伟
@@ -18,7 +18,7 @@ VUE_APP_BASE_API = 'http://47.92.229.224:8080'
 # VUE_APP_BASE_API = 'http://localhost:8080'
 # 55环境
 # VUE_APP_BASE_API = 'http://10.87.21.107:8080'
-# VUE_APP_BASE_API = 'http://localhost:8080'
+VUE_APP_BASE_API = 'http://localhost:8080'
 # 开发环境
 # VUE_APP_BASE_API = 'http://10.87.21.103:8080'
 # 路由懒加载

src/views/safetyBook/newBook/dialog.des.vue

@@ -24,7 +24,7 @@
             :label-style="labelStyle"
             :contentStyle="content_style"
           >
-          <el-descriptions-item
+            <el-descriptions-item
               labelClassName="gx_info_label"
               label="签署层级"
             >
@@ -56,8 +56,24 @@
             <el-descriptions-item
               labelClassName="gx_info_label"
               label="甲方机构"
+              v-if="formData.type == 1 || formData.type == 3"
             >
-              {{ formData.partyAOrg }}
+              {{ formData.partyAOrgName }}
+            </el-descriptions-item>
+            <el-descriptions-item
+              labelClassName="gx_info_label"
+              label="甲方机构"
+              v-if="formData.type == 2"
+            >
+              <tree-select
+                :disabled="true"
+                v-model="formData.partyAOrg"
+                :options="deptOptions"
+                :show-count="true"
+                :normalizer="tenantIdnormalizer"
+                :props="{ checkStrictly: true, label: 'shortName' }"
+                placeholder="请选择乙方所属机构"
+              />
             </el-descriptions-item>
             <el-descriptions-item labelClassName="gx_info_label" label="乙方">
               {{ formData.partyB }}
@@ -65,6 +81,22 @@
             <el-descriptions-item
               labelClassName="gx_info_label"
               label="乙方机构"
+              v-if="formData.type == 1 || formData.type == 3"
+            >
+              <tree-select
+                :disabled="true"
+                v-model="formData.partyBOrg"
+                :options="deptOptions"
+                :show-count="true"
+                :normalizer="tenantIdnormalizer"
+                :props="{ checkStrictly: true, label: 'shortName' }"
+                placeholder="请选择乙方所属机构"
+              />
+            </el-descriptions-item>
+            <el-descriptions-item
+              labelClassName="gx_info_label"
+              label="乙方机构"
+              v-if="formData.type == 2"
             >
               {{ formData.partyBOrgName }}
             </el-descriptions-item>
@@ -82,24 +114,24 @@
               labelClassName="gx_info_label"
               label="签署文件"
             >
-            <div
-              v-for="(file, index) in formData.files"
-              :key="index"
-              class="container"
-            >
-              <el-image
-                class="item"
-                v-if="isPic(file.url)"
-                :src="file.url"
-                :preview-src-list="[file.url]"
-                fit="contain"
-              ></el-image>
-              <div v-else="isPic(file.url)">
-                <el-link :href="file.url" :underline="false" target="_blank">
-                  <span class="el-icon-document"> {{ file.name }} </span>
-                </el-link>
+              <div
+                v-for="(file, index) in formData.files"
+                :key="index"
+                class="container"
+              >
+                <el-image
+                  class="item"
+                  v-if="isPic(file.url)"
+                  :src="file.url"
+                  :preview-src-list="[file.url]"
+                  fit="contain"
+                ></el-image>
+                <div v-else="isPic(file.url)">
+                  <el-link :href="file.url" :underline="false" target="_blank">
+                    <span class="el-icon-document"> {{ file.name }} </span>
+                  </el-link>
+                </div>
               </div>
-            </div>
             </el-descriptions-item>
           </el-descriptions>
         </el-form>
@@ -127,7 +159,7 @@ import { deptTreeSelect } from "@/api/system/public";
 //   import DialogSelect from "./dialog.sign";
 import dayjs from "dayjs";
 export default {
-  dicts: ["safety_book_type","sign_level"],
+  dicts: ["safety_book_type", "sign_level"],
   data() {
     return {
       labelStyle: {

src/views/safetyBook/newBook/dialog.edit.vue

@@ -58,27 +58,45 @@
             <div>
               <el-input
                 v-model="formData.partyA"
-                placeholder="请输入甲方:"
+                placeholder="请输入甲方姓名:"
               ></el-input>
             </div>
           </el-form-item>
-          <el-form-item prop="partyAOrg" label="甲方机构:">
+          <el-form-item prop="partyAOrgName" label="甲方机构:" v-if="formData.type==1||formData.type==3">
             <div>
               <el-input
-                v-model="formData.partyAOrg"
-                placeholder="请输入甲方机构:"
+                v-model="formData.partyAOrgName"
+                placeholder="请输入甲方机构"
               ></el-input>
             </div>
           </el-form-item>
-          <el-form-item prop="partyB" label="乙方:">
+          <el-form-item prop="partyAOrg" label="甲方机构:" v-if="formData.type==2">
+            <tree-select
+              v-model="formData.partyAOrg"
+              :options="deptOptions"
+              :show-count="true"
+              :normalizer="tenantIdnormalizer"
+              :props="{ checkStrictly: true, label: 'shortName' }"
+              placeholder="请选择乙方所属机构"
+            />
+          </el-form-item>
+          <el-form-item prop="partyB" label="乙方姓名:">
             <div>
               <el-input
                 v-model="formData.partyB"
-                placeholder="请输入乙方:"
+                placeholder="请输入乙方"
+              ></el-input>
+            </div>
+          </el-form-item>
+          <el-form-item prop="partyBOrgName" label="乙方机构:" v-if="formData.type==2">
+            <div>
+              <el-input
+                v-model="formData.partyBOrgName"
+                placeholder="请输入甲方机构"
               ></el-input>
             </div>
           </el-form-item>
-          <el-form-item prop="partyBOrg" label="乙方机构:">
+          <el-form-item prop="partyBOrg" label="乙方机构:" v-if="formData.type==1||formData.type==3">
             <tree-select
               v-model="formData.partyBOrg"
               :options="deptOptions"
@@ -156,13 +174,15 @@ export default {
       //修改新增中的机构树
       deptOptions: [],
       formDataRules: {
-    
+        signLevel: [{ required: true, message: "请选择签署层级" }],
         type: [{ required: true, message: "请选择签署责任书类型" }],
         year: [{ required: true, message: "请选择所属年度" }],
-        partyA: [{ required: true, message: "请输入甲方" }],
-        partyAOrg: [{ required: true, message: "请输入甲方机构" }],
-        partyB: [{ required: true, message: "请输入乙方" }],
-        partyBOrg: [{ required: true, message: "请输入乙方机构" }],
+        partyA: [{ required: true, message: "请输入甲方姓名" }],
+        partyAOrg: [{ required: true, message: "请选择甲方机构", trigger: "change" }],
+        partyAOrgName: [{ required: true, message: "请输入甲方机构" }],
+        partyB: [{ required: true, message: "请输入乙方姓名" }],
+        partyBOrg: [{ required: true, message: "请选择乙方机构", trigger: "change" }],
+        partyBOrgName: [{ required: true, message: "请输入乙方机构" }],
         time: [{ required: true, message: "请选择时间" }],
         files: [{ required: true, message: "请上传责任书" }],
       },

src/views/safetyBook/newBook/index.vue

@@ -115,7 +115,7 @@
         </el-table-column>
         <el-table-column label="所属年份" align="center" prop="year" />
         <el-table-column label="甲方" align="left" prop="partyA" />
-        <el-table-column label="甲方机构" align="left" prop="partyAOrg" />
+        <el-table-column label="甲方机构" align="left" prop="partyAOrgName" />
         <el-table-column label="乙方" align="left" prop="partyB" />
 
         <el-table-column label="乙方机构" align="left" prop="partyBOrgName" />