Merge remote-tracking branch 'remotes/origin/intex_pandian' into intex

src/views/wms/basicDataManage/supplierManage/deliTime/deliTime.data.ts

@@ -46,7 +46,7 @@ export const DeliTime = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         type: 'time',
         dateFormat: 'HH:mm:ss',
-        valueFormat: 'x'
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
       }
     },
     form: {

src/views/wms/basicDataManage/supplierManage/deliTimeWms/deliTimeWms.data.ts

@@ -46,7 +46,7 @@ export const DeliTimeWms = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         type: 'time',
         dateFormat: 'HH:mm:ss',
-        valueFormat: 'x'
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
       }
     },
     form: {

src/views/wms/basicDataManage/supplierManage/deliTimeWms/index.vue

@@ -155,7 +155,14 @@ const openForm = (type: string, row?: any) => {
         item.componentProps.disabled = true
       }
     })
+  } else {
+    DeliTimeWms.allSchemas.formSchema.forEach((item) => {
+      if(item.field == 'code'){
+        item.componentProps.disabled = false
+      }
+    })
   }
+  
   basicFormRef.value.open(type, row)
 }
 

src/views/wms/basicDataManage/supplierManage/modelDeliTime/index.vue

@@ -28,7 +28,7 @@
       v-model:sort="tableObject.sort"
     >
       <template #model="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.model)">
+        <el-button type="primary" link @click="openDetail(row, '受入号', row.model)">
           <span>{{ row.model }}</span>
         </el-button>
       </template>

src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts

@@ -5,11 +5,12 @@ import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '../supplier/supplier.data'
 import { DeliTimeWms } from '../DeliTimeWms/deliTimeWms.data'
 import * as DeliTimeWmsApi from '@/api/wms/deliTimeWms'
+import { fa } from 'element-plus/es/locale'
 
 // 表单校验
 export const ModelDeliTimeDetailRules = reactive({
-  model: [required],
-  yearAndMonth: [required],
+  modelShow: [required],
+  yearAndMonthShow: [required],
   delayDeli: [required],
 })
 
@@ -199,11 +200,15 @@ export const ModelDeliTime = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
   },
   {
     label: '操作',
     field: 'action',
     isForm: false,
+    isDetail:false,
     table: {
       width: 150,
       fixed: 'right'