14384 集团单位看不见 应该看见的相关方

src/views/xgf/flow/components/list.vue

@@ -42,8 +42,8 @@
       <el-table-column label="操作" align="center" width="450">
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleFlowShow(row)">流程详情</el-button>
+          <el-button v-if="false" type="primary" icon="el-icon-edit" size="mini" @click="handleFlowShow(row)">流程详情</el-button>
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleFlowStepShow(row)">审批流程</el-button>
+          <el-button v-if="false" type="primary" icon="el-icon-edit" size="mini" @click="handleFlowStepShow(row)">审批流程</el-button>
           <el-button v-if="row.power_flag === '1'" type="primary" icon="el-icon-s-claim" size="mini" @click="approve([row])">审批</el-button>
           <el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button>
         </template>

src/views/xgf/flow/components/sendUtil.vue

@@ -64,6 +64,11 @@
                 :upload-type="1"/>
             </el-form-item>
           </el-col>
+          <el-col v-if="menu.limitFlag === '1' && form.STATUS === '1'" :span="12">
+            <el-form-item label="培训有效期结束时间:">
+              <el-date-picker v-model="form.LIMIT_END_TIME" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width:300px "/>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
 
@@ -125,6 +130,9 @@ export default {
         ],
         APPOINT_ANNEX: [
           { required: true, message: '请上传文件', trigger: 'change' }
+        ],
+        LIMIT_END_TIME: [
+          { required: true, message: '请选择指定培训有效截至时间', trigger: 'change' }
         ]
       },
       heirloom: {},
@@ -143,7 +151,8 @@ export default {
       menu: {
         department: '',
         user: '',
-        uploadFile: ''
+        uploadFile: '',
+        limitFlag: ''
       }
     }
   },
@@ -187,6 +196,7 @@ export default {
           this.menu.department = data.Department
           this.menu.user = data.User
           this.menu.uploadFile = data.UploadFile
+          this.menu.limitFlag = data.limitFlag
           resolve(true)
         }).catch((e) => {
         })

src/views/xgf/flowApply/components/userInfo.vue

@@ -62,7 +62,7 @@
 
             <tr>
               <th>民族</th>
-              <td>{{ userDetailForm.NATIONALITY_NAME ? userDetailForm.NATIONALITY_NAME : '暂无信息' }}</td>
+              <td>{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}</td>
               <th>婚姻状况</th>
               <td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
               <th>政治面貌</th>
@@ -109,6 +109,68 @@
               </td>
             </tr>
             <tr>
+              <th>是否按期缴纳工伤保险</th>
+              <td :colspan="userDetailForm.IS_INJURIES_PAY === '1' ? '':5">{{ formatLabel(userDetailForm.IS_INJURIES_PAY) }}</td>
+              <th v-if="userDetailForm.IS_INJURIES_PAY === '1'">工伤保险有效期</th>
+              <td v-if="userDetailForm.IS_INJURIES_PAY === '1'">{{ userDetailForm.IS_INJURIES_PAY_TIME }}</td>
+              <th v-if="userDetailForm.IS_INJURIES_PAY === '1'">工伤保险凭证</th>
+              <td v-if="userDetailForm.IS_INJURIES_PAY === '1'">
+                <span>
+                  <viewer>
+                    <img
+                      v-for="item in gongshangbaoxianFile"
+                      :src="config.fileUrl + item.FILEPATH"
+                      :key="item.IMGFILES_ID"
+                      width="40"
+                      height="40"
+                      style="object-fit: cover;">
+                  </viewer>
+                </span>
+              </td>
+            </tr>
+            <tr>
+              <th>是否缴纳商业保险</th>
+              <td :colspan="userDetailForm.ISPAY === '1' ? '' : 5">
+                {{ formatLabel(userDetailForm.ISPAY) }}
+              </td>
+              <th v-if="userDetailForm.ISPAY === '1'">商业保险附件</th>
+              <td v-if="userDetailForm.ISPAY === '1'">
+                <span>
+                  <viewer>
+                    <img
+                      v-for="item in insuranceFileList"
+                      :src="config.fileUrl + item.FILEPATH"
+                      :key="item.IMGFILES_ID"
+                      width="40"
+                      height="40"
+                      style="object-fit: cover;">
+                  </viewer>
+                </span>
+              </td>
+              <th v-if="userDetailForm.ISPAY === '1'">商业保险单号</th>
+              <td v-if="userDetailForm.ISPAY === '1'">{{ userDetailForm.ISPAY_NUMBER }}</td>
+            </tr>
+            <tr>
+              <th>是否签订劳动合同</th>
+              <td :colspan="userDetailForm.IS_SIGN_LABOR === '1' ? '' : 5">
+                {{ formatLabel(userDetailForm.IS_SIGN_LABOR) }}
+              </td>
+              <th v-if="userDetailForm.IS_SIGN_LABOR === '1'">劳动合同附件</th>
+              <td v-if="userDetailForm.IS_SIGN_LABOR === '1'" colspan="3">
+                <span>
+                  <viewer>
+                    <img
+                      v-for="item in contractFileList"
+                      :src="config.fileUrl + item.FILEPATH"
+                      :key="item.IMGFILES_ID"
+                      width="40"
+                      height="40"
+                      style="object-fit: cover;">
+                  </viewer>
+                </span>
+              </td>
+            </tr>
+            <tr/><tr>
               <th>是否参加三级安全培训</th>
               <td>{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }}</td>
               <th v-if="userDetailForm.IS_LEVEL_THREE == 1">三级安全培训照片</th>

