From 5b871f27f539bf9bb15efb4831cd27949a635525 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Wed, 1 Mar 2023 11:01:20 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=A0=B4=E7=A2=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/pms/brokeLog/config.js | 43 ++++++++++++++----------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/views/modules/pms/brokeLog/config.js b/src/views/modules/pms/brokeLog/config.js
index 6036fac..7212f63 100644
--- a/src/views/modules/pms/brokeLog/config.js
+++ b/src/views/modules/pms/brokeLog/config.js
@@ -8,13 +8,16 @@ export default function () {
     { type: 'index', label: '序号' },
     // { prop: "createTime", label: "添加时间", filter: timeFilter },
     { prop: "updateTime", label: "上料时间", filter: timeFilter },
-    { prop: "material", label: "原料" },
+    { prop: "materialName", label: "原料" },
+    // { prop: "material", label: "原料编码" },
     { prop: "qty", label: "上料量" },
     { prop: "siloCode1", label: "上料料仓1" },
     { prop: "siloCode2", label: "上料料仓2" },
     { prop: "siloCode3", label: "上料料仓3" },
+    { prop: 'startTime', label: "开始上料时间", filter: timeFilter },
+    { prop: 'endTime', label: "结束上料时间", filter: timeFilter },
     { prop: "statusDictValue", label: "破碎作业", filter: val => ['正常停止', '废除'][val] ?? '-' },
-    { prop: "description", label: "描述" },
+    // { prop: "description", label: "描述" },
     { prop: "remark", label: "备注" },
     {
       prop: "operations",
@@ -45,7 +48,7 @@ export default function () {
       label: "按料仓搜索",
       fieldOptionLabel: 'code', // 把料仓筛选条件的label改为展示code，而不是展示name
       select: [],
-      fn: () => this.$http.get("/pms/materialStorage/page", { params: { page: 1, limit: 999 } }),
+      fn: () => this.$http.get("/pms/materialStorage/page", { params: { page: 1, limit: 999, typeDictValue: '0' } }),
       bind: {
         placeholder: '请选择料仓',
         filterable: true,
@@ -109,13 +112,8 @@ export default function () {
             rules: [{ required: true, message: "必填项不能为空", trigger: "blur" }, { type: 'number', message: '请输入正确的数字类型', trigger: 'blur', transform: val => Number(val) }],
             elparams: { placeholder: "请输入上料量" },
           },
-          {
-            datetime: true,
-            label: "上料时间",
-            prop: "updateTime",
-            rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-            elparams: { placeholder: "请选择上料时间", type: 'datetime' },
-          },
+          { select: true, label: "破碎作业", prop: "statusDictValue", options: [{ label: '正常停止', value: 0 }, { label: '废除', value: '1' }], elparams: { placeholder: "破碎作业", filterable: true } },
+          
         ],
         [
           {
@@ -124,7 +122,7 @@ export default function () {
             select: true,
             options: [],
             rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-            fetchData: () => this.$http.get("/pms/materialStorage/page", { params: { page: 1, limit: 999 } }),
+            fetchData: () => this.$http.get("/pms/materialStorage/page", { params: { page: 1, limit: 999, typeDictValue: '0' } }),
             elparams: { placeholder: "请选择上料料仓1" }
           },
           {
@@ -133,7 +131,7 @@ export default function () {
             select: true,
             options: [],
             rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-            fetchData: () => this.$http.get("/pms/materialStorage/page", { params: { page: 1, limit: 999 } }),
+            fetchData: () => this.$http.get("/pms/materialStorage/page", { params: { page: 1, limit: 999, typeDictValue: '0' } }),
             elparams: { placeholder: "请选择上料料仓2" }
           },
           {
@@ -142,16 +140,25 @@ export default function () {
             select: true,
             options: [],
             rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-            fetchData: () => this.$http.get("/pms/materialStorage/page", { params: { page: 1, limit: 999 } }),
+            fetchData: () => this.$http.get("/pms/materialStorage/page", { params: { page: 1, limit: 999, typeDictValue: '0' } }),
             elparams: { placeholder: "请选择上料料仓3" }
           },
         ],
         [
-          { select: true, label: "破碎作业", prop: "statusDictValue", options: [{ label: '正常停止', value: 0 }, { label: '废除', value: '1' }], elparams: { placeholder: "破碎作业", filterable: true } },
-          {},
-          {}
-        ],
-        [
+          {
+            datetime: true,
+            label: "开始上料时间",
+            prop: "startTime",
+            rules: { required: true, message: "必填项不能为空", trigger: "blur" },
+            elparams: { placeholder: "请选择上料时间", type: 'datetime' },
+          },
+          {
+            datetime: true,
+            label: "结束上料时间",
+            prop: "endTime",
+            rules: { required: true, message: "必填项不能为空", trigger: "blur" },
+            elparams: { placeholder: "请选择上料结束时间", type: 'datetime' },
+          },
           { input: true, label: "描述信息", prop: "description", elparams: { placeholder: "描述信息" } },
         ],
         [{ input: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }],