From 08c5a54ae6f0c0a8794ffaaf88ec14172144443e Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Fri, 21 Jun 2024 15:20:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=B5=84=E6=96=99=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Byd_Dg_Web.iml                             |  9 ++++++
 src/views/base-data/area/index.vue         |  4 ---
 src/views/base-data/bigBom/index.vue       | 18 ++++-------
 src/views/base-data/bigItem/index.vue      | 20 ++++--------
 src/views/base-data/item/index.vue         | 11 ++++---
 src/views/base-data/packageCheck/index.vue | 36 +++-------------------
 src/views/base-data/point/index.vue        | 32 +++----------------
 src/views/base-data/stock/index.vue        | 10 +++---
 8 files changed, 44 insertions(+), 96 deletions(-)
 create mode 100644 Byd_Dg_Web.iml

diff --git a/Byd_Dg_Web.iml b/Byd_Dg_Web.iml
new file mode 100644
index 0000000..8021953
--- /dev/null
+++ b/Byd_Dg_Web.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/src/views/base-data/area/index.vue b/src/views/base-data/area/index.vue
index 38fb232..2bbfaef 100644
--- a/src/views/base-data/area/index.vue
+++ b/src/views/base-data/area/index.vue
@@ -60,10 +60,6 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="agvScene.name" label="AGV场景" v-if="false">
-        </el-table-column>
-        <el-table-column prop="createBy" label="创建人"/>
-        <el-table-column prop="createTime" label="创建时间"/>
         <el-table-column v-if="checkPer(['admin','area:edit'])" label="操作" align="center">
           <template slot-scope="scope">
             <udOperation
diff --git a/src/views/base-data/bigBom/index.vue b/src/views/base-data/bigBom/index.vue
index 2cfde8f..c0a876f 100644
--- a/src/views/base-data/bigBom/index.vue
+++ b/src/views/base-data/bigBom/index.vue
@@ -4,11 +4,11 @@
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <label class="el-form-item-label">bigitem</label>
+        <label class="el-form-item-label">成品编码</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>
+        <label class="el-form-item-label">单品编码</label>
         <el-input v-model="query.itemCode" clearable style="width: 185px;" class="filter-item"
                   @keyup.enter.native="crud.toQuery"/>
 
@@ -20,7 +20,7 @@
       <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-form-item label="成品" prop="bigItem">
             <el-select v-model="form.bigItem" value-key="id" filterable placeholder="请选择" style="width: 370px;">
               <el-option
                 v-for="item in bigItemList"
@@ -32,7 +32,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="item" prop="item">
+          <el-form-item label="单品" prop="item">
             <el-select v-model="form.item" value-key="id" filterable placeholder="请选择" style="width: 370px;">
               <el-option
                 v-for="item in itemList"
@@ -44,9 +44,6 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="数量" prop="quantity">
-            <el-input v-model="form.quantity" style="width: 370px;"/>
-          </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -57,11 +54,8 @@
       <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="bigItem.code" label="bigitem"/>
-        <el-table-column prop="item.code" label="item"/>
-        <el-table-column prop="quantity" label="数量"/>
-        <el-table-column prop="createTime" label="创建时间"/>
-        <el-table-column prop="updateTime" label="修改时间"/>
+        <el-table-column prop="bigItem.code" label="成品编码"/>
+        <el-table-column prop="item.code" label="单品编码"/>
         <el-table-column v-if="checkPer(['admin','bigBom:edit','bigBom:del'])" label="操作" align="center">
           <template slot-scope="scope">
             <udOperation
diff --git a/src/views/base-data/bigItem/index.vue b/src/views/base-data/bigItem/index.vue
index 691871f..96cfae1 100644
--- a/src/views/base-data/bigItem/index.vue
+++ b/src/views/base-data/bigItem/index.vue
@@ -4,8 +4,8 @@
     <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"