src/views/xgf/insert/components/corpInfoAdd.vue

@@ -97,7 +97,7 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="集团单位" prop="CORP_TYPE">
-                <el-select v-model="form.CORP_TYPE" style="width: 100%">
+                <el-select v-model="form.CORP_TYPE" multiple style="width: 100%">
                   <el-option v-for="item in corpTypeList" :key="item.BIANMA" :label="item.NAME" :value="item.BIANMA"/>
                 </el-select>
               </el-form-item>
@@ -439,13 +439,13 @@ export default {
             this.form.COMPANY_AREA = this.$refs.POSSESSION.getCheckedNodes()[0].pathLabels ? this.$refs.POSSESSION.getCheckedNodes()[0].pathLabels.join(',') : ''
           }
           this.form.SELECT_FORM = this.form.SELECT_FORMS.join(',')
-          this.form.SELECT_FORM = this.form.SELECT_FORMS.join(',')
           if (this.form.COMPETENT_DEPT_ID) {
             this.form.COMPETENT_DEPT_ID = this.form.COMPETENT_DEPT_ID.join(',')
           }
           if (this.form.MANAGER_DEPARTMENT_ID) {
             this.form.MANAGER_DEPARTMENT_ID = this.form.MANAGER_DEPARTMENT_ID.join(',')
           }
+          this.form.CORP_TYPE = JSON.stringify(this.form.CORP_TYPE)
           requestFN(
             '/relevantunits/saveCorpInfo',
             this.form

src/views/xgf/insert/components/corpInfoEdit.vue

@@ -97,7 +97,7 @@
           <el-row :gutter="24">
             <el-col :span="12">
               <el-form-item label="集团单位" prop="CORP_TYPE">
-                <el-select v-model="form.CORP_TYPE" style="width: 100%">
+                <el-select v-model="form.CORP_TYPE" multiple style="width: 100%">
                   <el-option v-for="item in corpTypeList" :key="item.BIANMA" :label="item.NAME" :value="item.BIANMA"/>
                 </el-select>
               </el-form-item>
@@ -474,6 +474,11 @@ export default {
           }
         ).then((data) => {
           this.form = Object.assign(this.form, data.pd)
+          if (this.form.CORP_TYPE.indexOf('[') > -1) {
+            this.form.CORP_TYPE = JSON.parse(this.form.CORP_TYPE)
+          } else {
+            this.form.CORP_TYPE = [this.form.CORP_TYPE]
+          }
           var sz = this.form.SELECT_FORM
           var cdi = this.form.COMPETENT_DEPT_ID
           var mdi = this.form.MANAGER_DEPARTMENT_ID
@@ -552,13 +557,7 @@ export default {
           if (this.form.MANAGER_DEPARTMENT_ID) {
             this.form.MANAGER_DEPARTMENT_ID = this.form.MANAGER_DEPARTMENT_ID.join(',')
           }
-          /* if (this.form.INDUSTRYALL && this.form.INDUSTRYALL.length > 0) {
+          this.form.CORP_TYPE = JSON.stringify(this.form.CORP_TYPE)
-            this.form.CORP_TYPE = this.form.INDUSTRYALL[0] || ''
-            this.form.CORP_TYPE2 = this.form.INDUSTRYALL[1] || ''
-            this.form.CORP_TYPE3 = this.form.INDUSTRYALL[2] || ''
-            this.form.CORP_TYPE4 = this.form.INDUSTRYALL[3] || ''
-            this.form.CORP_TYPE_NAME = this.$refs.industryCascader.getCheckedNodes()[0].pathLabels ? this.$refs.industryCascader.getCheckedNodes()[0].pathLabels.join('/') : ''
-          } */
           requestFN(
             '/xgf/corp/editCorpInfo',
             this.form