From 83714b2115ad36677add7a83878e8206e822f8fb Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Sat, 13 Apr 2024 15:16:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=A0=E5=B0=84=E4=BF=9D=E5=AD=98=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oneCompany/reflection/components/info.vue | 62 +++++++++++++------
 .../oneCompany/reflection/components/list.vue |  6 +-
 2 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/src/views/oneCompany/reflection/components/info.vue b/src/views/oneCompany/reflection/components/info.vue
index 3426505..1cd789a 100644
--- a/src/views/oneCompany/reflection/components/info.vue
+++ b/src/views/oneCompany/reflection/components/info.vue
@@ -12,16 +12,21 @@
         <el-row :gutter="12">
           <el-col :span="12">
             <el-form-item prop="typeInfo" label="映射类型: ">
-              <el-select v-model="material.typeInfo" filterable style="width: 300px" placeholder="请选择" @change="saveInfo">
+              <el-select v-model="material.typeInfo" filterable style="width:300px" placeholder="请选择" @change="saveInfo">
                 <el-option v-for="item in dic.mapType" :key="item.value" :label="item.name" :value="JSON.stringify(item)"/>
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注：" prop="remark">
+              <el-input v-model="material.remark" style="width: 300px" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-col :span="12">
-              <el-form-item label="部门：" prop="departmentId">
+              <el-form-item label="负责部门：" prop="departmentId" style="width:300px">
                 <Treeselect
                   :options="dic.deptList"
                   :normalizer="normalizer"
@@ -36,8 +41,8 @@
             </el-col>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="人员：" prop="userInfo">
-              <el-select v-model="material.userInfo" style="width: 300px" placeholder="请选择" @change="chooseUser">
+            <el-form-item label="负责人员：" prop="userInfo" >
+              <el-select v-model="material.userInfo" style="width:300px" placeholder="请选择" @change="chooseUser">
                 <el-option
                   v-for="item in dic.userList"
                   :key="item.USER_ID"
@@ -47,34 +52,39 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="负责人手机号：" prop="userPhone">
+              <el-input v-model="material.userPhone" style="width: 300px" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="负责人身份证：" prop="userCardId">
+              <el-input v-model="material.userCardId" style="width: 300px" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="设备编号：" prop="deviceId">
-              <el-input v-model="material.deviceId" placeholder="请输入内容"/>
+              <el-input v-model="material.deviceId" style="width: 300px" placeholder="请输入内容"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="设备名称：" prop="deviceName">
-              <el-input v-model="material.deviceName" placeholder="请输入内容"/>
+              <el-input v-model="material.deviceName" style="width: 300px" placeholder="请输入内容"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="其他系统编号：" prop="id">
-              <el-input v-model="material.id" placeholder="请输入内容"/>
+              <el-input v-model="material.id" style="width: 300px" placeholder="请输入内容"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="其他系统编号备注：" prop="id_remark">
-              <el-input v-model="material.idRemark" placeholder="请输入内容"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="备注：" prop="id">
-              <el-input v-model="material.remark" placeholder="请输入内容"/>
+            <el-form-item label="其他系统编号备注：" prop="idRemark">
+              <el-input v-model="material.idRemark" style="width: 300px" placeholder="请输入内容"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -120,7 +130,9 @@ export default {
         deviceName: '',
         id: '',
         idRemark: '',
-        remark: ''
+        remark: '',
+        userCardId: '',
+        userPhone: ''
       },
       form: {
         required: {
@@ -133,9 +145,11 @@ export default {
           deviceId: '',
           deviceName: '',
           id: '',
-          idRemark: ''
+          userCardId: '',
+          userPhone: ''
         },
-        remark: ''
+        remark: '',
+        idRemark: ''
       },
       normalizer(node) {
         return {
@@ -166,6 +180,12 @@ export default {
         ],
         idRemark: [
           { required: true, message: '请填写其他系统编号备注', trigger: 'change' }
+        ],
+        userPhone: [
+          { required: true, message: '请填写负责人手机号', trigger: 'change' }
+        ],
+        userCardId: [
+          { required: true, message: '请填写负责人身份证', trigger: 'change' }
         ]
       },
       heirloom: {},
@@ -217,7 +237,9 @@ export default {
           this.form.required.deviceId = this.material.deviceId
           this.form.required.deviceName = this.material.deviceName
           this.form.required.id = this.material.id
-          this.form.required.idRemark = this.material.idRemark
+          this.form.required.userCardId = this.material.userCardId
+          this.form.required.userPhone = this.material.userPhone
+          this.form.idRemark = this.material.idRemark
           this.form.remark = this.material.remark
 
           requestFN(
diff --git a/src/views/oneCompany/reflection/components/list.vue b/src/views/oneCompany/reflection/components/list.vue
index 8d173f7..cf26c0b 100644
--- a/src/views/oneCompany/reflection/components/list.vue
+++ b/src/views/oneCompany/reflection/components/list.vue
@@ -36,15 +36,15 @@
       highlight-current-row>
       <el-table-column :selectable="handleSelectWithDifferentStatus" type="selection" width="55" align="center"/>
       <el-table-column type="index" label="序号" width="50" align="center"/>
-      <el-table-column prop="USERNAME" label="用户名" align="center"/>
-      <el-table-column prop="NAME" label="姓名" align="center"/>
+      <el-table-column prop="typeName" label="映射类型" align="center"/>
+      <el-table-column prop="userName" label="姓名" align="center"/>
       <el-table-column prop="departmentName" label="部门名称" align="center"/>
       <el-table-column prop="userPhone" label="用户手机号" align="center"/>
       <el-table-column prop="deviceId" label="设备id" align="center"/>
       <el-table-column prop="deviceName" label="设备名称" align="center"/>
       <el-table-column prop="id" label="其他系统编号" align="center"/>
       <el-table-column prop="idRemark" label="其他系统备注" align="center"/>
-      <el-table-column prop="createTime" label="创建时间" align="center"/>
+      <el-table-column prop="createdTime" label="创建时间" align="center"/>
       <el-table-column label="操作" align="center" width="200">
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleDelete(row)">删除</el-button>