From 52ae9cbba972e239997e98f52cc81a06a97bc2ad Mon Sep 17 00:00:00 2001
From: zhousq <zhoushaoqiang@sina.com>
Date: Fri, 17 May 2024 13:43:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=AB=E6=96=99=E3=80=81?=
 =?UTF-8?q?=E8=A1=A5=E6=96=99=20=E7=9A=84=E9=A1=B5=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts                             |  2 +-
 src/views/mes/itemRequestMain/index.vue       |  8 +++---
 .../itemRequestMain/itemRequestMain.data.ts   | 28 +++++++++++++++----
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 92d89451e..731adaa35 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -322,7 +322,7 @@ export enum DICT_TYPE {
   DISMANTLING_BILL_TYPE = 'dismantling_bill_type',//工单类型
   DISMANTLING_MATERIAL_STATUS = 'dismantling_material_status',//报废拆解物料状态
   DISMANTLING_MATERIAL_HANDLE_STATUS = 'dismantling_material_handle_status',//报废拆解处理状态
-
+  MES_REQUEST_TYPE = 'mes_request_type',//生产物料申请类型
 
   SUPPLIERINVOICE_REQUEST_STATUS = 'supplierinvoice_request_status', //发票申请状态
   SUPPLIERINVOICE_STATUS = 'supplierinvoice_status', //待开票审核状态
diff --git a/src/views/mes/itemRequestMain/index.vue b/src/views/mes/itemRequestMain/index.vue
index ec23d1d99..291647ef1 100644
--- a/src/views/mes/itemRequestMain/index.vue
+++ b/src/views/mes/itemRequestMain/index.vue
@@ -61,9 +61,9 @@
           :apiCreate="ItemRequestDetailApi.createItemRequestDetail"
           :apiUpdate="ItemRequestDetailApi.updateItemRequestDetail"
           :apiDelete="ItemRequestDetailApi.deleteItemRequestDetail"
-          :detailButtonIsShowAdd="true"
-          :detailButtonIsShowEdit="true"
-          :detailButtonIsShowDelete="true"
+          :detailButtonIsShowAdd="false"
+          :detailButtonIsShowEdit="false"
+          :detailButtonIsShowDelete="false"
           @handleMainFefresh="handleMainFefresh"
           @searchTableSuccessDetail="searchTableSuccessDetail"
           :key="count"
@@ -150,7 +150,7 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'mes:itemRequestMain:update'}), // 编辑
+  //defaultButtons.mainListEditBtn({hasPermi:'mes:itemRequestMain:update'}), // 编辑
   defaultButtons.mainListDeleteBtn({hasPermi:'mes:itemRequestMain:delete'}), // 删除
 ]
 
diff --git a/src/views/mes/itemRequestMain/itemRequestMain.data.ts b/src/views/mes/itemRequestMain/itemRequestMain.data.ts
index 32e25a10e..19bfee525 100644
--- a/src/views/mes/itemRequestMain/itemRequestMain.data.ts
+++ b/src/views/mes/itemRequestMain/itemRequestMain.data.ts
@@ -3,7 +3,7 @@ import { dateFormatter } from '@/utils/formatTime'
 
 // 表单校验
 export const ItemRequestMainRules = reactive({
-  concurrencyStamp: [required],
+  requestBillNo:[{required  : true, message: '请输入删除时间', trigger: 'blur' }]
 })
 
 export const ItemRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
@@ -24,6 +24,9 @@ export const ItemRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -37,6 +40,7 @@ export const ItemRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestBillNo',
     sort: 'custom',
     isSearch: true,
+    disabled: true,
   },
   {
     label: '主键',
@@ -132,13 +136,20 @@ export const ItemRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '类型（1:叫料、2:补料）',
+    label: '类型',
     field: 'requestType',
     sort: 'custom',
     isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                },
+    dictType: DICT_TYPE.MES_REQUEST_TYPE,
+    dictClass: 'string',
+    form: {
+      component: 'Select',
+      // componentProps:{
+      //   options:[{label:'叫料',value:'1'},{label:'补料',value:'2'}]
+      // },
+      value:'1'
+    },
+   
   },
   {
     label: '创建时间',
@@ -154,6 +165,9 @@ export const ItemRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     isForm: false,
   },
   {
@@ -275,6 +289,9 @@ export const ItemRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     isForm: false,
   },
   {
@@ -287,6 +304,7 @@ export const ItemRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '操作',
     field: 'action',
     isForm: false,
+    isTable: false,
     table: {
       width: 150,
       fixed: 'right'