修改禅道上相应的bug

industry-admin/src/views/device/deviceLedger/addItem.vue

@@ -1,12 +1,14 @@
 <template>
     <el-dialog :title="title" width="60%" custom-class="dialog-addItem" top="5vh" center :before-close="dialogClose"
         :visible.sync="visible" @open="handleOpen" @close="handleClose">
-        <template>
-            <el-select v-model="selectedGroup" @change="groupChange" collapse-tags placeholder="请选择">
-                <el-option v-for="group in groupList" :key="group.id" :label="group.groupName" :value="group.id">
-                </el-option>
-            </el-select>
-        </template>
+        <el-form ref="form" label-width="80px">
+            <el-form-item label="数据组">
+                <el-select v-model="selectedGroup" @change="groupChange" collapse-tags placeholder="请选择数据组">
+                    <el-option v-for="group in groupList" :key="group.id" :label="group.groupName" :value="group.id">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+        </el-form>
         <!-- <el-divider content-position="left"></el-divider> -->
         <el-row>
             <el-col :span="10">
@@ -280,7 +282,7 @@ export default {
     }
 }
 
-.cy-line{
+.cy-line {
     border: 1px solid #b8b4b4;
 }
 

industry-admin/src/views/device/deviceLedger/index.vue

@@ -374,6 +374,8 @@ export default {
                 this.$refs.deviceLedger.deviceLedgerForm.deviceHealth = data.deviceHealth
                 this.$refs.deviceLedger.deviceLedgerForm.deviceDeptId = data.deviceDeptId
                 this.$refs.deviceLedger.deviceLedgerForm.deviceDeptName = data.departmentName
+                this.$refs.deviceLedger.deviceLedgerForm.devicePerson = data.devicePerson
+                this.$refs.deviceLedger.deviceLedgerForm.devicePersonName = data.devicePersonName
                 this.$refs.deviceLedger.deviceLedgerForm.buyTime = data.buyTime
                 this.$refs.deviceLedger.deviceLedgerForm.useTime = data.useTime
                 this.$refs.deviceLedger.deviceLedgerForm.supplier = data.supplier

industry-admin/src/views/device/deviceLedger/itemList.vue

@@ -141,7 +141,7 @@ export default {
         deleteItem(row) {
             let params = {
                 deviceLedgerId: this.queryParam.deviceLedgerId,
-                itemIdList: [row.id]
+                itemIdList: [row.itemId]
             }
             this.delItemList(params)
         },
@@ -162,7 +162,7 @@ export default {
             showConfirmWin(this, null, '您确定要删除已选择数据项吗？', () => {
                 let params = {
                     deviceLedgerId: this.queryParam.deviceLedgerId,
-                    itemIdList: Array.from(this.checkItemList, ({ id }) => id)
+                    itemIdList: Array.from(this.checkItemList, ({ itemId }) => itemId)
                 }
                 this.delItemList(params)
             })

industry-admin/src/views/device/deviceType/chooseDeviceType.vue

@@ -48,6 +48,7 @@ export default {
                 {
                     propName: "sortNum",
                     labelName: "排序号",
+                    align: "center"
                 },
                 // {
                 //     propName: "deviceTypeRemark",
@@ -56,6 +57,7 @@ export default {
                 {
                     propName: "createTime",
                     labelName: "创建时间",
+                    align: "center"
                 }
             ],
             tableData: [],
@@ -64,7 +66,7 @@ export default {
                     btnName: '选择',
                     size: "mini",
                     style: '',
-                    icon: 'el-icon-search',
+                    // icon: 'el-icon-search',
                     methodName: "chooseDeviceTypeEvent",
                 }
             ],

industry-admin/src/views/source/dataQuery/chooseItem.vue

@@ -1,12 +1,14 @@
 <template>
     <el-dialog :title="title" width="60%" custom-class="dialog-addItem" top="5vh" center :before-close="dialogClose"
         :visible.sync="visible" @open="handleOpen" @close="handleClose">
-        <template>
-            <el-select v-model="selectedGroup" @change="groupChange" collapse-tags placeholder="请选择">
-                <el-option v-for="group in groupList" :key="group.id" :label="group.groupName" :value="group.id">
-                </el-option>
-            </el-select>
-        </template>
+        <el-form ref="form" label-width="80px">
+            <el-form-item label="数据组">
+                <el-select v-model="selectedGroup" @change="groupChange" collapse-tags placeholder="请选择数据组">
+                    <el-option v-for="group in groupList" :key="group.id" :label="group.groupName" :value="group.id">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+        </el-form>
         <!-- <el-divider content-position="left"></el-divider> -->
         <el-row>
             <el-col :span="10">

industry-system/industry-da/src/main/resources/mapper/DeviceLedgerDao.xml

@@ -251,6 +251,7 @@
                tdl.device_dept_id,
                sd.department_name,
                tdl.device_person,
+               ss.staff_name as device_person_name,
                tdl.buy_time,
                tdl.use_time,
                tdl.supplier,
@@ -264,6 +265,7 @@
         from t_device_ledger tdl
                  left join t_device_type tdt on tdl.device_type_id = tdt.id
                  left join sys_department sd on tdl.device_dept_id = sd.id
+                 left join sys_staff ss on tdl.device_person=ss.id
         where tdl.id = #{id}
     </select>