Merge branch 'master' of http://git.mingansei.com/xiaobai/equipment

src/components/TreeSelect/index.vue

@@ -33,7 +33,7 @@ export default {
       default: () => {
         return {
           value: 'id', // ID字段名
-          label: 'title', // 显示名称
+          label: 'name', // 显示名称
           children: 'children' // 子级字段名
         }
       }

src/views/device_management/components/Move.vue

@@ -166,9 +166,9 @@ import TreeSelect from '@/components/TreeSelect'
 // crud交由presenter持有
 const defaultCrud = presenter(CRUD({
   title: '领用、借用管理',
-  url: '/move',
+  url: '/move/list',
   orderBy: ['id desc'],
-  crudMethod: { ...InstrumentMove }
+  crudMethod: { ...InstrumentMove },
 }))
 
 // 设置初始form
@@ -180,7 +180,8 @@ const defaultForm = form({
   applyDate: '',
   currentUserId: '',
   currentDepartmentId: null,
-  remark: ''
+  remark: '',
+  instrumentId: null
 })
 
 // 自定义模板内容
@@ -210,21 +211,21 @@ export default {
   data() {
     return {
       dialogVisible: false,
-      userList: this.$store.getters.allUserList,
+      userList: this.$store.getters.allUser,
       treeSelectProps: {
         children: 'children',
-        label: 'departmentName',
+        label: 'name',
         value: 'id'
       },
       colConfigs: [
-        { prop: 'currentUserId', label: '当前使用人', align: 'center', formatter: this.formatter.formatterNickName },
+        { prop: 'currentUserId', label: '当前使用人', align: 'center', formatter: this.formatter.getChineseName },
         {
           prop: 'currentDepartmentId',
           label: '当前使用科室',
           align: 'center',
           formatter: this.formatter.formatterDepartmentName
         },
-        { prop: 'applicantId', label: '申请人', align: 'center', formatter: this.formatter.formatterNickName },
+        { prop: 'applicantId', label: '申请人', align: 'center', formatter: this.formatter.getChineseName },
         {
           prop: 'applyDepartmentId',
           label: '申请科室',
@@ -272,12 +273,13 @@ export default {
   methods: {
     // 刷新前做的操作
     [CRUD.HOOK.beforeRefresh](crud) {
-      crud.query.instrumentId = this.instrumentId
+      crud.query.id = this.instrumentId
     },
     //  新增前做的操作
     [CRUD.HOOK.beforeToAdd](crud, form) {
       this.applyDepartmentId = 0
       this.currentDepartmentId = 0
+      form.id = this.instrumentId
       form.instrumentId = this.instrumentId
     },
     //  编辑框打开后做的操作

src/views/device_management/index.vue

@@ -52,7 +52,7 @@
       </crud>
     </div>
     <!--表格内容-->
-    <CustomTable ref="customTable" :col-configs="colConfigs" :columns="columns" :crud="crud" :row-class-name="getTableRowClassName">
+    <CustomTable ref="customTable" :col-configs="colConfigs" :selection="false" :columns="columns" :crud="crud" :row-class-name="getTableRowClassName">
       <el-table-column slot="operation" align="center" width="100" label="操作">
         <template slot-scope="scope">
           <Edit :permission="permission" :data="scope.row" :disabled-edit="false" />

src/views/ysjl/2000/2100/zbg/dj/edit.vue

@@ -216,12 +216,12 @@
             </el-row>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="工作压力" prop="shiyongyali">
+                <el-form-item label="使用压力" prop="shiyongyali">
                   <el-input v-model="param.shiyongyali" type="text" style="width: 120%;" disabled />
                 </el-form-item>
               </el-col>
               <el-col :span="9">
-                <el-form-item label="工作温度" prop="shiyongwendu">
+                <el-form-item label="使用温度" prop="shiyongwendu">
                   <el-input v-model="param.shiyongwendu" type="text" style="width: 120%;" disabled>
                     <template slot="append">
                       (℃)