From 5b9e03a5a77d20f58ed92232f8c412d6dbcb67b8 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Fri, 14 Jul 2023 13:54:18 +0800
Subject: [PATCH] =?UTF-8?q?update=200714=E5=8F=8D=E9=A6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/pms/blenderBatchDetails/config.js | 4 +++-
 src/views/modules/pms/blenderOrder/config.js        | 2 +-
 src/views/modules/pms/order/config.js               | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/pms/blenderBatchDetails/config.js b/src/views/modules/pms/blenderBatchDetails/config.js
index 8eca1b7..b0b8ce6 100644
--- a/src/views/modules/pms/blenderBatchDetails/config.js
+++ b/src/views/modules/pms/blenderBatchDetails/config.js
@@ -6,8 +6,10 @@ import { timeFilter } from "@/utils/filters";
 export default function () {
   const tableProps = [
     { type: "index", label: "序号" },
-    { prop: "batchId", label: "混料批次ID" },
+    // { prop: "batchId", label: "混料批次ID" },
     { prop: "materialCode", label: "原料编码" },
+    { prop: "materialDesc", label: "原料描述" },
+    { prop: "materialName", label: "原料中文名称" },
     { prop: "qty", label: "计算用量" },
     { prop: "realqty", label: "实际用量" },
     { width: 160, prop: "createTime", label: "添加时间", filter: timeFilter },
diff --git a/src/views/modules/pms/blenderOrder/config.js b/src/views/modules/pms/blenderOrder/config.js
index 2e34d28..8e1e46f 100644
--- a/src/views/modules/pms/blenderOrder/config.js
+++ b/src/views/modules/pms/blenderOrder/config.js
@@ -33,7 +33,7 @@ export default function () {
       prop: "operations",
       name: "操作",
       fixed: "right",
-      width: 180,
+      width: 190,
       subcomponent: TableOperaionComponent,
       options: [
         {
diff --git a/src/views/modules/pms/order/config.js b/src/views/modules/pms/order/config.js
index 1b1109f..0b03b52 100644
--- a/src/views/modules/pms/order/config.js
+++ b/src/views/modules/pms/order/config.js
@@ -310,7 +310,7 @@ export default function () {
                 input: true,
                 label: "Add on",
                 prop: "sapParam1",
-                rules: { required: true, message: "必填项不能为空", trigger: "blur" },
+                // rules: { required: true, message: "必填项不能为空", trigger: "blur" },
                 elparams: { placeholder: "输入addon" },
               },
             ],