opt:优化修改仓位管理功能

2024-10-22 17:16:33 +08:00
parent 32c9e743fb
commit 08bf09b36a
8 changed files with 173 additions and 313 deletions
--- a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
@@ -326,7 +326,6 @@ import crudStructivt from '@/views/wms/basedata/st/ivt/structivt'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 import UploadDialog from '@/views/wms/basedata/st/ivt/UploadDialog'
@@ -355,7 +354,7 @@ const defaultForm = {
 export default {
  name: 'Structivt',
  dicts: ['ST_QUALITY_SCODE', 'product_area', 'IS_OR_NOT', 'SUB_TYPE'],
-  components: { pagination, crudOperation, rrOperation, udOperation, UploadDialog },
+  components: { pagination, crudOperation, rrOperation, UploadDialog },
  mixins: [presenter(), header(), form(defaultForm), crud()],
  cruds() {
    return CRUD({
--- a/lms/nladmin-ui/src/views/wms/basedata/st/struct/OneCreateDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/struct/OneCreateDialog.vue
@@ -24,13 +24,6 @@
            />
          </el-form-item>
        </el-col>
-
-       <!-- <el-col :span="8">
-          <el-form-item label="仓位前缀:">
-            <el-input v-model="formMst.prefix" placeholder="如：91、B21、C31等" size="mini" style="width: 210px" />
-          </el-form-item>
-        </el-col>-->
-
        <el-col :span="8">
          <el-form-item label="生成数量:">
            <el-input-number :precision="0" :step="1" :min="1" :max="90000" v-model="formMst.num" size="mini" :controls="false" style="width: 210px" />
@@ -61,7 +54,7 @@ import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 import crudStructattr from '@/views/wms/basedata/st/struct/structattr'

 export default {
-  name: 'SunShowDialog',
+  name: 'OneCreateDialog',
  mixins: [crud()],
  props: {
    dialogShow: {
@@ -138,20 +131,7 @@ export default {
      }).catch(() => {
        this.loadingBut = false
      })
-    },
-    blurQuery() {
-      this.loadingBut = true
-      crudStructattr.blurQuery({ 'prefix': this.formMst.prefix }).then(res => {
-        this.crud.notify('可使用此前缀!', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.loadingBut = false
-      }).catch(() => {
-        this.loadingBut = false
-      })
    }
  }
 }
 </script>
-
-<style scoped>
-
-</style>
--- a/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue
@@ -88,7 +88,7 @@
              inactive-value="1"
              active-color="#C0CCDA"
              inactive-color="#409EFF"
-              @change="hand"
+              @change="crud.toQuery"
            />
          </el-form-item>
          <rrOperation />
@@ -232,39 +232,6 @@
          </el-row>

          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="容量" prop="capacity">
-                <label slot="label">容&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;量:</label>
-                <el-input v-model="form.capacity" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="承受重量" prop="weight">
-                <el-input v-model="form.weight" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="宽度" prop="width">
-                <label slot="label">宽&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;度:</label>
-                <el-input v-model="form.width" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="深度" prop="zdepth">
-                <label slot="label">深&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;度:</label>
-                <el-input v-model="form.zdepth" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="高度" prop="height">
-                <label slot="label">高&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;度:</label>
-                <el-input v-model="form.height" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
            <el-col :span="12">
              <el-form-item label="放置类型" prop="placement_type">
                <el-select
@@ -319,13 +286,10 @@
        style="width: 100%;"
        @selection-change="crud.selectionChangeHandler"
      >
-        <!--
-        <el-table-column type="selection" width="55" />
-->
        <el-table-column prop="struct_code" label="仓位编码" :min-width="flexWidth('struct_code',crud.data,'仓位编码')" />
        <el-table-column prop="struct_name" label="仓位名称" :min-width="flexWidth('struct_name',crud.data,'仓位名称')" />
        <el-table-column prop="simple_name" label="仓位简称" :min-width="flexWidth('simple_name',crud.data,'仓位简称')" />
-        <el-table-column prop="sect_name" label="所属库区" width="150" />
+        <el-table-column prop="sect_name" label="所属库区" width="150" :min-width="flexWidth('sect_name',crud.data,'所属库区')" />
        <el-table-column prop="stor_name" label="所属仓库" width="150" />
        <el-table-column prop="storagevehicle_code" label="载具号" :min-width="flexWidth('storagevehicle_code',crud.data,'载具号')" />
        <el-table-column prop="lock_type" label="锁定类型" min-width="120" show-overflow-tooltip>
@@ -333,13 +297,11 @@
            {{ dict.label.d_lock_type[scope.row.lock_type] }}
          </template>
        </el-table-column>
-        <el-table-column prop="sect_name" label="库区名称" :min-width="flexWidth('sect_name',crud.data,'库区名称')" />
        <el-table-column prop="placement_type" label="放置类型" min-width="120" show-overflow-tooltip>
          <template slot-scope="scope">
            {{ dict.label.placement_type[scope.row.placement_type] }}
          </template>
        </el-table-column>
-        <el-table-column prop="zdepth" label="深度" min-width="120" show-overflow-tooltip :formatter="zdepthType" />
        <el-table-column prop="storagevehicle_type" label="托盘类型" min-width="120" show-overflow-tooltip :formatter="formattTwo" />
        <el-table-column label="是否启用" align="center" prop="is_used">
          <template slot-scope="scope">
@@ -386,7 +348,8 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-/* import checkoutbill from "@/api/wms/st/core/outbill/checkoutbill";*/
+import UploadDialog from '@/views/wms/basedata/st/struct/OneCreateDialog'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'

 const defaultForm = {
  struct_id: null,
@@ -401,33 +364,13 @@ const defaultForm = {
  stor_code: null,
  stor_name: null,
  stor_type: null,
-  capacity: null,
-  width: null,
-  height: null,
-  zdepth: null,
-  weight: null,
-  xqty: null,
-  yqty: null,
-  zqty: null,
  is_tempstruct: '0',
-  create_id: null,
-  create_name: null,
-  create_time: null,
-  update_optid: null,
-  update_optname: null,
-  update_time: null,
+  placement_type: null,
  is_delete: null,
-  back_ground_color: null,
-  front_ground_color: null,
-  back_ground_pic: null,
-  font_direction_scode: null,
  is_used: null,
-  is_zdepth: null,
-  storagevehicle_id: null,
  storagevehicle_code: null,
  storagevehicle_type: null,
  is_emptyvehicle: null,
-  storagevehicle_qty: null,
  lock_type: null,
  material_height_type: null,
  ext_id: null,
@@ -436,7 +379,7 @@ const defaultForm = {
 export default {
  name: 'Structattr',
  dicts: ['ST_HEIGHT_TYPE', 'is_used', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'placement_type', 'zdepth', 'storagevehicle_type'],
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  components: { pagination, crudOperation, rrOperation, udOperation, UploadDialog },
  mixins: [presenter(), header(), form(defaultForm), crud()],
  cruds() {
    return CRUD({
@@ -448,24 +391,15 @@ export default {
    })
  },
  data() {
-    const numberOne = (rule, value, callback) => {
-      const numReg = /^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/
-      const numRe = new RegExp(numReg)
-      if (value) {
-        if (!numRe.test(value)) {
-          callback(new Error('只能输入数字'))
-        } else {
-          callback()
-        }
-      } else {
-        callback()
-      }
-    }
    return {
      openOneCreateDialog: false,
      sects: [],
      invtypelist: [],
-      permission: {},
+      permission: {
+        add: ['admin', 'structattr:add'],
+        edit: ['admin', 'structattr:edit'],
+        del: ['admin', 'structattr:del']
+      },
      layerList: [
        { 'label': '1层', 'value': '1' },
        { 'label': '2层', 'value': '2' },
@@ -509,26 +443,6 @@ export default {
        stor_id: [
          { required: true, message: '仓库标识不能为空', trigger: 'blur' }
        ],
-        capacity: [
-          { required: false, message: '不能为空', trigger: 'blur' },
-          { validator: numberOne }
-        ],
-        weight: [
-          { required: false, message: '不能为空', trigger: 'blur' },
-          { validator: numberOne }
-        ],
-        width: [
-          { required: false, message: '不能为空', trigger: 'blur' },
-          { validator: numberOne }
-        ],
-        height: [
-          { required: false, message: '不能为空', trigger: 'blur' },
-          { validator: numberOne }
-        ],
-        zdepth: [
-          { required: false, message: '不能为空', trigger: 'blur' },
-          { validator: numberOne }
-        ],
        material_height_type: [
          { required: true, message: '物料高度类型不能为空', trigger: 'blur' }
        ]
@@ -615,11 +529,14 @@ export default {
      }
      this.formMst.is_used = '1'
      crudStructattr.tunConfirm(this.formMst).then(res => {
-        this.$refs['form2'].resetFields()
-        this.dialogVisible2 = false
-        this.crud.toQuery()
+        close()
      })
    },
+    close() {
+      this.$refs['form2'].resetFields()
+      this.dialogVisible2 = false
+      this.crud.toQuery()
+    },
    tunClose() {
      if (!this.formMst.block_num) {
        this.crud.notify('请选择巷道!', CRUD.NOTIFICATION_TYPE.INFO)
@@ -627,22 +544,9 @@ export default {
      }
      this.formMst.is_used = '0'
      crudStructattr.tunConfirm(this.formMst).then(res => {
-        this.$refs['form2'].resetFields()
-        this.dialogVisible2 = false
-        this.crud.toQuery()
+        close()
      })
    },
-    zdepthType(row) {
-      if (row.zdepth === '1') {
-        return '浅货位'
-      }
-      if (row.zdepth === '2') {
-        return '深货位'
-      }
-      if (row.zdepth === '3') {
-        return '无'
-      }
-    },
    formattTwo(row) {
      if (row.storagevehicle_type === '1') {
        return '小托盘'