Преглед изворни кода

feat(资产管理): 将"使用岗位"字段统一改为"使用单位"并添加"权属部门"字段

yusheng пре 5 месеци
родитељ
комит
beab1d37b8

+ 13 - 6
src/views/ledgerAssets/boat/components/boat-list.vue

@@ -193,12 +193,7 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
-          {
-            prop: 'postName',
-            label: '使用岗位',
-            showOverflowTooltip: true,
-            minWidth: 110
-          },
+   
           {
             prop: 'codeNumber',
             label: '编号',
@@ -216,6 +211,12 @@
             label: '规格',
             showOverflowTooltip: true,
             minWidth: 110
+          },
+            {
+            prop: 'postName',
+            label: '使用单位',
+            showOverflowTooltip: true,
+            minWidth: 110
           },
           {
             prop: 'usePerson',
@@ -223,6 +224,12 @@
             showOverflowTooltip: true,
             minWidth: 80
           },
+          {
+            prop: 'ownershipGroupName',
+            label: '权属部门',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'areaPersonInChargeUserName',
             label: '片区负责人',

+ 4 - 4
src/views/ledgerAssets/boat/components/boat-search.vue

@@ -23,8 +23,8 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="使用位:" label-width="100px">
-          <DeptSelect v-model="where.usePostId" @input="selectChange" />
+        <el-form-item label="使用位:" label-width="100px">
+          <DeptSelect v-model="where.postId" @input="selectChange" />
         </el-form-item>
       </el-col>
     </el-row>
@@ -165,7 +165,7 @@
         runStatus: '',
         module: '',
         space: '',
-        usePostId: ''
+        postId: ''
       };
       return {
         assetLevel: [],
@@ -210,7 +210,7 @@
       /* 清空 */
       selectChange(value) {
         if (!value) {
-          this.where.usePostId = '';
+          this.where.postId = '';
         }
       },
       /* 搜索 */

+ 1 - 1
src/views/ledgerAssets/components/assetInformation.vue

@@ -610,7 +610,7 @@
         this.zcInfo.chargePersonId = '';
         this.zcInfo.usePersonId = '';
         this.userList = [];
-        this.postName = data.name;
+        this.zcInfo.postName = data.name;
         if (id) {
           this.getStaffList(id);
         }

+ 13 - 7
src/views/ledgerAssets/equipment/components/equipment-list.vue

@@ -262,12 +262,7 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
-          {
-            prop: 'postName',
-            label: '使用岗位',
-            showOverflowTooltip: true,
-            minWidth: 110
-          },
+
           {
             prop: 'codeNumber',
             label: '编号',
@@ -299,13 +294,24 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
-
+          {
+            prop: 'postName',
+            label: '使用单位',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'usePerson',
             label: '使用人',
             showOverflowTooltip: true,
             minWidth: 80
           },
+          {
+            prop: 'ownershipGroupName',
+            label: '权属部门',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'areaPersonInChargeUserName',
             label: '片区负责人',

+ 4 - 4
src/views/ledgerAssets/equipment/components/equipment-search.vue

@@ -23,8 +23,8 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="使用位:" label-width="100px">
-          <DeptSelect v-model="where.usePostId" @input="selectChange" />
+        <el-form-item label="使用位:" label-width="100px">
+          <DeptSelect v-model="where.postId" @input="selectChange" />
         </el-form-item>
       </el-col>
     </el-row>
@@ -168,7 +168,7 @@
         lifeCycle: '',
         module: '',
         space: '',
-        usePostId: ''
+        postId: ''
       };
       return {
         assetLevel: [],
@@ -213,7 +213,7 @@
       /* 清空 */
       selectChange(value) {
         if (!value) {
-          this.where.usePostId = '';
+          this.where.postId = '';
         }
       },
       /* 搜索 */

+ 12 - 6
src/views/ledgerAssets/material/components/material-list.vue

@@ -154,12 +154,6 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
-          {
-            prop: 'postName',
-            label: '使用岗位',
-            showOverflowTooltip: true,
-            minWidth: 110
-          },
           {
             prop: 'codeNumber',
             label: '编号',
@@ -185,12 +179,24 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: 'postName',
+            label: '使用单位',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'usePerson',
             label: '使用人',
             showOverflowTooltip: true,
             minWidth: 80
           },
+          {
+            prop: 'ownershipGroupName',
+            label: '权属部门',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'chargePerson',
             label: '负责人',

+ 4 - 4
src/views/ledgerAssets/material/components/material-search.vue

@@ -23,8 +23,8 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="使用位:" label-width="100px">
-          <DeptSelect v-model="where.usePostId" @input="selectChange" />
+        <el-form-item label="使用位:" label-width="100px">
+          <DeptSelect v-model="where.postId" @input="selectChange" />
         </el-form-item>
       </el-col>
     </el-row>
@@ -158,7 +158,7 @@
         runStatus: '',
         module: '',
         space: '',
-        usePostId: ''
+        postId: ''
       };
       return {
         assetLevel: [],
@@ -197,7 +197,7 @@
       /* 清空 */
       selectChange(value) {
         if (!value) {
-          this.where.usePostId = '';
+          this.where.postId = '';
         }
       },
       /* 搜索 */

+ 13 - 6
src/views/ledgerAssets/meter/components/equipment-list.vue

@@ -205,12 +205,7 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
-          {
-            prop: 'postName',
-            label: '使用岗位',
-            showOverflowTooltip: true,
-            minWidth: 110
-          },
+
           {
             prop: 'codeNumber',
             label: '编号',
@@ -235,6 +230,12 @@
             label: '规格',
             showOverflowTooltip: true,
             minWidth: 110
+          },
+            {
+            prop: 'postName',
+            label: '使用单位',
+            showOverflowTooltip: true,
+            minWidth: 110
           },
           {
             prop: 'usePerson',
@@ -242,6 +243,12 @@
             showOverflowTooltip: true,
             minWidth: 80
           },
+          {
+            prop: 'ownershipGroupName',
+            label: '权属部门',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'areaPersonInChargeUserName',
             label: '片区负责人',

+ 4 - 4
src/views/ledgerAssets/meter/components/equipment-search.vue

@@ -23,8 +23,8 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="使用位:" label-width="100px">
-          <DeptSelect v-model="where.usePostId" @input="selectChange" />
+        <el-form-item label="使用位:" label-width="100px">
+          <DeptSelect v-model="where.postId" @input="selectChange" />
         </el-form-item>
       </el-col>
     </el-row>
@@ -158,7 +158,7 @@
         runStatus: '',
         module: '',
         space: '',
-        usePostId: ''
+        postId: ''
       };
       return {
         assetLevel: [],
@@ -197,7 +197,7 @@
       /* 清空 */
       selectChange(value) {
         if (!value) {
-          this.where.usePostId = '';
+          this.where.postId = '';
         }
       },
       /* 搜索 */

+ 14 - 7
src/views/ledgerAssets/mould/components/mould-list.vue

@@ -201,7 +201,7 @@
             minWidth: 180
           },
           {
-             prop: 'category.name',
+            prop: 'category.name',
             label: '名称',
             showOverflowTooltip: true,
             minWidth: 110
@@ -212,12 +212,7 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
-          {
-            prop: 'postName',
-            label: '使用岗位',
-            showOverflowTooltip: true,
-            minWidth: 110
-          },
+ 
           {
             prop: 'codeNumber',
             label: '编号',
@@ -243,12 +238,24 @@
             minWidth: 130
           },
 
+          {
+            prop: 'postName',
+            label: '使用单位',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'usePerson',
             label: '使用人',
             showOverflowTooltip: true,
             minWidth: 80
           },
+          {
+            prop: 'ownershipGroupName',
+            label: '权属部门',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'areaPersonInChargeUserName',
             label: '片区负责人',

+ 4 - 4
src/views/ledgerAssets/mould/components/mould-search.vue

@@ -23,8 +23,8 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="使用位:" label-width="100px">
-          <DeptSelect v-model="where.usePostId" @input="selectChange" />
+        <el-form-item label="使用位:" label-width="100px">
+          <DeptSelect v-model="where.postId" @input="selectChange" />
         </el-form-item>
       </el-col>
     </el-row>
@@ -163,7 +163,7 @@
         runStatus: '',
         module: '',
         space: '',
-        usePostId: ''
+        postId: ''
       };
       return {
         assetLevel: [],
@@ -202,7 +202,7 @@
       /* 清空 */
       selectChange(value) {
         if (!value) {
-          this.where.usePostId = '';
+          this.where.postId = '';
         }
       },
       /* 搜索 */

+ 13 - 6
src/views/ledgerAssets/office/components/data-list.vue

@@ -215,12 +215,7 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
-          {
-            prop: 'postName',
-            label: '使用岗位',
-            showOverflowTooltip: true,
-            minWidth: 110
-          },
+
           {
             prop: 'codeNumber',
             label: '编号',
@@ -246,12 +241,24 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: 'postName',
+            label: '使用单位',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'usePerson',
             label: '使用人',
             showOverflowTooltip: true,
             minWidth: 80
           },
+          {
+            prop: 'ownershipGroupName',
+            label: '权属部门',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'chargePerson',
             label: '负责人',

+ 3 - 3
src/views/ledgerAssets/office/components/user-search.vue

@@ -23,8 +23,8 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="使用位:" label-width="100px">
-          <DeptSelect v-model="where.usePostId" @input="selectChange" />
+        <el-form-item label="使用位:" label-width="100px">
+          <DeptSelect v-model="where.postId" @input="selectChange" />
         </el-form-item>
       </el-col>
     </el-row>
@@ -158,7 +158,7 @@
         runStatus: '',
         module: '',
         space: '',
-        usePostId: ''
+        postId: ''
       };
       return {
         assetLevel: [],

+ 13 - 1
src/views/ledgerAssets/sparepart/components/sparepart-list.vue

@@ -210,7 +210,19 @@
           },
           {
             prop: 'postName',
-            label: '使用岗位',
+            label: '使用单位',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'usePerson',
+            label: '使用人',
+            showOverflowTooltip: true,
+            minWidth: 80
+          },
+          {
+            prop: 'ownershipGroupName',
+            label: '权属部门',
             showOverflowTooltip: true,
             minWidth: 110
           },

+ 4 - 4
src/views/ledgerAssets/sparepart/components/sparepart-search.vue

@@ -23,8 +23,8 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="使用位:" label-width="100px">
-          <DeptSelect v-model="where.usePostId" @input="selectChange" />
+        <el-form-item label="使用位:" label-width="100px">
+          <DeptSelect v-model="where.postId" @input="selectChange" />
         </el-form-item>
       </el-col>
     </el-row>
@@ -158,7 +158,7 @@
         runStatus: '',
         module: '',
         space: '',
-        usePostId: ''
+        postId: ''
       };
       return {
         assetLevel: [],
@@ -197,7 +197,7 @@
       /* 清空 */
       selectChange(value) {
         if (!value) {
-          this.where.usePostId = '';
+          this.where.postId = '';
         }
       },
       /* 搜索 */

+ 13 - 6
src/views/ledgerAssets/turnoverCar/components/turnovercar-list.vue

@@ -197,12 +197,7 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
-          {
-            prop: 'postName',
-            label: '使用岗位',
-            showOverflowTooltip: true,
-            minWidth: 110
-          },
+
           {
             prop: 'codeNumber',
             label: '编号',
@@ -221,12 +216,24 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: 'postName',
+            label: '使用单位',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'usePerson',
             label: '使用人',
             showOverflowTooltip: true,
             minWidth: 80
           },
+          {
+            prop: 'ownershipGroupName',
+            label: '权属部门',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'areaPersonInChargeUserName',
             label: '片区负责人',

+ 4 - 4
src/views/ledgerAssets/turnoverCar/components/turnovercar-search.vue

@@ -23,8 +23,8 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="使用位:" label-width="100px">
-          <DeptSelect v-model="where.usePostId" @input="selectChange" />
+        <el-form-item label="使用位:" label-width="100px">
+          <DeptSelect v-model="where.postId" @input="selectChange" />
         </el-form-item>
       </el-col>
     </el-row>
@@ -158,7 +158,7 @@
         runStatus: '',
         module: '',
         space: '',
-        usePostId: ''
+        postId: ''
       };
       return {
         assetLevel: [],
@@ -197,7 +197,7 @@
       /* 清空 */
       selectChange(value) {
         if (!value) {
-          this.where.usePostId = '';
+          this.where.postId = '';
         }
       },
       /* 搜索 */

+ 13 - 6
src/views/ledgerAssets/turnoverDisks/components/equipment-list.vue

@@ -192,12 +192,7 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
-          {
-            prop: 'postName',
-            label: '使用岗位',
-            showOverflowTooltip: true,
-            minWidth: 110
-          },
+
           {
             prop: 'codeNumber',
             label: '编号',
@@ -215,6 +210,12 @@
             label: '规格',
             showOverflowTooltip: true,
             minWidth: 110
+          },
+            {
+            prop: 'postName',
+            label: '使用单位',
+            showOverflowTooltip: true,
+            minWidth: 110
           },
           {
             prop: 'usePerson',
@@ -222,6 +223,12 @@
             showOverflowTooltip: true,
             minWidth: 80
           },
+          {
+            prop: 'ownershipGroupName',
+            label: '权属部门',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'areaPersonInChargeUserName',
             label: '片区负责人',

+ 3 - 3
src/views/ledgerAssets/turnoverDisks/components/equipment-search.vue

@@ -23,8 +23,8 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="使用位:" label-width="100px">
-          <DeptSelect v-model="where.usePostId" @input="selectChange" />
+        <el-form-item label="使用位:" label-width="100px">
+          <DeptSelect v-model="where.postId" @input="selectChange" />
         </el-form-item>
       </el-col>
     </el-row>
@@ -197,7 +197,7 @@
       /* 清空 */
       selectChange(value) {
         if (!value) {
-          this.where.usePostId = '';
+          this.where.postId = '';
         }
       },
       /* 搜索 */