相关页面bug修改

1、相关方app样式混乱更改
2、相关方流程审批bug修复
2024-07-01 18:04:23 +08:00 · 2024-06-13 18:06:18 +08:00 · 2024-06-13 16:36:23 +08:00 · 2024-06-13 15:52:27 +08:00 · 2024-06-07 09:29:05 +08:00 · 2024-06-06 17:33:07 +08:00
8 changed files with 858 additions and 360 deletions
--- a/api/index.js
+++ b/api/index.js
@ -27,8 +27,8 @@ export const getUserInfo = (params) => post("/app/user/getDetailByUserIdAndCorpI
 export const setUserInfo = (params) => post("/app/user/edit", params) //修改用户信息
 export const getCertificateInformationList = (params) => post("/app/specialUser/list", params) //证书信息列表
 export const getCertificateInformationView = (params) => post("/app/specialUser/goEdit", params) //证书信息查看
-export const setCertificateInformationAdd = (params) => upload("/app/specialUser/add", params) //证书信息添加
-export const setCertificateInformationEdit = (params) => upload("/app/specialUser/edit", params) //证书信息修改
+export const setCertificateInformationAdd = (params) => uploads("/app/specialUser/add", params) //证书信息添加
+export const setCertificateInformationEdit = (params) => uploads("/app/specialUser/edit", params) //证书信息修改
 export const setCertificateInformationEditPost = (params) => post("/app/specialUser/edit", params) //证书信息修改
 export const getDeptTree = (params) => post("/api/department/listzTree", params) //用户信息
 export const getEMPLOYMENTAPPLYMANAGEMENTID = (params) => post("/app/user/getEMPLOYMENTAPPLYMANAGEMENTID",params)//获取EMPLOYMENTAPPLYMANAGEMENTID
--- a/pages/certificate_information/add.vue
+++ b/pages/certificate_information/add.vue
@ -2,7 +2,7 @@
  <view class="content">
    <view class="card">
      <u--form labelPosition="left" :model="form" :rules="rules" ref="form" labelWidth="100px">
-        <u-form-item label="证书图片" prop="fileList" borderBottom required>
+        <u-form-item label="证书正面图片" prop="fileList" borderBottom required>
          <u-upload
              :fileList="form.fileList"
              @afterRead="fnAfterRead"
@ -11,6 +11,15 @@
              previewFullImage
          ></u-upload>
        </u-form-item>
+        <u-form-item label="证书反面图片" prop="fileListBack" borderBottom required>
+          <u-upload
+              :fileList="form.fileListBack"
+              @afterRead="fnAfterRead1"
+              @delete="fnDeletePic1"
+              :maxCount="1"
+              previewFullImage
+          ></u-upload>
+        </u-form-item>
        <u-form-item label="姓名" prop="NAME" borderBottom required>
          <u--input v-model="form.NAME" border="none" disabled disabledColor="#ffffff"></u--input>
        </u-form-item>
@ -105,6 +114,7 @@ export default {
      reviewTimeValue: new Date().toString(),
      form: {
        fileList: [],
+        fileListBack: [],
        NAME: '',
        SEX_NAME: '',
        PHONE: '',
@ -122,95 +132,63 @@ export default {
        REVIEW_TIME: ''
      },
      rules: {
-        // fileList: {
-        //   type: 'array',
-        //   required: true,
-        //   message: '请上传证书图片',
-        //   trigger: ['change']
-        // },
-        // NAME: {
-        //   required: true,
-        //   message: '请填写姓名',
-        //   trigger: ['blur']
-        // },
-        // SEX_NAME: {
-        //   required: true,
-        //   message: '请选择性别',
-        //   trigger: ['change']
-        // },
-        // PHONE: [
-        //   {
-        //     required: true,
-        //     message: '请填写手机号',
-        //     trigger: ['blur']
-        //   },
-        //   {
-        //     validator: (rule, value, callback) => {
-        //       return uni.$u.test.mobile(value);
-        //     },
-        //     message: '手机号格式不正确',
-        //     trigger: ['blur'],
-        //   },
-        // ],
-        // CARD_ID: [
-        //   {
-        //     required: true,
-        //     message: '请填写身份证号',
-        //     trigger: ['blur']
-        //   },
-        //   {
-        //     validator: (rule, value, callback) => {
-        //       return uni.$u.test.idCard(value);
-        //     },
-        //     message: '身份证号格式不正确',
-        //     trigger: ['blur'],
-        //   },
-        // ],
-        // CER_TYPE_NAME: {
-        //   required: true,
-        //   message: '请选择证书类型',
-        //   trigger: ['change']
-        // },
-        // CERTIFICATE: {
-        //   required: true,
-        //   message: '请填写证书名称',
-        //   trigger: ['change']
-        // },
-        // SPECIAL_NUMBER: {
-        //   required: true,
-        //   message: '请填写证书编号',
-        //   trigger: ['blur']
-        // },
-        // JOBS_TYPE: {
-        //   required: true,
-        //   message: '请填写工种',
-        //   trigger: ['change']
-        // },
-        // specialName: {
-        //   required: true,
-        //   message: '请选择作业类别',
-        //   trigger: ['change']
-        // },
-        // operationName: {
-        //   required: true,
-        //   message: '请选择操作项目',
-        //   trigger: ['change']
-        // },
-        // ISSUING_AUTHORITY: {
-        //   required: true,
-        //   message: '请填写发证机关',
-        //   trigger: ['blur']
-        // },
-        // VALIDITY_TIME_START: {
-        //   required: true,
-        //   message: '请选择有效期开始时间',
-        //   trigger: ['change']
-        // },
-        // VALIDITY_TIME_END: {
-        //   required: true,
-        //   message: '请选择有效期结束时间',
-        //   trigger: ['change']
-        // },
+        fileList: {
+          type: 'array',
+          required: true,
+          message: '请上传证书图片',
+          trigger: ['change']
+        },
+        fileListBack: {
+          type: 'array',
+          required: true,
+          message: '请上传证书图片',
+          trigger: ['change']
+        },
+        CER_TYPE_NAME: {
+          required: true,
+          message: '请选择证书类型',
+          trigger: ['change']
+        },
+        CERTIFICATE: {
+          required: true,
+          message: '请填写证书名称',
+          trigger: ['change']
+        },
+        SPECIAL_NUMBER: {
+          required: true,
+          message: '请填写证书编号',
+          trigger: ['blur']
+        },
+        JOBS_TYPE: {
+          required: true,
+          message: '请填写工种',
+          trigger: ['change']
+        },
+        specialName: {
+          required: true,
+          message: '请选择作业类别',
+          trigger: ['change']
+        },
+        operationName: {
+          required: true,
+          message: '请选择操作项目',
+          trigger: ['change']
+        },
+        ISSUING_AUTHORITY: {
+          required: true,
+          message: '请填写发证机关',
+          trigger: ['blur']
+        },
+        VALIDITY_TIME_START: {
+          required: true,
+          message: '请选择有效期开始时间',
+          trigger: ['change']
+        },
+        VALIDITY_TIME_END: {
+          required: true,
+          message: '请选择有效期结束时间',
+          trigger: ['change']
+        },
        REVIEW_TIME: {
          required: true,
          message: '请选择复审时间',
@ -248,7 +226,14 @@ export default {
          SPECIAL_USER_ID: this.SPECIAL_USER_ID
        })
        this.form = {...this.form, ...resData.pd, CER_TYPE_NAME: resData.pd.typeName}
-        this.$set(this.form,'fileList',[{url:this.$filePath + resData.pd.FILEPATH,FILEPATH:this.$filePath + resData.pd.FILEPATH}])
+        this.$set(this.form, 'fileList', [{
+          url: this.$filePath + resData.pd.FILEPATH,
+          FILEPATH: this.$filePath + resData.pd.FILEPATH
+        }])
+        this.$set(this.form, 'fileListBack', [{
+          url: this.$filePath + resData.pd.FILEPATH_BACK,
+          FILEPATH: this.$filePath + resData.pd.FILEPATH_BACK
+        }])
        let resDatares = await getDataDictionary({DICTIONARIES_ID: this.form.SPECIAL_TYPE})
        this.certificateTypeColumnsOpe = [resDatares.list]
      } else {
@ -259,9 +244,9 @@ export default {
        this.fnCardIdDisassembly(this.form.CARD_ID)
        this.fnCardIdDisassembly(this.form.CARD_ID)
      }
-      if (this.form.SEX_NAME == '0') {
+      if (this.form.SEX_NAME === '0') {
        this.form.SEX_NAME = '男'
-      } else if (this.form.SEX_NAME == '1') {
+      } else if (this.form.SEX_NAME === '1') {
        this.form.SEX_NAME = '女'
      }
    },
@ -354,27 +339,73 @@ export default {
        this.form.fileList = []

      }
-      
+    },
+    fnAfterRead1(event) {
+      var houzhui = event.file.url.replace(/.+\./, "");
+      console.log(houzhui);
+      if (houzhui == "jpg" || houzhui == "png") {
+        this.form.fileListBack.push(event.file)
+      } else {
+        uni.$u.toast('图片格式不正确，请上传jpg格式图片或者png格式图片')
+        this.form.fileListBack = []
+      }
    },
    fnDeletePic(event) {
      this.form.fileList.splice(event.index, 1)
    },
+    fnDeletePic1(event) {
+      this.form.fileListBack.splice(event.index, 1)
+    },
    async fnSubmit() {
      console.info(this.$refs)
      this.$refs.form.validate().then(async () => {
        if(!this.SPECIAL_USER_ID){
+          let files = []
+          files.push({
+            name: 'FILEPATH',
+            file: this.form.fileList[0],
+            uri: this.form.fileList[0].url,
+          })
+
+          files.push({
+            name: 'FILEPATH_BACK',
+            file: this.form.fileListBack[0],
+            uri: this.form.fileListBack[0].url,
+          })
+
+          if (files.length !== 2){
+            uni.$u.toast('请上传证书正反面')
+            return
+          }
+
          await setCertificateInformationAdd({
-            filePath: this.form.fileList[0].url,
-            name: 'file',
+            files: files,
            formData: {
              ...this.form
            }
          })
        }else {
+          if (!this.form.fileList[0].FILEPATH || !this.form.fileListBack[0].FILEPATH) {
+            uni.$u.toast('1')
+            let files = []
            if (!this.form.fileList[0].FILEPATH){
+              files.push({
+                name: 'FILEPATH',
+                file: this.form.fileList[0],
+                uri: this.form.fileList[0].url,
+              })
+            }
+
+            if (!this.form.fileListBack[0].FILEPATH){
+              files.push({
+                name: 'FILEPATH_BACK',
+                file: this.form.fileListBack[0],
+                uri: this.form.fileListBack[0].url,
+              })
+            }
+
            await setCertificateInformationEdit({
-              filePath: this.form.fileList[0].url,
-              name: 'file',
+              files: files,
              formData: {
                ...this.form
              }
@ -387,13 +418,14 @@ export default {
          }

        }
-        uni.$u.toast('保存成功')
+        // uni.$u.toast('保存成功')
        setTimeout(()=>{
          uni.navigateBack()
        },2000)
      }).catch((e) => {
        console.info(e)
-        uni.$u.toast('请补全必填项')
+        // uni.$u.toast('请补全必填项')
+        uni.$u.toast(e)
      })
    }
  },
--- a/pages/certificate_information/view.vue
+++ b/pages/certificate_information/view.vue
@ -5,6 +5,7 @@
        <u-cell title="证书图片">
          <template #value>
            <u--image :src="info.FILEPATH" width="100upx" height="100upx" radius="10upx" @click="fnPreview"></u--image>
+            <u--image v-if="info.FILEPATH_BACK" :src="info.FILEPATH_BACK" width="100upx" height="100upx" radius="10upx" @click="fnPreview"></u--image>
          </template>
        </u-cell>
        <u-cell title="姓名" :value="info.NAME"></u-cell>
@ -46,6 +47,9 @@ export default {
      })
      this.info = resData.pd
      this.$set(this.info,'FILEPATH',this.$filePath + resData.pd.FILEPATH)
+      if (resData.pd.FILEPATH_BACK){
+        this.$set(this.info,'FILEPATH_BACK',this.$filePath + resData.pd.FILEPATH_BACK)
+      }
    },
    fnPreview() {
      uni.previewImage({
--- a/pages/mine/information/index.vue
+++ b/pages/mine/information/index.vue
@ -52,6 +52,27 @@
 						</view>
 					</template>
 				</u-cell>
+        <u-cell title="是否签订劳动合同" :value="info.IS_SIGN_LABOR_NAME"></u-cell>
+        <u-cell title="合同图片" v-if="info.IS_SIGN_LABOR==='1'">
+          <template #value>
+            <view v-for="(item,index) in contractFile" :key="index"
+                  style="display: flex;justify-content: space-between">
+              <u--image :src="item" width="100upx" height="100upx" style="margin-left: 10upx;"
+                        @click="fnPreview(contractFile)"></u--image>
+            </view>
+          </template>
+        </u-cell>
+        <u-cell title="是否缴纳商业保险" :value="info.ISPAY_NAME"></u-cell>
+        <u-cell title="商业保险单号" v-if="info.ISPAY==='1'" :value="info.ISPAY_NUMBER"></u-cell>
+        <u-cell title="保险图片" v-if="info.ISPAY==='1'">
+          <template #value>
+            <view v-for="(item,index) in insuranceFile" :key="index"
+                  style="display: flex;justify-content: space-between">
+              <u--image :src="item" width="100upx" height="100upx" style="margin-left: 10upx;"
+                        @click="fnPreview(insuranceFile)"></u--image>
+            </view>
+          </template>
+        </u-cell>
 				<u-cell title="是否按期缴纳工伤保险" :value="info.IS_INJURIES_PAY_NAME"></u-cell>
 				<u-cell title="工伤保险有效期" v-if="info.IS_INJURIES_PAY==='1'" :value="info.IS_INJURIES_PAY_TIME"></u-cell>
 				<u-cell title="工伤保险凭证" v-if="info.IS_INJURIES_PAY==='1'">
@ -63,6 +84,17 @@
 						</view>
 					</template>
 				</u-cell>
+        <u-cell title="岗位名称(工种)" :value="info.POST_ID"></u-cell>
+        <u-cell title="是否参加三级安全培训" :value="info.IS_LEVEL_THREE_NAME"></u-cell>
+        <u-cell title="三级安全培训照片" v-if="info.IS_LEVEL_THREE==='1'">
+          <template #value>
+            <view v-for="(item,index) in photosOfLevel" :key="index"
+                  style="display: flex;justify-content: space-between">
+              <u--image :src="item" width="100upx" height="100upx" style="margin-left: 10upx;"
+                        @click="fnPreview(photosOfLevel)"></u--image>
+            </view>
+          </template>
+        </u-cell>
 				<u-cell title="是否流动人员" :value="info.ISFLOW_NAME"></u-cell>
 			</u-cell-group>
 		</view>
@ -82,6 +114,9 @@
 				userCardIDPhotoFile: [],
 				socialPhotoFile: [],
 				injuriesPayTiemFile:[],
+        photosOfLevel:[],
+        contractFile:[],
+        insuranceFile: [],
 				EMPLOYMENT_APPLY_MANAGEMENT_ID:'',
 			}
 		},
@ -110,6 +145,9 @@
 				this.userCardIDPhotoFile = []
 				this.socialPhotoFile = []
 				this.injuriesPayTiemFile = []
+        this.contractFile = []
+        this.photosOfLevel = []
+        this.insuranceFile = []
 				let Employed =  await getEmployedBy({
 					showCount: 10,
 					currentPage: 1,
@ -136,6 +174,19 @@
 				for (let i = 0; i < resData.workInsurancePhotoFile.length; i++) {
 					this.injuriesPayTiemFile.push(this.$filePath + resData.workInsurancePhotoFile[i].FILEPATH)
 				}
+
+        for (let i = 0; i < resData.contractFile.length; i++) {
+          this.contractFile.push(this.$filePath + resData.contractFile[i].FILEPATH)
+        }
+
+        for (let i = 0; i < resData.photosOfLevel.length; i++) {
+          this.photosOfLevel.push(this.$filePath + resData.photosOfLevel[i].FILEPATH)
+        }
+
+        for (let i = 0; i < resData.insuranceFile.length; i++){
+          this.insuranceFile.push(this.$filePath + resData.insuranceFile[i].FILEPATH)
+        }
+
 				if (this.info.ISFLOW === '0') {
 					this.info.ISFLOW_NAME = '否'
 				} else if (this.info.ISFLOW === '1') {
@ -151,6 +202,21 @@
 				} else if (this.info.IS_INJURIES_PAY === '1') {
 					this.info.IS_INJURIES_PAY_NAME = '是'
 				}
+        if (this.info.IS_SIGN_LABOR === '0') {
+          this.info.IS_SIGN_LABOR_NAME = '否'
+        } else if (this.info.IS_SIGN_LABOR === '1') {
+          this.info.IS_SIGN_LABOR_NAME = '是'
+        }
+        if (this.info.IS_LEVEL_THREE === '0'){
+          this.info.IS_LEVEL_THREE_NAME = '否'
+        } else if (this.info.IS_LEVEL_THREE === '1'){
+          this.info.IS_LEVEL_THREE_NAME = '是'
+        }
+        if (this.info.ISPAY === '1'){
+          this.info.ISPAY_NAME = '是'
+        }else {
+          this.info.ISPAY_NAME = '否'
+        }
 				if (resData.userPhotoFile.length > 0) {
 					this.$set(this.info, 'userPhoto', this.$filePath + resData.userPhotoFile[0].FILEPATH)
 				}
--- a/pages/mine/information/update.vue
+++ b/pages/mine/information/update.vue
@ -23,9 +23,17 @@
 				</u-form-item>
 				<u-form-item label="身份证照片(正反面)" prop="userCardIDPhotoFile" borderBottom required
 					class="form-item-block">
+<!--					<u-upload class="mt-10" :fileList="form.userCardIDPhotoFile" @afterRead="fnAttIdPhotoAdd"-->
+<!--						@delete="fnAttIdPhotoDelete" multiple :maxCount="2" previewFullImage>-->
+<!--					</u-upload>-->
+          <view>
            <u-upload class="mt-10" :fileList="form.userCardIDPhotoFile" @afterRead="fnAttIdPhotoAdd"
                      @delete="fnAttIdPhotoDelete" multiple :maxCount="2" previewFullImage>
            </u-upload>
+            <view class="tip">
+              温馨提示：用户需上传身份证正反面（身份证照片数量需≥2张），才能进行人员培训
+            </view>
+          </view>
 				</u-form-item>
 				<u-form-item label="民族" prop="NATIONALITY" borderBottom required
 					@click="singleChoiceClick('NATIONALITY')">
@ -46,50 +54,127 @@
 					<u--input v-model="form.DEGREE_OF_EDUCATION_NAME" border="none" disabled disabledColor="#ffffff">
 					</u--input>
 				</u-form-item>
+        <view>
          <u-form-item label="婚姻状况" prop="MARITALSTATUS" borderBottom required
                       @click="singleChoiceClick('MARITALSTATUS')">
            <u--input v-model="form.MARITALSTATUS_NAME" border="none" disabled disabledColor="#ffffff">
            </u--input>
          </u-form-item>
+        </view>
+        <view>
          <u-form-item label="政治面貌" prop="POLITICAL_STATUS" borderBottom required
                       @click="singleChoiceClick('POLITICAL_STATUS')">
            <u--input v-model="form.POLITICAL_STATUS_NAME" border="none" disabled disabledColor="#ffffff">
            </u--input>
          </u-form-item>
-				<u-form-item v-if="form.POLITICAL_STATUS == 'zhonggongdangyuan'" label="入党时间" prop="POLITICAL_STATUS" borderBottom required
+        </view>
+        <view>
+          <u-form-item v-if="form.POLITICAL_STATUS == 'zhonggongdangyuan'" label="入党时间" prop="POLITICAL_STATUS"
+                       borderBottom required
                       @click="fnShowDatePicke('POLITICAL_TIME')">
            <u--input v-model="form.POLITICAL_TIME" border="none" disabled disabledColor="#ffffff">
            </u--input>
          </u-form-item>
+        </view>
+        <view>
          <u-form-item label="是否缴纳社保" prop="IS_SOCIAL_NAME" borderBottom required
                       @click="fnShowIsSocial">
            <u--input v-model="form.IS_SOCIAL_NAME" border="none" disabled disabledColor="#ffffff"
                      inputAlign="right"></u--input>
          </u-form-item>
-				<u-form-item v-if="form.IS_SOCIAL=='1'" label="社会保障号" prop="SOCIAL_NUMBER" borderBottom required>
+        </view>
+        <view>
+          <u-form-item v-if="form.IS_SOCIAL==='1'" label="社会保障号码" prop="SOCIAL_NUMBER" borderBottom required>
            <u--input border="none" v-model="form.SOCIAL_NUMBER"></u--input>
          </u-form-item>
-				<u-form-item v-if="form.IS_SOCIAL=='1'" label="社会保障卡(正反面)" prop="socialPhotoFile" borderBottom required class="form-item-block">
+        </view>
+        <view>
+          <u-form-item v-if="form.IS_SOCIAL==='1'" label="社会保障卡" prop="socialPhotoFile" borderBottom required
+                       class="form-item-block">
            <u-upload class="mt-10" :fileList="form.socialPhotoFile" @afterRead="fnAttSocialAdd"
-						@delete="fnAttSocialDelete" multiple :maxCount="2" previewFullImage>
-					</u-upload>
+                      @delete="fnAttSocialDelete" multiple :maxCount="2" previewFullImage></u-upload>
          </u-form-item>
+        </view>
+        <view>
+          <u-form-item label="是否缴纳保险" prop="IS_BF_NAME" borderBottom required @click="fnShowBf">
+            <u--input v-model="form.IS_BF_NAME" border="none" disabled disabledColor="#ffffff"
+                      inputAlign="right"></u--input>
+          </u-form-item>
+        </view>
+        <view>
+          <u-form-item label="是否签订劳动合同" prop="IS_SIGN_LABOR_NAME" borderBottom required
+                       @click="fnShowIsSignLabor">
+            <u--input v-model="form.IS_SIGN_LABOR_NAME" border="none" disabled disabledColor="#ffffff"
+                      inputAlign="right"></u--input>
+          </u-form-item>
+        </view>
+        <view>
+          <u-form-item v-if="form.IS_SIGN_LABOR==='1'" label="合同图片" prop="contractFile" borderBottom required
+                       class="form-item-block">
+            <u-upload class="mt-10" :fileList="form.contractFile" @afterRead="fnIsSignLaborAdd"
+                      @delete="fnIsSignLaborDelete" multiple :maxCount="4" previewFullImage></u-upload>
+          </u-form-item>
+        </view>
+        <view>
+          <u-form-item label="是否缴纳商业保险" prop="ISPAY_NAME" borderBottom required @click="fnShowIsPay">
+            <u--input v-model="form.ISPAY_NAME" border="none" disabled disabledColor="#ffffff"
+                      inputAlign="right"></u--input>
+          </u-form-item>
+        </view>
+        <view>
+          <u-form-item v-if="form.ISPAY==='1'" label="商业保险单号" prop="ISPAY_NUMBER" borderBottom required>
+            <u--input border="none" v-model="form.ISPAY_NUMBER"></u--input>
+          </u-form-item>
+        </view>
+        <view>
+          <u-form-item v-if="form.ISPAY==='1'" label="保险图片" prop="insuranceFile" borderBottom required
+                       class="form-item-block">
+            <u-upload class="mt-10" :fileList="form.insuranceFile" @afterRead="fnIsPayAdd" @delete="fnIsPayDelete"
+                      multiple :maxCount="4" previewFullImage></u-upload>
+          </u-form-item>
+        </view>
+        <view>
          <u-form-item label="是否按期缴纳工伤保险" prop="IS_INJURIES_PAY_NAME" borderBottom required
                       @click="fnShowEmploymentInjuryInsurance">
            <u--input v-model="form.IS_INJURIES_PAY_NAME" border="none" disabled disabledColor="#ffffff"
                      inputAlign="right"></u--input>
          </u-form-item>
-				<u-form-item label="工伤保险有效期" v-if="form.IS_INJURIES_PAY==='1'" prop="<strong>IS_INJURIES_PAY_TIME</strong>" borderBottom
+        </view>
+        <view>
+          <u-form-item label="工伤保险有效期" v-if="form.IS_INJURIES_PAY==='1'" prop="IS_INJURIES_PAY_TIME" borderBottom
                       required @click="fnShowInjuriesPayTiemEducation">
            <u--input v-model="form.IS_INJURIES_PAY_TIME" border="none" disabled disabledColor="#ffffff"
                      inputAlign="right"></u--input>
          </u-form-item>
+        </view>
+        <view>
          <u-form-item label="上传工伤保险凭证" prop="injuriesPayTiemFile" borderBottom required
                       v-if="form.IS_INJURIES_PAY==='1'" class="form-item-block">
            <u-upload class="mt-10" :fileList="form.injuriesPayTiemFile"
                      @afterRead="fnInjuriesPayTiemAttachmentsAfterRead" @delete="fnInjuriesPayTiemAttachmentsDelete"
                      multiple :maxCount="4" previewFullImage></u-upload>
          </u-form-item>
+        </view>
+        <view>
+          <u-form-item label="岗位名称(工种)" prop="POST_ID" borderBottom required>
+            <u--textarea border="none" v-model="form.POST_ID" autoHeight></u--textarea>
+          </u-form-item>
+        </view>
+        <view>
+          <u-form-item label="是否参加三级安全培训" prop="IS_LEVEL_THREE_NAME" borderBottom required
+                       @click="fnShowPhotosOfLevel">
+            <u--input v-model="form.IS_LEVEL_THREE_NAME" border="none" disabled disabledColor="#ffffff"
+                      inputAlign="right"></u--input>
+          </u-form-item>
+        </view>
+        <view>
+          <u-form-item v-if="form.IS_LEVEL_THREE === '1'" label="三级安全培训照片" prop="photosOfLevel" borderBottom
+                       required class="form-item-block">
+            <u-upload class="mt-10" :fileList="form.photosOfLevel" @afterRead="fnPhotosOfLevelAdd"
+                      @delete="fnPhotosOfLevelDelete" multiple :maxCount="4" previewFullImage>
+            </u-upload>
+          </u-form-item>
+        </view>
 				<u-form-item label="是否流动人员" prop="ISFLOW_NAME" borderBottom required
 							 @click="fnShowFloatingPersonnel">
 					<u--input v-model="form.ISFLOW_NAME" border="none" disabled disabledColor="#ffffff" inputAlign="right"></u--input>
@ -106,6 +191,15 @@
 			</u-picker>
 			<u-picker :show="showFloatingPersonnel" :columns="[[{name: '是', id: '1'}, {name: '否', id: '0'}]]" keyName="name"
 					  @confirm="fnFloatingPersonnelConfirm" @cancel="fnShowFloatingPersonnel"></u-picker>
+      <u-picker :show="showBf" :columns="[[{name: '是', id: '1'}, {name: '否', id: '0'}]]" keyName="name"
+                @confirm="fnBFConfirm" @cancel="fnShowBf"></u-picker>
+      <u-picker :show="showIsSignLabor" :columns="[[{name: '是', id: '1'}, {name: '否', id: '0'}]]" keyName="name"
+                @confirm="fnIsSignLaborConfirm" @cancel="fnShowIsSignLabor"></u-picker>
+      <u-picker :show="showPhotosOfLevel" :columns="[[{name: '是', id: '1'}, {name: '否', id: '0'}]]" keyName="name"
+                @confirm="fnShowPhotosOfLevelConfirm" @cancel="fnShowPhotosOfLevel"></u-picker>
+      <u-picker :show="showIsPay" :columns="[[{name: '是', id: '1'}, {name: '否', id: '0'}]]" keyName="name"
+                @confirm="fnShowIsPayConfirm" @cancel="fnShowIsPay"></u-picker>
+
 			<u-datetime-picker :show="showInjuriesPayTiem" v-model="IS_INJURIES_PAY_TIME" mode="date"
 				@confirm="fnShowInjuriesPayTiemConfirm" @cancel="fnShowInjuriesPayTiemEducation"></u-datetime-picker>
 			<u-button type="primary" text="保 存" class="mt-10" @click="$u.debounce(fnSubmit, 1000,true)"></u-button>
@ -144,13 +238,20 @@
 				degreeOfEducationColumns: [],
 				showPersonWorkType: false,
 				showFloatingPersonnel: false,
+        showBf: false,
+        showIsSignLabor: false,
+        showPhotosOfLevel: false,
+        showIsPay: false,
 				personWorkTypeColumns: [],
 				prePhotoId: [],
 				form: {
 					userPhoto: [],
 					userCardIDPhotoFile: [],
 					socialPhotoFile: [],
-					injuriesPayTiemFile: [], //工伤保险有效凭证
+          contractFile:[],
+					injuriesPayTiemFile: [],
+          photosOfLevel:[],
+          insuranceFile: [],
 					IS_INJURIES_PAY_TIME:'',
 					NAME: '',
 					USERNAME: '',
@ -169,6 +270,15 @@
 					ISFLOW_NAME: '',
 					IS_SOCIAL:'',
 					IS_SOCIAL_NAME:'',
+          IS_BF_NAME: '',
+          IS_BF: '',
+          IS_SIGN_LABOR: '',
+          IS_SIGN_LABOR_NAME: '',
+          POST_ID: '',
+          IS_LEVEL_THREE: '',
+          IS_LEVEL_THREE_NAME: '',
+          ISPAY: '',
+          ISPAY_NAME: ''
 				},
 				rules: {
 					userPhoto: {
@ -197,7 +307,7 @@
 					socialPhotoFile: {
 						type: 'array',
 						required: true,
-						message: '请上传设保卡正反照',
+						message: '请上传社保卡正反照',
 						trigger: ['change']
 					},
 					CARD_ID: [{
@ -267,14 +377,54 @@
 						message: '请选择工伤保险有效期',
 						trigger: ['change']
 					},
+          IS_BF_NAME:{
+            required: true,
+            message: '请选择是否是否缴纳保险',
+            trigger: ['change']
+          },
+          IS_SIGN_LABOR_NAME:{
+            required: true,
+            message: '请选择是否签订劳动合同',
+            trigger: ['change']
+          },
+          contractFile:{
+            type: 'array',
+            required: true,
+            message: '请上传劳动合同',
+            trigger: ['change']
+          },
+          insuranceFile:{
+            type: 'array',
+            required: true,
+            message: '请上传保险图片',
+            trigger: ['change']
+          },
+          POST_ID:{
+            required: true,
+            message: '请填写岗位',
+            trigger: ['change']
+          },
+          photosOfLevel:{
+            type: 'array',
+            required: true,
+            message: '请上传三级安全培训照片',
+            trigger: ['change']
+          },
+          IS_LEVEL_THREE_NAME:{
+            required: true,
+            message: '请选择是否为三级人员',
+            trigger: ['change']
+          },
+          ISPAY_NUMBER:{
+            required: true,
+            message: '请填写商业保单号',
+            trigger: ['change']
+          },
 				}
 			}
 		},
 		onLoad() {
 			this.fnGetData()
-			// this.fnGetDataDictionary('d7d80f08d73a4accbccf4fd3d8d1d867', 'degreeOfEducationColumns')
-			// this.fnGetDataDictionary('55484e491a5e442d839c4595380713ec', 'personWorkTypeColumns')
-
 		},
 		computed: {
 			userInfo() {
@ -330,20 +480,13 @@
 							if (event.file.id) {
 								// 准备删除的数据
 								this.prePhotoId.push(event.file.id)
-								// await removeUploadAttachments({
-								// 	IMGFILES_ID: event.file.id
-								// })
 							}
 							uni.showToast({
 								title: '操作成功',
 								duration: 2000
 							});
-							// var pages = getCurrentPages(); // 获取当前页面栈
-							// var prePage = pages[pages.length - 2]; // 上级页面
-							// prePage.$vm.reloadx();
 							this.form.userCardIDPhotoFile.splice(event.index, 1)
 						} else if (res.cancel) {
-							// console.log('用户点击取消');
 						}
 					}
 				});
@ -363,17 +506,11 @@
 						if (res.confirm) {
 							if (event.file.id) {
 								this.prePhotoId.push(event.file.id)
-								// await removeUploadAttachments({
-								// 	IMGFILES_ID: event.file.id
-								// })
 							}
 							uni.showToast({
 								title: '操作成功',
 								duration: 2000
 							});
-							// var pages = getCurrentPages(); // 获取当前页面栈
-							// var prePage = pages[pages.length - 2]; // 上级页面
-							// prePage.$vm.reloadx();
 							this.form.socialPhotoFile.splice(event.index, 1)
 						} else if (res.cancel) {
 							// console.log('用户点击取消');
@ -381,6 +518,87 @@
 					}
 				});
 			},
+      // 合同图片
+      fnIsSignLaborAdd(event) {
+        for (let i = 0; i < event.file.length; i++) {
+          this.form.contractFile.push(event.file[i])
+        }
+      },
+      // 合同图片删除
+      fnIsSignLaborDelete(event) {
+        uni.showModal({
+          title: '提示',
+          content: '确定删除吗',
+          success: async (res) => {
+            if (res.confirm) {
+              if (event.file.id) {
+                this.prePhotoId.push(event.file.id)
+              }
+              uni.showToast({
+                title: '操作成功',
+                duration: 2000
+              });
+              this.form.contractFile.splice(event.index, 1)
+            } else if (res.cancel) {
+              // console.log('用户点击取消');
+            }
+          }
+        });
+      },
+      // 合同图片
+      fnIsPayAdd(event) {
+        for (let i = 0; i < event.file.length; i++) {
+          this.form.insuranceFile.push(event.file[i])
+        }
+      },
+      // 合同图片删除
+      fnIsPayDelete(event) {
+        uni.showModal({
+          title: '提示',
+          content: '确定删除吗',
+          success: async (res) => {
+            if (res.confirm) {
+              if (event.file.id) {
+                this.prePhotoId.push(event.file.id)
+              }
+              uni.showToast({
+                title: '操作成功',
+                duration: 2000
+              });
+              this.form.insuranceFile.splice(event.index, 1)
+            } else if (res.cancel) {
+              // console.log('用户点击取消');
+            }
+          }
+        });
+      },
+      // 三级教育培训新增
+      fnPhotosOfLevelAdd(event) {
+        for (let i = 0; i < event.file.length; i++) {
+          this.form.photosOfLevel.push(event.file[i])
+        }
+      },
+      // 三级教育培训删除
+      fnPhotosOfLevelDelete(event) {
+        uni.showModal({
+          title: '提示',
+          content: '确定删除吗',
+          success: async (res) => {
+            if (res.confirm) {
+              if (event.file.id) {
+                this.prePhotoId.push(event.file.id)
+              }
+              uni.showToast({
+                title: '操作成功',
+                duration: 2000
+              });
+              this.form.photosOfLevel.splice(event.index, 1)
+            } else if (res.cancel) {
+              // console.log('用户点击取消');
+            }
+          }
+        });
+      },

 			async fnGetDataDictionary(DICTIONARIES_ID) {
 				let resData = await getDataDictionary({
@ -399,22 +617,46 @@
 			fnShowPersonWorkType() {
 				this.showPersonWorkType = !this.showPersonWorkType
 			},
-			// fnPersonWorkTypeConfirm(e) {
-			//   this.form.PERSON_WORK_TYPE = e.value[0].BIANMA
-			//   this.form.PERSON_WORK_TYPE_NAME = e.value[0].NAME
-			//   this.fnShowPersonWorkType()
-			// },
 			fnShowFloatingPersonnel() {
 				this.showFloatingPersonnel = !this.showFloatingPersonnel
 			},
-
+      fnShowBf(){
+        this.showBf = !this.showBf
+      },
+      fnShowIsSignLabor(){
+        this.showIsSignLabor = !this.showIsSignLabor
+      },
+      fnShowIsPay(){
+        this.showIsPay = !this.showIsPay
+      },
+      fnShowIsPayConfirm(e){
+        this.form.ISPAY = e.value[0].id
+        this.form.ISPAY_NAME = e.value[0].name
+        this.fnShowIsPay()
+      },
+      fnShowPhotosOfLevel(){
+        this.showPhotosOfLevel = !this.showPhotosOfLevel
+      },
+      fnShowPhotosOfLevelConfirm(e){
+        this.form.IS_LEVEL_THREE = e.value[0].id
+        this.form.IS_LEVEL_THREE_NAME = e.value[0].name
+        this.fnShowPhotosOfLevel()
+      },
 			fnFloatingPersonnelConfirm(e) {
 				this.form.ISFLOW = e.value[0].id
 				this.form.ISFLOW_NAME = e.value[0].name
 				this.fnShowFloatingPersonnel()
 			},
-
-
+      fnBFConfirm(e){
+        this.form.IS_BF = e.value[0].id
+        this.form.IS_BF_NAME = e.value[0].name
+        this.fnShowBf()
+      },
+      fnIsSignLaborConfirm(e){
+        this.form.IS_SIGN_LABOR = e.value[0].id
+        this.form.IS_SIGN_LABOR_NAME = e.value[0].name
+        this.fnShowIsSignLabor()
+      },
 			fnShowIsSocial() {
 				this.showIsSocial = !this.showIsSocial
 			},
@ -447,17 +689,11 @@
 						if (res.confirm) {
 							if (event.file.id) {
 								this.prePhotoId.push(event.file.id)
-								// await removeUploadAttachments({
-								// 	IMGFILES_ID: event.file.id
-								// })
 							}
 							uni.showToast({
 								title: '操作成功',
 								duration: 2000
 							});
-							// var pages = getCurrentPages(); // 获取当前页面栈
-							// var prePage = pages[pages.length - 2]; // 上级页面
-							// prePage.$vm.reloadx();
 							this.form.injuriesPayTiemFile.splice(event.index, 1)
 						} else if (res.cancel) {
 							// console.log('用户点击取消');
@ -547,26 +783,50 @@
 				}
 				this.form.PHONE = this.form.USERNAME
 				this.fnCardIdDisassembly(this.form.CARD_ID)
-				if (this.form.IS_SOCIAL === '0') {
-					this.form.IS_SOCIAL_NAME = '否'
-				} else if (this.form.IS_SOCIAL === '1') {
+				if (this.form.IS_SOCIAL === '1') {
 					this.form.IS_SOCIAL_NAME = '是'
+				} else {
+					this.form.IS_SOCIAL_NAME = '否'
 				}
-				if (this.form.IS_INJURIES_PAY === '0') {
-					this.form.IS_INJURIES_PAY_NAME = '否'
-				} else if (this.form.IS_INJURIES_PAY === '1') {
+				if (this.form.IS_INJURIES_PAY === '1') {
 					this.form.IS_INJURIES_PAY_NAME = '是'
+				} else {
+					this.form.IS_INJURIES_PAY_NAME = '否'
 				}
-				if (this.form.SEX_NAME == '0') {
+				if (this.form.SEX_NAME === '0') {
 					this.form.SEX_NAME = '男'
-				} else if (this.form.SEX_NAME == '1') {
+				} else if (this.form.SEX_NAME === '1') {
 					this.form.SEX_NAME = '女'
 				}
-				if (this.form.ISFLOW == '0') {
-					this.form.ISFLOW_NAME = '否'
-				} else if (this.form.ISFLOW == '1') {
+				if (this.form.ISFLOW === '1') {
 					this.form.ISFLOW_NAME = '是'
+				} else  {
+					this.form.ISFLOW_NAME = '否'
 				}
+
+        if (this.form.ISPAY === '1'){
+          this.form.ISPAY_NAME = '是'
+        }else {
+          this.form.ISPAY_NAME = '否'
+        }
+
+        if (this.form.IS_LEVEL_THREE === '1'){
+          this.form.IS_LEVEL_THREE_NAME = '是'
+        }else {
+          this.form.IS_LEVEL_THREE_NAME = '否'
+        }
+
+        if (this.form.IS_BF === '1'){
+          this.form.IS_BF_NAME = '是'
+        }else {
+          this.form.IS_BF_NAME = '否'
+        }
+        if (this.form.IS_SIGN_LABOR === '1'){
+          this.form.IS_SIGN_LABOR_NAME = '是'
+        }else {
+          this.form.IS_SIGN_LABOR_NAME = '否'
+        }
+
 				if (resData.userPhotoFile.length > 0) {
 					this.$set(this.form, 'userPhoto', [{
 						url: this.$filePath + resData.userPhotoFile[0].FILEPATH,
@ -600,7 +860,33 @@
 						this.form.injuriesPayTiemFile.push(obj)
 					})
 				}
-
+        if (resData.photosOfLevel.length > 0) {
+          resData.photosOfLevel.forEach(item => {
+            const obj = {
+              id: item.IMGFILES_ID,
+              url: this.$filePath + item.FILEPATH
+            }
+            this.form.photosOfLevel.push(obj)
+          })
+        }
+        if (resData.contractFile.length > 0) {
+          resData.contractFile.forEach(item => {
+            const obj = {
+              id: item.IMGFILES_ID,
+              url: this.$filePath + item.FILEPATH
+            }
+            this.form.contractFile.push(obj)
+          })
+        }
+        if (resData.insuranceFile.length > 0) {
+          resData.insuranceFile.forEach(item => {
+            const obj = {
+              id: item.IMGFILES_ID,
+              url: this.$filePath + item.FILEPATH
+            }
+            this.form.insuranceFile.push(obj)
+          })
+        }
 			},
 			fnAfterRead(event) {
 				this.form.userPhoto.push(event.file)
@ -617,17 +903,16 @@
 					}
 					if (await this.fnIDCardDeduplication()) return
 					if (await this.fnPhoneNumberDeduplication()) return
-					if (this.form.userCardIDPhotoFile.length != 2) {
+					if (this.form.userCardIDPhotoFile.length !== 2) {
 						uni.$u.toast('身份证照片需要两张')
 						return
 					}
 					if(this.form.IS_SOCIAL==='1'){
-						if (this.form.socialPhotoFile.length != 2) {
+						if (this.form.socialPhotoFile.length !== 2) {
 							uni.$u.toast('社保卡照片需要两张')
 							return
 						}
 					}
-
          let fileUrl = ''
 					// 删除点击删除的图片
 					for (let i = 0; i < this.prePhotoId.length; i++) {
@ -635,6 +920,7 @@
 							IMGFILES_ID: this.prePhotoId[i]
 						})
 					}
+          // 保存图片
 					for (let i = 0; i < this.form.userPhoto.length; i++) {
 						if (!this.form.userPhoto[i].FILEPATH) {
 							let resData = await setUploadAttachments({
@ -660,7 +946,6 @@
 							}
 						})
 					}
-
 					for (let i = 0; i < this.form.socialPhotoFile.length; i++) {
 						await setUploadAttachments({
 							filePath: this.form.socialPhotoFile[i].url,
@ -672,17 +957,51 @@
 							}
 						})
 					}
-					for (let i = 0; i < this.form.injuriesPayTiemFile.length; i++) { // 16上传工伤保险凭证
+					for (let i = 0; i < this.form.injuriesPayTiemFile.length; i++) {
 						await setUploadAttachments({
 							filePath: this.form.injuriesPayTiemFile[i].url,
 							name: 'files',
 							formData: {
 								TYPE: '16',
-								FOREIGN_KEY: this.userInfo.USER_ID,
-								CORPINFO_ID: this.CORPINFO_ID,
+								FOREIGN_KEY: this.form.EMPLOYMENT_APPLY_MANAGEMENT_ID,
+								CORPINFO_ID: this.userInfo.CORPINFO_ID,
 							}
 						})
 					}
+          for (let i = 0; i < this.form.photosOfLevel.length; i++) {
+            await setUploadAttachments({
+              filePath: this.form.photosOfLevel[i].url,
+              name: 'files',
+              formData: {
+                TYPE: '19',
+                FOREIGN_KEY: this.form.EMPLOYMENT_APPLY_MANAGEMENT_ID,
+                CORPINFO_ID: this.userInfo.CORPINFO_ID,
+              }
+            })
+          }
+          for (let i = 0; i < this.form.contractFile.length; i++) {
+            await setUploadAttachments({
+              filePath: this.form.contractFile[i].url,
+              name: 'files',
+              formData: {
+                TYPE: '10',
+                FOREIGN_KEY: this.form.EMPLOYMENT_APPLY_MANAGEMENT_ID,
+                CORPINFO_ID: this.userInfo.CORPINFO_ID,
+              }
+            })
+          }
+          for (let i = 0; i < this.form.insuranceFile.length; i++) {
+            await setUploadAttachments({
+              filePath: this.form.insuranceFile[i].url,
+              name: 'files',
+              formData: {
+                TYPE: '11',
+                FOREIGN_KEY: this.form.EMPLOYMENT_APPLY_MANAGEMENT_ID,
+                CORPINFO_ID: this.userInfo.CORPINFO_ID,
+              }
+            })
+          }
+          // 保存人员信息
 					await setUserInfo({
 						...this.form,
 						PHOTO: fileUrl
@ -723,5 +1042,9 @@
 </script>

 <style scoped>
-
+.tip {
+  color: red;
+  font-size: 12px;
+  margin-top: 5px;
+}
 </style>
--- a/pages/related_party_units/add.vue
+++ b/pages/related_party_units/add.vue
@ -33,10 +33,19 @@
 					<u--input v-model="form.CARD_ID" border="none" @blur="fnCardIdDisassembly" inputAlign="right">
 					</u--input>
 				</u-form-item>
-				<u-form-item label="身份证照片(录入身份证正、反彩色照片)" prop="userCardIDFileList" borderBottom required
-					class="form-item-block">
+<!--				<u-form-item label="身份证照片(录入身份证正、反彩色照片)" prop="userCardIDFileList" borderBottom required-->
+<!--					class="form-item-block">-->
+<!--					<u-upload class="mt-10" :fileList="form.userCardIDFileList" @afterRead="fnUserCardIDAttachmentsRead"-->
+<!--						@delete="fnInsuranceAttachmentsDelete" multiple :maxCount="2" previewFullImage></u-upload>-->
+<!--				</u-form-item>-->
+        <u-form-item label="身份证照片(录入身份证正、反彩色照片)" prop="userCardIDFileList" borderBottom required class="form-item-block">
+          <view>
            <u-upload class="mt-10" :fileList="form.userCardIDFileList" @afterRead="fnUserCardIDAttachmentsRead"
-						@delete="fnInsuranceAttachmentsDelete" multiple :maxCount="2" previewFullImage></u-upload>
+                      @delete="fnUserCardIDAttachmentsDelete" multiple :maxCount="2" previewFullImage></u-upload>
+            <view class="tip">
+              温馨提示：用户需上传身份证正反面（身份证照片数量需≥2张），才能进行人员培训
+            </view>
+          </view>
        </u-form-item>

 				<u-form-item label="民族" prop="NATIONALITY_NAME" borderBottom required @click="fnShowMizuOfEducation">
@ -59,10 +68,10 @@
 					<u--input v-model="form.POLITICAL_TIME" border="none" disabled disabledColor="#ffffff"
 						inputAlign="right"></u--input>
 				</u-form-item>
-				<u-form-item label="户口所在地" prop="HKLOCAL" borderBottom required class="form-item-block">
+        <u-form-item label="户口所在地" prop="HKLOCAL" borderBottom class="form-item-block">
          <u--textarea v-model="form.HKLOCAL" border="none" autoHeight></u--textarea>
        </u-form-item>
-				<u-form-item label="现住址" prop="ADDRESS" borderBottom required class="form-item-block">
+        <u-form-item label="现住址" prop="ADDRESS" borderBottom class="form-item-block">
          <u--textarea v-model="form.ADDRESS" border="none" autoHeight></u--textarea>
        </u-form-item>
 				<u-form-item label="联系电话" prop="PHONE" borderBottom required>
@ -78,22 +87,22 @@
 				<!--          &lt;!&ndash;     20230612改成输入框     &ndash;&gt;-->
 				<!--          <u&#45;&#45;input v-model="form.PERSON_WORK_TYPE" border="none" disabledColor="#ffffff" inputAlign="right"></u&#45;&#45;input>-->
 				<!--        </u-form-item>-->
-				<u-form-item label="本企业从业开始日期" prop="CORP_START_DATE" borderBottom required
-					@click="fnShowEnterpriseStartingDateOfEmployment">
-					<u--input v-model="form.CORP_START_DATE" border="none" disabled disabledColor="#ffffff"
-						inputAlign="right"></u--input>
-				</u-form-item>
+<!--				<u-form-item label="本企业从业开始日期" prop="CORP_START_DATE" borderBottom required-->
+<!--					@click="fnShowEnterpriseStartingDateOfEmployment">-->
+<!--					<u&#45;&#45;input v-model="form.CORP_START_DATE" border="none" disabled disabledColor="#ffffff"-->
+<!--						inputAlign="right"></u&#45;&#45;input>-->
+<!--				</u-form-item>-->
 				<!--     @click="fnShowPost"    -->
 				<u-form-item label="岗位名称" prop="POST_ID" borderBottom required>
 					<!--     20230612改成输入框     -->
 					<u--input v-model="form.POST_ID" border="none" disabledColor="#ffffff" inputAlign="right">
 					</u--input>
 				</u-form-item>
-				<u-form-item label="本岗位从业开始日期" prop="ENTRY_DATE" borderBottom required
-					@click="fnShowPostStartingDateOfEmployment">
-					<u--input v-model="form.ENTRY_DATE" border="none" disabled disabledColor="#ffffff"
-						inputAlign="right"></u--input>
-				</u-form-item>
+<!--				<u-form-item label="本岗位从业开始日期" prop="ENTRY_DATE" borderBottom required-->
+<!--					@click="fnShowPostStartingDateOfEmployment">-->
+<!--					<u&#45;&#45;input v-model="form.ENTRY_DATE" border="none" disabled disabledColor="#ffffff"-->
+<!--						inputAlign="right"></u&#45;&#45;input>-->
+<!--				</u-form-item>-->
 				<u-form-item label="是否缴纳社保" prop="IS_SOCIAL_NAME" borderBottom required
 					@click="fnShowIsSocial">
 					<u--input v-model="form.IS_SOCIAL_NAME" border="none" disabled disabledColor="#ffffff"
@ -106,6 +115,11 @@
 					<u-upload class="mt-10" :fileList="form.socialFileList" @afterRead="fnSocialAttachmentsRead"
 						@delete="fnSocialAttachmentsDelete" multiple :maxCount="2" previewFullImage></u-upload>
 				</u-form-item>
+        <u-form-item label="是否缴纳保险" prop="IS_BF_NAME" borderBottom required
+                     @click="fnShowInjuryInsurance">
+          <u--input v-model="form.IS_BF_NAME" border="none" disabled disabledColor="#ffffff"
+                    inputAlign="right"></u--input>
+        </u-form-item>
 				<u-form-item label="是否签署劳动合同" prop="IS_SIGN_LABOR_NAME" borderBottom required
 					@click="fnShowLaborContract">
 					<u--input v-model="form.IS_SIGN_LABOR_NAME" border="none" disabled disabledColor="#ffffff"
@ -153,6 +167,11 @@
 					<u--input v-model="form.IS_LEVEL_THREE_NAME" border="none" disabled disabledColor="#ffffff"
 						inputAlign="right"></u--input>
 				</u-form-item>
+        <u-form-item label="三级安全培训图片" prop="safetytraining" borderBottom required v-if="form.IS_LEVEL_THREE==='1'"
+                     class="form-item-block">
+          <u-upload class="mt-10" :fileList="form.safetytraining" @afterRead="fnSafetyTrainingAfterRead2"
+                    @delete="fnSafetyTrainingAttachmentsDelete" multiple :maxCount="4" previewFullImage></u-upload>
+        </u-form-item>
 				<!-- <u-form-item label="安全告知培训是否合格" prop="IS_SAFETY_TELL_NAME" borderBottom required
                     @click="fnShowAdmissionSafetyNotification">
          <u--input v-model="form.IS_SAFETY_TELL_NAME" border="none" disabled
@ -163,16 +182,16 @@
                     @click="fnShowSafetyTimeTraining">
          <u--input v-model="form.IS_SAFETY_TIME" border="none" disabled disabledColor="#ffffff" inputAlign="right"></u--input>
        </u-form-item> -->
-				<u-form-item label="身体状况是否适应本岗位工作" prop="IS_BODY_ADAPT_NAME" borderBottom required
-					@click="fnShowAdaptToTheJobPosition">
-					<u--input v-model="form.IS_BODY_ADAPT_NAME" border="none" disabled disabledColor="#ffffff"
-						inputAlign="right"></u--input>
-				</u-form-item>
-				<u-form-item label="是否特殊工种" prop="IS_SPECIAL_JOB_NAME" borderBottom required
-					@click="fnShowSpecialTypeOfWork">
-					<u--input v-model="form.IS_SPECIAL_JOB_NAME" border="none" disabled disabledColor="#ffffff"
-						inputAlign="right"></u--input>
-				</u-form-item>
+<!--				<u-form-item label="身体状况是否适应本岗位工作" prop="IS_BODY_ADAPT_NAME" borderBottom required-->
+<!--					@click="fnShowAdaptToTheJobPosition">-->
+<!--					<u&#45;&#45;input v-model="form.IS_BODY_ADAPT_NAME" border="none" disabled disabledColor="#ffffff"-->
+<!--						inputAlign="right"></u&#45;&#45;input>-->
+<!--				</u-form-item>-->
+<!--				<u-form-item label="是否特殊工种" prop="IS_SPECIAL_JOB_NAME" borderBottom required-->
+<!--					@click="fnShowSpecialTypeOfWork">-->
+<!--					<u&#45;&#45;input v-model="form.IS_SPECIAL_JOB_NAME" border="none" disabled disabledColor="#ffffff"-->
+<!--						inputAlign="right"></u&#45;&#45;input>-->
+<!--				</u-form-item>-->
 				 <u-form-item label="是否流动人员" prop="ISFLOW_NAME" borderBottom required
                     @click="fnShowFloatingPersonnel">
          <u--input v-model="form.ISFLOW_NAME" border="none" disabled disabledColor="#ffffff" inputAlign="right"></u--input>
@ -194,6 +213,9 @@

 			<u-picker :show="showLaborContract" :columns="[[{name: '是', id: '1'}, {name: '否', id: '0'}]]" keyName="name"
 				@confirm="fnLaborContractConfirm" @cancel="fnShowLaborContract"></u-picker>
+			<u-picker :show="showInsurance" :columns="[[{name: '是', id: '1'}, {name: '否', id: '0'}]]"
+				keyName="name" @confirm="fnEInsuranceConfirm" @cancel="fnShowEmploymentInjuryInsurance">
+			</u-picker>
      <u-picker :show="showEmploymentInjuryInsurance" :columns="[[{name: '是', id: '1'}, {name: '否', id: '0'}]]"
                keyName="name" @confirm="fnEmploymentInjuryInsuranceConfirm" @cancel="fnShowEmploymentInjuryInsurance">
      </u-picker>
@ -282,6 +304,7 @@
 				showIsSocial: false,
 				showLaborContract: false,
 				showEmploymentInjuryInsurance: false,
+				showInsurance: false,
 				showEmploymentPayInsurance: false,
 				showSafetyTraining: false,
 				showAdmissionSafetyNotification: false,
@ -324,15 +347,18 @@
 					contractFile: [],
 					ISPAY: '',
 					ISPAY_NAME: '',
+          IS_BF: '',
+          IS_BF_NAME: '',
          IS_INJURIES_PAY: '',
 					IS_INJURIES_PAY_NAME: '',
+          safetytraining: [],
 					insuranceFile: [],
 					IS_LEVEL_THREE: '',
 					IS_LEVEL_THREE_NAME: '',
 					IS_SAFETY_TELL: '',
 					IS_SAFETY_TELL_NAME: '',
 					IS_BODY_ADAPT: '',
-					IS_BODY_ADAPT_NAME: '',
+					// IS_BODY_ADAPT_NAME: '',
 					IS_SPECIAL_JOB: '',
 					IS_SPECIAL_JOB_NAME: '',
 					ISFLOW: '',
@ -389,16 +415,16 @@
 						message: '请上传身份证照片',
 						trigger: ['change']
 					},
-					HKLOCAL: {
-						required: true,
-						message: '请填写户口所在地',
-						trigger: ['blur']
-					},
-					ADDRESS: {
-						required: true,
-						message: '请填写现住址',
-						trigger: ['blur']
-					},
+					// HKLOCAL: {
+					// 	required: true,
+					// 	message: '请填写户口所在地',
+					// 	trigger: ['blur']
+					// },
+					// ADDRESS: {
+					// 	required: true,
+					// 	message: '请填写现住址',
+					// 	trigger: ['blur']
+					// },
 					PHONE: [{
 							required: true,
 							message: '请填写联系电话',
@ -442,21 +468,21 @@
 					//   message: '请输入工种',
 					//   trigger: ['change']
 					// },
-					CORP_START_DATE: {
-						required: true,
-						message: '请选择本企业从业开始日期',
-						trigger: ['change']
-					},
+					// CORP_START_DATE: {
+					// 	required: true,
+					// 	message: '请选择本企业从业开始日期',
+					// 	trigger: ['change']
+					// },
 					POST_ID: {
 						required: true,
 						message: '请选择岗位名称',
 						trigger: ['blur']
 					},
-					ENTRY_DATE: {
-						required: true,
-						message: '请选择本岗位从业开始日期',
-						trigger: ['change']
-					},
+					// ENTRY_DATE: {
+					// 	required: true,
+					// 	message: '请选择本岗位从业开始日期',
+					// 	trigger: ['change']
+					// },
 					SOCIAL_NUMBER: {
 						required: true,
 						message: '请填写社会保障号码',
@ -484,7 +510,11 @@
 						message: '请上传劳动合同附件',
 						trigger: ['change']
 					},
-					IS_INJURIES_PAY_NAME: {
+          IS_BF_NAME: {
+						required: true,
+						message: '请选择是否缴纳保险',
+						trigger: ['change']
+					},IS_INJURIES_PAY_NAME: {
 						required: true,
 						message: '请选择是否按期缴纳工伤保险',
 						trigger: ['change']
@ -511,6 +541,12 @@
 						message: '请上传保险附件',
 						trigger: ['change']
 					},
+          safetytraining: {
+						type: 'array',
+						required: true,
+						message: '请上传三方安全培训图片',
+						trigger: ['change']
+					},
 					IS_LEVEL_THREE_NAME: {
 						required: true,
 						message: '请选择是否参加三级安全培训',
@ -526,16 +562,16 @@
 						message: '请选择安全告知培训合格日期',
 						trigger: ['change']
 					},
-					IS_BODY_ADAPT_NAME: {
-						required: true,
-						message: '请选择身体状况是否适应本岗位工作',
-						trigger: ['change']
-					},
-					IS_SPECIAL_JOB_NAME: {
-						required: true,
-						message: '请选择是否特殊工种',
-						trigger: ['change']
-					},
+					// IS_BODY_ADAPT_NAME: {
+					// 	required: true,
+					// 	message: '请选择身体状况是否适应本岗位工作',
+					// 	trigger: ['change']
+					// },
+					// IS_SPECIAL_JOB_NAME: {
+					// 	required: true,
+					// 	message: '请选择是否特殊工种',
+					// 	trigger: ['change']
+					// },
 					ISFLOW_NAME: {
 						required: true,
 						message: '请选择是否流动人员',
@ -593,7 +629,11 @@
 				} else if (this.form.IS_SIGN_LABOR === '1') {
 					this.form.IS_SIGN_LABOR_NAME = '是'
 				}
-				if (this.form.IS_INJURIES_PAY === '0') {
+				if (this.form.IS_BF === '0') {
+					this.form.IS_BF_NAME = '否'
+				} else if (this.form.IS_BF === '1') {
+					this.form.IS_BF_NAME = '是'
+				}if (this.form.IS_INJURIES_PAY === '0') {
 					this.form.IS_INJURIES_PAY_NAME = '否'
 				} else if (this.form.IS_INJURIES_PAY === '1') {
 					this.form.IS_INJURIES_PAY_NAME = '是'
@ -608,16 +648,16 @@
 				} else if (this.form.IS_SAFETY_TELL === '1') {
 					this.form.IS_SAFETY_TELL_NAME = '是'
 				}
-				if (this.form.IS_BODY_ADAPT === '0') {
-					this.form.IS_BODY_ADAPT_NAME = '否'
-				} else if (this.form.IS_BODY_ADAPT === '1') {
-					this.form.IS_BODY_ADAPT_NAME = '是'
-				}
-				if (this.form.IS_SPECIAL_JOB === '0') {
-					this.form.IS_SPECIAL_JOB_NAME = '否'
-				} else if (this.form.IS_SPECIAL_JOB === '1') {
-					this.form.IS_SPECIAL_JOB_NAME = '是'
-				}
+				// if (this.form.IS_BODY_ADAPT === '0') {
+				// 	this.form.IS_BODY_ADAPT_NAME = '否'
+				// } else if (this.form.IS_BODY_ADAPT === '1') {
+				// 	this.form.IS_BODY_ADAPT_NAME = '是'
+				// }
+				// if (this.form.IS_SPECIAL_JOB === '0') {
+				// 	this.form.IS_SPECIAL_JOB_NAME = '否'
+				// } else if (this.form.IS_SPECIAL_JOB === '1') {
+				// 	this.form.IS_SPECIAL_JOB_NAME = '是'
+				// }
 				if (this.form.ISFLOW === '0') {
 					this.form.ISFLOW_NAME = '否'
 				} else if (this.form.ISFLOW === '1') {
@ -643,14 +683,14 @@
 					showCount: 9999,
 					currentPage: 1,
 				});
-				this.certificateInformationLength = resData.varList.length
-				if (resData.varList.length > 0) {
-					this.form.IS_SPECIAL_JOB = '1'
-					this.form.IS_SPECIAL_JOB_NAME = '是'
-				} else {
-					this.form.IS_SPECIAL_JOB = '0'
-					this.form.IS_SPECIAL_JOB_NAME = '否'
-				}
+				// this.certificateInformationLength = resData.varList.length
+				// if (resData.varList.length > 0) {
+				// 	this.form.IS_SPECIAL_JOB = '1'
+				// 	this.form.IS_SPECIAL_JOB_NAME = '是'
+				// } else {
+				// 	this.form.IS_SPECIAL_JOB = '0'
+				// 	this.form.IS_SPECIAL_JOB_NAME = '否'
+				// }
 			},
 			async fnIDCardDeduplication(CARD_ID = this.form.CARD_ID) {
 				let resData = await getIDCardDeduplication({
@ -782,9 +822,17 @@
 			fnShowEmploymentInjuryInsurance() {
 				this.showEmploymentInjuryInsurance = !this.showEmploymentInjuryInsurance
 			},
+      fnShowInjuryInsurance() {
+				this.showInsurance = !this.showInsurance
+			},
 			fnShowEmploymentPayInsurance() {
 				this.showEmploymentPayInsurance = !this.showEmploymentPayInsurance
 			},
+      fnEInsuranceConfirm(e) {
+        this.form.IS_BF = e.value[0].id
+        this.form.IS_BF_NAME = e.value[0].name
+        this.fnShowInjuryInsurance()
+      },
 			fnEmploymentInjuryInsuranceConfirm(e) {
 				this.form.IS_INJURIES_PAY = e.value[0].id
 				this.form.IS_INJURIES_PAY_NAME = e.value[0].name
@ -812,6 +860,14 @@
 			fnAttachmentToLaborContractDelete(event) {
 				this.form.contractFile.splice(event.index, 1)
 			},
+      fnSafetyTrainingAfterRead2(event) {
+        for (let i = 0; i < event.file.length; i++) {
+          this.form.safetytraining.push(event.file[i])
+        }
+      },
+      fnSafetyTrainingAttachmentsDelete(event) {
+        this.form.safetytraining.splice(event.index, 1)
+      },
 			fnInsuranceAttachmentsAfterRead2(event) {
 				for (let i = 0; i < event.file.length; i++) {
 					this.form.insuranceFile.push(event.file[i])
@ -909,33 +965,33 @@
 			fnInjuriesPayTiemAttachmentsDelete(event) {
 				this.form.injuriesPayTiemFile.splice(event.index, 1)
 			},
-			fnAdaptToTheJobPositionConfirm(e) {
-				this.form.IS_BODY_ADAPT = e.value[0].id
-				this.form.IS_BODY_ADAPT_NAME = e.value[0].name
-				this.fnShowAdaptToTheJobPosition()
-			},
+			// fnAdaptToTheJobPositionConfirm(e) {
+			// 	this.form.IS_BODY_ADAPT = e.value[0].id
+			// 	this.form.IS_BODY_ADAPT_NAME = e.value[0].name
+			// 	this.fnShowAdaptToTheJobPosition()
+			// },
 			fnShowSpecialTypeOfWork() {
 				this.showSpecialTypeOfWork = !this.showSpecialTypeOfWork
 			},
-			fnSpecialTypeOfWorkConfirm(e) {
-				this.form.IS_SPECIAL_JOB = e.value[0].id
-				this.form.IS_SPECIAL_JOB_NAME = e.value[0].name
-				this.fnShowSpecialTypeOfWork()
-				if (e.value[0].id === '1' && this.certificateInformationLength === 0) {
-					uni.showModal({
-						title: '提示',
-						content: '当前没有证书信息，请完善证书信息',
-						showCancel: false,
-						success: (res) => {
-							if (res.confirm) {
-								uni.$u.route({
-									url: '/pages/certificate_information/index',
-								})
-							}
-						}
-					})
-				}
-			},
+			// fnSpecialTypeOfWorkConfirm(e) {
+			// 	this.form.IS_SPECIAL_JOB = e.value[0].id
+			// 	this.form.IS_SPECIAL_JOB_NAME = e.value[0].name
+			// 	this.fnShowSpecialTypeOfWork()
+			// 	if (e.value[0].id === '1' && this.certificateInformationLength === 0) {
+			// 		uni.showModal({
+			// 			title: '提示',
+			// 			content: '当前没有证书信息，请完善证书信息',
+			// 			showCancel: false,
+			// 			success: (res) => {
+			// 				if (res.confirm) {
+			// 					uni.$u.route({
+			// 						url: '/pages/certificate_information/index',
+			// 					})
+			// 				}
+			// 			}
+			// 		})
+			// 	}
+			// },
 			fnShowFloatingPersonnel() {
 				this.showFloatingPersonnel = !this.showFloatingPersonnel
 			},
@ -997,6 +1053,17 @@
 							}
 						})
 					}
+					for (let i = 0; i < this.form.safetytraining.length; i++) {
+						await setUploadAttachments({
+							filePath: this.form.safetytraining[i].url,
+							name: 'files',
+							formData: {
+								TYPE: '19',
+								FOREIGN_KEY: this.form.EMPLOYMENT_APPLY_MANAGEMENT_ID,
+								CORPINFO_ID: this.CORPINFO_ID,
+							}
+						})
+					}
          for (let i = 0; i < this.form.insuranceFile.length; i++) {
 						await setUploadAttachments({
 							filePath: this.form.insuranceFile[i].url,
@ -1063,5 +1130,9 @@
 </script>

 <style scoped>
-
+.tip {
+  color: red;
+  font-size: 12px;
+  margin-top: 5px;
+}
 </style>
--- a/pages/related_party_units/edit.vue
+++ b/pages/related_party_units/edit.vue
@ -6,16 +6,16 @@
 					<u--input v-model="form.POST_ID" border="none" disabledColor="#ffffff" inputAlign="right">
 					</u--input>
 				</u-form-item>
-				<u-form-item label="本企业从业开始日期" prop="CORP_START_DATE" borderBottom required
-					@click="fnShowDatePicke('CORP_START_DATE')">
-					<u--input v-model="form.CORP_START_DATE" border="none" disabled disabledColor="#ffffff"
-						inputAlign="right"></u--input>
-				</u-form-item>
-				<u-form-item label="本岗位从业开始日期" prop="ENTRY_DATE" borderBottom required
-					@click="fnShowDatePicke('ENTRY_DATE')">
-					<u--input v-model="form.ENTRY_DATE" border="none" disabled disabledColor="#ffffff"
-						inputAlign="right"></u--input>
-				</u-form-item>
+<!--				<u-form-item label="本企业从业开始日期" prop="CORP_START_DATE" borderBottom required-->
+<!--					@click="fnShowDatePicke('CORP_START_DATE')">-->
+<!--					<u&#45;&#45;input v-model="form.CORP_START_DATE" border="none" disabled disabledColor="#ffffff"-->
+<!--						inputAlign="right"></u&#45;&#45;input>-->
+<!--				</u-form-item>-->
+<!--				<u-form-item label="本岗位从业开始日期" prop="ENTRY_DATE" borderBottom required-->
+<!--					@click="fnShowDatePicke('ENTRY_DATE')">-->
+<!--					<u&#45;&#45;input v-model="form.ENTRY_DATE" border="none" disabled disabledColor="#ffffff"-->
+<!--						inputAlign="right"></u&#45;&#45;input>-->
+<!--				</u-form-item>-->
 				<u-form-item label="是否签署劳动合同" prop="IS_SIGN_LABOR_NAME" borderBottom required
 					@click="fnShowLaborContract">
 					<u--input v-model="form.IS_SIGN_LABOR_NAME" border="none" disabled disabledColor="#ffffff"
--- a/pages/related_party_units/view.vue
+++ b/pages/related_party_units/view.vue
@ -4,7 +4,7 @@
 			<view class="card">
 				<view class="text_content">
 					<view class="title title_left">基础信息</view>
-					<view class="title_right" @click="fnGoEditUserInfo">修改</view>
+<!--					<view class="title_right" @click="fnGoEditUserInfo">修改</view>-->
 				</view>
 				<u-cell-group>
 					<u-cell title="照片">
@ -66,13 +66,14 @@
 			<view class="card">
 				<view class="text_content">
 					<view class="title title_left">企业就职信息</view>
-					<view v-if = "info.DEPART_STATE == '0'" class="title_right" @click="goEdit">修改</view>
-					<view v-else class="title_right_red">已离职</view>
+<!--					<view v-if = "info.DEPART_STATE == '0'" class="title_right" @click="goEdit">修改</view>-->
+<!--					<view v-else class="title_right_red">已离职</view>-->
+          <view class="title_right_red" v-if="info.DEPART_STATE != '0'">已离职</view>
 				</view>
 				<u-cell-group>
 					<u-cell title="岗位名称" :value="info.POST_ID"></u-cell>
-					<u-cell title="本企业从业开始日期" :value="info.CORP_START_DATE"></u-cell>
-					<u-cell title="本岗位从业开始日期" :value="info.ENTRY_DATE"></u-cell>
+<!--					<u-cell title="本企业从业开始日期" :value="info.CORP_START_DATE"></u-cell>-->
+<!--					<u-cell title="本岗位从业开始日期" :value="info.ENTRY_DATE"></u-cell>-->
 					<u-cell title="是否签署劳动合同" :value="info.IS_SIGN_LABOR == '0' ? '否' : '是'"></u-cell>
 					<u-cell title="劳动合同附件" v-show="info.IS_SIGN_LABOR === '1'">
 						<template #value>
@ -148,9 +149,9 @@
 		onLoad(query) {
 			this.EMPLOYMENT_APPLY_MANAGEMENT_ID = query.EMPLOYMENT_APPLY_MANAGEMENT_ID
 			this.CORPINFO_ID = query.CORPINFO_ID
-			if (query.DEPART_STATE != '0') {
-				this.DEPART_STATE = query.DEPART_STATE
-			}
+			// if (query.DEPART_STATE != '0') {
+			// 	this.DEPART_STATE = query.DEPART_STATE
+			// }
 			this.fnGetData()
 		},
 		computed: {
@ -164,16 +165,16 @@
 					url: '/pages/mine/information/update'
 				})
 			},
-			goEdit() {
-				uni.$u.route({
-					url: '/pages/related_party_units/edit',
-					params: {
-						EMPLOYMENT_APPLY_MANAGEMENT_ID: this.EMPLOYMENT_APPLY_MANAGEMENT_ID,
-						CORPINFO_ID: this.CORPINFO_ID,
-						DEPART_STATE: this.DEPART_STATE
-					}
-				})
-			},
+			// goEdit() {
+			// 	uni.$u.route({
+			// 		url: '/pages/related_party_units/edit',
+			// 		params: {
+			// 			EMPLOYMENT_APPLY_MANAGEMENT_ID: this.EMPLOYMENT_APPLY_MANAGEMENT_ID,
+			// 			CORPINFO_ID: this.CORPINFO_ID,
+			// 			DEPART_STATE: this.DEPART_STATE
+			// 		}
+			// 	})
+			// },
 			reloadx() {
 				this.contractFile = []
 				this.insuranceFile = []
@ -217,6 +218,7 @@
        }
        if(resData.userPhotoFile && resData.userPhotoFile.length>0){
          this.$set(this.info, 'userPhoto', this.$filePath + resData.userPhotoFile[0].FILEPATH)
+          console.log(this.info.userPhoto)
        }

 			},
Author	SHA1	Message	Date
WenShiJun	58e1c1cc74	相关页面bug修改	2024-07-01 18:04:23 +08:00
liujun	4d1e6a7cf0	1、相关方app样式混乱更改 2、相关方流程审批bug修复	2024-06-13 18:06:18 +08:00
liujun	a964030d0e	相关方人员编辑按钮逻辑调整	2024-06-13 16:36:23 +08:00
liujun	1094bd3d82	bug修复	2024-06-13 15:52:27 +08:00
liujun	ce7d33dc34	相关方app端编辑信息bug修复	2024-06-07 09:29:05 +08:00
liujun	eee02bfa5a	相关方app端编辑信息bug修复	2024-06-06 17:33:07 +08:00
liujun	bbea3b58db	相关方app信息同步	2024-06-06 17:03:31 +08:00
liujun	287a51c891	相关方证书无法更换图片bug	2024-04-08 16:28:12 +08:00
liujun	1564af86d4	特种作业证书状态更新	2024-04-08 14:48:21 +08:00