(hyx_2024-10-23_tongbu)

用户名，身份证号中台校验
兼容微信小程序
2024-10-23 14:30:25 +08:00 · 2024-09-30 09:40:54 +08:00 · 2024-09-29 14:57:55 +08:00 · 2024-08-29 09:53:08 +08:00 · 2024-08-27 15:04:44 +08:00 · 2024-08-15 16:56:46 +08:00
35 changed files with 4571 additions and 4048 deletions
--- a/api/index.js
+++ b/api/index.js
@ -1,8 +1,8 @@
 import {post, upload, uploads} from "../utils/request";

 export const submitLogin = (params) => post("/app/admin/check", params) // 登录
-export const getIDCardDeduplication = (params) => post("/app/user/hasCardIdForApp", params) // 身份证去重
-export const getUserDeduplication = (params) => post("/app/user/hasUserNameForApp", params) // 用户名去重
+export const getIDCardDeduplication = (params) => post("/app/user/goCheck", params) // 身份证去重
+export const getUserDeduplication = (params) => post("/app/user/goCheck", params) // 用户名去重
 export const getPhoneNumberDeduplication = (params) => post("/app/user/hasPhoneForApp", params) // 手机号去重
 export const setRegister = (params) => post("/app/admin/register", params) // 注册
 export const setForgotPassword = (params) => post("/app/admin/forgetPassword", params) // 忘记密码
@ -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/components/empty/empty.vue
+++ b/components/empty/empty.vue
@ -1,6 +1,6 @@
 <template>
  <view class="empty">
-    <u--image :showLoading="true" src="/static/svg/empty.svg" width="750upx" height="500upx"></u--image>
+    <u--image :showLoading="true" src="/static/svg/empty.svg" width="750rpx" height="500rpx"></u--image>
    <view class="empty-text">{{ message }}</view>
  </view>
 </template>
@ -24,10 +24,10 @@ export default {
  align-items: center;
  position: relative;
  .empty-text{
-    font-size: 30upx;
+    font-size: 30rpx;
    color: $uni-text-color-placeholder;
    position: absolute;
-    top: 400upx;
+    top: 400rpx;
  }
 }
 </style>
