From 622a46a1bbae652575737620aa2ebcbcc15cb6e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?=
 <411641505@qq.com>
Date: Sun, 8 Sep 2024 16:25:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E5=BA=93=E5=8C=BA=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/md/vendor/index.vue    |   1 +
 src/views/mes/wm/area/index.vue      | 107 +++++++++++++++------------
 src/views/mes/wm/location/index.vue  |  64 ++++++++++------
 src/views/mes/wm/warehouse/index.vue |  95 ++++++++++++++++--------
 4 files changed, 165 insertions(+), 102 deletions(-)

diff --git a/src/views/mes/md/vendor/index.vue b/src/views/mes/md/vendor/index.vue
index 3b2e280..8e52ccf 100644
--- a/src/views/mes/md/vendor/index.vue
+++ b/src/views/mes/md/vendor/index.vue
@@ -571,6 +571,7 @@ export default {
     },
     // 查询明细按钮操作
     handleView(row){
+      debugger;
       this.reset();
       const vendorId = row.vendorId || this.ids
       getVendor(vendorId).then(response => {
diff --git a/src/views/mes/wm/area/index.vue b/src/views/mes/wm/area/index.vue
index 6240223..e54a774 100644
--- a/src/views/mes/wm/area/index.vue
+++ b/src/views/mes/wm/area/index.vue
@@ -172,54 +172,65 @@
     <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
-          <el-col :span="8">
-            <el-form-item label="库位编码" prop="areaCode">
-              <el-input v-model="form.areaCode" placeholder="请输入库位编码" />
-            </el-form-item>
+          <el-col :span="14">
+            <el-row>
+              <el-col :span="16">
+                <el-form-item label="库位编码" prop="areaCode">
+                  <el-input v-model="form.areaCode" placeholder="请输入库位编码" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item  label-width="80">
+                  <el-switch v-model="autoGenFlag"
+                      active-color="#13ce66"
+                      active-text="自动生成"
+                      @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">               
+                  </el-switch>
+              </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="库位名称" prop="areaName">
+                  <el-input v-model="form.areaName" placeholder="请输入库位名称" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="面积" prop="area">
+                  <el-input-number :min="0" :step="1" :percision="2" v-model="form.area" placeholder="请输入面积" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="最大载重量" prop="maxLoa">
+                  <el-input-number v-model="form.maxLoa" :step="1" :percision="2" placeholder="请输入最大载重量" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="是否启用" prop="enableFlag">
+                  <el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
+                    <el-radio
+                      v-for="dict in dict.type.sys_yes_no"
+                      :key="dict.value"
+                      :label="dict.value"
+                    >{{dict.label}}</el-radio>
+                  </el-radio-group>
+                  <el-radio-group v-model="form.enableFlag" v-else>
+                    <el-radio
+                      v-for="dict in dict.type.sys_yes_no"
+                      :key="dict.value"
+                      :label="dict.value"
+                    >{{dict.label}}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-col>
-          <el-col :span="4">
-            <el-form-item  label-width="80">
-              <el-switch v-model="autoGenFlag"
-                  active-color="#13ce66"
-                  active-text="自动生成"
-                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">               
-              </el-switch>
-          </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="库位名称" prop="areaName">
-              <el-input v-model="form.areaName" placeholder="请输入库位名称" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="面积" prop="area">
-              <el-input-number :min="0" :step="1" :percision="2" v-model="form.area" placeholder="请输入面积" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="最大载重量" prop="maxLoa">
-              <el-input-number v-model="form.maxLoa" :step="1" :percision="2" placeholder="请输入最大载重量" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="是否启用" prop="enableFlag">
-              <el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
-                <el-radio
-                  v-for="dict in dict.type.sys_yes_no"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
-              </el-radio-group>
-              <el-radio-group v-model="form.enableFlag" v-else>
-                <el-radio
-                  v-for="dict in dict.type.sys_yes_no"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
+          <el-col :span="10">
+            <BarcodeImg :bussinessId="form.areaId" :bussinessCode="form.areaCode" barcodeType="AREA"></BarcodeImg>
           </el-col>
         </el-row>
         <el-row>
@@ -259,9 +270,11 @@
 <script>
 import { listArea, getArea, delArea, addArea, updateArea, changeFrozenState } from "@/api/mes/wm/area";
 import {genCode} from "@/api/system/autocode/rule"
+import BarcodeImg from "@/components/barcodeImg/index.vue"
 export default {
   name: "Area",
   dicts: ['sys_yes_no'],
+  components: { BarcodeImg } ,
   data() {
     return {
       //自动生成编码
diff --git a/src/views/mes/wm/location/index.vue b/src/views/mes/wm/location/index.vue
index 6f10c26..eb0f399 100644
--- a/src/views/mes/wm/location/index.vue
+++ b/src/views/mes/wm/location/index.vue
@@ -116,32 +116,46 @@
     <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="140px">
       <el-row>
-        <el-col :span="8">
-          <el-form-item label="库区编码" prop="locationCode">
-            <el-input v-model="form.locationCode" placeholder="请输入库区编码" />
-          </el-form-item>
+        <el-col :span="14">
+          <el-row>
+            <el-col :span="16">
+              <el-form-item label="库区编码" prop="locationCode">
+                <el-input v-model="form.locationCode" placeholder="请输入库区编码" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item  label-width="80">
+                <el-switch v-model="autoGenFlag"
+                    active-color="#13ce66"
+                    active-text="自动生成"
+                    @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">               
+                </el-switch>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="库区名称" prop="locationName">
+                <el-input v-model="form.locationName" placeholder="请输入库区名称" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="面积" prop="area">
+                <el-input-number :min="0" :step="1" :percision="2" v-model="form.area" placeholder="请输入面积" />
+              </el-form-item>
+            </el-col>      
+          </el-row>
         </el-col>
-        <el-col :span="4">
-          <el-form-item  label-width="80">
-            <el-switch v-model="autoGenFlag"
-                active-color="#13ce66"
-                active-text="自动生成"
-                @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">               
-            </el-switch>
-          </el-form-item>
+        <el-col :span="10">
+          <BarcodeImg :bussinessId="form.locationId" :bussinessCode="form.locationCode" barcodeType="LOCATION"></BarcodeImg>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="库区名称" prop="locationName">
-            <el-input v-model="form.locationName" placeholder="请输入库区名称" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="面积" prop="area">
-            <el-input-number :min="0" :step="1" :percision="2" v-model="form.area" placeholder="请输入面积" />
-          </el-form-item>
-        </el-col>      
       </el-row>
       <el-row>
         <el-col :span="24">
@@ -163,9 +177,11 @@
 <script>
 import { listLocation, getLocation, delLocation, addLocation, updateLocation, changeFrozenState} from "@/api/mes/wm/location";
 import {genCode} from "@/api/system/autocode/rule"
+import BarcodeImg from "@/components/barcodeImg/index.vue"
 export default {
   name: "Location",
   dicts: ['sys_yes_no'],
+  components: { BarcodeImg } ,
   data() {
     return {
       //自动生成编码
diff --git a/src/views/mes/wm/warehouse/index.vue b/src/views/mes/wm/warehouse/index.vue
index 25cc12c..0ab5ebc 100644
--- a/src/views/mes/wm/warehouse/index.vue
+++ b/src/views/mes/wm/warehouse/index.vue
@@ -130,26 +130,50 @@
     <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
-          <el-col :span="8">
-            <el-form-item label="仓库编码" prop="warehouseCode">
-              <el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" />
-            </el-form-item>
+          <el-col :span="14">
+            <el-row>
+              <el-col :span="16">
+                <el-form-item label="仓库编码" prop="warehouseCode">
+                  <el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item  label-width="80">
+                  <el-switch v-model="autoGenFlag"
+                      active-color="#13ce66"
+                      active-text="自动生成"
+                      @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">               
+                  </el-switch>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="仓库名称" prop="warehouseName">
+                  <el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="负责人" prop="charge">
+                  <el-input v-model="form.charge" placeholder="请输入负责人" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="面积" prop="area">
+                  <el-input-number :min="0" :step="1" :percision="2" v-model="form.area" placeholder="请输入面积" />
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-col>
-          <el-col :span="4">
-            <el-form-item  label-width="80">
-              <el-switch v-model="autoGenFlag"
-                  active-color="#13ce66"
-                  active-text="自动生成"
-                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">               
-              </el-switch>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="仓库名称" prop="warehouseName">
-              <el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
-            </el-form-item>
+          <el-col :span="10">
+            <BarcodeImg :bussinessId="form.warehouseId" :bussinessCode="form.warehouseCode" barcodeType="WAREHOUSE"></BarcodeImg>
           </el-col>
         </el-row>
+
         <el-row>
           <el-col :span="24">
             <el-form-item label="位置" prop="location">
@@ -157,18 +181,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="面积" prop="area">
-              <el-input-number :min="0" :step="1" :percision="2" v-model="form.area" placeholder="请输入面积" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="负责人" prop="charge">
-              <el-input v-model="form.charge" placeholder="请输入负责人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
+
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
@@ -189,8 +202,10 @@
 <script>
 import { listWarehouse, getWarehouse, delWarehouse, addWarehouse, updateWarehouse,changeFrozenState } from "@/api/mes/wm/warehouse";
 import {genCode} from "@/api/system/autocode/rule"
+import BarcodeImg from "@/components/barcodeImg/index.vue"
 export default {
   name: "Warehouse",
+  components: { BarcodeImg } ,
   data() {
     return {
       //自动生成编码
@@ -225,7 +240,23 @@ export default {
         charge: null,
       },
       // 表单参数
-      form: {},
+      form: {
+        warehouseId: null,
+        warehouseCode: null,
+        warehouseName: null,
+        location: null,
+        area: null,
+        charge: null,
+        remark: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        attr4: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      },
       // 表单校验
       rules: {
         warehouseCode: [
@@ -302,9 +333,10 @@ export default {
     },
     // 查询明细按钮操作
     handleView(row){
+      debugger;
       this.reset();
       const warehouseId = row.warehouseId || this.ids
-      getWarehouse(warehouseId).then(response => {
+      getWarehouse(warehouseId).then(response => {        
         this.form = response.data;
         this.open = true;
         this.title = "查看仓库";
@@ -377,6 +409,7 @@ export default {
     handleLocation(warehouseId){
       this.$router.push({ path: '/mes/wm/location/index', query: { warehouseId: warehouseId || 0 ,optType: this.optType} })
     },
+
     //自动生成编码
     handleAutoGenChange(autoGenFlag){
       if(autoGenFlag){