add: 新增物料信息

2023-05-04 19:57:35 +08:00
parent e5c9cfb90d
commit ca6c375605
16 changed files with 634 additions and 8 deletions
--- a/nladmin-ui/src/views/wms/basedata/material/index.vue
+++ b/nladmin-ui/src/views/wms/basedata/material/index.vue
@@ -0,0 +1,201 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-position="right"
+        label-width="90px"
+        label-suffix=":"
+      >
+        <el-form-item label="模糊搜索">
+          <el-input
+            v-model="query.blurry"
+            clearable
+            size="mini"
+            placeholder="编码/名称"
+            @keyup.enter.native="crud.toQuery"
+          />
+        </el-form-item>
+        <rrOperation />
+      </el-form>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， 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="500px"
+      >
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
+          <el-form-item label="物料编码">
+            <el-input v-model="form.materialCode" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="物料名称 ">
+            <el-input v-model="form.materialName" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="物料规格">
+            <el-input v-model="form.materialSpec" style="width: 370px;" />
+          </el-form-item>
+<!--          <el-form-item label="物料分类标识">-->
+<!--            <el-input v-model="form.classId" style="width: 370px;" />-->
+<!--          </el-form-item>-->
+          <el-form-item label="静置时间(分钟)">
+            <el-input v-model="form.standingTime" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="车间编码">
+            <el-select v-model="form.workshopCode" placeholder="请选择" style="width: 370px;" clearable >
+              <el-option
+                v-for="item in workShopList"
+                :key="item.workshopCode"
+                :label="item.workshopName"
+                :value="item.workshopCode">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="备注">
+            <el-input v-model="form.remark" style="width: 370px;" />
+          </el-form-item>
+        </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 type="selection" width="55" />
+        <el-table-column
+          prop="materialCode"
+          label="物料编码"
+          :min-width="flexWidth('materialCode',crud.data,'物料编码')"
+        />
+        <el-table-column
+          prop="materialName"
+          label="物料名称 "
+          :min-width="flexWidth('materialName',crud.data,'物料名称 ')"
+        />
+        <el-table-column
+          prop="materialSpec"
+          label="物料规格"
+          :min-width="flexWidth('materialSpec',crud.data,'物料规格')"
+        />
+        <el-table-column
+          prop="standingTime"
+          label="静置时间(分钟)"
+          :width="flexWidth('standingTime',crud.data,'静置时间分钟分钟')"
+        />
+        <el-table-column
+          prop="workshopCode"
+          label="车间编码"
+          :width="flexWidth('workshopCode',crud.data,'车间编码')"
+        />
+        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
+        <el-table-column prop="isUsed" label="是否启用" :min-width="flexWidth('isUsed',crud.data,'是否启用')">
+          <template slot-scope="scope">
+            {{scope.row.isUsed?'是':'否'}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="isDelete" label="是否删除" :min-width="flexWidth('isDelete',crud.data,'是否删除')">
+          <template slot-scope="scope">
+            {{scope.row.isDelete?'是':'否'}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="createName" label="创建人" :min-width="flexWidth('createName',crud.data,'创建人')" />
+        <el-table-column prop="createTime" label="创建时间" :min-width="flexWidth('createTime',crud.data,'创建时间')" />
+        <el-table-column prop="updateName" label="修改人" :min-width="flexWidth('updateName',crud.data,'修改人')" />
+        <el-table-column prop="updateTime" label="修改时间" :min-width="flexWidth('updateTime',crud.data,'修改时间')" />
+        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudMaterial from './material'
+import crudWorkShop from '../workshop/workshop'
+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'
+
+const defaultForm = {
+  materialId: null,
+  materialCode: null,
+  materialName: null,
+  materialSpec: null,
+  classId: null,
+  standingTime: null,
+  workshopCode: null,
+  remark: null,
+  isUsed: true,
+  isDelete: false,
+  createId: null,
+  createName: null,
+  createTime: null,
+  updateId: null,
+  updateName: null,
+  updateTime: null,
+  extId: null
+}
+export default {
+  name: 'Material',
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '物料基础信息',
+      url: 'api/material',
+      idField: 'materialId',
+      sort: 'materialId,desc',
+      crudMethod: { ...crudMaterial }
+    })
+  },
+  data() {
+    return {
+      permission: {},
+      rules: {},
+      workShopList: {}
+    }
+  },
+  created() {
+    this.workShopListIni() // 初始化车间数据
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    workShopListIni() {
+      crudWorkShop.workShopList().then(res => {
+        console.log(res)
+        this.workShopList = res
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
--- a/nladmin-ui/src/views/wms/basedata/material/material.js
+++ b/nladmin-ui/src/views/wms/basedata/material/material.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'

 export function add(data) {
  return request({
-    url: 'api/workshop',
+    url: 'api/material',
    method: 'post',
    data
  })
@@ -10,7 +10,7 @@ export function add(data) {

 export function del(ids) {
  return request({
-    url: 'api/workshop/',
+    url: 'api/material/',
    method: 'delete',
    data: ids
  })
@@ -18,7 +18,7 @@ export function del(ids) {

 export function edit(data) {
  return request({
-    url: 'api/workshop',
+    url: 'api/material',
    method: 'put',
    data
  })
--- a/nladmin-ui/src/views/wms/basedata/workshop/index.vue
+++ b/nladmin-ui/src/views/wms/basedata/workshop/index.vue
@@ -81,10 +81,10 @@
 <script>
 import crudWorkshop from './workshop'
 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 rrOperation from '@crud/RR.operation.vue'
+import crudOperation from '@crud/CRUD.operation.vue'
+import udOperation from '@crud/UD.operation.vue'
+import pagination from '@crud/Pagination.vue'

 const defaultForm = {
  workshopCode: null,
--- a/nladmin-ui/src/views/wms/basedata/workshop/workshop.js
+++ b/nladmin-ui/src/views/wms/basedata/workshop/workshop.js
@@ -0,0 +1,34 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/workshop',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/workshop/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/workshop',
+    method: 'put',
+    data
+  })
+}
+
+export function workShopList() {
+  return request({
+    url: 'api/workshop/workShopList',
+    method: 'get'
+  })
+}
+
+export default { add, edit, del, workShopList }