完善计量的功能

src/views/repair/application-form/modules/DetailCheck.vue

@@ -85,7 +85,7 @@
             <detail-list-item term="审核人员">{{ model.checkUserName }}</detail-list-item>
             <detail-list-item term="审核描述">{{ model.checkContent }}</detail-list-item>
           </detail-list>
-<!--          <detail-list title="审核图片：" :col="6">
+          <!--          <detail-list title="审核图片：" :col="6">
             <upload-image-detail :images-list="model.checkFileList"/>
           </detail-list>-->
         </a-layout-content>
@@ -103,7 +103,7 @@
       </a-layout>
       <title-divider title="配件清单" width="90px"></title-divider>
       <div class="table-operator" v-if="$auth('repair-application-forms-finish')">
-<!--        <a-button type="primary" @click="handleSpareSelect">
+        <!--        <a-button type="primary" @click="handleSpareSelect">
           <a-icon type="plus"/>
           添加
         </a-button>-->
@@ -116,7 +116,7 @@
       </a-table>
       <title-divider title="费用清单" width="90px"></title-divider>
       <div class="table-operator" v-if="$auth('repair-application-forms-finish') ">
-<!--        <a-button type="primary" @click="handleAddFee">
+        <!--        <a-button type="primary" @click="handleAddFee">
           <a-icon type="plus"/>
           添加
         </a-button>-->
@@ -142,7 +142,7 @@
       </a-table>
       <title-divider title="维修报告" width="90px"></title-divider>
       <div class="table-operator" >
-<!--        <a-button type="primary" v-if="$auth('repair-repair-reasons-add') && ((dataReason === null) || (dataReason.length===0))" @click="handleAddReason">
+        <!--        <a-button type="primary" v-if="$auth('repair-repair-reasons-add') && ((dataReason === null) || (dataReason.length===0))" @click="handleAddReason">
           <a-icon type="plus"/>
           添加
         </a-button>-->
@@ -604,4 +604,4 @@ export default {
   margin: 5px;
   display: inline-block;
 }
-</style>
+</style>

src/views/sb/position/SbPosition.vue

@@ -127,10 +127,14 @@ export default {
             return this.BaseTool.Object.getField(this.positionTypeMap, text)
           }
         },
-        /* {
+        {
+          title: '父子关联编码',
+          dataIndex: 'code'
+        },
+        {
           title: '排序',
           dataIndex: 'sort'
-        }, */
+        },
         {
           title: '上层位置',
           dataIndex: 'parentId',

src/views/sb/position/modules/BaseForm.vue

@@ -42,6 +42,44 @@
           </a-select-option>
         </a-select>
       </a-form-item>
+      <a-form-item
+        label="上层位置"
+        :labelCol="BaseTool.Constant.labelCol"
+        :wrapperCol="BaseTool.Constant.wrapperCol"
+      >
+        <a-tree-select
+          style="width: 100%"
+          :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+          :treeData="treeData"
+          :treeNodeFilterProp="'title'"
+          :showSearch="true"
+          v-decorator="['parentId', {rules: [{required: false, message: '上层位置不能为空'}]}]"
+          placeholder="请选择"
+        >
+        </a-tree-select>
+      </a-form-item>
+      <a-form-item
+        label="父子关联编码"
+        :labelCol="BaseTool.Constant.labelCol"
+        :wrapperCol="BaseTool.Constant.wrapperCol"
+      >
+        <a-input
+          v-decorator="['code', {rules: [{required: true, message: '父子关联编码不能为空'}]}]" />
+      </a-form-item>
+      <a-form-item
+        label="区域维修负责人"
+        :labelCol="BaseTool.Constant.labelCol"
+        :wrapperCol="BaseTool.Constant.wrapperCol"
+      >
+        <a-select v-decorator="['userId', {rules: [{required: true, message: '仓库负责人不能为空'}]}]" placeholder="请选择">
+          <a-select-option
+            v-for="({userId, realName}) in userList"
+            :key="userId"
+            :label="realName"
+            :value="userId">{{ realName }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
       <a-form-item
         label="排序"
         :labelCol="BaseTool.Constant.labelCol"
@@ -66,22 +104,6 @@
           </a-select-option>
         </a-select>
       </a-form-item>
-      <a-form-item
-        label="上层位置"
-        :labelCol="BaseTool.Constant.labelCol"
-        :wrapperCol="BaseTool.Constant.wrapperCol"
-      >
-        <a-tree-select
-          style="width: 100%"
-          :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
-          :treeData="treeData"
-          :treeNodeFilterProp="'title'"
-          :showSearch="true"
-          v-decorator="['parentId', {rules: [{required: false, message: '上层位置不能为空'}]}]"
-          placeholder="请选择"
-        >
-        </a-tree-select>
-      </a-form-item>
       <a-form-item
         label="备注"
         :labelCol="BaseTool.Constant.labelCol"
@@ -100,6 +122,7 @@
 <script>
 import pick from 'lodash.pick'
 import { addSbPosition, updateSbPosition, getSbPositionTree } from '@/api/sb/position'
+import { queryUser } from '@/api/upms/user'
 
 export default {
   name: 'BaseSbPosition',
@@ -111,6 +134,7 @@ export default {
       visible: false,
       positionTypeMap: {},
       delFlagMap: {},
+      userList: {},
       treeData: []
     }
   },
@@ -119,6 +143,9 @@ export default {
   created () {
     this.delFlagMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.DELFLAG)
     this.positionTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBPOSITION_TYPE)
+    queryUser().then(res => {
+      this.userList = res.data
+    })
   },
   methods: {
     base (record) {
@@ -140,9 +167,11 @@ export default {
           'no',
           'name',
           'type',
+          'code',
           'sort',
           'delFlag',
           'parentId',
+          'userId',
           'remark'
         ])))
       })