+        <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>
@@ -27,15 +27,10 @@
           <el-form-item label="名称">
             <el-input v-model="form.name" style="width: 370px;"/>
           </el-form-item>
-          <el-form-item label="类型">
-            <el-input v-model="form.type" style="width: 370px;"/>
-          </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 @click="crud.cancelCU">取消</el-button>
           <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
         </div>
       </el-dialog>
@@ -43,11 +38,8 @@
       <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="code" label="代码"/>
+        <el-table-column prop="code" label="编码"/>
         <el-table-column prop="name" label="名称"/>
-        <el-table-column prop="remark" 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">
           <template slot-scope="scope">
             <udOperation
@@ -90,7 +82,7 @@ export default {
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
-      title: 'bigitem',
+      title: '成品管理',
       url: 'api/bigItem',
       idField: 'id',
       sort: 'id,desc',
diff --git a/src/views/base-data/item/index.vue b/src/views/base-data/item/index.vue
index 583cc32..9227d8f 100644
--- a/src/views/base-data/item/index.vue
+++ b/src/views/base-data/item/index.vue
@@ -93,6 +93,10 @@
               />
             </el-select>
           </el-form-item>
+
+          <el-form-item label="装载数量" prop="extendD1">
+            <el-input v-model="form.extendD1"  style="width: 180px;"/>
+          </el-form-item>
           <!--          <el-form-item label="单位" prop="unit">
                       <el-select v-model="form.unit" filterable placeholder="请选择" style="width: 180px;"
                                  :default-first-option="true">
@@ -108,7 +112,7 @@
 
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button  @click="crud.cancelCU">取消</el-button>
+          <el-button @click="crud.cancelCU">取消</el-button>
           <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
         </div>
       </el-dialog>
@@ -125,6 +129,7 @@
         <el-table-column prop="xh" label="序号" type="index" width="50"/>
         <el-table-column prop="code" label="编码" width="150"/>
         <el-table-column prop="name" label="名称" width="150"/>
+        <el-table-column prop="extendD1" label="装载数量" width="150"/>
         <el-table-column prop="extendD2" label="整托高度" width="150">
           <template slot-scope="scope">
             {{ dict.label.item_height[scope.row.extendD2] }}
@@ -150,8 +155,6 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="agvScene.name" label="AGV场景" v-if="false">
-        </el-table-column>
         <el-table-column v-if="checkPer(['admin','item:edit'])" label="操作" align="center">
           <template slot-scope="scope">
             <udOperation
@@ -181,7 +184,7 @@ import pagination from '@crud/Pagination'
 import DonMessage from "@/utils/message";
 import {getToken} from "@/utils/auth";
 
-const defaultForm = {id: null}
+const defaultForm = {id: null, extendD1: 1}
 export default {
   name: 'Item',
   components: {pagination, crudOperation, rrOperation, udOperation},
diff --git a/src/views/base-data/packageCheck/index.vue b/src/views/base-data/packageCheck/index.vue
index 099ec7d..d327c1d 100644
--- a/src/views/base-data/packageCheck/index.vue
+++ b/src/views/base-data/packageCheck/index.vue
@@ -4,14 +4,10 @@
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <label class="el-form-item-label">成套代码</label>
+        <label class="el-form-item-label">代码</label>
         <el-input v-model="query.code" clearable style="width: 185px;" class="filter-item"
                   @keyup.enter.native="crud.toQuery"/>
 
-        <label class="el-form-item-label">物料编码</label>
-        <el-input v-model="query.itemCode" clearable style="width: 185px;" class="filter-item"
-                  @keyup.enter.native="crud.toQuery"/>
-
         <rrOperation :crud="crud"/>
       </div>
 
@@ -21,27 +17,12 @@
       <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-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-input v-model="form.quantity" style="width: 370px;" :min="1" type="number"/>
           </el-form-item>
 
         </el-form>
@@ -55,15 +36,8 @@
                 @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="code" label="代码"/>
         <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">
@@ -94,7 +68,7 @@ const defaultForm = {
   id: null,
   code: null,
   itemId: null,
-  quantity: null,
+  quantity: 1,
   createBy: null,
   updateBy: null,
   createTime: null,
diff --git a/src/views/base-data/point/index.vue b/src/views/base-data/point/index.vue
index 125498f..88bd001 100644
--- a/src/views/base-data/point/index.vue
+++ b/src/views/base-data/point/index.vue
@@ -5,10 +5,10 @@
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
         <label class="el-form-item-label">代码</label>
-        <el-input v-model="query.code" clearable placeholder="代码" style="width: 120px;" class="filter-item"
+        <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: 120px;" class="filter-item"
+        <el-input v-model="query.name" clearable placeholder="名称" style="width: 185px;" class="filter-item"
                   @keyup.enter.native="crud.toQuery"/>
         <label class="el-form-item-label">状态</label>
         <el-select
@@ -17,7 +17,7 @@
           size="small"
           placeholder="状态"
           class="filter-item"
-          style="width: 100px"
+          style="width: 185px"
           @change="crud.toQuery"
         >
           <el-option
@@ -28,7 +28,7 @@
           />
         </el-select>
         <label class="el-form-item-label">库区</label>
-        <el-select v-model="query.areaName" style="width: 120px;" clearable placeholder="请选择"
+        <el-select v-model="query.areaName" style="width: 185px;" clearable placeholder="请选择"
                    @keyup.enter.native="crud.toQuery" class="filter-item" @change="crud.toQuery">
           <el-option
             v-for="area in areas"
@@ -38,23 +38,6 @@
           />
         </el-select>
 
-        <label class="el-form-item-label">冷却区-小库区编号</label>
-        <el-select
-          v-model="query.beatCode"
-          clearable
-          size="small"
-          placeholder="小库区编号"
-          class="filter-item"
-          style="width: 100px"
-          @change="crud.toQuery"
-        >
-          <el-option
-            v-for="item in dict.smallArea"
-            :key="item.id"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
         <rrOperation :crud="crud"/>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -74,6 +57,7 @@
 
         <el-button
           slot="right"
+          v-show="false"
           class="filter-item"
           size="mini"
           type="danger"
@@ -221,12 +205,6 @@
             <div>{{ scope.row.area.name }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="beatCode" label="冷却区-小库区编号"/>
-        <el-table-column :show-overflow-tooltip="true" prop="deptName" label="仓库">
-          <template slot-scope="scope">
-            <div>{{ scope.row.dept.name }}</div>
-          </template>
-        </el-table-column>
         <el-table-column label="启用" align="center" prop="enabled">
           <template slot-scope="scope">
             <el-switch
diff --git a/src/views/base-data/stock/index.vue b/src/views/base-data/stock/index.vue
index 12de4b3..14983c6 100644
--- a/src/views/base-data/stock/index.vue
+++ b/src/views/base-data/stock/index.vue
@@ -168,19 +168,21 @@
 
             <el-button :loading="crud.status.cu === 2"
                        size="mini" type="primary" icon="el-icon-edit" @click="crud.toEdit(scope.row)"></el-button>
-            <el-button slot='right' size="mini"
+
+            <el-button slot='right' size="mini" v-show="false"
                        type="warning" @click="toCallContainer(scope.row)">呼叫
             </el-button>
-            <el-button slot='right' size="mini"
+            <el-button slot='right' size="mini" v-show="false"
                        type="success" @click="toContainerIn(scope.row)">入场
             </el-button>
-            <el-button slot='right' size="mini"
+            <el-button slot='right' size="mini" v-show="false"
                        type="danger" @click="toContainerOut(scope.row)">出场
             </el-button>
 
-            <el-button slot='right' size="mini"
+            <el-button slot='right' size="mini" v-show="false"
                        type="info" @click="toReturnEntity(scope.row)">返空
             </el-button>
+
           </template>
         </el-table-column>
       </el-table>