src/views/component/device/deviceDialog.vue

@@ -131,13 +131,14 @@
                                                 default-time="12:00:00"
                                                 :readonly="readonly"
                                                 value-format="yyyy-MM-dd HH:mm"
+                                                format="yyyy-MM-dd HH:mm"
                                                 size="mini"
                                             />
                                         </el-form-item>
                                     </el-col>
                                 </el-row>
                                 <el-row :gutter="20">
-                                    <el-col :span="8">
+                                    <el-col :span="8" v-show="false">
                                         <el-form-item
                                             label="设备编号："
                                             prop="sheBeiShiBieH"
@@ -162,12 +163,12 @@
                                     </el-col>
                                     <el-col :span="8">
                                         <el-form-item
-                                            label="原设备编号："
+                                            label="设备编号："
                                             prop="yuanSheBeiBian"
                                         >
                                             <template slot="label">
                                                 <span class="required"
-                                                    >原设备编号：</span
+                                                    >设备编号：</span
                                                 >
                                             </template>
                                             <el-input
@@ -259,12 +260,12 @@
                                 <el-row :gutter="20">
                                     <el-col :span="8">
                                         <el-form-item
-                                            label="保管人："
+                                            label="负责人："
                                             prop="guanLiRen"
                                         >
                                             <template slot="label">
                                                 <span class="required"
-                                                    >保管人：</span
+                                                    >负责人：</span
                                                 >
                                             </template>
                                             <ibps-user-selector
@@ -304,7 +305,7 @@
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="8">
-                                        <el-form-item label="固定资产号：">
+                                        <el-form-item label="资产编号：">
                                             <el-input
                                                 v-model="form.ziChanBianHao"
                                                 size="mini"
@@ -952,7 +953,7 @@
                                                 >
                                                     <el-col>
                                                         <el-form-item
-                                                            label="最近校准时间："
+                                                            label="上次校准日期："
                                                         >
                                                             <el-date-picker
                                                                 v-model="
@@ -1055,7 +1056,7 @@
                                                 <el-row>
                                                     <el-col>
                                                         <el-form-item
-                                                            label="技术参数："
+                                                            label="检定/校准参数："
                                                         >
                                                             <el-input
                                                                 v-model="
@@ -1074,7 +1075,7 @@
                                                 >
                                                     <el-col>
                                                         <el-form-item
-                                                            label="测量范围："
+                                                            label="预期测量范围："
                                                         >
                                                             <el-input
                                                                 v-model="
@@ -1093,7 +1094,7 @@
                                                 >
                                                     <el-col>
                                                         <el-form-item
-                                                            label="U/精确度/最大允差："
+                                                            label="U/准确度/最大允差："
                                                             label-width="130"
                                                         >
                                                             <el-input
