Merge branches 'master' and 'master' of http://119.23.210.103:3000/wy/lh_firm_former

src/views/platform/bpmn/bpmInstHis/record/component/testingRecord.vue

@@ -168,12 +168,6 @@
             path: '43罗湖/LHXBJY-QP-7.1-01-FQ-05 检测委托单.rpx',
             hasItem: false
         },
-        {
-            name: '检测报告',
-            key: 'id_',
-            path: '43罗湖/LH非 检测报告.rpx',
-            hasItem: false
-        },
         // {
         //     name: '检测报告审批表',
         //     key: 'id_',
@@ -191,7 +185,13 @@
             key: 'file',
             path: '',
             hasItem: true
-        }
+        },
+        {
+            name: '检测报告',
+            key: 'id_',
+            path: '43罗湖/LH非 检测报告.rpx',
+            hasItem: false
+        },
     ]
     // 非通用检测项目编号及报表路径
     const specialTest = [

src/views/platform/org/employee/edit/basic-info.vue

@@ -45,6 +45,10 @@
             {{ formData.isSuper|optionsFilter(isSuperOptions,'label') }}
           </el-tag>
         </el-form-item>
+        <el-form-item label="单位名称">
+          <el-input v-if="!readonly" v-model="formData.qq" />
+          <span v-else>{{ formData.qq }}</span>
+        </el-form-item>
         <el-form-item label="员工姓名" prop="name">
           <el-input v-if="!readonly" v-model="formData.name" />
           <span v-else>{{ formData.name }}</span>
@@ -83,10 +87,10 @@
           <el-input v-if="!readonly" v-model="formData.mobile" />
           <span v-else>{{ formData.mobile }}</span>
         </el-form-item>
-        <el-form-item label="QQ">
+        <!-- <el-form-item label="QQ">
           <el-input v-if="!readonly" v-model="formData.qq" />
           <span v-else>{{ formData.qq }}</span>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
     </el-col>
   </el-row>

src/views/platform/org/employee/list.vue

@@ -125,7 +125,7 @@ export default {
           { prop: 'account', label: this.$t('platform.org.employee.prop.account'),width:150},
           //{ prop: 'wcAccount', label: this.$t('platform.org.employee.prop.wcAccount'),width:120},
           { prop: 'orgName', label: this.$t('platform.org.employee.prop.orgPath'), sortable: false ,width:250},
-          { prop: 'wcAccount', label: '客户单位名称',width:250},
+          { prop: 'qq', label: '客户单位名称',width:250},
           { prop: 'status', label: this.$t('platform.org.employee.prop.status'), tags: statusOptions,width:100},
           { prop: 'createTime', label: this.$t('common.field.createTime')},
         ],