From 1bd826b21cca5eecdc402983b4d46dd2b0597711 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Wed, 13 Sep 2023 10:32:41 +0800
Subject: [PATCH] update 0913

---
 src/views/atomViews/ListViewWithHead.vue      | 12 ++++++-----
 .../pms/order/components/order--edit.vue      |  5 +++--
 .../pms/order/components/tabs/orderDetail.vue |  4 ++--
 src/views/modules/pms/order/config.js         |  4 ++--
 src/views/modules/pms/shape/config.js         | 20 ++++++++++++++++++-
 5 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/src/views/atomViews/ListViewWithHead.vue b/src/views/atomViews/ListViewWithHead.vue
index 32f026e..cba10b4 100644
--- a/src/views/atomViews/ListViewWithHead.vue
+++ b/src/views/atomViews/ListViewWithHead.vue
@@ -785,14 +785,16 @@ export default {
           })
             .then(async () => {
               const batchPrint = async function* () {
-                for (const { id } of this.tableSelectedIds) {
-                  yield { id: id, result: await this.printOnce(id) };
+                for (const item of this.tableSelectedIds) {
+                  if (typeof item == "object" && "id" in item) {
+                    yield { id: item.id, result: await this.printOnce(item.id) };
+                  } else {
+                    yield { id: item, result: await this.printOnce(item) }; // 此时 item 本身就是 id
+                  }
                 }
               };
 
               for await (const { id } of batchPrint.call(this)) {
-                //console.log("打印中...", id);
-                // send successful request
                 await this.$http({
                   url: "/pms/pallet/print",
                   method: "post",
@@ -808,7 +810,7 @@ export default {
               this.getList();
             })
             .catch((err) => {
-              this.$message.error(`批量打印出错: ${err}`);
+              // this.$message.error(`批量打印出错: ${err}`);
             });
         case "报工":
           //console.log("报工ids:", this.tableSelectedIds);
diff --git a/src/views/modules/pms/order/components/order--edit.vue b/src/views/modules/pms/order/components/order--edit.vue
index 17334e6..c04d4d4 100644
--- a/src/views/modules/pms/order/components/order--edit.vue
+++ b/src/views/modules/pms/order/components/order--edit.vue
@@ -499,8 +499,8 @@
                 clearable
                 :disabled="mode.includes('detail')"
                 v-bind="{ placeholder: '选择贴纸板' }">
-                <el-option label="否" value="0"></el-option>
-                <el-option label="是" value="1"></el-option>
+                <el-option label="不贴" value="0"></el-option>
+                <el-option label="贴" value="1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -600,6 +600,7 @@ export default {
         customerId: null,
         shortDesc: null,
         remark: null,
+        paperboard: null
       },
       visible: false,
       requestList: [
diff --git a/src/views/modules/pms/order/components/tabs/orderDetail.vue b/src/views/modules/pms/order/components/tabs/orderDetail.vue
index 81453b9..a3721a7 100644
--- a/src/views/modules/pms/order/components/tabs/orderDetail.vue
+++ b/src/views/modules/pms/order/components/tabs/orderDetail.vue
@@ -492,8 +492,8 @@
                 clearable
                 :disabled="mode.includes('detail')"
                 v-bind="{ placeholder: '选择贴纸板' }">
-                <el-option label="否" value="0"></el-option>
-                <el-option label="是" value="1"></el-option>
+                <el-option label="不贴" value="0"></el-option>
+                <el-option label="贴" value="1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
diff --git a/src/views/modules/pms/order/config.js b/src/views/modules/pms/order/config.js
index 6f03e91..3a6bb7f 100644
--- a/src/views/modules/pms/order/config.js
+++ b/src/views/modules/pms/order/config.js
@@ -576,8 +576,8 @@ export default function () {
                 prop: 'paperboard',
                 select: true,
                 options: [
-                  { label: '不要', value: '0' },
-                  { label: '要', value: '1' },
+                  { label: '不贴', value: '0' },
+                  { label: '贴', value: '1' },
                 ]
               },
             ],
diff --git a/src/views/modules/pms/shape/config.js b/src/views/modules/pms/shape/config.js
index a45e39e..9f50549 100644
--- a/src/views/modules/pms/shape/config.js
+++ b/src/views/modules/pms/shape/config.js
@@ -11,6 +11,7 @@ export default function () {
     { prop: "name", label: "砖型名称" },
     { prop: "code", label: "砖型编码" },
     { prop: "externalCode", label: "砖型ID" },
+    { prop: "tag", label: "码砖宽度" },
     { prop: "line", label: "中心线颜色", filter: dictFilter("line") },
     { prop: "tequipmentTechCode1", label: "压制工艺", subcomponent: techBox },
     { prop: "tequipmentTechCode2", label: "检测工艺", subcomponent: techBox },
@@ -151,8 +152,25 @@ export default function () {
             elparams: null,
           },
         ],
+        [
+          { input: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } },
+          {
+            input: true,
+            label: "码砖宽度",
+            prop: "tag",
+            elparams: { placeholder: "请输入码砖宽度" },
+            rules: [
+              { required: true, message: "必填项不能为空", trigger: "blur" },
+              {
+                type: "number",
+                message: "请输入正确的数字类型",
+                trigger: "blur",
+                transform: (val) => !val.includes('-') && Number(val),
+              },
+            ],
+          },
+        ],
         [{ textarea: true, label: "描述", prop: "description", elparams: { placeholder: "描述" } }],
-        [{ input: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }],
       ],
       operations: [
         { name: "add", label: "保存", type: "primary", permission: "pms:shape:save", showOnEdit: false },