@@ -1385,7 +1386,7 @@ export default {
                 cunFangDiDian: "",
                 cunFangWeiZhi: "", // 放置地点
                 jieShouZhuangTai: "", // 接收时状态
-                guanLiRen: "", // 保管人
+                guanLiRen: "", // 负责人
                 weiHuFangShi: "", // 设备分组
                 bianZhiRen: "", // 建档人
                 bianZhiBuMen: "", // 建档部门
@@ -1410,12 +1411,12 @@ export default {
                 xiaoZhunWuCha: "", // 是否限用
                 xiaoZhunZQ: "", // 检定/校准周期
                 shiYongKeShi: "", // 检定/校准单位
-                yuanSheBeiBian: "", // 原设备编号
+                yuanSheBeiBian: "", // 设备编号
                 jianKongYiJu: "", // 是否24H开机
                 biXuDeHuanJin: "", // 核查人
                 biXuSheShi: "", // 核查日期
                 ziChanYuanZhi: "", // 资产原值
-                ziChanBianHao: "", // 固定资产号
+                ziChanBianHao: "", // 资产编号
                 shiFouWeiHu: "", // 是否维护
                 jiShenXuHao: "", // 出厂编号
                 yanShouRiQi: "", // 验收日期
@@ -1459,17 +1460,17 @@ export default {
                 yuanSheBeiBian: [
                     {
                         required: true,
-                        message: "原设备编号不能为空",
-                        trigger: "blur",
-                    },
-                ],
-                sheBeiLeiXing: [
-                    {
-                        required: true,
-                        message: "设备类型不能为空",
+                        message: "设备编号不能为空",
                         trigger: "blur",
                     },
                 ],
+                // sheBeiLeiXing: [
+                //     {
+                //         required: true,
+                //         message: "设备类型不能为空",
+                //         trigger: "blur",
+                //     },
+                // ],
                 sheBeiZhuangTa: [
                     {
                         required: true,
@@ -1515,7 +1516,7 @@ export default {
                 guanLiRen: [
                     {
                         required: true,
-                        message: "保管人不能为空",
+                        message: "负责人不能为空",
                         trigger: "blur",
                     },
                 ],
@@ -1736,7 +1737,7 @@ export default {
             const { data = [] } = result.variables || {};
             if (data[0].num > 0) {
                 throw new Error(
-                    `系统当前已经存在此原设备编号,请更换另一个编号!`
+                    `系统当前已经存在此设备编号,请更换另一个编号!`
                 );
             }
 

src/views/component/trainingManage/registerInfoDialog.vue

@@ -74,13 +74,9 @@
                             width="150"
                         >
                             <template slot-scope="{row}">
-                                <ibps-user-selector
-                                    type="user"
-                                    :value="row.ren_yuan_id_"
-                                    readonly-text="text"
-                                    :disabled="true"
-                                    :multiple="true"
-                                />
+
+                                <div>{{ row.ren_yuan_name_ }}</div>
+
                             </template>
                         </el-table-column>
                         <el-table-column
@@ -146,7 +142,8 @@ export default {
 
             dialogVisible: true,
             tableList: [],
-            selectItem: '全部'
+            selectItem: '全部',
+            refresh: false
         }
     },
     computed: {
@@ -200,8 +197,22 @@ export default {
             return this.categoryList.slice(start, end)
         }
     },
+    watch: {
+        tableList (val) {
+            const { userList = [] } = this.$store.getters || {}
+            val.forEach(item => {
+                const user = userList.find(userItem => userItem.userId === item.ren_yuan_id_)
+                if (user) {
+                    item.ren_yuan_name_ = user.userName
+                }
+            })
+            // this.refresh = false
+            // this.refresh = true
+        }
+    },
     async mounted () {
         console.log(this.params)
+
         await this.getAllPeople()
     },
     methods: {
@@ -258,7 +269,7 @@ export default {
                 case 't_fwxyhyqdb':
                     peopleList = data[0].bian_zhi_can_hui_?.split(',')
                     break
-                case 't_rypxcjb':
+                case 't_lhrypxjlb':
                     peopleList = data[0].pei_xun_ren_yuan_?.split(',')
                     break
                 default:
@@ -275,11 +286,11 @@ export default {
                 }
             })
             await this.getRegisterPeople()
-            if (this.params.tableName === 't_rypxcjb') {
-                if (data[0].shi_fou_guo_shen_ === '进行中') {
+            if (this.params.tableName === 't_lhrypxjlb') {
+                if (data[0].pei_xun_zhuang_ta === '进行中') {
                     this.addPeople()
                 }
-                if (data[0].shi_fou_guo_shen_ === '已结束' && data[0].bu_qian_ren_yuan_) {
+                if (data[0].pei_xun_zhuang_ta === '已结束' && data[0].bu_qian_ren_yuan_) {
                     data[0].bu_qian_ren_yuan_.split(',').forEach(person => {
                         const p = this.tableList.find(item => item.ren_yuan_id_ === person)
                         if (p) {
@@ -294,7 +305,7 @@ export default {
                     })
                 }
             } else if (this.params.tableName === 't_fwxyhyqdb' || this.params.tableName === 't_nshyjyb' || this.params.tableName === 't_gshyjyb' || this.params.tableName === 't_jykzjbdjb') {
-                if (data[0].shi_fou_guo_shen_ !== '已完成') {
+                if (data[0].pei_xun_zhuang_ta !== '已完成') {
                     this.addPeople()
                 }
             }
@@ -317,8 +328,10 @@ export default {
                     p.status = '已签到'
                     p.qian_dao_shi_jian = person.qian_dao_shi_jian
                 }
+                console.log(this.tableList)
             })
         },
+
         // 当前页码改变
         handleCurrentChange (val) {
             this.pagination.currentPage = val

src/views/component/trainingManage/trainingStatic.vue

@@ -86,7 +86,7 @@
                             width="100"
                         />
                         <el-table-column
-                            prop="shi_fou_guo_shen_"
+                            prop="pei_xun_zhuang_ta"
                             label="培训状态"
                             width="100"
                         />

src/views/platform/office/bpmInitiatedProcess/myDraft.vue

@@ -19,6 +19,7 @@
       :search-form="listConfig.searchForm"
       :pk-key="pkKey"
       :columns="listConfig.columns"
+      display-field="我的暂存"
       :pagination="pagination"
       :loading="loading"
       :index-row="false"

src/views/platform/office/bpmInitiatedProcess/myRequest.vue

@@ -18,6 +18,7 @@
       :search-form="listConfig.searchForm"
       :pk-key="pkKey"
       :columns="listConfig.columns"
+      display-field="我的发起"
       :row-handle="listConfig.rowHandle"
       :pagination="pagination"
       :loading="loading"

src/views/platform/office/bpmReceivedProcess/completed.vue

@@ -18,6 +18,7 @@
       :search-form="listConfig.searchForm"
       :pk-key="pkKey"
       :columns="listConfig.columns"
+      display-field="我的办结"
       :row-handle="listConfig.rowHandle"
       :pagination="pagination"
       :loading="loading"

src/views/platform/office/bpmReceivedProcess/handled.vue

@@ -19,6 +19,7 @@
       :search-form="listConfig.searchForm"
       :pk-key="pkKey"
       :columns="listConfig.columns"
+      display-field="我的已办"
       :row-handle="listConfig.rowHandle"
       :pagination="pagination"
       :loading="loading"

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

@@ -126,7 +126,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: 'qq', 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') }
                 ],
@@ -623,7 +623,7 @@ export default {
                 const deptName = item.position.split('\n')
                 const roleItemList = []
                 const posItemList = []
-                roleName.forEach(r => {
+                deptName.forEach(r => {
                     const temp = roleList.find(i => i.name === r.trim().replace(/\r/g, ''))
                     if (temp) {
                         roleItemList.push({

src/views/platform/system/news/list.vue

@@ -8,6 +8,7 @@
       :search-form="listConfig.searchForm"
       :pk-key="pkKey"
       :columns="listConfig.columns"
+      display-field="通知公告"
       :row-handle="listConfig.rowHandle"
       :pagination="pagination"
       :loading="loading"