--- a/components/fab_button/index.vue
+++ b/components/fab_button/index.vue
@ -0,0 +1,39 @@
+<template>
+  <view class="fab_button" @click="$emit('click')">
+    <block v-if="type === 'plus'">
+      <u-icon name="plus" color="#fff" size="28rpx"></u-icon>
+    </block>
+    <block v-if="type === 'search'">
+      <u-icon name="search" color="#fff" size="28rpx"></u-icon>
+    </block>
+    <block v-if="type === 'edit'">
+      <u-icon name="edit-pen" color="#fff" size="28rpx"></u-icon>
+    </block>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    type: {
+      type: String,
+      default: "plus",
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.fab_button {
+  position: fixed;
+  bottom: 100rpx;
+  right: 30rpx;
+  background-color: #3377ff;
+  border-radius: 50%;
+  width: 80rpx;
+  height: 80rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+</style>
--- a/components/sign/sign.vue
+++ b/components/sign/sign.vue
@ -53,7 +53,7 @@ export default {

 <style lang="scss" scoped>
 .handCenter {
-  border: 4upx dashed #e9e9e9;
+  border: 4rpx dashed #e9e9e9;
  height: 80vh;
  overflow: hidden;
  box-sizing: border-box;
--- a/manifest.json
+++ b/manifest.json
@ -105,11 +105,18 @@
    "quickapp" : {},
    /* 小程序特有相关 */
    "mp-weixin" : {
-        "appid" : "",
+        "appid" : "wx06c53a01ae0afd2c",
        "setting" : {
-            "urlCheck" : false
+            "urlCheck" : false,
+            "minified" : true,
+            "es6" : true
        },
-        "usingComponents" : true
+        "usingComponents" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "展示当前位置信息"
+            }
+        }
    },
    "mp-alipay" : {
        "usingComponents" : true
--- a/pages.json
+++ b/pages.json
@ -72,17 +72,7 @@
 		{
 			"path": "pages/certificate_information/index",
 			"style": {
-				"navigationBarTitleText": "证书信息",
-				"app-plus": {
-					"titleNView": {
-						"buttons": [{
-							"text": "新建",
-							"fontSize": "15",
-							"float": "right",
-							"width": "40px"
-						}]
-					}
-				}
+				"navigationBarTitleText": "证书信息"
 			}
 		},
 		{
@ -119,17 +109,7 @@
 		{
 			"path": "pages/mine/information/index",
 			"style": {
-				"navigationBarTitleText": "我的信息",
-				"app-plus": {
-					"titleNView": {
-						"buttons": [{
-							"text": "修改",
-							"fontSize": "15",
-							"float": "right",
-							"width": "40px"
-						}]
-					}
-				}
+				"navigationBarTitleText": "我的信息"
 			}
 		},
 		{
--- 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>
@ -21,7 +30,8 @@
          <u--input v-model="form.PHONE" border="none" disabled disabledColor="#ffffff"></u--input>
        </u-form-item>
        <u-form-item label="身份证号码" prop="CARD_ID" borderBottom required>
-          <u--input v-model="form.CARD_ID" border="none" @blur="fnCardIdDisassembly" disabled disabledColor="#ffffff"></u--input>
+          <u--input v-model="form.CARD_ID" border="none" @blur="fnCardIdDisassembly" disabled
+                    disabledColor="#ffffff"></u--input>
        </u-form-item>
        <u-form-item label="证书类型" prop="CER_TYPE_NAME" borderBottom required @click="fnShowCertificateType">
          <u--input v-model="form.CER_TYPE_NAME" border="none" disabled disabledColor="#ffffff"></u--input>
@ -39,10 +49,12 @@
        <u-form-item label="工种" prop="JOBS_TYPE" borderBottom required>
          <u--input v-model="form.JOBS_TYPE" border="none" disabledColor="#ffffff"></u--input>
        </u-form-item>
-        <u-form-item v-if="form.CER_TYPE_NAME === '特种作业'" label="作业类别" prop="specialName" borderBottom required @click="fnShowCertificateTypeSpe">
+        <u-form-item v-if="form.CER_TYPE_NAME === '特种作业'" label="作业类别" prop="specialName" borderBottom required
+                     @click="fnShowCertificateTypeSpe">
          <u--input v-model="form.specialName" border="none" disabled disabledColor="#ffffff"></u--input>
        </u-form-item>
-        <u-form-item v-if="form.CER_TYPE_NAME === '特种作业'" label="操作项目" prop="operationName" borderBottom required @click="fnShowCertificateTypeOpe">
+        <u-form-item v-if="form.CER_TYPE_NAME === '特种作业'" label="操作项目" prop="operationName" borderBottom
+                     required @click="fnShowCertificateTypeOpe">
          <u--input v-model="form.operationName" border="none" disabled disabledColor="#ffffff"></u--input>
        </u-form-item>
        <u-form-item label="有效期开始" prop="VALIDITY_TIME_START" borderBottom required
@ -71,7 +83,9 @@
                         @confirm="fnTermOfValidityEndConfirm" @cancel="fnShowTermOfValidityEnd"></u-datetime-picker>
      <u-datetime-picker :show="showReviewTime" v-model="reviewTimeValue" mode="date"
                         @confirm="fnReviewTimeConfirm" @cancel="fnShowReviewTime"></u-datetime-picker>
-      <u-button type="primary" text="保 存" class="mt-10" @click="$u.debounce(fnSubmit, 1000,true)"></u-button>
+      <view class="mt-10">
+        <u-button type="primary" text="保 存" @click="$u.debounce(fnSubmit, 1000,true)"></u-button>
+      </view>
    </view>
  </view>
 </template>
@ -105,6 +119,7 @@ export default {
      reviewTimeValue: new Date().toString(),
      form: {
        fileList: [],
+        fileListBack: [],
        NAME: '',
        SEX_NAME: '',
        PHONE: '',
@ -122,95 +137,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 +231,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 +249,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 +344,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 +423,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/index.vue
+++ b/pages/certificate_information/index.vue
@ -4,7 +4,7 @@
      <u-list-item v-for="(item, index) in list" :key="index">
        <view style="display: flex;align-items: center;justify-content: space-between;">
          <view>
-            <u-image width="200upx" height="200upx" :src="$filePath + item.FILEPATH"></u-image>
+            <u-image width="200rpx" height="200rpx" :src="$filePath + item.FILEPATH"></u-image>
          </view>
          <view class="ml-10" style="flex: 1;">
            <view class="flex-between main-title">
@ -19,8 +19,12 @@
            <view class="flex-between mt-10 subtitle">
              <view></view>
              <view class="flex-between">
-                <u-button type="primary" text="编辑" size="mini" class="bth-mini" @click="fnEdit(item.SPECIAL_USER_ID)"></u-button>
-                <u-button type="primary" text="查看" size="mini" class="bth-mini ml-10" @click="fnView(item.SPECIAL_USER_ID)"></u-button>
+                <u-button type="primary" text="编辑" size="mini"
+                          @click="fnEdit(item.SPECIAL_USER_ID)"></u-button>
+                <view class="ml-10">
+                  <u-button type="primary" text="查看" size="mini"
+                            @click="fnView(item.SPECIAL_USER_ID)"></u-button>
+                </view>
              </view>
            </view>
          </view>
@ -28,13 +32,18 @@
      </u-list-item>
    </u-list>
    <empty v-else></empty>
+    <fab-button @click="fnEdit"/>
  </view>
 </template>

 <script>
 import {getCertificateInformationList, getCertificateInformationView} from "../../api";
+import FabButton from '@/components/fab_button/index.vue'

 export default {
+  components: {
+    FabButton,
+  },
  data() {
    return {
      SPECIAL_USER_ID: '',
@ -52,11 +61,6 @@ export default {
  onShow() {
    this.resetList()
  },
-  onNavigationBarButtonTap(e) {
-    if (e.index === 0) {
-      this.fnEdit()
-    }
-  },
  methods: {
    async getData() {
      let resData = await getCertificateInformationList({
--- a/pages/certificate_information/view.vue
+++ b/pages/certificate_information/view.vue
@ -4,7 +4,9 @@
      <u-cell-group>
        <u-cell title="证书图片">
          <template #value>
-            <u--image :src="info.FILEPATH" width="100upx" height="100upx" radius="10upx" @click="fnPreview"></u--image>
+            <u--image :src="info.FILEPATH" width="100rpx" height="100rpx" radius="10rpx" @click="fnPreview"></u--image>
+            <u--image v-if="info.FILEPATH_BACK" :src="info.FILEPATH_BACK" width="100rpx" height="100rpx" radius="10rpx"
+                      @click="fnPreview"></u--image>
          </template>
        </u-cell>
        <u-cell title="姓名" :value="info.NAME"></u-cell>
@ -46,6 +48,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/electronic_work_card/index.vue
+++ b/pages/electronic_work_card/index.vue
@ -4,7 +4,7 @@
      <u-cell-group>
        <u-cell title="照片">
          <template #value>
-						<u--image :src="info.PHOTO" shape="circle" width="100upx" height="100upx"
+            <u--image :src="info.PHOTO" shape="circle" width="100rpx" height="100rpx"
                      @click="fnPreview(info.PHOTO)"></u--image>
          </template>
        </u-cell>
@ -19,9 +19,10 @@
        <u-cell title="联系电话" :value="info.PHONE"></u-cell>
        <u-cell title="人员类型" :value="info.ISFLOW === '1' ? '流动人员' : '固定人员'">
        </u-cell>
-				<u-cell title="二维码" v-show="!CODE_TYPE && info.STATUS === '2' && info.CORPINFO_ID">
+        <u-cell title="二维码"
+                v-if="info.CORPINFO_ID && cleanCode && (info.DEPART_STATE == '0' || info.DEPART_STATE == '-1')">
          <template #value>
-						<u--image :src="info.code" width="100upx" height="100upx" @click="fnPreview(info.code)">
+            <u--image :src="info.code" width="100rpx" height="100rpx" @click="fnPreview(info.code)">
            </u--image>
          </template>
        </u-cell>
@ -41,7 +42,8 @@
    return {
      info: {},
      USER_ID: '',
-				CODE_TYPE: ''
+      CODE_TYPE: '',
+      cleanCode: ''
    }
  },
  created() {
@ -65,6 +67,7 @@
      console.log(this.$filePath + resData.pd.PHOTO)
      this.info.PHOTO = this.$filePath + resData.pd.PHOTO
      this.info.code = 'data:image/jpg;base64,' + code
+      this.cleanCode = code
    },
    fnPreview(urls) {
      uni.previewImage({
--- a/pages/employed_by/index.vue
+++ b/pages/employed_by/index.vue
@ -40,15 +40,17 @@
          <view class="flex-between mt-10 subtitle">
            <view></view>
            <view class="flex-between">
-							<u-button type="primary" text="查看" size="mini" class="bth-mini ml-10"
+              <u-button type="primary" text="查看" size="mini"
                        @click="fnView(item.EMPLOYMENT_APPLY_MANAGEMENT_ID, item.CORPINFO_ID, item.DEPART_STATE)"></u-button>
-							<u-button type="primary" text="离职申请" size="mini" class="bth-mini ml-10"
+              <view class="ml-10">
+                <u-button type="primary" text="离职申请" size="mini"
                          v-if="item.DEPART_STATE === '0'"
                          @click="fnResignationApplication(item.EMPLOYMENT_APPLY_MANAGEMENT_ID,item.RELEVANT_UNIT_NAME)">
                </u-button>
              </view>
            </view>
          </view>
+        </view>
      </u-list-item>
    </u-list>
    <empty v-else></empty>
--- a/pages/employed_by/resignation_application.vue
+++ b/pages/employed_by/resignation_application.vue
@ -12,7 +12,9 @@
        <u-cell title="申请时间" :value="form.APPLY_TIME"></u-cell>
        <u-cell title="申请人" :value="userInfo.NAME"></u-cell>
      </u-cell-group>
-      <u-button type="primary" text="提交" class="mt-10" @click="$u.debounce(fnSubmit, 1000,true)"></u-button>
+      <view class="mt-10">
+        <u-button type="primary" text="提交" @click="$u.debounce(fnSubmit, 1000,true)"></u-button>
+      </view>
    </view>
  </view>
 </template>
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -1,21 +1,22 @@
 <template>
  <view class="page">
-    <!-- #ifdef APP-PLUS -->
    <view class="status_bar">
      <view class="top_view"></view>
    </view>
-    <!-- #endif -->
    <view class="wui_banner">
-      <view class="wui-bar">
-        <view class="icon-ui">
-          <u-icon name="scan" color="#fff" size="28" @click="fnScan"></u-icon>
-        </view>
-      </view>
      <view class="banner_img">
        <image src="../../static/home-bg.png" mode=""></image>
      </view>
    </view>
    <view class="home-apps">
+      <view class="home-apps-item" @click="fnScan">
+        <view class="home-apps-item-img">
+          <image src="../../static/icon-apps/app_icons6.png" mode=""></image>
+        </view>
+        <view class="text">
+          <text>扫码</text>
+        </view>
+      </view>
      <view class="home-apps-item" v-for="(item,index) in baseList" :key="index" @click="fnNavigator(index)">
        <view class="home-apps-item-img">
          <image :src="item.img" mode=""></image>
@ -26,7 +27,8 @@
      </view>
    </view>
    <u-modal :show="updateVersion.modalShow" title="温馨提示" :showConfirmButton="updateVersion.showConfirmButton"
-             :showCancelButton="updateVersion.showCancelButton" :confirmText="updateVersion.confirmText" :cancelText="updateVersion.cancelText"
+             :showCancelButton="updateVersion.showCancelButton" :confirmText="updateVersion.confirmText"
+             :cancelText="updateVersion.cancelText"
             @cancel="modalCancel" @confirm="modalConfirm">
      <view style="text-align: center;color:#606266">
        <rich-text :nodes="updateVersion.modalContent"></rich-text>
--- a/pages/login/forgot_password.vue
+++ b/pages/login/forgot_password.vue
@ -2,7 +2,7 @@
  <view class="content1">
    <view class="change-password">
      <u--form labelPosition="top" :model="form" :rules="rules" ref="form" labelWidth="100%"
-               :labelStyle="{color:'#333',  fontSize:'34upx', fontWeight:'bold'}">
+               :labelStyle="{color:'#333',  fontSize:'34rpx', fontWeight:'bold'}">
        <u-form-item label="用户名" prop="USERNAME" borderBottom>
          <u--input v-model="form.USERNAME" border="none"></u--input>
        </u-form-item>
@ -95,7 +95,7 @@ export default {
 <style lang="scss" scoped>
 .change-password {
  background-color: #fff;
-  border-radius: 20upx;
-  padding: 40upx;
+  border-radius: 20rpx;
+  padding: 40rpx;
 }
 </style>
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@ -1,7 +1,7 @@
 <template>
  <view class="wui_login">
    <view class="form">
-      <u--form labelPosition="top" :model="form" labelWidth="140upx" >
+      <u--form labelPosition="top" :model="form" labelWidth="140rpx">
        <u-form-item label="账号" borderBottom>
          <u--input v-model="form.userName" border="none" placeholder="请输入账号..."></u--input>
        </u-form-item>
@ -9,14 +9,16 @@
          <u--input v-model="form.userPwd" type="password" border="none" placeholder="请输入密码..."></u--input>
        </u-form-item>
      </u--form>
-      <u-button type="primary" text="登 录" @click="$u.debounce(fnLogin, 1000,true)"></u-button>
+      <u-button type="primary" text="登 录" custom-style="margin:40rpx 0 20rpx 0"
+                @click="$u.debounce(fnLogin, 1000,true)"></u-button>
      <view class="tip">
        <view @click="fnForgotPassword">忘记密码</view>
        <view @click="fnRegister">新用户注册</view>
      </view>
    </view>
    <u-modal :show="updateVersion.modalShow" title="温馨提示" :showConfirmButton="updateVersion.showConfirmButton"
-             :showCancelButton="updateVersion.showCancelButton" :confirmText="updateVersion.confirmText" :cancelText="updateVersion.cancelText"
+             :showCancelButton="updateVersion.showCancelButton" :confirmText="updateVersion.confirmText"
+             :cancelText="updateVersion.cancelText"
             @cancel="modalCancel" @confirm="modalConfirm">
      <view style="text-align: center;color:#606266">
        <rich-text :nodes="updateVersion.modalContent"></rich-text>
@ -94,47 +96,36 @@ export default {
  height: 100vh;
  background-color: #058cf5;
  position: relative;
+
  .title {
    color: #fff;
-    font-size: 44upx;
+    font-size: 44rpx;
    font-weight: 500;
    display: flex;
    flex-direction: column;
-    padding-top: 106upx;
-    padding-left: 46upx;
+    padding-top: 106rpx;
+    padding-left: 46rpx;
    line-height: 1.6;
  }
+
  .form {
    width: 70%;
    position: absolute;
    top: 49%;
    left: 50%;
    background-color: #fff;
-	border-radius: 20upx;
-	padding: 30upx 9%;
+    border-radius: 20rpx;
+    padding: 30rpx 9%;
    transform: translate(-50%, -50%);
+
    .tip {
-      font-size: 20upx;
-      margin-bottom: 40upx;
+      font-size: 24rpx;
+      margin-bottom: 40rpx;
      color: #0b80e7;
      display: flex;
      align-items: center;
      justify-content: space-between;
    }
  }
-  button{
-    margin-top: 40upx;
-    background-color: #0b80e7;
-    color: #fff;
-    font-weight: bold;
-    border: none;
-    border-radius: 10upx;
-    margin-bottom: 20upx;
-  }
-  ::v-deep{
-    .u-button__text{
-      font-size: 32upx !important;
-    }
-  }
 }
 </style>
--- a/pages/login/register.vue
+++ b/pages/login/register.vue
@ -19,7 +19,9 @@
        </u-form-item>
        <view class="tip">密码长度8~32位，须包含数字、字母、符号至少2种或以上元素</view>
      </u--form>
-      <u-button type="primary" text="注 册" class="mt-10" @click="$u.debounce(fnRegister, 1000,true)"></u-button>
+      <view class="mt-10">
+        <u-button type="primary" text="注 册" @click="$u.debounce(fnRegister, 1000,true)"></u-button>
+      </view>
    </view>
  </view>
 </template>
@ -141,8 +143,8 @@ export default {

 <style scoped lang="scss">
 .tip {
-  padding-top: 20upx;
-  padding-bottom: 20upx;
-  font-size: 20upx;
+  padding-top: 20rpx;
+  padding-bottom: 20rpx;
+  font-size: 20rpx;
 }
 </style>
--- a/pages/mine/about_us/about_us.vue
+++ b/pages/mine/about_us/about_us.vue
@ -16,8 +16,7 @@
 </template>

 <script>
-	export default {
-	}
+export default {}
 </script>

 <style lang="scss" scoped>
@ -25,6 +24,7 @@
  background-color: #fff;
  box-sizing: border-box;
  line-height: 60rpx;
+
  .title {
  }
 }
--- a/pages/mine/agreement/agreement.vue
+++ b/pages/mine/agreement/agreement.vue
@ -7,9 +7,7 @@
 </template>

 <script>
-export default {
-
-}
+export default {}
 </script>

 <style scoped>
--- a/pages/mine/change_password/change_password.vue
+++ b/pages/mine/change_password/change_password.vue
@ -2,7 +2,7 @@
  <view class="content1">
    <view class="change-password">
      <u--form labelPosition="top" :model="form" :rules="rules" ref="form" labelWidth="100%"
-				:labelStyle="{color:'#333',  fontSize:'34upx', fontWeight:'bold'}">
+               :labelStyle="{color:'#333',  fontSize:'34rpx', fontWeight:'bold'}">
        <u-form-item label="原密码" prop="oldPwd" borderBottom>
          <u--input v-model="form.oldPwd" type="password" border="none"></u--input>
        </u-form-item>
@ -104,7 +104,7 @@
 <style lang="scss" scoped>
 .change-password {
  background-color: #fff;
-		border-radius: 20upx;
-		padding: 40upx;
+  border-radius: 20rpx;
+  padding: 40rpx;
 }
 </style>
--- a/pages/mine/feedback/feedback.vue
+++ b/pages/mine/feedback/feedback.vue
@ -5,9 +5,10 @@
      <view class="feedback-type">
        <view class="item" v-for="(item, index) in feedbackType" :key="index"
              :class="{active:item.value === form.FEEDBACK_TYPE}" @click="form.FEEDBACK_TYPE = item.value">
-					<u--image :src="item.img" width="40upx" height="38upx"
-						style="margin-left: 70upx; margin-top: 20upx;"></u--image>
-					<view style="margin-top: -40upx;">{{item.label}}</view>
+          <view style="margin-left: 70rpx; margin-top: 20rpx;">
+            <u--image :src="item.img" width="40rpx" height="38rpx"></u--image>
+          </view>
+          <view style="margin-top: -40rpx;">{{ item.label }}</view>
        </view>
      </view>
      <view class="title">我要反馈</view>
@ -128,17 +129,17 @@ import {setFeedbackAdd, setFeedbackUpload} from "../../../api";

 <style lang="scss" scoped>
 .feedback {
-		padding: 40upx;
+  padding: 40rpx;
  background-color: #fff;

  .title {
    font-weight: bold;
-			margin-top: 20upx;
-			margin-bottom: 20upx;
+    margin-top: 20rpx;
+    margin-bottom: 20rpx;
    color: $uni-text-color-placeholder;
-			font-size: 30upx;
+    font-size: 30rpx;

-			&:irst-child {
+    &:first-child {
      margin-top: 0;
    }
  }
@ -146,24 +147,24 @@ import {setFeedbackAdd, setFeedbackUpload} from "../../../api";
  .feedback-type {
    display: flex;
    flex-wrap: wrap;
-			margin-bottom: 20upx;
-			margin-top: 20upx;
+    margin-bottom: 20rpx;
+    margin-top: 20rpx;


    .item {
-				padding: 10upx;
-				border-radius: 10upx;
-				margin-top: 10upx;
-				margin-right: 10upx;
-				margin-bottom: 10upx;
+      padding: 10rpx;
+      border-radius: 10rpx;
+      margin-top: 10rpx;
+      margin-right: 10rpx;
+      margin-bottom: 10rpx;
      background-color: #f6f7fb;
      text-align: center;
-				font-size: 30upx;
+      font-size: 30rpx;
      color: #9fa7bc;
-				width: 207upx;
-				height: 143upx;
+      width: 207rpx;
+      height: 143rpx;
      box-sizing: border-box;
-				line-height: 143upx;
+      line-height: 143rpx;
      text-align: center;

      &.active {
@ -175,14 +176,14 @@ import {setFeedbackAdd, setFeedbackUpload} from "../../../api";

  ::v-deep {
    .u-upload__wrap__preview__image {
-				width: 146upx !important;
-				height: 146upx !important;
+      width: 146rpx !important;
+      height: 146rpx !important;
    }
  }
 }

 .title {
-		font-size: 32upx;
+  font-size: 32rpx;
  color: #333;
 }
 </style>
--- a/pages/mine/index/index.vue
+++ b/pages/mine/index/index.vue
@ -19,9 +19,10 @@
    </view>
    <view class="my_main">
      <view class="my_main_info">
-				<view class="my_main_info_wrap" v-for="(item,index) in list" :key="item.name" @click="clickItem(item.name,index)">
+        <view class="my_main_info_wrap" v-for="(item,index) in list" :key="item.name"
+              @click="clickItem(item.name,index)">
          <view class="my_main_info_wrap_img">
-						<u--image :src="item.img" width="40upx" height="40upx"></u--image>
+            <u--image :src="item.img" width="40rpx" height="40rpx"></u--image>
          </view>
          <view class="my_main_info_wrap_info">
            <view class="my_main_info_wrap_info_lable">
@ -40,7 +41,8 @@
      </view>
    </view>
    <u-modal :show="updateVersion.modalShow" title="温馨提示" :showConfirmButton="updateVersion.showConfirmButton"
-			:showCancelButton="updateVersion.showCancelButton" :confirmText="updateVersion.confirmText" :cancelText="updateVersion.cancelText"
+             :showCancelButton="updateVersion.showCancelButton" :confirmText="updateVersion.confirmText"
+             :cancelText="updateVersion.cancelText"
             @cancel="modalCancel" @confirm="modalConfirm">
      <view style="text-align: center;color:#606266">
        <rich-text :nodes="updateVersion.modalContent"></rich-text>
@ -72,10 +74,12 @@ export default {
          name: '修改密码',
          url: '/pages/mine/change_password/change_password'
        },
+        // #ifdef APP-PLUS
        {
          img: require('../../../static/images/my_ico5.png'),
          name: '版本更新',
        },
+        // #endif
        {
          img: require('../../../static/images/my_ico6.png'),
          name: '关于我们',
@ -129,50 +133,50 @@ export default {
  .mytop {
    width: 100%;
    background: url(/static/images/mybannerbg.png);
-			height: 400upx;
+    height: 400rpx;
    background-size: 100% 100%;
-			padding: 20upx;
+    padding: 20rpx;
    box-sizing: border-box;

    .mytop_main_info {
      width: 80%;
      margin: 0 auto;
-				margin-top: 150upx;
+      margin-top: 150rpx;
      display: flex;
      align-items: center;

      .mytop_main_info_tx {
-					margin-right: 20upx;
+        margin-right: 20rpx;
      }

      .mytop_main_test_name {
        color: #fff;
-					font-size: 36upx;
+        font-size: 36rpx;
        font-weight: 600;
      }

      .mytop_main_test_p {
        color: #fff;
-					font-size: 26upx;
+        font-size: 26rpx;
        opacity: 0.6;
-					margin-top: 5upx;
+        margin-top: 5rpx;
      }
    }
  }

  .my_main {
    width: 100%;
-			padding: 40upx;
-			margin-top: -120upx;
+    padding: 40rpx;
+    margin-top: -120rpx;
    box-sizing: border-box;

    .my_main_info {
      width: 100%;
      background: #fff;
-				padding: 20upx 40upx;
+      padding: 20rpx 40rpx;
      box-sizing: border-box;
-				border-radius: 10upx;
-				box-shadow: 0 0 20upx #eee;
+      border-radius: 10rpx;
+      box-shadow: 0 0 20rpx #eee;

      .my_main_info_wrap {
        width: 100%;
@ -180,19 +184,19 @@ export default {
        align-items: center;

        .my_main_info_wrap_img {
-						width: 50upx;
-						height: 50upx;
-						margin-top: 10upx;
+          width: 50rpx;
+          height: 50rpx;
+          margin-top: 10rpx;
        }

        .my_main_info_wrap_info {
          flex: 1;
-						border-bottom: 1upx solid #eee;
+          border-bottom: 1rpx solid #eee;
          display: flex;
          justify-content: space-between;
          align-items: center;
-						padding: 30upx 0upx;
-						padding-left: 10upx;
+          padding: 30rpx 0rpx;
+          padding-left: 10rpx;

          .my_main_info_wrap_info_lable {

@ -210,19 +214,19 @@ export default {
 .layout_btner {
  width: 100%;
  text-align: center;
-		padding: 0upx 40upx;
+  padding: 0rpx 40rpx;
  box-sizing: border-box;


  .layout_btn {
    width: 100%;
    text-align: center;
-			padding: 20upx;
+    padding: 20rpx;
    background: #e72f2f;
    box-sizing: border-box;
    color: #fff;
-			box-shadow: 0 0 20upx #eee;
-			border-radius: 10upx;
+    box-shadow: 0 0 20rpx #eee;
+    border-radius: 10rpx;
  }
 }
 </style>
--- a/pages/mine/information/index.vue
+++ b/pages/mine/information/index.vue
@ -4,7 +4,7 @@
      <u-cell-group>
        <u-cell title="照片">
          <template #value>
-						<u--image :src="info.userPhoto" shape="circle" width="100upx" height="100upx"></u--image>
+            <u--image :src="info.userPhoto" shape="circle" width="100rpx" height="100rpx"></u--image>
          </template>
        </u-cell>
        <u-cell title="姓名" :value="info.NAME"></u-cell>
@ -16,12 +16,12 @@
        </u-cell>
        <u-cell title="出生年月" :value="info.DATE_OF_BIRTH"></u-cell>
        <u-cell title="年龄" :value="info.AGE"></u-cell>
-				<u-cell title="身份证" :value="info.CARD_ID"></u-cell>
+        <u-cell title="身份证" :value="info.CARD_ID" @blur="fnIDCardDeduplication"></u-cell>
        <u-cell title="身份证照片">
          <template #value>
            <view v-for="(item,index) in userCardIDPhotoFile" :key="index"
-							style="display: flex;justify-content: space-between">
-							<u--image :src="item" width="100upx" height="100upx" style="margin-left: 10upx;"
+                  style="display: flex;justify-content: space-between;margin-left: 10rpx;">
+              <u--image :src="item" width="100rpx" height="100rpx"
                        @click="fnPreview(userCardIDPhotoFile)"></u--image>
            </view>
          </template>
@ -40,58 +40,91 @@
        <u-cell title="联系电话" :value="info.PHONE"></u-cell>
        <u-cell title="婚姻状况" :value="info.MARITALSTATUS == 0 ? '未婚':'已婚'"></u-cell>
        <u-cell title="政治面貌" :value="info.zzName"></u-cell>
-				<u-cell v-if="info.POLITICAL_STATUS == 'zhonggongdangyuan'" title="入党时间" :value="info.POLITICAL_TIME"></u-cell>
+        <u-cell v-if="info.POLITICAL_STATUS == 'zhonggongdangyuan'" title="入党时间"
+                :value="info.POLITICAL_TIME"></u-cell>
        <u-cell title="是否缴纳社保" :value="info.IS_SOCIAL_NAME"></u-cell>
-				<u-cell title="社会保障号" v-if="info.IS_SOCIAL==='1'" :value="info.SOCIAL_NUMBER"></u-cell>
-				<u-cell title="社会保障卡照片" v-if="info.IS_SOCIAL==='1'" >
+        <!-- 用v-if会出现渲染问题导致出现两行相同的数据 所以改成v-show modify by water_xu 2024.7.19 -->
+        <u-cell title="社会保障号" v-show="info.IS_SOCIAL==='1'" :value="info.SOCIAL_NUMBER"></u-cell>
+        <u-cell title="社会保障卡照片" v-show="info.IS_SOCIAL==='1'">
          <template #value>
            <view v-for="(item,index) in socialPhotoFile" :key="index"
-							style="display: flex;justify-content: space-between">
-							<u--image :src="item" width="100upx" height="100upx" style="margin-left: 10upx;"
+                  style="display: flex;justify-content: space-between;margin-left: 10rpx;">
+              <u--image :src="item" width="100rpx" height="100rpx"
                        @click="fnPreview(socialPhotoFile)"></u--image>
            </view>
          </template>
        </u-cell>
+        <u-cell title="是否签订劳动合同" :value="info.IS_SIGN_LABOR_NAME"></u-cell>
+        <u-cell title="合同图片" v-show="info.IS_SIGN_LABOR==='1'">
+          <template #value>
+            <view v-for="(item,index) in contractFile" :key="index"
+                  style="display: flex;justify-content: space-between;margin-left: 10rpx;">
+              <u--image :src="item" width="100rpx" height="100rpx"
+                        @click="fnPreview(contractFile)"></u--image>
+            </view>
+          </template>
+        </u-cell>
+        <u-cell title="是否缴纳商业保险" :value="info.ISPAY_NAME"></u-cell>
+        <u-cell title="商业保险单号" v-show="info.ISPAY==='1'" :value="info.ISPAY_NUMBER"></u-cell>
+        <u-cell title="保险图片" v-show="info.ISPAY==='1'">
+          <template #value>
+            <view v-for="(item,index) in insuranceFile" :key="index"
+                  style="display: flex;justify-content: space-between;margin-left: 10rpx;">
+              <u--image :src="item" width="100rpx" height="100rpx"
+                        @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'">
+        <u-cell title="工伤保险有效期" v-show="info.IS_INJURIES_PAY==='1'" :value="info.IS_INJURIES_PAY_TIME"></u-cell>
+        <u-cell title="工伤保险凭证" v-show="info.IS_INJURIES_PAY==='1'">
          <template #value>
            <view v-for="(item,index) in injuriesPayTiemFile" :key="index"
-							style="display: flex;justify-content: space-between">
-							<u--image :src="item" width="100upx" height="100upx" style="margin-left: 10upx;"
+                  style="display: flex;justify-content: space-between;margin-left: 10rpx;">
+              <u--image :src="item" width="100rpx" height="100rpx"
                        @click="fnPreview(injuriesPayTiemFile)"></u--image>
            </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-show="info.IS_LEVEL_THREE==='1'">
+          <template #value>
+            <view v-for="(item,index) in photosOfLevel" :key="index"
+                  style="display: flex;justify-content: space-between;margin-left: 10rpx;">
+              <u--image :src="item" width="100rpx" height="100rpx"
+                        @click="fnPreview(photosOfLevel)"></u--image>
+            </view>
+          </template>
+        </u-cell>
        <u-cell title="是否流动人员" :value="info.ISFLOW_NAME"></u-cell>
      </u-cell-group>
    </view>
+    <fab-button type="edit" @click="$u.route({url: '/pages/mine/information/update'})"/>
  </view>
 </template>

 <script>
 import {
  getUserInfo,
-		getEmployedBy
+  getEmployedBy, getIDCardDeduplication
 } from "../../../api";
+import FabButton from "@/components/fab_button/index.vue";

 export default {
+  components: {FabButton},
  data() {
    return {
      info: {},
      userCardIDPhotoFile: [],
      socialPhotoFile: [],
      injuriesPayTiemFile: [],
+      photosOfLevel: [],
+      contractFile: [],
+      insuranceFile: [],
      EMPLOYMENT_APPLY_MANAGEMENT_ID: '',
    }
  },
-		onNavigationBarButtonTap(e) {
-			if (e.index === 0) {
-				uni.$u.route({
-					url: '/pages/mine/information/update'
-				})
-			}
-		},
  onShow() {
    this.fnGetData()
  },
@ -101,6 +134,14 @@
    }
  },
  methods: {
+    async fnIDCardDeduplication(CARD_ID = this.form.CARD_ID) {
+      let resData = await getIDCardDeduplication({CARD_ID})
+      if (resData.pd) {
+        uni.$u.toast('身份证号重复')
+        return true
+      }
+      return false
+    },
    fnPreview(urls) {
      uni.previewImage({
        urls
@ -110,6 +151,9 @@
      this.userCardIDPhotoFile = []
      this.socialPhotoFile = []
      this.injuriesPayTiemFile = []
+      this.contractFile = []
+      this.photosOfLevel = []
+      this.insuranceFile = []
      let Employed = await getEmployedBy({
        showCount: 10,
        currentPage: 1,
@ -136,6 +180,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 +208,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
@ -21,11 +21,16 @@
        <u-form-item label="身份证" prop="CARD_ID" borderBottom required>
          <u--input border="none" v-model="form.CARD_ID" @blur="fnCardIdDisassembly"></u--input>
        </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"
+        <u-form-item label="身份证照片(正反面)" prop="userCardIDPhotoFile" borderBottom required labelPosition="top"
+                     labelWidth="auto">
+          <view class="mt-10 w100">
+            <u-upload :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,53 +51,141 @@
          <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">
-					<u-upload class="mt-10" :fileList="form.socialPhotoFile" @afterRead="fnAttSocialAdd"
-						@delete="fnAttSocialDelete" multiple :maxCount="2" previewFullImage>
-					</u-upload>
+        </view>
+        <view>
+          <u-form-item v-if="form.IS_SOCIAL==='1'" label="社会保障卡" prop="socialPhotoFile" borderBottom required
+                       labelPosition="top" labelWidth="auto">
+            <view class="mt-10 w100">
+              <u-upload :fileList="form.socialPhotoFile" @afterRead="fnAttSocialAdd"
+                        @delete="fnAttSocialDelete" multiple :maxCount="2" previewFullImage></u-upload>
+            </view>
          </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
+                       labelPosition="top" labelWidth="auto">
+            <view class="mt-10 w100">
+              <u-upload :fileList="form.contractFile" @afterRead="fnIsSignLaborAdd"
+                        @delete="fnIsSignLaborDelete" multiple :maxCount="4" previewFullImage></u-upload>
+            </view>
+          </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
+                       labelPosition="top" labelWidth="auto">
+            <view class="mt-10 w100">
+              <u-upload :fileList="form.insuranceFile" @afterRead="fnIsPayAdd" @delete="fnIsPayDelete"
+                        multiple :maxCount="4" previewFullImage></u-upload>
+            </view>
+          </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"
+                       v-if="form.IS_INJURIES_PAY==='1'" labelPosition="top" labelWidth="auto">
+            <view class="mt-10 w100">
+              <u-upload :fileList="form.injuriesPayTiemFile"
                        @afterRead="fnInjuriesPayTiemAttachmentsAfterRead" @delete="fnInjuriesPayTiemAttachmentsDelete"
                        multiple :maxCount="4" previewFullImage></u-upload>
+            </view>
          </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 labelPosition="top" labelWidth="auto">
+            <view class="mt-10 w100">
+              <u-upload :fileList="form.photosOfLevel" @afterRead="fnPhotosOfLevelAdd"
+                        @delete="fnPhotosOfLevelDelete" multiple :maxCount="4" previewFullImage>
+              </u-upload>
+            </view>
+          </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>
+          <u--input v-model="form.ISFLOW_NAME" border="none" disabled disabledColor="#ffffff"
+                    inputAlign="right"></u--input>
        </u-form-item>
      </u--form>
      <u-picker ref="uPicker" :show="singleChoice" :columns="singleChoiceColumns" keyName="NAME"
@ -106,9 +199,21 @@
      </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>
+                         @confirm="fnShowInjuriesPayTiemConfirm"
+                         @cancel="fnShowInjuriesPayTiemEducation"></u-datetime-picker>
+      <view class="mt-10">
+        <u-button type="primary" text="保 存" @click="$u.debounce(fnSubmit, 1000,true)"></u-button>
+      </view>
    </view>
  </view>
 </template>
@ -144,13 +249,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 +281,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 +318,7 @@
        socialPhotoFile: {
          type: 'array',
          required: true,
-						message: '请上传设保卡正反照',
+          message: '请上传社保卡正反照',
          trigger: ['change']
        },
        CARD_ID: [{
@ -267,14 +388,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() {
@ -288,7 +449,10 @@
      this.changeFrom = changeFrom
      if (changeFrom == 'NATIONALITY') this.fnGetDataDictionary('0a0e406f27f74ee698fe9979d25f62dd')
      if (changeFrom == 'DEGREE_OF_EDUCATION') this.fnGetDataDictionary('d7d80f08d73a4accbccf4fd3d8d1d867')
-				if (changeFrom == 'MARITALSTATUS') this.singleChoiceColumns = [[{NAME: '已婚', BIANMA: '1'}, {NAME: '未婚', BIANMA: '0'}]]
+      if (changeFrom == 'MARITALSTATUS') this.singleChoiceColumns = [[{NAME: '已婚', BIANMA: '1'}, {
+        NAME: '未婚',
+        BIANMA: '0'
+      }]]
      if (changeFrom == 'POLITICAL_STATUS') this.fnGetDataDictionary('6351efdd12dc4730952e5d195718e252')

      this.singleChoice = true
@ -330,20 +494,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 +520,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 +532,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 +631,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 +703,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 +797,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 +874,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 +917,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 +934,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 +960,6 @@
            }
          })
        }
-
        for (let i = 0; i < this.form.socialPhotoFile.length; i++) {
          await setUploadAttachments({
            filePath: this.form.socialPhotoFile[i].url,
@ -672,17 +971,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 +1056,9 @@
 </script>

 <style scoped>
-
+.tip {
+  color: red;
+  font-size: 12px;
+  margin-top: 5px;
+}
 </style>
--- a/pages/mine/privacy/privacy.vue
+++ b/pages/mine/privacy/privacy.vue
@ -7,9 +7,7 @@
 </template>

 <script>
-export default {
-
-}
+export default {}
 </script>

 <style scoped>
--- a/pages/related_party_units/add.vue
+++ b/pages/related_party_units/add.vue
@ -2,12 +2,12 @@
  <view class="content">
    <view class="card">
      <u--form labelPosition="left" :model="form" :rules="rules" ref="form" labelWidth="auto">
-				<u-form-item label="照片" prop="userPhoto" borderBottom required class="form-item-block">
-					<u-upload class="mt-10" :fileList="form.userPhoto" :maxCount="1" @afterRead="fnUserPhotoRead"
+        <u-form-item label="照片" prop="userPhoto" borderBottom required labelPosition="top" labelWidth="auto">
+          <view class="mt-10 w100">
+            <u-upload :fileList="form.userPhoto" :maxCount="1" @afterRead="fnUserPhotoRead"
                      @delete="fnUserPhotoDelete" multiple previewFullImage></u-upload>
+          </view>
        </u-form-item>
-
-
        <u-form-item label="单位名称" prop="NAME" borderBottom required>
          <u--input v-model="RELEVANT_UNIT_NAME" :disabled="true" border="none" inputAlign="right"></u--input>
        </u-form-item>
@ -34,9 +34,14 @@
          </u--input>
        </u-form-item>
        <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>
+                     labelPosition="top" labelWidth="auto">
+          <view class="mt-10 w100">
+            <u-upload :fileList="form.userCardIDFileList" @afterRead="fnUserCardIDAttachmentsRead"
+                      @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 +64,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 labelPosition="top" labelWidth="auto">
          <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 labelPosition="top" labelWidth="auto">
          <u--textarea v-model="form.ADDRESS" border="none" autoHeight></u--textarea>
        </u-form-item>
        <u-form-item label="联系电话" prop="PHONE" borderBottom required>
@ -78,22 +83,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"
@ -102,9 +107,17 @@
        <u-form-item label="社会保障号码" prop="SOCIAL_NUMBER" borderBottom required v-if="form.IS_SOCIAL==='1'">
          <u--input v-model="form.SOCIAL_NUMBER" border="none" inputAlign="right"></u--input>
        </u-form-item>
-				<u-form-item label="社保卡照片" prop="socialFileList" borderBottom required class="form-item-block" v-if="form.IS_SOCIAL==='1'" >
-					<u-upload class="mt-10" :fileList="form.socialFileList" @afterRead="fnSocialAttachmentsRead"
+        <u-form-item label="社保卡照片" prop="socialFileList" borderBottom required labelPosition="top"
+                     labelWidth="auto" v-if="form.IS_SOCIAL==='1'">
+          <view class="mt-10 w100">
+            <u-upload :fileList="form.socialFileList" @afterRead="fnSocialAttachmentsRead"
                      @delete="fnSocialAttachmentsDelete" multiple :maxCount="2" previewFullImage></u-upload>
+          </view>
+        </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">
@ -112,10 +125,12 @@
                    inputAlign="right"></u--input>
        </u-form-item>
        <u-form-item label="劳动合同附件" prop="contractFile" borderBottom required v-if="form.IS_SIGN_LABOR==='1'"
-					class="form-item-block">
-					<u-upload class="mt-10" :fileList="form.contractFile"
+                     labelPosition="top" labelWidth="auto">
+          <view class="mt-10 w100">
+            <u-upload :fileList="form.contractFile"
                      @afterRead="fnAttachmentToLaborContractAfterRead" @delete="fnAttachmentToLaborContractDelete"
                      multiple :maxCount="4" previewFullImage></u-upload>
+          </view>
        </u-form-item>
        <u-form-item label="是否按期缴纳工伤保险" prop="IS_INJURIES_PAY_NAME" borderBottom required
                     @click="fnShowEmploymentInjuryInsurance">
@ -128,10 +143,12 @@
                    inputAlign="right"></u--input>
        </u-form-item>
        <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"
+                     v-if="form.IS_INJURIES_PAY==='1'" labelPosition="top" labelWidth="auto">
+          <view class="mt-10 w100">
+            <u-upload :fileList="form.injuriesPayTiemFile"
                      @afterRead="fnInjuriesPayTiemAttachmentsAfterRead" @delete="fnInjuriesPayTiemAttachmentsDelete"
                      multiple :maxCount="4" previewFullImage></u-upload>
+          </view>
        </u-form-item>


@ -144,15 +161,25 @@
          <u--input v-model="form.ISPAY_NUMBER" border="none" inputAlign="right"></u--input>
        </u-form-item>
        <u-form-item label="保险附件" prop="insuranceFile" borderBottom required v-if="form.ISPAY==='1'"
-					class="form-item-block">
-					<u-upload class="mt-10" :fileList="form.insuranceFile" @afterRead="fnInsuranceAttachmentsAfterRead2"
+                     labelPosition="top" labelWidth="auto">
+          <view class="mt-10 w100">
+            <u-upload :fileList="form.insuranceFile" @afterRead="fnInsuranceAttachmentsAfterRead2"
                      @delete="fnInsuranceAttachmentsDelete" multiple :maxCount="4" previewFullImage></u-upload>
+          </view>
        </u-form-item>
        <u-form-item label="是否参加三级安全培训" prop="IS_LEVEL_THREE_NAME" borderBottom required
                     @click="fnShowSafetyTraining">
          <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'"
+                     labelPosition="top" labelWidth="auto">
+          <view class="mt-10 w100">
+            <u-upload :fileList="form.safetytraining" @afterRead="fnSafetyTrainingAfterRead2"
+                      @delete="fnSafetyTrainingAttachmentsDelete" multiple :maxCount="4" previewFullImage></u-upload>
+          </view>
+        </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,19 +190,20 @@
                     @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>
+          <u--input v-model="form.ISFLOW_NAME" border="none" disabled disabledColor="#ffffff"
+                    inputAlign="right"></u--input>
        </u-form-item>
      </u--form>
      <u-picker :show="showDegreeOfEducation" :columns="degreeOfEducationColumns" keyName="NAME"
@ -194,6 +222,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>
@ -227,12 +258,15 @@
                @confirm="fnShowPoliticalStatusConfirm" @cancel="fnShowPoliticalStatusEducation"></u-picker>
      <!-- 入党时间 -->
      <u-datetime-picker :show="showPoliticalTime" v-model="POLITICAL_TIME" mode="date"
-				@confirm="fnShowPoliticalTimeConfirm" @cancel="fnShowPoliticalTimeEducation"></u-datetime-picker>
+                         @confirm="fnShowPoliticalTimeConfirm"
+                         @cancel="fnShowPoliticalTimeEducation"></u-datetime-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>
-
+                         @confirm="fnShowInjuriesPayTiemConfirm"
+                         @cancel="fnShowInjuriesPayTiemEducation"></u-datetime-picker>
+      <view class="mt-10">
+        <u-button type="primary" text="保 存" @click="$u.debounce(fnSubmit, 1000,true)"></u-button>
+      </view>
    </view>
  </view>
 </template>
@ -248,7 +282,8 @@
  setRelatedPartyRegistration,
  setUploadAttachments,
  getEMPLOYMENTAPPLYMANAGEMENTID,
-		getEmployedBy
+  getEmployedBy,
+  removeUploadAttachments
 } from "../../api";

 export default {
@ -282,6 +317,7 @@
      showIsSocial: false,
      showLaborContract: false,
      showEmploymentInjuryInsurance: false,
+      showInsurance: false,
      showEmploymentPayInsurance: false,
      showSafetyTraining: false,
      showAdmissionSafetyNotification: false,
@ -324,15 +360,19 @@
        contractFile: [],
        ISPAY: '',
        ISPAY_NAME: '',
+        imgDelKey: '',
+        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 +429,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 +482,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 +524,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 +555,12 @@
          message: '请上传保险附件',
          trigger: ['change']
        },
+        safetytraining: {
+          type: 'array',
+          required: true,
+          message: '请上传三方安全培训图片',
+          trigger: ['change']
+        },
        IS_LEVEL_THREE_NAME: {
          required: true,
          message: '请选择是否参加三级安全培训',
@ -526,16 +576,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: '请选择是否流动人员',
@ -588,11 +638,21 @@
      } else if (this.form.IS_SOCIAL === '1') {
        this.form.IS_SOCIAL_NAME = '是'
      }
+      if (this.form.MARITALSTATUS === '0') {
+        this.form.MARITALSTATUS_NAME = '未婚'
+      } else if (this.form.MARITALSTATUS === '1') {
+        this.form.MARITALSTATUS_NAME = '已婚'
+      }
      if (this.form.IS_SIGN_LABOR === '0') {
        this.form.IS_SIGN_LABOR_NAME = '否'
      } else if (this.form.IS_SIGN_LABOR === '1') {
        this.form.IS_SIGN_LABOR_NAME = '是'
      }
+      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') {
@ -608,32 +668,35 @@
      } 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') {
        this.form.ISFLOW_NAME = '是'
      }
      this.$set(this.form, 'userPhoto', [{
-					url: this.$filePath + resData.userPhotoFile[0].FILEPATH
+        url: this.$filePath + resData.userPhotoFile[0].FILEPATH,
+        id: resData.userPhotoFile[0].IMGFILES_ID
      }])
      for (let i = 0; i < resData.userCardIDPhotoFile.length; i++) {
        let ogj = {}
        ogj.url = this.$filePath + resData.userCardIDPhotoFile[i].FILEPATH
+        ogj.id = resData.userCardIDPhotoFile[i].IMGFILES_ID
        this.form.userCardIDFileList.push(ogj)
      }
      for (let i = 0; i < resData.socialPhotoFile.length; i++) {
        let ogj = {}
        ogj.url = this.$filePath + resData.socialPhotoFile[i].FILEPATH
+        ogj.id = resData.socialPhotoFile[i].IMGFILES_ID
        this.form.socialFileList.push(ogj)
      }
      this.getDataCertificateInformation()
@ -643,14 +706,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 +845,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
@ -802,6 +873,8 @@
      }
    },
    fnUserPhotoDelete(event) {
+      var id = this.form.userPhoto[event.index].id
+      this.form.imgDelKey = this.form.imgDelKey + id + ','
      this.form.userPhoto.splice(event.index, 1)
    },
    fnAttachmentToLaborContractAfterRead(event) {
@ -812,6 +885,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])
@ -861,6 +942,8 @@
      }
    },
    fnUserCardIDAttachmentsDelete(event) {
+      var id = this.form.userCardIDFileList[event.index].id
+      this.form.imgDelKey = this.form.imgDelKey + id + ','
      this.form.userCardIDFileList.splice(event.index, 1)
    },
    //政治面貌 POLITICAL_STATUS
@ -888,6 +971,8 @@
      }
    },
    fnSocialAttachmentsDelete(event) {
+      var id = this.form.socialFileList[event.index].id
+      this.form.imgDelKey = this.form.imgDelKey + id + ','
      this.form.socialFileList.splice(event.index, 1)
    },

@ -909,33 +994,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
    },
@ -946,6 +1031,10 @@
    },
    fnSubmit() {
      let fileUrl = ''
+      let imgDelKey = String(this.form.imgDelKey)
+      if (imgDelKey.length > 0) {
+        this.form.imgDelKey = imgDelKey.replace(/undefined,/g, '').slice(0, -1)
+      }
      this.$refs.form.validate().then(async () => {
        if (await this.fnIDCardDeduplication()) return
        if (await this.fnPhoneNumberDeduplication()) return
@ -974,6 +1063,8 @@
          uni.$u.toast('工商或社保全无人员，不可进入本系统相关方人员管理！');
          return;
        }
+        // 开始上传图片
+        // 头像
        for (let i = 0; i < this.form.userPhoto.length; i++) {
          let resData = await setUploadAttachments({
            filePath: this.form.userPhoto[i].url,
@ -997,6 +1088,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,
@ -1008,6 +1110,7 @@
            }
          })
        }
+        // 身份证
        for (let i = 0; i < this.form.userCardIDFileList
            .length; i++) { // 14 身份证照片 15 社保卡照片 16上传工伤保险凭证
          await setUploadAttachments({
@ -1048,6 +1151,7 @@
          CORPINFO_ID: this.CORPINFO_ID,
          RELEVANT_UNIT_NAME: this.RELEVANT_UNIT_NAME,
          PHOTO: fileUrl,
+          WORK_SIGN: this.form.IS_SIGN_LABOR,
        })
        uni.$u.toast('保存成功，请等待相关方审核')
        setTimeout(() => {
@ -1063,5 +1167,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,27 +6,30 @@
          <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"
                    inputAlign="right"></u--input>
        </u-form-item>
        <view v-if="form.IS_SIGN_LABOR==='1'">
-					<u-form-item label="劳动合同附件" prop="contractFile" borderBottom required class="form-item-block">
-						<u-upload class="mt-10" :fileList="form.contractFile"
+          <u-form-item label="劳动合同附件" prop="contractFile" borderBottom required labelPosition="top"
+                       labelWidth="auto">
+            <view class="mt-10 w100">
+              <u-upload :fileList="form.contractFile"
                        @afterRead="fnAttachmentToLaborContractAfterRead"
                        @delete="fnAttachmentToLaborContractDelete" multiple :maxCount="4" previewFullImage>
              </u-upload>
+            </view>
          </u-form-item>
        </view>
        <u-form-item label="是否缴纳工伤保险" prop="IS_INJURIES_PAY_NAME" borderBottom required
@ -43,11 +46,13 @@
        </view>
        <view v-if="form.IS_INJURIES_PAY==='1'">
          <u-form-item label="工伤保险凭证" prop="workInsurancePhotoFile" borderBottom required
-						class="form-item-block">
-						<u-upload class="mt-10" :fileList="form.workInsurancePhotoFile"
+                       labelPosition="top" labelWidth="auto">
+            <view class="mt-10 w100">
+              <u-upload :fileList="form.workInsurancePhotoFile"
                        @afterRead="fnWorkInsuranceRead" @delete="fnWorkInsuranceDelete" multiple
                        :maxCount="4" previewFullImage>
              </u-upload>
+            </view>
          </u-form-item>
        </view>
        <u-form-item label="是否缴纳商业保险" prop="ISPAY_NAME" borderBottom required
@ -60,10 +65,13 @@
          </u--input>
        </u-form-item>
        <view v-if="form.ISPAY==='1'">
-					<u-form-item label="保险附件" prop="insuranceFile" borderBottom required class="form-item-block">
-						<u-upload class="mt-10" :fileList="form.insuranceFile"
+          <u-form-item label="保险附件" prop="insuranceFile" borderBottom required labelPosition="top"
+                       labelWidth="auto">
+            <view class="mt-10 w100">
+              <u-upload :fileList="form.insuranceFile"
                        @afterRead="fnInsuranceAttachmentsAfterRead" @delete="fnInsuranceDelete" multiple
                        :maxCount="4" previewFullImage></u-upload>
+            </view>
          </u-form-item>
        </view>
        <u-form-item label="是否参加三级安全培训" prop="IS_LEVEL_THREE_NAME" borderBottom required
@ -118,7 +126,9 @@
                keyName="name" @confirm="fnSpecialTypeOfWorkConfirm" @cancel="fnShowSpecialTypeOfWork"></u-picker>
      <u-picker :show="showFloatingPersonnel" :columns="[[{name: '是', id: '1'}, {name: '否', id: '0'}]]"
                keyName="name" @confirm="fnFloatingPersonnelConfirm" @cancel="fnShowFloatingPersonnel"></u-picker>
-			<u-button type="primary" text="修 改" class="mt-10" @click="$u.debounce(fnSubmit, 1000,true)"></u-button>
+      <view class="mt-10">
+        <u-button type="primary" text="修 改" @click="$u.debounce(fnSubmit, 1000,true)"></u-button>
+      </view>
    </view>
  </view>
 </template>
@ -403,6 +413,11 @@
      } else if (this.form.IS_SIGN_LABOR === '1') {
        this.form.IS_SIGN_LABOR_NAME = '是'
      }
+      if (this.form.MARITALSTATUS === '0') {
+        this.form.MARITALSTATUS_NAME = '未婚'
+      } else if (this.form.MARITALSTATUS === '1') {
+        this.form.MARITALSTATUS_NAME = '已婚'
+      }
      if (this.form.IS_INJURIES_PAY === '0') {
        this.form.IS_INJURIES_PAY_NAME = '否'
      } else if (this.form.IS_INJURIES_PAY === '1') {
@ -626,7 +641,8 @@
              duration: 2000
            });
            this.form.contractFile.splice(event.index, 1)
-						} else if (res.cancel) {}
+          } else if (res.cancel) {
+          }
        }
      });
    },
--- a/pages/related_party_units/view.vue
+++ b/pages/related_party_units/view.vue
@ -4,12 +4,12 @@
      <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="照片">
            <template #value>
-							<u--image :src="info.userPhoto" shape="circle" width="100upx" height="100upx"></u--image>
+              <u--image :src="info.userPhoto" shape="circle" width="100rpx" height="100rpx"></u--image>
            </template>
          </u-cell>
          <u-cell title="姓名" :value="info.NAME"></u-cell>
@ -25,8 +25,8 @@
          <u-cell title="身份证照片">
            <template #value>
              <view v-for="(item,index) in userCardIDPhotoFile" :key="index"
-								style="display: flex;justify-content: space-between">
-								<u--image :src="item" width="100upx" height="100upx" style="margin-left: 10upx;"
+                    style="display: flex;justify-content: space-between;margin-left: 10rpx;">
+                <u--image :src="item" width="100rpx" height="100rpx"
                          @click="fnPreview(userCardIDPhotoFile)"></u--image>
              </view>
            </template>
@ -45,15 +45,16 @@
          <u-cell title="联系电话" :value="info.PHONE"></u-cell>
          <u-cell title="婚姻状况" :value="info.MARITALSTATUS_NAME"></u-cell>
          <u-cell title="政治面貌" :value="info.POLITICAL_STATUS_NAME"></u-cell>
-					<u-cell v-if="info.POLITICAL_STATUS == 'zhonggongdangyuan'" title="入党时间" :value="info.POLITICAL_TIME"></u-cell>
+          <u-cell v-if="info.POLITICAL_STATUS == 'zhonggongdangyuan'" title="入党时间"
+                  :value="info.POLITICAL_TIME"></u-cell>


          <u-cell title="社会保障号" :value="info.SOCIAL_NUMBER"></u-cell>
          <u-cell title="社会保障卡照片">
            <template #value>
              <view v-for="(item,index) in socialPhotoFile" :key="index"
-								style="display: flex;justify-content: space-between">
-								<u--image :src="item" width="100upx" height="100upx" style="margin-left: 10upx;"
+                    style="display: flex;justify-content: space-between;margin-left: 10rpx;">
+                <u--image :src="item" width="100rpx" height="100rpx"
                          @click="fnPreview(socialPhotoFile)"></u--image>
              </view>
            </template>
@ -66,19 +67,20 @@
      <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>
              <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;"
+                    style="display: flex;justify-content: space-between;margin-left: 10rpx;">
+                <u--image :src="item" width="100rpx" height="100rpx"
                          @click="fnPreview(contractFile)"></u--image>
              </view>
            </template>
@ -89,8 +91,8 @@
          <u-cell title="工伤保险凭证" v-show="info.IS_INJURIES_PAY === '1'">
            <template #value>
              <view v-for="(item,index) in workInsurancePhotoFile" :key="index"
-								style="display: flex;justify-content: space-between">
-								<u--image :src="item" width="100upx" height="100upx" style="margin-left: 10upx;"
+                    style="display: flex;justify-content: space-between;margin-left: 10rpx;">
+                <u--image :src="item" width="100rpx" height="100rpx"
                          @click="fnPreview(workInsurancePhotoFile)"></u--image>
              </view>
            </template>
@ -100,18 +102,14 @@
          <u-cell title="保险附件" v-show="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;"
+                    style="display: flex;justify-content: space-between;margin-left: 10rpx;">
+                <u--image :src="item" width="100rpx" height="100rpx"
                          @click="fnPreview(insuranceFile)"></u--image>
              </view>
            </template>
          </u-cell>
          <u-cell title="是否参加三级安全培训" :value="info.IS_LEVEL_THREE == '0' ? '否' : '是'"></u-cell>
-					<!-- <u-cell title="是否开展入场安全告知" :value="info.IS_SAFETY_TELL == '0' ? '否' : '是'"></u-cell> -->
-					<u-cell title="身体状况是否适应本岗位工作" :value="info.IS_BODY_ADAPT == '0' ? '否' : '是'"></u-cell>
          <u-cell title="是否特殊工种" :value="info.IS_SPECIAL_JOB == '0' ? '否' : '是'"></u-cell>
-					<!-- <u-cell title="是否流动人员" :value="info.ISFLOW == '0' ? '否' : '是'"></u-cell> -->
-					<!-- <u-cell title="审核意见" v-show="info.AUDIT_REMARKS != ''" :value="info.AUDIT_REMARKS"></u-cell>-->
        </u-cell-group>
      </view>
    </view>
@ -148,9 +146,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 +162,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 +215,7 @@
      }
      if (resData.userPhotoFile && resData.userPhotoFile.length > 0) {
        this.$set(this.info, 'userPhoto', this.$filePath + resData.userPhotoFile[0].FILEPATH)
+        console.log(this.info.userPhoto)
      }

    },
@ -247,6 +246,7 @@
  font-size: 30rpx;
  margin-top: 5px;
 }
+
 .title_right_red {
  margin-left: auto;
  color: red;
--- a/pages/service_unit_management/index.vue
+++ b/pages/service_unit_management/index.vue
@ -16,7 +16,8 @@
          </view>
          <view class="flex-between mt-10 subtitle">
            <view></view>
-            <u-button type="primary" text="查看" size="mini" class="bth-mini" @click="fnView(item.SERVICE_COMPANY_USER_MAP_ID)"></u-button>
+            <u-button type="primary" text="查看" size="mini"
+                      @click="fnView(item.SERVICE_COMPANY_USER_MAP_ID)"></u-button>
          </view>
        </view>
      </u-list-item>
--- a/qa-prevention-xgf-app.iml
+++ b/qa-prevention-xgf-app.iml
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
--- a/qa-related-parties-gwj-app.iml
+++ b/qa-related-parties-gwj-app.iml
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
--- a/static/icon-apps/app_icons6.png
+++ b/static/icon-apps/app_icons6.png
--- a/styles/home_style.scss
+++ b/styles/home_style.scss
@ -12,53 +12,9 @@
 	}
 }
 .wui_banner{
-	height: 507upx;
+	height: 507rpx;
 	position: relative;
 	overflow: hidden;
-	.wui-bar{
-		display: flex;
-		align-items: center;
-		min-height: 100upx;
-		justify-content: flex-end;
-		z-index: 9999;
-		position: absolute;
-		width: 100%;
-		.search-form{
-			background: rgba(255,255,255,0.2);
-			border-radius: 100upx;
-			flex: 1;
-			height: 60upx;
-			line-height: 60upx;
-			font-size: 24upx;
-			color: #333333;
-			display: flex;
-			align-items: center;
-			margin: 0 30upx;
-			padding: 0 30upx;
-			.cuIcon-search{
-				color: rgba(255,255,255,0.5);
-				margin-right: 16upx;
-				font-size: 28upx;
-			}
-			input{
-				color: rgba(255,255,255,0.5);
-				flex: 1;
-				padding-right: 30upx;
-				height: 64upx;
-				line-height: 64upx;
-				font-size: 26upx;
-				background-color: transparent;
-				.phcolor{
-					color: rgba(255,255,255,0.5);
-				}
-			}
-		}
-		.icon-ui {
-			color: #fff;
-			font-size: 42upx;
-			margin-right: 22upx;
-		}
-	}
 	.banner_img{
 		z-index: 1;
 		width: 100%;
@ -74,11 +30,11 @@

 .home-apps {
 	position: relative;
-	top: -180upx;
+	top: -180rpx;
 	background-color: #fff;
-	padding: 30upx 20upx;
-	border-radius: 40upx;
-	margin: 0 30upx;
+	padding: 30rpx 20rpx;
+	border-radius: 40rpx;
+	margin: 0 30rpx;
 	display: flex;
 	flex-wrap:wrap;
 	.home-apps-item {
@ -88,14 +44,14 @@
 		flex-grow: 0;
 		width: 25%;
 		.text {
-			margin: 10upx 0;
-			font-size: 28upx;
+			margin: 10rpx 0;
+			font-size: 28rpx;
 			text-align: center;
-			width: 140upx;
+			width: 140rpx;
 		}
 		.home-apps-item-img {
-			width: 136upx;
-			height: 136upx;
+			width: 136rpx;
+			height: 136rpx;
 			image {
 				width: 100%;
 				height: 100%;
@ -105,39 +61,39 @@
 }
 .home-message{
 	position: relative;
-	top: -160upx;
-	height: 120upx;
+	top: -160rpx;
+	height: 120rpx;
 	background-color: #fff;
-	border-radius: 40upx;
-	margin: 0 30upx;
-	padding: 0 30upx;
+	border-radius: 40rpx;
+	margin: 0 30rpx;
+	padding: 0 30rpx;
 	display: flex;
 	align-items: center;
 	.home-title{
 		width: 54px;
 		height: 54px;
-		margin-right: 10upx;
+		margin-right: 10rpx;
 		image{
 			width: 100%;
 			height: 100%;
 		}
 	}
 	.home-content{
-		font-size: 28upx;
+		font-size: 28rpx;
 		flex: 1;
 	}
 	.home-more{
 		color: #ccc;
-		font-size: 26upx;
+		font-size: 26rpx;
 	}
 }
 .home-letters{
 	position: relative;
-	top: -140upx;
+	top: -140rpx;
 	background-color: #fff;
-	border-radius: 40upx;
-	margin: 0 30upx;
-	padding: 30upx;
+	border-radius: 40rpx;
+	margin: 0 30rpx;
+	padding: 30rpx;

 	.letters-title{
 		width: 80px;
@ -149,17 +105,17 @@
 	}
 	.letters-content{
 		.letters-item{
-			border-bottom: 1upx solid #e5e5e5;
-			padding: 20upx 0;
+			border-bottom: 1rpx solid #e5e5e5;
+			padding: 20rpx 0;
 			&:last-child{
 				border: none;
 			}
 			.lable{
-				font-size: 30upx;
+				font-size: 30rpx;
 				white-space: nowrap;
 			}
 			.font{
-				font-size: 28upx;
+				font-size: 28rpx;
 				color: #666;
 			}
 			.letters-title{
@ -185,14 +141,14 @@
 				align-items: flex-start;
 				justify-content: space-between;
 				width: 100%;
-				font-size: 30upx;
-				margin: 10upx 0;
+				font-size: 30rpx;
+				margin: 10rpx 0;
 			}
 			.letters-date{
 				display: flex;
 				align-items: center;
 				width: 100%;
-				font-size: 30upx;
+				font-size: 30rpx;

 			}
 		}
@ -200,7 +156,7 @@
 }
 .home-line{
 	position: relative;
-	top: -70upx;
+	top: -70rpx;
 	text-align: center;
 	color: #ccc;
 }
@ -213,19 +169,19 @@
 		z-index: 999;
 	}
 	.grid_item{
-		width: calc(47% - 4upx);
+		width: calc(47% - 4rpx);
 		display: block;
-		padding: 30upx 0;
+		padding: 30rpx 0;
 		color: #fff;
 		margin-left: 2%;
 		margin-top: 2%;
 		text-align: center;
 	background-image: linear-gradient(to bottom right, rgba(0,138,255,1), rgba(91,74,255,1));
-		border: 1upx solid #2084d9;
+		border: 1rpx solid #2084d9;
 		position: relative;
 		.grid_text{
 			display: flex;
-			padding-left: 30upx;
+			padding-left: 30rpx;
 			.grid_tut{
 				width: 85%;
 			}
@ -235,28 +191,28 @@


 .message_list{
-	padding: 30upx;
+	padding: 30rpx;
 	.message_item{
 		position: relative;
 		.message_flex{
-			width: calc(100% - 30upx);
+			width: calc(100% - 30rpx);
 			display: flex;
 			flex-direction: row;
 			justify-content: space-between;
 			align-items: center;
 			.fontstyle{
-				font-size: 32upx;
-				line-height: 60upx;
+				font-size: 32rpx;
+				line-height: 60rpx;
 			}
 			.font0{
-				font-size: 30upx;
+				font-size: 30rpx;
 				color: #666;
-				flex-basis: 72upx;
+				flex-basis: 72rpx;
 			}
 			.message_time{
-				font-size: 26upx;
+				font-size: 26rpx;
 				color: #666;
-				line-height: 60upx;
+				line-height: 60rpx;
 			}
 		}
 	}
@ -269,12 +225,12 @@
 		bottom: 0;
 		display: block;
 		margin: auto;
-		width: 30upx;
-		height: 30upx;
+		width: 30rpx;
+		height: 30rpx;
 		color: #b4b4b4;
 		content: "\e6a3";
 		text-align: center;
-		font-size: 34upx;
+		font-size: 34rpx;
 		font-family: cuIcon;
-		line-height: 30upx
+		line-height: 30rpx
 	}
--- a/styles/theme.scss
+++ b/styles/theme.scss
@ -1,154 +1,130 @@
 .ml-10 {
-  margin-left: 20upx !important;
+  margin-left: 20rpx !important;
 }
+
 .mt-10 {
-  margin-top: 20upx !important;
+  margin-top: 20rpx !important;
 }
+
 .mb-10 {
-  margin-bottom: 20upx !important;
+  margin-bottom: 20rpx !important;
 }
+
 .mr-10 {
-  margin-right: 20upx !important;
+  margin-right: 20rpx !important;
 }
+
 .m-10 {
-  margin: 20upx !important;
+  margin: 20rpx !important;
 }
+
 .p-10 {
-  padding: 20upx !important;
+  padding: 20rpx !important;
 }
+
 .pl-10 {
-  padding-left: 20upx !important;
+  padding-left: 20rpx !important;
 }
+
 .pr-10 {
-  padding-right: 20upx !important;
+  padding-right: 20rpx !important;
 }
+
 .pt-10 {
-  padding-top: 20upx !important;
+  padding-top: 20rpx !important;
 }
+
 .pb-10 {
-  padding-bottom: 20upx !important;
+  padding-bottom: 20rpx !important;
 }
+
 .w100 {
  width: 100%;
 }
+
 .flex1 {
  flex: 1;
 }
+
 .pr {
  position: relative;
 }
+
 .border {
  border: 1px solid #e5e5e5;
 }
+
 .content {
  position: relative;
  min-height: 100vh;
  background-color: $uni-bg-color-grey;
 }
+
 .card {
-  padding: 20upx;
+  padding: 20rpx;
  background-color: #FFFFFF;
 }
+
 .search {
  border-bottom: 1px solid #ccc;
  display: flex;
  flex-direction: row;
+
  .u-text {
-    width: 100upx !important;
+    width: 100rpx !important;
    flex: none !important;
  }
+
  .u-button {
-    height: 68upx !important;
+    height: 68rpx !important;
  }
+
  .u-input__content__field-wrapper__field {
-    height: 42upx !important;
+    height: 42rpx !important;
  }
 }
-.bth-mini{
-  width: auto !important;
-  border-radius: 15upx !important;
-  margin-left: unset;
-  margin-right: unset;
-}
-.bth{
-  flex: 1;
-  border-radius: 15upx !important;
-  margin-left: unset;
-  margin-right: unset;
-}
+
 .flex-between {
  display: flex;
  flex-direction: row;
  justify-content: space-between;
 }
+
 .flex-end {
  display: flex;
  flex-direction: row;
  justify-content: flex-end;
 }
+
 .flex-warp {
  display: flex;
  flex-direction: row;
  flex-wrap: wrap;
 }
+
 .main-title {
  color: #333333;
-  font-size: 30upx;
+  font-size: 30rpx;
 }
+
 .subtitle {
  color: #888888;
-  font-size: 26upx;
-}
-.view-title{
-  border-left: 8upx solid #1d82fe;
-  .u-text{
-    padding-left: 10upx;
-    color: #353535 !important;
-  }
+  font-size: 26rpx;
 }
+
 .title {
  font-weight: bold;
  color: #000000;
-  font-size: 28upx;
-}
-.title-none{
-  .u-cell__body__content,.u-cell__title{
-    display: none !important;
-  }
-}
-.title-show{
-  .u-cell__body__content,.u-cell__title{
-    display: flex !important;
-  }
-}
-.flex-none{
-  display: block;
-  .u-cell__body{
-    display: block !important;
-  }
+  font-size: 28rpx;
 }
+
 .required {
  &:before {
    content: '*';
    position: absolute;
    left: 0;
    color: #f56c6c;
-    font-size: 40upx;
+    font-size: 40rpx;
    font-weight: normal;
  }
 }
-.form-item-block{
-.u-form-item__body{
-  display: block !important;
-  .u-form-item__body__left{
-    width: 100% !important;
-  }
-  .u-form-item__body__right{
-    .u-form-item__body__right__content__slot{
-      justify-content: flex-start;
-      position: relative;
-      margin-left: 20upx;
-    }
-  }
-}
-}
--- a/styles/uview.scss
+++ b/styles/uview.scss
@ -1,17 +1,17 @@
 .u-list {
  .u-list-item {
-    padding: 20upx;
+    padding: 20rpx;
    background-color: #fff;
    border-bottom: 1px solid rgb(214, 215, 217);
  }
 }
 .u-textarea{
-  padding: 18upx;
+  padding: 18rpx;
 }
 .u-form-item__body__left__content__required{
  position: relative !important;
  left: 0 !important;
-  margin-right: 10upx;
+  margin-right: 10rpx;
 }
 .u-form-item__body__left{
  //flex: 1 !important;
@ -20,7 +20,7 @@
  .u-form-item__body__right__content__slot{
    justify-content: flex-end;
    position: relative;
-    padding-right: 20upx;
+    padding-right: 20rpx;
  }
  .u-text{
    justify-content: flex-end !important;
@ -30,19 +30,19 @@
  }
 }
 .u-text__value{
-  font-size: 28upx !important;
+  font-size: 28rpx !important;
 }
 .u-form-item__body__left__content__label{
-  font-size: 28upx !important;
+  font-size: 28rpx !important;
 }
 .u-tabs__wrapper__nav__item{
  flex: 1 !important;
 }
 .u-upload__deletable{
-  height: 40upx !important;
-  width: 40upx !important;
+  height: 40rpx !important;
+  width: 40rpx !important;
  .u-icon__icon{
-    font-size: 30upx !important;
-    line-height: 30upx !important;
+    font-size: 30rpx !important;
+    line-height: 30rpx !important;
  }
 }
Author	SHA1	Message	Date
huangyuxuan	fa39606861	(hyx_2024-10-23_tongbu) 用户名，身份证号中台校验	2024-10-23 14:30:25 +08:00
LiuJiaNan	0b6c61b5b3	兼容微信小程序	2024-09-30 09:40:54 +08:00
LiuJiaNan	8aa01ed294	Merge branch 'refs/heads/pet' into dev	2024-09-29 14:57:55 +08:00
water_xu	362552fc86	相关方 - 电子工牌培训不合格人员也会显示合格证bug	2024-08-29 09:53:08 +08:00
LiuJiaNan	ac49d4525f	upx单位改rpx	2024-08-27 15:04:44 +08:00
water_xu	6f0cbd3c31	Merge branch 'refs/heads/pet' into dev	2024-08-15 16:56:46 +08:00
water_xu	f7e87105f8	相关方 - 适配电子工牌 & 电子工牌显示条件修改	2024-08-02 11:12:19 +08:00
water_xu	2f1884a903	Merge remote-tracking branch 'refs/remotes/origin/pet' into dev # Conflicts: # pages/mine/information/index.vue	2024-07-30 16:24:27 +08:00
water_xu	f88d4e0856	相关方 - 人员离职再入职流程bug修正以及优化	2024-07-20 15:13:03 +08:00
liujun	99deba7cf2	解决app编译后显示项重复问题修复	2024-07-02 18:41:26 +08:00
liujun	3392c5c718	解决app编译后显示项重复问题修复	2024-07-02 17:53:59 +08:00
liujun	7036b72802	解决app编译后显示项重复问题修复	2024-07-02 17:16:10 +08:00
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