add：移库管理

wms/nladmin-ui/src/views/wms/pub/StructDialog.vue

@@ -83,7 +83,7 @@ export default {
       url: 'api/structattr',
       idField: 'struct_id',
       sort: 'struct_id,desc',
-      query: { search: '', is_lock: '1', lock_type: '', sect_id: '', stor_id: '' },
+      query: { search: '', is_lock: '0', lock_type: '0', sect_id: '', stor_id: '' },
       crudMethod: { ...crudStructattr }
     })
   },
@@ -137,7 +137,7 @@ export default {
      */
     getMsg(msg) {
       this.dialogDis = msg
-      this.lock = '1'
+      this.lock = '0'
     },
     [CRUD.HOOK.beforeRefresh]() {
       this.crud.query.stor_id = this.storId
@@ -152,7 +152,7 @@ export default {
       crudSectattr.getSect({ 'stor_id': this.storId }).then(res => {
         this.sects = res.content
       })
-      this.query.is_lock = '1'
+      this.query.is_lock = '0'
       this.query.lock_type = this.lock
       this.query.is_used = '1'
       this.crud.toQuery()

wms/nladmin-ui/src/views/wms/st/movebill/AddDialog.vue

@@ -0,0 +1,473 @@
+<template>
+  <el-dialog
+    :title="crud.status.title"
+    append-to-body
+    fullscreen
+    :before-close="crud.cancelCU"
+    :visible.sync="crud.status.cu > 0 || crud.status.view > 0"
+    @open="open"
+    @close="close"
+  >
+    <el-row v-show="crud.status.cu > 0" :gutter="20">
+      <el-col :span="20" style="border: 1px solid white">
+        <span />
+      </el-col>
+      <el-col :span="4">
+        <span>
+          <el-button
+            icon="el-icon-check"
+            size="mini"
+            :loading="crud.cu === 2"
+            type="primary"
+            @click="crud.submitCU"
+          >保存</el-button>
+          <el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
+        </span>
+      </el-col>
+    </el-row>
+
+    <el-form
+      ref="form"
+      style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
+      :inline="true"
+      :model="form"
+      :rules="rules"
+      size="mini"
+      label-width="85px"
+      label-suffix=":"
+    >
+      <el-input v-show="false" v-model="form.stor_code" placeholder="仓库编码" />
+      <el-input v-show="false" v-model="form.stor_name" placeholder="仓库名称" />
+      <el-form-item label="单据号" prop="bill_code">
+        <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
+        <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
+      </el-form-item>
+      <el-form-item label="仓库" prop="stor_id">
+        <label slot="label">仓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;库:</label>
+        <el-select
+          v-model="form.stor_id"
+          clearable
+          placeholder="仓库"
+          class="filter-item"
+          style="width: 210px"
+          :disabled="crud.status.view > 0"
+          @change="storChange"
+        >
+          <el-option
+            v-for="item in storlist"
+            :key="item.stor_id"
+            :label="item.stor_name"
+            :value="item.stor_id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="业务类型" prop="bill_type">
+        <el-select
+          v-model="form.bill_type"
+          placeholder="业务类型"
+          class="filter-item"
+        >
+          <el-option
+            v-for="item in dict.ST_INV_TYPE_MV"
+            :disabled="item.value === '21' || item.value === '31'"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="单据状态" prop="bill_status">
+        <el-select
+          v-model="form.bill_status"
+          placeholder="单据状态"
+          class="filter-item"
+          :disabled="true"
+        >
+          <el-option
+            v-for="item in dict.move_bill_status"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="明细数" prop="detail_count">
+        <label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
+        <el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
+      </el-form-item>
+      <el-form-item label="总重量" prop="total_qty">
+        <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
+        <el-input-number
+          v-model="form.total_qty"
+          :controls="false"
+          :precision="3"
+          :min="0"
+          disabled
+          style="width: 210px"
+        />
+      </el-form-item>
+      <el-form-item label="业务日期" prop="biz_date">
+        <el-date-picker
+          v-model="form.biz_date"
+          type="date"
+          placeholder="选择日期"
+          style="width: 210px"
+          value-format="yyyy-MM-dd"
+          :disabled="crud.status.view > 0"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
+        <el-input
+          v-model="form.remark"
+          style="width: 380px;"
+          rows="2"
+          type="textarea"
+          :disabled="crud.status.view > 0"
+        />
+      </el-form-item>
+    </el-form>
+
+    <div class="crud-opts2">
+      <span class="role-span">移库明细</span>
+      <span v-if="crud.status.cu > 0" class="crud-opts-right2">
+
+        <!--左侧插槽-->
+        <slot name="left" />
+        <el-button
+          slot="left"
+          v-if="form.bill_type !== '30'"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="queryDtl()"
+        >
+          添加库存物料
+        </el-button>
+      </span>
+
+    </div>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      :data="form.tableData"
+      style="width: 100%;"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+    >
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column v-if="crud.status.add!==1" prop="work_status" label="状态" align="center" :formatter="bill_statusFormat" :min-width="flexWidth('work_status',crud.data,'状态')" />
+      <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
+      <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
+      <el-table-column prop="pcsn" label="批次号" :min-width="flexWidth('pcsn',crud.data,'批次号')" />
+      <el-table-column prop="qty" label="重量" :formatter="crud.formatNum3" align="center" :min-width="flexWidth('qty',crud.data,'重量')" />
+      <el-table-column prop="qty_unit_name" label="单位" align="center" :min-width="flexWidth('qty_unit_name',crud.data,'单位')" />
+      <el-table-column prop="storagevehicle_code" label="载具号" :min-width="flexWidth('storagevehicle_code',crud.data,'载具号')" />
+      <el-table-column prop="turnout_sect_name" label="移出库区" :min-width="flexWidth('turnout_sect_name',crud.data,'移出库区')" />
+      <el-table-column prop="turnout_struct_code" label="移出货位" :min-width="flexWidth('turnout_struct_code',crud.data,'移出货位')" />
+      <el-table-column prop="turnin_sect_name" label="移入库区" :min-width="flexWidth('turnin_sect_name',crud.data,'移入库区')" />
+      <el-table-column prop="turnin_struct_code" label="移入货位" :min-width="flexWidth('turnin_struct_code',crud.data,'移入货位')" align="center">
+        <template scope="scope">
+          <el-input v-show="!scope.row.edit" v-model="scope.row.turnin_struct_code" disabled class="input-with-select">
+            <el-button slot="append" icon="el-icon-search" @click="queryStruct(scope.$index, scope.row)" />
+          </el-input>
+          <span v-show="scope.row.edit">{{ scope.row.turnin_struct_code }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="crud.status.cu > 0" align="center" width="160" label="操作" fixed="right">
+        <template scope="scope">
+          <el-button
+            type="danger"
+            class="filter-item"
+            size="mini"
+            icon="el-icon-delete"
+            @click.native.prevent="deleteRow(scope.$index, form.tableData)"
+          />
+          <el-button
+            v-show="!scope.row.edit"
+            type="primary"
+            class="filter-item"
+            size="mini"
+            icon="el-icon-edit"
+            @click="handleEdit(scope.$index, scope.row)"
+          >编辑
+          </el-button>
+          <el-button
+            v-show="scope.row.edit"
+            type="success"
+            class="filter-item"
+            size="mini"
+            icon="el-icon-check"
+            @click="handleEdit(scope.$index, scope.row)"
+          >完成
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <AddDtl :dialog-show.sync="dtlShow" :stor-id="storId" @tableChanged="tableChanged" />
+    <StructDiv ref="child" :stor-id="storId" :dialog-show.sync="structShow" @tableChanged="structChanged" />
+  </el-dialog>
+</template>
+
+<script>
+import CRUD, { crud, form } from '@crud/crud'
+import AddDtl from '@/views/wms/st/movebill/AddDtl'
+import movestor from '@/views/wms/st/movebill/movestor'
+import StructDiv from '@/views/wms/pub/StructDialog'
+import crudUserStor from '@/views/wms/basedata/bsrealstorattr/bsrealstorattr'
+
+const defaultForm = {
+  bill_code: '',
+  stor_id: '1582991156504039424',
+  stor_code: 'AC01',
+  stor_name: '兰州仓库',
+  block_num: null,
+  bill_status: '10',
+  total_qty: '0',
+  detail_count: '0',
+  bill_type: '29',
+  remark: '',
+  biz_date: new Date(),
+  create_mode: '',
+  tableData: []
+}
+export default {
+  name: 'AddDialog',
+  components: { AddDtl, StructDiv },
+  mixins: [crud(), form(defaultForm)],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    }
+  },
+  dicts: ['move_bill_status', 'ST_INV_TYPE_MV', 'MOVE_WORK_STATUS'],
+  data() {
+    return {
+      dialogVisible: false,
+      dtlShow: false,
+      structShow: false,
+      structShow2: false,
+      flagnow: false,
+      nowrow: {},
+      storId: null,
+      nowindex: '',
+      storlist: [],
+      invtypelist: [],
+      rules: {
+        stor_id: [
+          { required: true, message: '仓库不能为空', trigger: 'blur' }
+        ],
+        bill_type: [
+          { required: true, message: '业务类型不能为空', trigger: 'blur' }
+        ],
+        biz_date: [
+          { required: true, message: '业务日期不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      crudUserStor.getStor().then(res => {
+        this.storlist = res
+      })
+    },
+    close() {
+      this.$emit('AddChanged')
+    },
+    [CRUD.HOOK.afterToEdit]() {
+      movestor.getMoveDtl({ 'moveinv_id': this.form.moveinv_id }).then(res => {
+        this.form.tableData = res
+        // 将明细变成不可编辑
+        for (let i = 0; i < this.form.tableData.length; i++) {
+          const row = this.form.tableData[i]
+          row.edit = true
+          this.form.tableData.splice(i, 1, row)
+        }
+      })
+    },
+    [CRUD.HOOK.afterToView]() {
+      movestor.getMoveDtl({ 'moveinv_id': this.form.moveinv_id }).then(res => {
+        this.form.tableData = res
+        // 将明细变成不可编辑
+        for (let i = 0; i < this.form.tableData.length; i++) {
+          const row = this.form.tableData[i]
+          row.edit = true
+          this.form.tableData.splice(i, 1, row)
+        }
+      })
+    },
+    bill_statusFormat(row) {
+      return this.dict.label.MOVE_WORK_STATUS[row.work_status]
+    },
+    storChange(row) {
+      this.storlist.forEach((item) => {
+        if (item.stor_id === row) {
+          this.form.stor_code = item.stor_code
+          this.form.stor_name = item.stor_name
+        }
+      })
+      this.form.tableData = []
+    },
+    async queryDtl() {
+      if (!this.form.stor_id) {
+        return this.crud.notify('请先选择仓库！', CRUD.NOTIFICATION_TYPE.INFO)
+      }
+      this.storId = this.form.stor_id
+      this.dtlShow = true
+    },
+    async queryStruct(index, row) {
+      this.structShow = true
+      this.$refs.child.getMsg(false)
+      this.nowindex = index
+      this.nowrow = row
+    },
+    tableChanged(rows) {
+      const tablemap = new Map()
+      rows.forEach((item) => {
+        if (this.form.tableData.length !== 0) {
+          this.flagnow = false
+          for (let i = 0; i < this.form.tableData.length; i++) {
+            if (this.form.tableData[i].stockrecord_id === item.stockrecord_id) {
+              this.flagnow = true
+            }
+          }
+          if (!this.flagnow) {
+            this.$set(item, 'edit', false)
+            this.$set(item, 'work_status', '10')
+            this.$set(item, 'turnin_sect_code', '')
+            this.$set(item, 'turnin_struct_code', '')
+            tablemap.set(item.stockrecord_id, item)
+          }
+        } else {
+          this.$set(item, 'edit', false)
+          this.$set(item, 'work_status', '10')
+          this.$set(item, 'turnin_sect_code', '')
+          this.$set(item, 'turnin_struct_code', '')
+          tablemap.set(item.stockrecord_id, item)
+        }
+      })
+      for (const value of tablemap.values()) {
+        this.form.tableData.push(value)
+      }
+      this.form.detail_count = this.form.tableData.length
+    },
+    structChanged(row) {
+      let structflag = false
+      for (let i = 0; i < this.form.tableData.length; i++) {
+        if ((this.form.tableData[i].turnin_struct_id === row.struct_id) || (this.form.tableData[i].turnout_struct_id === row.struct_id)) {
+          structflag = true
+        }
+      }
+      if (structflag) {
+        this.crud.notify('该货位已被设置，不允许重复设置！', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      for (let i = 0; i < this.form.tableData.length; i++) {
+        if (this.form.tableData[i].storagevehicle_code === this.nowrow.storagevehicle_code) {
+          this.form.tableData[i].turnin_struct_id = row.struct_id
+          this.form.tableData[i].turnin_struct_code = row.struct_code
+          this.form.tableData[i].turnin_struct_name = row.struct_name
+
+          this.form.tableData[i].turnin_sect_id = row.sect_id
+          this.form.tableData[i].turnin_sect_code = row.sect_code
+          this.form.tableData[i].turnin_sect_name = row.sect_name
+          this.form.tableData.splice(i, 1, this.form.tableData[i]) // 通过splice 替换数据 触发视图更新
+        }
+      }
+      console.log(this.form.tableData)
+    },
+    handleEdit(index, row) {
+      // 判断是否可以关闭编辑状态
+      if (!row.edit) {
+        if (row.turnin_struct_id === '') {
+          this.crud.notify('请先选择载具：' + row.storagevehicle_code + '的移入货位！', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+        if (row.turnin_sect_id === '') {
+          this.crud.notify('请先选择载具：' + row.storagevehicle_code + '的移入库区！', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+      }
+      row.edit = !row.edit
+      this.form.tableData.splice(index, 1, row) // 通过splice 替换数据 触发视图更新
+      if (row.edit) {
+        this.form.total_qty = 0
+        this.form.tableData.forEach((item) => {
+          this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.qty)
+        })
+      }
+    },
+    deleteRow(index, rows) {
+      const storagevehicle_code = rows[index].storagevehicle_code
+      let len = rows.length
+      while (len--) {
+        const obj = rows[len]
+        if (storagevehicle_code === obj.storagevehicle_code) {
+          const index = rows.indexOf(obj)
+          if (index > -1) { // 移除找到的指定元素
+            this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].qty)
+            rows.splice(index, 1)
+            this.nowindex = ''
+            this.nowrow = {}
+            this.form.detail_count = this.form.tableData.length
+          }
+        }
+      }
+    },
+    [CRUD.HOOK.beforeSubmit]() {
+      if (this.form.bill_type !== '30') {
+        if (this.form.tableData.length === 0) {
+          this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+        for (let i = 0; i < this.form.tableData.length; i++) {
+          if (!this.form.tableData[i].edit) {
+            this.crud.notify('尚有未完成编辑的物料明细序号' + (i + 1) + '，请检查！')
+            return false
+          }
+        }
+      } else {
+        if (!this.form.block_num) {
+          this.crud.notify('请选择所属区域', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .crud-opts-right2 {
+  margin-left: auto;
+  padding: 4px 4px;
+}
+
+.input-with-select {
+  background-color: #fff;
+}
+</style>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 10px;
+}
+</style>

wms/nladmin-ui/src/views/wms/st/movebill/AddDtl.vue

@@ -0,0 +1,207 @@
+<template>
+  <el-dialog
+    title="库存物料选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    :show-close="false"
+    width="1300px"
+    @close="close"
+    @open="open"
+  >
+    <!-- 搜索 -->
+    <el-form
+      :inline="true"
+      class="demo-form-inline"
+      label-position="right"
+      label-width="80px"
+      label-suffix=":"
+    >
+      <el-form-item label="库区查询">
+        <el-cascader
+          v-model="defaultList"
+          placeholder="库区"
+          :options="sects"
+          :props="{ checkStrictly: true }"
+          clearable
+          @change="sectQueryChange"
+        />
+      </el-form-item>
+      <el-form-item label="货位编码">
+        <el-input
+          v-model="query.struct_code"
+          clearable
+          size="mini"
+          placeholder="货位号模糊查询"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料编码">
+        <el-input
+          v-model="query.material_code"
+          clearable
+          size="mini"
+          placeholder="物料"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-form-item>
+      <el-form-item label="批次">
+        <el-input
+          v-model="query.pcsn"
+          clearable
+          size="mini"
+          placeholder="批次"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-form-item>
+      <rrOperation />
+    </el-form>
+    <!--表格渲染-->
+    <div style="padding: 10px" />
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+    >
+      <el-table-column type="selection" width="55" />
+      <el-table-column prop="turnout_sect_name" label="库区名称" :min-width="flexWidth('turnout_sect_name',crud.data,'库区名称')" />
+      <el-table-column prop="turnout_struct_code" label="货位编码" :min-width="flexWidth('turnout_struct_code',crud.data,'货位编码')" />
+      <el-table-column prop="storagevehicle_code" label="载具编码" :min-width="flexWidth('storagevehicle_code',crud.data,'载具编码')" />
+      <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
+      <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
+      <el-table-column prop="pcsn" label="批次" :min-width="flexWidth('pcsn',crud.data,'批次')" />
+      <el-table-column prop="qty" label="重量" :formatter="crud.formatNum3" :min-width="flexWidth('qty',crud.data,'重量')" />
+      <el-table-column prop="qty_unit_name" label="重量单位" :min-width="flexWidth('qty_unit_name',crud.data,'重量单位')" />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
+      <el-button slot="left" type="primary" @click="submit">保存</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import movestor from '@/views/wms/st/movebill/movestor'
+import crudSectattr from '@/views/wms/basedata/sectattr/sectattr'
+
+export default {
+  name: 'AddDtl',
+  components: { rrOperation, pagination },
+  cruds() {
+    return CRUD({ title: '用户', idField: 'storagevehicleext_id', url: 'api/moveStor/getCanuseIvt',
+      query: {
+        struct_code: '',
+        remark: '',
+        sect_id: '',
+        stor_id: ''
+      },
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        reset: true,
+        download: false
+      }})
+  },
+  mixins: [presenter(), header()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: String
+    },
+    storId: {
+      type: String
+    }
+  },
+  dicts: ['ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'is_usable'],
+  data() {
+    return {
+      dialogVisible: false,
+      opendtlParam: '',
+      sects: [],
+      rows: [],
+      defaultList: ['1582991156504039424', '1582991348217286656']
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    openParam: {
+      handler(newValue, oldValue) {
+        this.opendtlParam = newValue
+      }
+    }
+  },
+  methods: {
+    [CRUD.HOOK.beforeRefresh]() {
+      this.crud.query.stor_id = this.storId
+      if (this.storId === this.defaultList[0]) {
+        this.crud.query.sect_id = this.defaultList[1]
+      }
+    },
+    open() {
+      crudSectattr.getSect({ 'stor_id': this.storId }).then(res => {
+        this.sects = res.content
+      })
+      this.crud.toQuery()
+    },
+    close() {
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+    },
+    ivt_levelFormat(row, column) {
+      return this.dict.label.ST_IVT_LEVEL[row.ivt_level]
+    },
+    is_activeFormat(row, column) {
+      return this.dict.label.is_usable[row.is_active]
+    },
+    sectQueryChange(val) {
+      if (val.length === 1) {
+        this.crud.query.stor_id = val[0]
+        this.crud.query.sect_id = ''
+      }
+      if (val.length === 0) {
+        this.crud.query.sect_id = ''
+        this.crud.query.stor_id = ''
+      }
+      if (val.length === 2) {
+        this.crud.query.stor_id = val[0]
+        this.crud.query.sect_id = val[1]
+      }
+      this.crud.toQuery()
+    },
+    submit() {
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选物料')
+        return
+      }
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged', this.rows)
+      this.crud.resetQuery(false)
+    }
+  }
+}
+</script>
+

wms/nladmin-ui/src/views/wms/st/movebill/index.vue

@@ -0,0 +1,341 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="模糊查询">
+            <el-input
+              v-model="query.bill_code"
+              size="mini"
+              clearable
+              placeholder="移库单号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="所属仓库">
+            <el-select
+              v-model="query.stor_id"
+              clearable
+              size="mini"
+              placeholder="全部"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in storlist"
+                :key="item.stor_id"
+                :label="item.stor_name"
+                :value="item.stor_id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="物料查询">
+            <el-input
+              v-model="query.material_code"
+              size="mini"
+              clearable
+              placeholder="物料编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="生成方式">
+            <el-select
+              v-model="query.create_mode"
+              clearable
+              size="mini"
+              placeholder="生成方式"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.ST_CREATE_MODE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="单据状态">
+            <el-select
+              v-model="query.bill_status"
+              clearable
+              size="mini"
+              placeholder="单据状态"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.move_bill_status"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="业务类型">
+            <el-select
+              v-model="query.bill_type"
+              clearable
+              filterable
+              size="mini"
+              placeholder="业务类型"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.ST_INV_TYPE_MV"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+
+            <el-form-item label="创建时间">
+              <el-date-picker
+                v-model="query.createTime"
+                type="daterange"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :default-time="['00:00:00', '23:59:59']"
+                @change="crud.toQuery"
+              />
+            </el-form-item>
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="warning"
+          :disabled="confirm_flag"
+          icon="el-icon-check"
+          size="mini"
+          @click="confirm"
+        >
+          强制确认
+        </el-button>
+      </crudOperation>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        size="mini"
+        :data="crud.data"
+        style="width: 100%;"
+        :highlight-current-row="true"
+        @selection-change="crud.selectionChangeHandler"
+        @current-change="handleCurrentChange"
+        @select="handleSelectionChange"
+        @select-all="onSelectAll"
+      >
+        <el-table-column
+          v-permission="['admin','movestor:del','movestor:edit']"
+          label="操作"
+          width="160"
+          align="center"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+              :disabled-edit="canUd(scope.row)"
+              :disabled-dle="canUd(scope.row)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column :selectable="checkboxT" type="selection" />
+        <el-table-column prop="bill_code" label="单据号" :min-width="flexWidth('bill_code',crud.data,'单据号')">
+          <template slot-scope="scope">
+            <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.bill_code }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column :formatter="stateFormat" prop="bill_status" label="单据状态" :min-width="flexWidth('bill_status',crud.data,'单据状态')"/>
+        <el-table-column prop="stor_name" label="仓库" :min-width="flexWidth('stor_name',crud.data,'仓库')" />
+        <el-table-column prop="bill_type" :formatter="bill_typeFormat" label="业务类型" :min-width="flexWidth('bill_type',crud.data,'业务类型')"/>
+        <el-table-column prop="biz_date" label="业务日期" :min-width="flexWidth('biz_date',crud.data,'业务日期')" />
+        <el-table-column :formatter="create_modeFormat" prop="create_mode" label="生成方式" :min-width="flexWidth('create_mode',crud.data,'生成方式')"/>
+        <el-table-column label="明细数" prop="detail_count" :min-width="flexWidth('detail_count',crud.data,'明细数')" />
+        <el-table-column prop="input_optname" label="创建人" :min-width="flexWidth('input_optname',crud.data,'创建人')" />
+        <el-table-column prop="input_time" label="创建日期" :min-width="flexWidth('input_time',crud.data,'创建日期')" />
+        <el-table-column prop="update_optname" label="修改人" :min-width="flexWidth('update_optname',crud.data,'修改人')" />
+        <el-table-column prop="update_time" label="修改日期" :min-width="flexWidth('update_time',crud.data,'修改日期')" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+    <AddDialog @AddChanged="querytable" />
+  </div>
+</template>
+
+<script>
+import movestor from '@/views/wms/st/movebill/movestor'
+import CRUD, { crud, 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 AddDialog from '@/views/wms/st/movebill/AddDialog'
+import crudStorattr from '@/views/wms/basedata/bsrealstorattr/bsrealstorattr'
+
+export default {
+  name: 'Movestor',
+  components: { AddDialog, crudOperation, rrOperation, udOperation, pagination },
+  cruds() {
+    return CRUD({ title: '移库单', idField: 'moveinv_id', url: 'api/moveStor', crudMethod: { ...movestor },
+      optShow: {
+        add: true,
+        edit: false,
+        del: false,
+        reset: true,
+        download: false
+      }})
+  },
+  mixins: [presenter(), header(), crud()],
+  // 数据字典
+  dicts: ['move_bill_status', 'ST_CREATE_MODE', 'ST_INV_TYPE_MV'],
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      permission: {
+        add: ['admin', 'movestor:add'],
+        edit: ['admin', 'movestor:edit'],
+        del: ['admin', 'movestor:del']
+      },
+      work_flag: true,
+      confirm_flag: true,
+      mstrow: {},
+      currentRow: null,
+      storlist: []
+    }
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  created() {
+    crudStorattr.getStor({}).then(res => {
+      this.storlist = res
+    })
+    this.initQuery()
+    this.crud.toQuery()
+  },
+  methods: {
+    initQuery() {
+      const end = new Date()
+      const start = new Date()
+      const endYear = end.getFullYear()
+      var endMonth = end.getMonth() + 1
+      if (end.getMonth() + 1 < 10) {
+        endMonth = '0' + endMonth.toString()
+      }
+      var endDay = end.getDate()
+      if (end.getDate() < 10) {
+        endDay = '0' + endDay.toString()
+      }
+      const endDate = endYear + '-' + endMonth + '-' + endDay + ' 23:59:59'
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+      const startYear = start.getFullYear()
+      var startMonth = start.getMonth() + 1
+      if (start.getMonth() + 1 < 10) {
+        startMonth = '0' + startMonth.toString()
+      }
+      var startDay = start.getDate()
+      if (start.getDate() < 10) {
+        startDay = '0' + startDay.toString()
+      }
+      const startDate = startYear + '-' + startMonth + '-' + startDay + ' 00:00:00'
+      this.$set(this.query, 'createTime', [startDate, endDate])
+      this.crud.toQuery()
+    },
+    canUd(row) {
+      return row.bill_status !== '10'
+    },
+    [CRUD.HOOK.beforeRefresh]() {
+      this.crud.query.buss_type = ''
+      this.handleCurrentChange(null)
+    },
+    stateFormat(row) {
+      return this.dict.label.move_bill_status[row.bill_status]
+    },
+    bill_typeFormat(row) {
+      return this.dict.label.ST_INV_TYPE_MV[row.bill_type]
+    },
+    create_modeFormat(row) {
+      return this.dict.label.ST_CREATE_MODE[row.create_mode]
+    },
+    handleSelectionChange(val, row) {
+      if (val.length > 1) {
+        this.$refs.table.clearSelection()
+        this.$refs.table.toggleRowSelection(val.pop())
+        this.buttonChange(row)
+      } else if (val.length === 1) {
+        this.buttonChange(row)
+      } else {
+        this.handleCurrentChange(null)
+      }
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+      this.handleCurrentChange(null)
+    },
+    buttonChange(current) {
+      if (current !== null) {
+        this.currentRow = current
+        if (current.bill_status === '10') {
+          this.work_flag = false
+        } else {
+          this.work_flag = true
+        }
+        if (current.bill_status !== '99') {
+          this.confirm_flag = false
+        } else {
+          this.confirm_flag = true
+        }
+      }
+    },
+    handleCurrentChange(current) {
+      if (current === null) {
+        this.confirm_flag = true
+        this.work_flag = true
+        this.currentRow = {}
+      }
+    },
+    checkboxT(row) {
+      return row.bill_status !== '99'
+    },
+    confirm() {
+      movestor.confirm({ 'moveinv_id': this.currentRow.moveinv_id }).then(res => {
+        this.crud.notify('强制确认成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.querytable()
+      })
+    },
+    querytable() {
+      this.onSelectAll()
+      this.crud.toQuery()
+      this.handleCurrentChange(null)
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 10px;
+}
+</style>

wms/nladmin-ui/src/views/wms/st/movebill/movestor.js

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