Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into hella_online_20240803

src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue

@@ -43,6 +43,7 @@
     @handleAddTable="handleAddTable" 
     @handleDeleteTable="handleDeleteTable"
     :isShowReduceButtonSelection="true"
+    @tableSelectionDelete="tableSelectionDelete"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
     :isShowButton=isShowButton />
@@ -102,6 +103,7 @@ import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 const { loadStart, loadDone } = usePageLoading()
+// 物料变更申请
 defineOptions({ name: 'RelegateRequestMain' })
 
 const message = useMessage() // 消息弹窗
@@ -171,7 +173,9 @@ const handlePoint = async (row) => {
     message.warning('请先创建标签')
   }
 }
-
+const tableSelectionDelete = (selection) => {
+  tableData.value = tableData.value.filter(item => !selection.includes(item))
+}
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
   nextTick(() => {

src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts

@@ -106,7 +106,10 @@ export const RelegateRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
+    isSearch: false,
+    table: {
+      width: 180
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -119,7 +122,7 @@ export const RelegateRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     isForm: false,
-    isTable: true
+    isTable: false
   },
   {
     label: '扩展属性',
@@ -374,7 +377,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         },{
           key: 'changeBeforeCode',
           value: 'itemCode',
-          isTableRowValue: true, 
+          isTableRowValue: true,
           isMainValue:false
         }],
         verificationParams: [{
@@ -402,7 +405,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         },{
           key: 'changeBeforeCode',
           value: 'itemCode',
-          isTableRowValue: true, 
+          isTableRowValue: true,
           isMainValue:false
         }]
     },
@@ -603,25 +606,47 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isTable:false,
   },
+  {
+    label: '创建人',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable: true
+  },
   {
     label: '创建时间',
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    isSearch: true,
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'YYYY-MM-DD',
         type: 'daterange',
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
     isForm:false,
     isTableForm: false,
-    isTable:false,
+    isTable:true,
   },
   {
     label: '状态',
@@ -814,4 +839,4 @@ export const RelegateRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>(
 //表单校验
 export const RelegateRequestDetailLabelRules = reactive({
 
-})
+})

src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts

@@ -43,18 +43,18 @@ export const ProductredressRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
     },
   },
-  {
+  // {
-    label: '状态',
+  //   label: '状态',
-    field: 'status',
+  //   field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
+  //   dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
+  //   dictClass: 'string',
-    isForm:false,
+  //   isForm:false,
-    isTable: true,
+  //   isTable: true,
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    }
+  //   }
-  },
+  // },
   {
     label: '生产线代码',
     field: 'productionlineCode',

src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts

@@ -106,6 +106,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isTable:true,
+    isSearch:true,
     tableForm: {
       enterSearch: true,
       isInpuFocusShow: true,