From 5b4d1f7f9a4a5be22c2e38d89d766447c39ca5db Mon Sep 17 00:00:00 2001
From: FOAM <491460741@qq.com>
Date: Tue, 2 Sep 2025 09:33:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base-data/item/index.vue            | 25 ++++++++++++-------
 src/views/base-data/point/index.vue           |  2 +-
 .../base-data/point/platformMaintenance.vue   | 11 --------
 src/views/base-data/point/print_kw_zy.vue     | 14 +++++------
 src/views/business-asn/xppRecord/index.vue    |  2 ++
 5 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/src/views/base-data/item/index.vue b/src/views/base-data/item/index.vue
index ba21dd1..516ddc7 100644
--- a/src/views/base-data/item/index.vue
+++ b/src/views/base-data/item/index.vue
@@ -61,13 +61,13 @@
           <el-form-item label="品番" prop="code">
             <el-input v-model="form.code" style="width: 180px;"/>
           </el-form-item>
-          <el-form-item label="名称" prop="name">
+          <el-form-item label="品名" prop="name">
             <el-input v-model="form.name" style="width: 180px;"/>
           </el-form-item>
-          <el-form-item label="规格" prop="specs">
-            <el-input v-model="form.specs" style="width: 180px;"/>
-          </el-form-item>
-          <!--          <el-form-item label="发动机" prop="isAttribute1">-->
+          <!-- <el-form-item label="规格" prop="specs">
+             <el-input v-model="form.specs" style="width: 180px;"/>
+           </el-form-item>
+                     <el-form-item label="发动机" prop="isAttribute1">-->
           <!--            <el-checkbox v-model="form.isAttribute1"></el-checkbox>-->
           <!--          </el-form-item>-->
           <!--          <el-form-item label="预备货" prop="isAttribute2">-->
@@ -82,12 +82,19 @@
           <!--              :value="item"-->
           <!--            />-->
           <!--          </el-select>-->
-          <el-form-item label="荷资" prop="extendStr3">
-            <el-input v-model="form.extendStr3" style="width: 180px;"/>
-          </el-form-item>
           <el-form-item label="收容数" prop="extendD3">
             <el-input v-model="form.extendD3" style="width: 180px;"/>
           </el-form-item>
+          <el-form-item label="A/C" prop="ac">
+            <el-input v-model="form.ac" style="width: 180px;"/>
+          </el-form-item>
+          <el-form-item label="加工内容" prop="contents">
+            <el-input v-model="form.contents" style="width: 180px;"/>
+          </el-form-item>
+
+          <el-form-item label="箱种" prop="xz">
+            <el-input v-model="form.xz" style="width: 180px;"/>
+          </el-form-item>
           <el-form-item label="描述">
             <el-input v-model="form.description" :rows="3" type="textarea" style="width: 370px;"/>
           </el-form-item>
@@ -109,7 +116,7 @@
           border
       >
         <el-table-column type="selection" width="55"/>
-        <el-table-column prop="id" label="序号" type="index" width="100"/>
+        <el-table-column prop="id" label="序号" width="100"/>
         <el-table-column prop="code" label="品番" />
         <el-table-column prop="name" label="名称"/>
         <el-table-column prop="extendD3" label="收容数"/>
diff --git a/src/views/base-data/point/index.vue b/src/views/base-data/point/index.vue
index 801466e..008d0d2 100644
--- a/src/views/base-data/point/index.vue
+++ b/src/views/base-data/point/index.vue
@@ -147,7 +147,7 @@
         <el-table-column type="selection" width="55"/>
         <el-table-column :show-overflow-tooltip="true" prop="area.name" label="库区">
         </el-table-column>
-        <el-table-column prop="code" label="代码"/>
+        <el-table-column prop="code" label="库位号"/>
        <!-- <el-table-column prop="name" label="名称"/>-->
         <el-table-column prop="itemCode" label="品番"/>
         <el-table-column prop="beatCode" label="纳所"/>
diff --git a/src/views/base-data/point/platformMaintenance.vue b/src/views/base-data/point/platformMaintenance.vue
index 9f28d55..42873fb 100644
--- a/src/views/base-data/point/platformMaintenance.vue
+++ b/src/views/base-data/point/platformMaintenance.vue
@@ -28,18 +28,7 @@
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" :tableKey="this.$options.name">
-        <el-upload
-          class="upload-demo"
-          slot='right'
-          style="float: right;padding-left: 5px"
-          :headers="headers"
-          action="/api/point/import_point"
-          :file-list="fileList"
-          :on-error="handleErr"
-          :on-success=" (response, file, fileList) => { return handleSuccess(response, file, fileList,crud);}"
-          :show-file-list="true">
 
-        </el-upload>
       </crudOperation>
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
diff --git a/src/views/base-data/point/print_kw_zy.vue b/src/views/base-data/point/print_kw_zy.vue
index 44dd958..0060227 100644
--- a/src/views/base-data/point/print_kw_zy.vue
+++ b/src/views/base-data/point/print_kw_zy.vue
@@ -84,7 +84,7 @@ export default {
         popTitle: '打印小物标签',
         preview: false,// 启用打印预览
         paperSize: 'A4',
-        orientation: 'landscape'
+        orientation: 'portrait'//'landscape'横向；'portrait'纵向
       });
     },
      getPrintList(){
@@ -94,8 +94,8 @@ export default {
         this.kkkk2=res;
 
         this.kwfenzu=[]
-        for (let i = 0; i < this.kkkk2.length; i += 28) {
-          this.kwfenzu.push(this.kkkk2.slice(i, i + 28));
+        for (let i = 0; i < this.kkkk2.length; i += 14) {
+          this.kwfenzu.push(this.kkkk2.slice(i, i + 14));
         }
         console.log(kwfenzu)
       });
@@ -179,8 +179,8 @@ body {
 .label-table {
   background: #00a0e9;
 
-  width: 69mm;
-  height: 25mm;
+  width: 100mm;
+  height: 40mm;
   background: #ffffff;
   border-collapse: collapse;
   font-size: 13px;
@@ -189,8 +189,8 @@ body {
 
 .grid-container {
   display: grid;
-  grid-template-columns: repeat(4, 1fr); /* 4列 */
-  grid-template-rows: repeat(5, 1fr);   /* 7行 */
+  grid-template-columns: repeat(2, 1fr); /* 4列 */
+  grid-template-rows: repeat(7, 1fr);   /* 7行 */
   width: 100%;
   height: 100%;
   background: #ffffff;
diff --git a/src/views/business-asn/xppRecord/index.vue b/src/views/business-asn/xppRecord/index.vue
index d0e0714..f66d1cb 100644
--- a/src/views/business-asn/xppRecord/index.vue
+++ b/src/views/business-asn/xppRecord/index.vue
@@ -295,6 +295,8 @@
           </template>
         </el-table-column>-->
         <el-table-column prop="ac" label="A/C" width="60px"/>
+        <el-table-column prop="contents" label="加工内容" width="60px"/>
+        <el-table-column prop="bonded" label="税别" width="60px"/>
         <el-table-column prop="srs" label="收容数" width="80px"/>
         <el-table-column prop="nr_date" label="纳入指示日" width="100px">
           <template slot-scope="scope">