opt:修改优化库区管理功能

lms/nladmin-ui/src/views/wms/basedata/st/sect/index.vue

@@ -98,18 +98,6 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="负责人">
-                <el-input v-model="form.sect_manager_name" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="联系电话" prop="mobile_no">
-                <el-input v-model="form.mobile_no" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="备注">
@@ -136,10 +124,9 @@
         <el-table-column prop="sect_code" sortable label="库区编码" />
         <el-table-column prop="sect_name" label="库区名称" width="150" />
         <el-table-column prop="simple_name" label="库区简称" width="150" />
+        <el-table-column prop="sect_type_attr" label="库区类型" width="150" :formatter="formatter_sect_type" />
         <el-table-column prop="stor_name" label="仓库名称" width="150" />
         <el-table-column prop="capacity" label="容量" />
-        <el-table-column prop="sect_manager_name" label="负责人" />
-        <el-table-column prop="mobile_no" label="联系电话" width="100px" />
         <el-table-column label="是否启用" align="center" prop="is_used">
           <template slot-scope="scope">
             <el-switch
@@ -180,7 +167,6 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import { isvalidPhone } from '@/utils/validate'
 import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 const defaultForm = {
@@ -190,29 +176,9 @@ const defaultForm = {
   simple_name: null,
   sect_type_attr: null,
   stor_id: null,
-  stor_type: null,
   capacity: null,
-  width: null,
-  height: null,
-  zdepth: null,
-  xqty: null,
-  yqty: null,
-  zqty: null,
-  sect_manager_name: null,
-  mobile_no: null,
   remark: null,
-  create_id: null,
-  create_name: null,
-  create_time: null,
-  update_optid: null,
-  update_optname: null,
-  update_time: null,
   is_delete: null,
-  back_ground_color: null,
-  front_ground_color: null,
-  back_ground_pic: null,
-  font_direction_scode: null,
-  floor_no: null,
   is_used: true,
   ext_id: null
 }
@@ -232,13 +198,6 @@ export default {
     })
   },
   data() {
-    const validPhone = (rule, value, callback) => {
-      if (value && !isvalidPhone(value)) {
-        callback(new Error('请输入正确的11位手机号码'))
-      } else {
-        callback()
-      }
-    }
     const numberOne = (rule, value, callback) => {
       const numReg = /^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/
       const numRe = new RegExp(numReg)
@@ -255,9 +214,9 @@ export default {
     return {
       stors: [],
       permission: {
-        add: ['admin', 'user:add'],
-        edit: ['admin', 'user:edit'],
-        del: ['admin', 'user:del']
+        add: ['admin', 'sectattr:add'],
+        edit: ['admin', 'sectattr:edit'],
+        del: ['admin', 'sectattr:del']
       },
       rules: {
         sect_code: [
@@ -275,9 +234,6 @@ export default {
         capacity: [
           { required: false, message: '不能为空', trigger: 'blur' },
           { validator: numberOne }
-        ],
-        mobile_no: [
-          { required: false, trigger: 'blur', validator: validPhone }
         ]
       }
     }
@@ -296,6 +252,9 @@ export default {
     format_is_used(is_used) {
       return is_used === '1'
     },
+    formatter_sect_type(row) {
+      return this.dict.label.st_sect_type[row.sect_type_attr]
+    },
     changeEnabled(data, val) {
       let msg = '此操作将停用，是否继续！'
       if (val !== '1') {

lms/nladmin-ui/src/views/wms/basedata/st/stor/index.vue

@@ -112,7 +112,7 @@
         <el-table-column prop="stor_code" label="仓库编码" />
         <el-table-column prop="stor_name" label="仓库名称" width="150" />
         <el-table-column prop="simple_name" label="简称" width="130" />
-        <el-table-column prop="stor_type_scode" label="仓库性质" />
+        <el-table-column prop="stor_type_scode" label="仓库性质" :formatter="formatter_stor_type" />
         <el-table-column prop="ext_id" label="外部标识" width="130" />
         <el-table-column label="是否启用" align="center" prop="is_used">
           <template slot-scope="scope">
@@ -252,6 +252,9 @@ export default {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
+    },
+    formatter_stor_type(row) {
+      return this.dict.label.st_stor_type[row.stor_type_scode]
     }
   }
 }