add：人员对应仓库

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

@@ -0,0 +1,407 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <el-input
+        v-model="query.stor_code"
+        clearable
+        style="width: 300px"
+        size="mini"
+        placeholder="输入仓库编码或名称"
+        prefix-icon="el-icon-search"
+        class="filter-item"
+      />
+      <rrOperation />
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表单组件-->
+      <el-dialog
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible.sync="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="700px"
+      >
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="仓库编码" prop="stor_code">
+                <el-input v-model="form.stor_code" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="仓库名称" prop="stor_name">
+                <el-input v-model="form.stor_name" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="仓库简称">
+                <el-input v-model="form.simple_name" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="所属部门" prop="sysdeptid">
+                <treeselect
+                  v-model="form.sysdeptid"
+                  :options="depts"
+                  :load-options="loadDepts"
+                  style="width: 200px"
+                  placeholder="选择部门"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="仓库容量" prop="stor_capacity">
+                <el-input v-model="form.stor_capacity" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="总面积(㎡)" prop="total_area">
+                <el-input v-model="form.total_area" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="仓库性质" prop="stor_type_scode">
+                <el-select
+                  v-model="form.stor_type_scode"
+                  placeholder=""
+                  style="width: 200px"
+                >
+                  <el-option
+                    v-for="item in dict.st_stor_type"
+                    :key="item.id"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="仓库地址">
+                <el-input v-model="form.storea_ddress" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="负责人">
+                <el-input v-model="form.principal" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系电话" prop="office_phone">
+                <el-input v-model="form.office_phone" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="外部标识">
+                <el-input v-model="form.ext_id" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-form-item label="仓库类型" required>
+              <el-col :span="4" />
+              <el-col :span="4">
+                <el-checkbox v-model="form.is_materialstore" true-label="1" false-label="0">原材料库</el-checkbox>
+              </el-col>
+              <el-col :span="4">
+                <el-checkbox v-model="form.is_semi_finished" true-label="1" false-label="0">半成品库</el-checkbox>
+              </el-col>
+              <el-col :span="4">
+                <el-checkbox v-model="form.is_productstore" true-label="1" false-label="0">成品库</el-checkbox>
+              </el-col>
+              <el-col :span="4">
+                <el-checkbox v-model="form.is_attachment" true-label="1" false-label="0">备件库</el-checkbox>
+              </el-col>
+              <el-col :span="4">
+                <el-checkbox v-model="form.is_virtualstore" true-label="1" false-label="0">虚拟库</el-checkbox>
+              </el-col>
+            </el-form-item>
+
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="24">
+              <el-form-item label="备注">
+                <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注</label>
+                <el-input v-model="form.remark" :rows="3" type="textarea" style="width: 550px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        size="mini"
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <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_capacity" label="容量" />
+        <el-table-column prop="total_area" width="100px" label="总面积(㎡)" />
+        <el-table-column prop="label" label="仓库性质" />
+        <el-table-column prop="storea_ddress" label="地址" />
+        <el-table-column prop="principal" label="负责人" />
+        <el-table-column prop="office_phone" label="联系电话" width="130" />
+        <el-table-column prop="ext_id" label="外部标识" width="130" />
+        <el-table-column label="是否启用" align="center" prop="is_used">
+          <template slot-scope="scope">
+            <el-switch
+              :value="format_is_used(scope.row.is_used)"
+              active-color="#409EFF"
+              inactive-color="#F56C6C"
+              @change="changeEnabled(scope.row, scope.row.is_used)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column prop="remark" label="备注" />
+        <el-table-column
+          v-permission="['admin','stIvtBsrealstorattr:edit','stIvtBsrealstorattr:del']"
+          label="操作"
+          fixed="right"
+          width="120px"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
+import CRUD, { crud, form, header, presenter } 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 Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { getDepts, getDeptSuperior } from '@/views/system/dept/dept'
+import { isvalidPhone } from '@/utils/validate'
+
+const defaultForm = {
+  stor_id: null,
+  stor_code: null,
+  stor_name: null,
+  simple_name: null,
+  stor_capacity: null,
+  total_area: null,
+  stor_type_scode: null,
+  is_virtualstore: null,
+  is_semi_finished: null,
+  is_materialstore: null,
+  is_productstore: null,
+  is_reversed: null,
+  is_mvout_auto_cfm: null,
+  is_mvin_auto_cfm: null,
+  area: null,
+  storea_ddress: null,
+  principal: null,
+  office_phone: null,
+  mobile_no: null,
+  remark: null,
+  order_index: null,
+  whstate_scode: null,
+  is_used: '1',
+  base_class_id: null,
+  create_id: null,
+  create_name: null,
+  create_time: null,
+  update_optid: null,
+  update_optname: null,
+  update_time: null,
+  sysownerid: null,
+  sysdeptid: null,
+  syscompanyid: null,
+  is_delete: null,
+  ext_id: null,
+  depart_name: null,
+  company_name: null,
+  is_attachment: null
+}
+export default {
+  name: 'StIvtBsrealstorattr',
+  dicts: ['st_stor_type', 'is_used'],
+  components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '仓库',
+      optShow: { add: true, reset: true },
+      url: 'api/stIvtBsrealstorattr',
+      idField: 'stor_id',
+      sort: 'stor_id,desc',
+      crudMethod: { ...crudStorattr }
+    })
+  },
+  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)
+      if (value) {
+        if (!numRe.test(value)) {
+          callback(new Error('只能输入数字'))
+        } else {
+          callback()
+        }
+      } else {
+        callback()
+      }
+    }
+    return {
+      depts: [],
+      permission: {},
+      rules: {
+        stor_code: [
+          { required: true, message: '仓库编码不能为空', trigger: 'blur' }
+        ],
+        stor_name: [
+          { required: true, message: '仓库名称不能为空', trigger: 'blur' }
+        ],
+        sysdeptid: [
+          { required: true, message: '所属部门不能为空', trigger: 'blur' }
+        ],
+        stor_capacity: [
+          { required: false, message: '不能为空', trigger: 'blur' },
+          { validator: numberOne }
+        ],
+        total_area: [
+          { required: false, message: '不能为空', trigger: 'blur' },
+          { validator: numberOne }
+        ],
+        office_phone: [
+          { required: false, trigger: 'blur', validator: validPhone }
+        ]
+      }
+    }
+  },
+  methods: {
+    // 新增与编辑前做的操作
+    [CRUD.HOOK.afterToCU](crud, form) {
+      if (form.id == null) {
+        this.getDepts()
+      } else {
+        this.getSupDepts(form.dept.id)
+      }
+    },
+    [CRUD.HOOK.beforeSubmit](crud, form) {
+      if (this.form.is_virtualstore === '0' && this.form.is_semi_finished === '0' && this.form.is_materialstore === '0' &&
+        this.form.is_productstore === '0' && this.form.is_attachment === '0') {
+        this.crud.notify('仓库类型至少选一条', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      if (!this.form.is_virtualstore && !this.form.is_semi_finished && !this.form.is_materialstore &&
+        !this.form.is_productstore && !this.form.is_attachment) {
+        this.crud.notify('仓库类型至少选一条', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+    },
+    getDepts() {
+      getDepts({ enabled: true }).then(res => {
+        this.depts = res.content.map(function(obj) {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          return obj
+        })
+      })
+    },
+    // 改变状态
+    format_is_used(is_used) {
+      return is_used === '1'
+    },
+    changeEnabled(data, val) {
+      let msg = '此操作将停用，是否继续！'
+      if (val !== '1') {
+        msg = '此操作将启用，是否继续！'
+      }
+      this.$confirm(msg, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        crudStorattr.changeActive(data).then(res => {
+          this.crud.toQuery()
+          this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        }).catch(() => {
+          data.is_used = !data.is_used
+        })
+      }).catch(() => {
+      })
+    },
+    getSupDepts(deptId) {
+      getDeptSuperior(deptId).then(res => {
+        const date = res.content
+        this.buildDepts(date)
+        this.depts = date
+      })
+    },
+    buildDepts(depts) {
+      depts.forEach(data => {
+        if (data.children) {
+          this.buildDepts(data.children)
+        }
+        if (data.hasChildren && !data.children) {
+          data.children = null
+        }
+      })
+    },
+    loadDepts({ action, parentNode, callback }) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        getDepts({ enabled: true, pid: parentNode.id }).then(res => {
+          parentNode.children = res.content.map(function(obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 200)
+        })
+      }
+    },
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

lms/nladmin-ui/src/views/wms/basedata/st/stor/storattr.js

@@ -0,0 +1,43 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/stIvtBsrealstorattr',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/stIvtBsrealstorattr/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/stIvtBsrealstorattr',
+    method: 'put',
+    data
+  })
+}
+
+export function getStor(params) {
+  return request({
+    url: 'api/stIvtBsrealstorattr/getStor',
+    method: 'get',
+    params
+  })
+}
+
+export function changeActive(data) {
+  return request({
+    url: 'api/stIvtBsrealstorattr/changeActive',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del, getStor, changeActive }

lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/AddDialog.vue

@@ -169,8 +169,8 @@
 import CRUD, { crud, form } from '@crud/crud'
 import AddDtl from '@/views/wms/storage_manage/ios/inbill/AddDtl'
 import inBill from '@/views/wms/storage_manage/ios/inbill/inbill'
+import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 // import MaterDtl from '@/views/wms/pub/MaterDialog'
-// import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 const defaultForm = {
   bill_code: '',
@@ -205,9 +205,7 @@ export default {
       bill_btn: false,
       mater_btn: false,
       materType: '',
-      storlist: [
-        { 'stor_id': '1010101', 'stor_name': '测试仓库' }
-      ],
+      storlist: [],
       rules: {
         stor_id: [
           { required: true, message: '仓库不能为空', trigger: 'blur' }
@@ -230,9 +228,9 @@ export default {
   },
   methods: {
     open() {
-  /*    crudUserStor.getUserStor().then(res => {
+      crudStorattr.getStor({}).then(res => {
         this.storlist = res
-      })*/
+      })
     },
     close() {
       this.$emit('AddChanged')

lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/AddDtl.vue

@@ -146,7 +146,7 @@ export default {
   },
   methods: {
     [CRUD.HOOK.beforeRefresh]() {
-      this.crud.query.status = '10'
+      this.crud.query.status = '0'
       return true
     },
     open() {

lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/ViewDialog.vue

@@ -153,6 +153,7 @@
 
 import { crud } from '@crud/crud'
 import inBill from '@/views/wms/storage_manage/ios/inbill/inbill'
+import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 // import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 export default {
@@ -196,10 +197,10 @@ export default {
   created() {
    /* checkoutbill.getInvTypes().then(res => {
       this.billtypelist = res
-    })
-    crudUserStor.getUserStor().then(res => {
-      this.storlist = res
     })*/
+    crudStorattr.getStor({}).then(res => {
+      this.storlist = res
+    })
   },
   methods: {
     open() {

lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/index.vue

@@ -196,7 +196,7 @@
           </template>
         </el-table-column>
         <el-table-column show-overflow-tooltip :formatter="stateFormat" prop="bill_status" label="单据状态" />
-        <el-table-column prop="stor_name" label="仓库" />
+        <el-table-column prop="stor_name" label="仓库" min-width="120" />
         <el-table-column show-overflow-tooltip prop="bill_type" min-width="120" :formatter="bill_typeFormat" label="业务类型" />
         <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="业务日期" />
         <el-table-column show-overflow-tooltip prop="create_mode" :formatter="create_modeFormat" label="生成方式" />
@@ -233,7 +233,7 @@ import AddDialog from '@/views/wms/storage_manage/ios/inbill/AddDialog'
 import DivDialog from '@/views/wms/storage_manage/ios/inbill/DivDialog'
 import ViewDialog from '@/views/wms/storage_manage/ios/inbill/ViewDialog'
 import TaskDialog from '@/views/wms/storage_manage/ios/inbill/TaskDialog'
-// import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
+import crudStorattr, { getStor } from '@/views/wms/basedata/st/stor/storattr'
 
 export default {
   name: 'Inbill',
@@ -272,9 +272,9 @@ export default {
     }
   },
   created() {
-    /*crudUserStor.getUserStor().then(res => {
+    crudStorattr.getStor({}).then(res => {
       this.storlist = res
-    })*/
+    })
   },
   methods: {
     canUd(row) {