no message

src/api/packageCheck.js

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

src/views/base-data/area/index.vue

@@ -5,15 +5,18 @@
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
         <label class="el-form-item-label">编号</label>
-        <el-input v-model="query.code" clearable placeholder="编号" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <el-input v-model="query.code" clearable placeholder="编号" style="width: 185px;" class="filter-item"
+                  @keyup.enter.native="crud.toQuery"/>
         <label class="el-form-item-label">名称</label>
-        <el-input v-model="query.name" clearable placeholder="名称" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <el-input v-model="query.name" clearable placeholder="名称" style="width: 185px;" class="filter-item"
+                  @keyup.enter.native="crud.toQuery"/>
         <rrOperation :crud="crud"/>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" :tableKey="this.$options.name"/>
       <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
+      <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="small" label-width="80px">
           <el-form-item label="库区编号" prop="code">
             <el-input v-model="form.code" style="width: 370px;"/>
@@ -41,7 +44,8 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" height="67vh" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" height="67vh" size="small" style="width: 100%;"
+                @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55"/>
         <el-table-column prop="code" label="库区编号"/>
         <el-table-column prop="name" label="库区名称"/>
@@ -96,7 +100,8 @@ export default {
   mixins: [presenter(), header(), form(defaultForm), crud()],
   dicts: ['base_staus'],
   cruds() {
-    return CRUD({ title: '库区', url: 'api/area', idField: 'id', sort: 'id,desc', crudMethod: { ...crudArea },
+    return CRUD({
+      title: '库区', url: 'api/area', idField: 'id', sort: 'id,desc', crudMethod: {...crudArea},
       optShow: {
         add: true,
         edit: false,

src/views/base-data/bigBom/index.vue

@@ -2,10 +2,23 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <label class="el-form-item-label">bigitem</label>
+        <el-input v-model="query.bigItemCode" clearable style="width: 185px;" class="filter-item"
+                  @keyup.enter.native="crud.toQuery"/>
+
+        <label class="el-form-item-label">item</label>
+        <el-input v-model="query.itemCode" clearable style="width: 185px;" class="filter-item"
+                  @keyup.enter.native="crud.toQuery"/>
+
+        <rrOperation :crud="crud"/>
+      </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" :tableKey="this.$options.name"/>
       <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
+      <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="small" label-width="80px">
           <el-form-item label="bigItem" prop="bigItem">
             <el-select v-model="form.bigItem" value-key="id" filterable placeholder="请选择" style="width: 370px;">
@@ -41,14 +54,12 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
+                @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55"/>
-        <el-table-column prop="id" label="id" />
         <el-table-column prop="bigItem.code" label="bigitem"/>
         <el-table-column prop="item.code" label="item"/>
         <el-table-column prop="quantity" label="数量"/>
-        <el-table-column prop="createBy" label="创建人" />
-        <el-table-column prop="updateBy" label="修改人" />
         <el-table-column prop="createTime" label="创建时间"/>
         <el-table-column prop="updateTime" label="修改时间"/>
         <el-table-column v-if="checkPer(['admin','bigBom:edit','bigBom:del'])" label="操作" align="center">
@@ -76,13 +87,37 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import {getAllBigItem} from '@/api/bigItem'
 import {getItemsList} from '@/api/item'
-const defaultForm = { id: null, bigItem: null, item: null, quantity: null, deptId: null, createBy: null, updateBy: null, createTime: null, updateTime: null }
+
+const defaultForm = {
+  id: null,
+  bigItem: null,
+  item: null,
+  quantity: null,
+  deptId: null,
+  createBy: null,
+  updateBy: null,
+  createTime: null,
+  updateTime: null
+}
 export default {
   name: 'BigBom',
   components: {pagination, crudOperation, rrOperation, udOperation},
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
-    return CRUD({ title: 'Bom管理', url: 'api/bigBom', idField: 'id', sort: 'id,desc', crudMethod: { ...crudBigBom }})
+    return CRUD({
+      title: 'Bom管理',
+      url: 'api/bigBom',
+      idField: 'id',
+      sort: 'id,desc',
+      crudMethod: {...crudBigBom},
+      optShow: {
+        add: true,
+        edit: false,
+        del: false,
+        reset: true,
+        download: true
+      }
+    })
   },
   data() {
     return {
@@ -103,7 +138,8 @@ export default {
         quantity: [
           {required: true, message: '数量不能为空', trigger: 'blur'}
         ]
-      }    }
+      }
+    }
   },
   mounted() {
     this.getBigItem();

src/views/base-data/bigItem/index.vue

@@ -2,10 +2,24 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <label class="el-form-item-label">代码</label>
+        <el-input v-model="query.code" clearable placeholder="代码" style="width: 185px;" class="filter-item"
+                  @keyup.enter.native="crud.toQuery"/>
+
+        <label class="el-form-item-label">名称</label>
+        <el-input v-model="query.name" clearable placeholder="名称" style="width: 185px;" class="filter-item"
+                  @keyup.enter.native="crud.toQuery"/>
+
+
+        <rrOperation :crud="crud"/>
+      </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" :tableKey="this.$options.name"/>
       <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
+      <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="small" label-width="80px">
           <el-form-item label="代码">
             <el-input v-model="form.code" style="width: 370px;"/>
@@ -26,15 +40,12 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
+                @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55"/>
-        <el-table-column prop="id" label="id" />
         <el-table-column prop="code" label="代码"/>
         <el-table-column prop="name" label="名称"/>
-        <el-table-column prop="type" label="类型" />
         <el-table-column prop="remark" label="备注"/>
-        <el-table-column prop="createBy" label="创建人" />
-        <el-table-column prop="updateBy" label="修改人" />
         <el-table-column prop="createTime" label="创建时间"/>
         <el-table-column prop="updateTime" label="修改时间"/>
         <el-table-column v-if="checkPer(['admin','bigItem:edit','bigItem:del'])" label="操作" align="center">
@@ -61,13 +72,37 @@ import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 
-const defaultForm = { id: null, code: null, name: null, type: null, remark: null, deptId: null, createBy: null, updateBy: null, createTime: null, updateTime: null }
+const defaultForm = {
+  id: null,
+  code: null,
+  name: null,
+  type: null,
+  remark: null,
+  deptId: null,
+  createBy: null,
+  updateBy: null,
+  createTime: null,
+  updateTime: null
+}
 export default {
   name: 'BigItem',
   components: {pagination, crudOperation, rrOperation, udOperation},
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
-    return CRUD({ title: 'bigitem', url: 'api/bigItem', idField: 'id', sort: 'id,desc', crudMethod: { ...crudBigItem }})
+    return CRUD({
+      title: 'bigitem',
+      url: 'api/bigItem',
+      idField: 'id',
+      sort: 'id,desc',
+      crudMethod: {...crudBigItem},
+      optShow: {
+        add: true,
+        edit: false,
+        del: false,
+        reset: true,
+        download: true
+      },
+    })
   },
   data() {
     return {
@@ -76,8 +111,8 @@ export default {
         edit: ['admin', 'bigItem:edit'],
         del: ['admin', 'bigItem:del']
       },
-      rules: {
+      rules: {}
-      }    }
+    }
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据

src/views/base-data/box/index.vue

@@ -36,7 +36,8 @@
 
 
         <label class="el-form-item-label">库区</label>
-        <el-select v-model="query.areaName" @focus="getArea"   style="width: 120px;" filterable  clearable placeholder="请选择" @keyup.enter.native="crud.toQuery" class="filter-item"  @change="crud.toQuery">
+        <el-select v-model="query.areaName" @focus="getArea" style="width: 120px;" filterable clearable
+                   placeholder="请选择" @keyup.enter.native="crud.toQuery" class="filter-item" @change="crud.toQuery">
           <el-option
             v-for="area in areas"
             :key="area.id"
@@ -173,7 +174,7 @@
         <el-table-column prop="xh" label="序号" type="index" width="50"/>
         <el-table-column prop="code" label="编号"/>
         <el-table-column prop="name" label="名称"/>
-        <el-table-column :show-overflow-tooltip="true" prop="itemName" label="物料编码">
+        <el-table-column :show-overflow-tooltip="true" prop="itemCode" label="物料编码">
           <template slot-scope="scope">
             <div>{{ scope.row.item == null ? "" : scope.row.item.code }}</div>
           </template>
@@ -192,7 +193,6 @@
         </el-table-column>
 
 
-
         <el-table-column prop="orderNumber" label="工单号"/>
         <el-table-column prop="iP" label="IP"/>
         <el-table-column prop="lampStatus" label="指示灯状态"/>
@@ -242,10 +242,9 @@ import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import {getItemsList} from "@/api/item"
-import pointUrl, {queryPointList} from "@/api/point"
+import {queryPointList} from "@/api/point"
-import {getAres, queryAreaList} from "@/api/area"
+import {queryAreaList} from "@/api/area"
 import BindOrderNumber from "@/views/base-data/box/bindOrderNumber.vue"
-import DonMessage from '@/utils/message'
 
 const defaultForm = {
   name: null,

src/views/base-data/packageCheck/index.vue

@@ -0,0 +1,147 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" :tableKey="this.$options.name"/>
+      <!--表单组件-->
+      <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="small" label-width="80px">
+          <el-form-item label="成套代码" prop="code">
+            <el-input v-model="form.code" style="width: 370px;"/>
+          </el-form-item>
+          <el-form-item label="物料" prop="item">
+            <el-select v-model="form.item" @focus="getItem" filterable placeholder="请选择物料" value-key="id"
+                       style="width: 370px;">
+              <el-option
+                v-for="item in items"
+                :key="item.id"
+                :label="item.code"
+                :value="item"
+                :disabled="!item.enabled"
+              >
+                <span style="float: left">{{ item.code }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="套数">
+            <el-input v-model="form.quantity" style="width: 370px;" :min="0" type="number"/>
+          </el-form-item>
+
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
+                @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55"/>
+        <el-table-column prop="xh" label="序号" type="index" width="50"/>
+        <el-table-column prop="code" label="成套代码"/>
+        <el-table-column :show-overflow-tooltip="true" prop="itemCode" label="物料编码">
+          <template slot-scope="scope">
+            <div>{{ scope.row.item == null ? "" : scope.row.item.code }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="quantity" label="套数"/>
+        <el-table-column prop="createTime" label="创建时间"/>
+        <el-table-column prop="updateTime" label="修改时间"/>
+        <el-table-column v-if="checkPer(['admin','packageCheck:edit','packageCheck:del'])" label="操作"
+                         align="center">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+              :show-dle="false"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination/>
+    </div>
+  </div>
+</template>
+
+<script>
+import crudPackageCheck from '@/api/packageCheck'
+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 {getItemsList} from "@/api/item";
+
+const defaultForm = {
+  id: null,
+  code: null,
+  itemId: null,
+  quantity: null,
+  createBy: null,
+  updateBy: null,
+  createTime: null,
+  updateTime: null
+}
+export default {
+  name: 'PackageCheck',
+  components: {pagination, crudOperation, rrOperation, udOperation},
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '翻包标准套数',
+      url: 'api/packageCheck',
+      idField: 'id',
+      sort: 'id,desc',
+      crudMethod: {...crudPackageCheck},
+      optShow: {
+        add: true,
+        edit: false,
+        del: false,
+        reset: true,
+        download: true
+      }
+    })
+  },
+  data() {
+    return {
+      permission: {
+        add: ['admin', 'packageCheck:add'],
+        edit: ['admin', 'packageCheck:edit'],
+        del: ['admin', 'packageCheck:del']
+      },
+      rules: {
+        code: [
+          {required: true, message: '成套代码不能为空', trigger: 'blur'}
+        ],
+        item: [
+          {required: true, message: '物料不能为空', trigger: 'blur'}
+        ]
+      }
+    }
+  },
+  mounted() {
+    //编辑下拉出现内容
+    this.getItem();
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    getItem() {
+      getItemsList({}).then(res => {
+        this.items = res;
+      })
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/base-data/stock/index.vue

@@ -4,8 +4,11 @@
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
+        <label class="el-form-item-label">代码</label>
         <el-input v-model="query.code" clearable placeholder="代码" style="width: 150px;" class="filter-item"
                   @keyup.enter.native="crud.toQuery"/>
+
+        <label class="el-form-item-label">状态</label>
         <el-select
           v-model="query.status"
           clearable
@@ -22,6 +25,8 @@
             :value="item.value"
           />
         </el-select>
+
+        <label class="el-form-item-label">容器类型</label>
         <el-select
           v-model="query.stockType"
           clearable
@@ -39,6 +44,7 @@
           />
         </el-select>
 
+        <label class="el-form-item-label">库区</label>
         <el-select v-model="query.areaName" style="width: 120px;" clearable placeholder="库区"
                    @keyup.enter.native="crud.toQuery" class="filter-item" @change="crud.toQuery">
           <el-option
@@ -48,6 +54,8 @@
             :value="area.name"
           />
         </el-select>
+
+        <label class="el-form-item-label">点位</label>
         <el-input v-model="query.pointCode" clearable placeholder="点位" style="width: 150px;" class="filter-item"
                   @keyup.enter.native="crud.toQuery"/>