From 80ec59771d17d9ed9ccc64edca09b56ff78bb6ad Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 29 May 2024 15:15:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processproductionRecord/index.vue         |  6 +--
 .../processproductionRecordMain.data.ts       | 35 +++++++++++++---
 .../processproductionRequest/index.vue        | 12 +++---
 .../processproductionRequestMain.data.ts      | 40 +++++++++++++++++--
 4 files changed, 76 insertions(+), 17 deletions(-)

diff --git a/src/views/wms/productionManage/processproduction/processproductionRecord/index.vue b/src/views/wms/productionManage/processproduction/processproductionRecord/index.vue
index 9f7f42537..c04743a7b 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRecord/index.vue
+++ b/src/views/wms/productionManage/processproduction/processproductionRecord/index.vue
@@ -28,9 +28,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
         </el-button>
       </template>
       <template #action="{ row,$index }">
diff --git a/src/views/wms/productionManage/processproduction/processproductionRecord/processproductionRecordMain.data.ts b/src/views/wms/productionManage/processproduction/processproductionRecord/processproductionRecordMain.data.ts
index c81b52900..7f70ffe6f 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRecord/processproductionRecordMain.data.ts
+++ b/src/views/wms/productionManage/processproduction/processproductionRecord/processproductionRecordMain.data.ts
@@ -9,7 +9,7 @@ export const ProcessproductionRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     sort: 'custom',
     isSearch: true,
     table: {
-      width: 150
+      width: 200
     },
   },
   {
@@ -18,7 +18,7 @@ export const ProcessproductionRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     sort: 'custom',
     isSearch: true,
     table: {
-      width: 150
+      width: 200
     },
   },
   {
@@ -69,11 +69,23 @@ export const ProcessproductionRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     table: {
-      width: 150
+      width: 180
     },
-    isForm: false,
-    isTable:false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '删除时间',
@@ -81,6 +93,8 @@ export const ProcessproductionRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     sort: 'custom',
     formatter: dateFormatter,
     isSearch: false,
+    isTableForm:false,
+    isDetail:false,
     table: {
       width: 150
     },
@@ -106,6 +120,8 @@ export const ProcessproductionRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'deleterId',
     sort: 'custom',
     isSearch: false,
+    isTableForm:false,
+    isDetail:false,
     table: {
       width: 150
     },
@@ -117,6 +133,8 @@ export const ProcessproductionRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     sort: 'custom',
     isSearch: false,
     isTable: false,
+    isTableForm:false,
+    isDetail:false,
     table: {
       width: 150
     },
@@ -127,6 +145,8 @@ export const ProcessproductionRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     sort: 'custom',
     isSearch: false,
     isTable: false,
+    isTableForm:false,
+    isDetail:false,
     form: {
       component: 'InputNumber',
       value: 0
@@ -141,12 +161,16 @@ export const ProcessproductionRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     sort: 'custom',
     isTable: false,
     isSearch: false,
+    isTableForm:false,
+    isDetail:false,
   },
   {
     label: '操作',
     field: 'action',
     isForm: false,
     isTable: false,
+    isTableForm:false,
+    isDetail:false,
     table: {
       width: 150,
       fixed: 'right'
@@ -174,6 +198,7 @@ export const ProcessproductionRecordDetail = useCrudSchemas(reactive<CrudSchema[
     label: '单据号',
     field: 'number',
     sort: 'custom',
+    hiddenInMain:true,
     isSearch: false,
     table: {
       width: 150
diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
index 12c0c74b5..3ac03937e 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
+++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
@@ -184,11 +184,11 @@ const butttondata = (row,$index) => {
   }
   return [
     defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:processproduction-request-main:close'}), // 关闭
-    defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:transferreceipt-request-main:reAdd'}), // 重新添加
-    defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferreceipt-request-main:submit'}), // 提交审批
-    defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:transferreceipt-request-main:refused'}), // 驳回
-    defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:transferreceipt-request-main:agree'}), // 审批通过
-    defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:transferreceipt-request-main:handle'}), // 处理
+    defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:processproduction-request-main:reAdd'}), // 重新添加
+    defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:processproduction-request-main:submit'}), // 提交审批
+    defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:processproduction-request-main:refused'}), // 驳回
+    defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:processproduction-request-main:agree'}), // 审批通过
+    defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:processproduction-request-main:handle'}), // 处理
     defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:processproduction-request-main:update'}), // 编辑
     defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:processproduction-request-main:delete'}), // 删除
   ]
@@ -202,7 +202,7 @@ const buttonTableClick = async (val, row) => {
     handleClose(row.masterId)
   } else if(val == 'mainReAdd'){// 重新添加
     handleReAdd(row.masterId)
-  } else if(val == ''){ // 提交审批
+  } else if(val == 'mainSubmit'){ // 提交审批
     handleSubmit(row.masterId)
   } else if (val == 'mainTurnDown') { // 驳回
     handleRefused(row.masterId)
diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts
index 631539002..c0088a6f3 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts
+++ b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts
@@ -23,6 +23,25 @@ export const ProcessproductionRequestMain = useCrudSchemas(reactive<CrudSchema[]
     isForm: false,
     isSearch: true,
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '物料代码',
     field: 'itemCode',
@@ -107,8 +126,23 @@ export const ProcessproductionRequestMain = useCrudSchemas(reactive<CrudSchema[]
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isForm: false,
-    isTable:false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '删除时间',
@@ -181,7 +215,7 @@ export const ProcessproductionRequestMain = useCrudSchemas(reactive<CrudSchema[]
     isForm: false,
     isDetail:false,
     table: {
-      width: 150,
+      width: 230,
       fixed: 'right'
     }
   }