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

src/api/wms/expectin/index.ts

@@ -44,6 +44,11 @@ export const deleteExpectin = async (id: number) => {
   return await request.delete({ url: `/wms/expectin/delete?id=` + id })
 }
 
+// 批量删除预计出库存
+export const deleteExpectinIds = async (ids: string) => {
+  return await request.delete({ url: `/wms/expectin/deleteIds?ids=` + ids })
+}
+
 // 导出预计入库存 Excel
 export const exportExpectin = async (params) => {
   if (params.isSearch) {

src/api/wms/expectout/index.ts

@@ -45,6 +45,11 @@ export const deleteExpectout = async (id: number) => {
   return await request.delete({ url: `/wms/expectout/delete?id=` + id })
 }
 
+// 批量删除预计出库存
+export const deleteExpectoutIds = async (ids: string) => {
+  return await request.delete({ url: `/wms/expectout/deleteIds?ids=` + ids })
+}
+
 // 导出预计出库存 Excel
 export const exportExpectout = async (params) => {
   if (params.isSearch) {

src/api/wms/inventorychangeRecordMain/index.ts

@@ -56,7 +56,7 @@ export const exportInventorychangeRecordMain = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/inventorychange-record-main/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/inventorychange-record-main/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/inventorychange-record-main/export-excel`, params })
   }
@@ -65,4 +65,4 @@ export const exportInventorychangeRecordMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/inventorychange-record-main/get-import-template' })
-}
+}

src/api/wms/inventorychangeRequestMain/index.ts

@@ -55,7 +55,7 @@ export const exportInventorychangeRequestMain = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/inventorychange-request-main/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/inventorychange-request-main/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/inventorychange-request-main/export-excel`, params })
   }
@@ -94,4 +94,4 @@ export const agree = (id) => {
 // 处理
 export const handle = (id) => {
   return request.put({ url: '/wms/inventorychange-request-main/handle?id=' + id })
-}
+}

src/components/Table/src/Table.vue

@@ -17,7 +17,7 @@ export default defineComponent({
   // eslint-disable-next-line vue/no-reserved-component-names
   name: 'Table',
   props: {
-    pageSize: propTypes.number.def(10),
+    pageSize: propTypes.number.def(20),
     currentPage: propTypes.number.def(1),
     // 是否多选
     selection: propTypes.bool.def(false),

src/hooks/web/useTable.ts

@@ -39,7 +39,7 @@ interface TableObject<T = any> {
 export const useTable = <T = any>(config?: UseTableConfig<T>) => {
   const tableObject = reactive<TableObject<T>>({
     // 页数
-    pageSize: 10,
+    pageSize: 20,
     // 当前页
     currentPage: 1,
     // 总条数

src/utils/disposition/defaultButtons.ts

@@ -980,6 +980,19 @@ export function mainLisSelectiontPointBtn(option:any) {
     hasPermi: ''
   })
 }
+// 主列表-批量删除
+export function mainLisSelectiontDeleteBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: t(`ts.批量删除`).replace('ts.', ''),
+    name: 'selection_delete',
+    hide: false,
+    type: 'primary',
+    icon: 'ep:download',
+    color: '',
+    float:'left',
+    hasPermi: ''
+  })
+}
 // 主列表-生成采购收货申请
 export function mainListGenerateApplicationBtn(option:any) {
   return __defaultBtnOption(option,{

src/views/eam/equipmentInspectionMain/finishForm2.vue

@@ -2,11 +2,11 @@
   <Dialog v-model="dialogVisible" :title="dialogTitle"  :close-on-click-modal="false">
     <el-form ref="basicFormRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="100px">
       <el-row>
-        <el-col :span="12">
+<!--        <el-col :span="12">-->
-          <el-form-item label="巡检人ID" prop="maintenancer">
+<!--          <el-form-item label="巡检人ID" prop="maintenancer">-->
-            <el-input v-model="formData.maintenancer" placeholder="请输入巡检人" :disabled="isDisabled"/>
+<!--            <el-input v-model="formData.maintenancer" placeholder="请输入巡检人" :disabled="isDisabled"/>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-        </el-col>
+<!--        </el-col>-->
         <el-col :span="12">
           <el-form-item label="巡检人电话" prop="maintenancePhone">
             <el-input v-model="formData.maintenancePhone" placeholder="请输入巡检人电话" />
@@ -72,16 +72,12 @@ const InputRef = ref<InstanceType<typeof ElInput>>()
 const formData = ref({
   id:'',
   number:'',
-  maintenancer: '',
   maintenancePhone: '',
   startTime:'',
   endTime:'',
   status:'5',
 })
 const formRules = reactive({
-  maintenancer: [
-    { required: true, message: '巡检人ID不能为空', trigger: 'blur' },
-  ],
   maintenancePhone: [
     { required: true, message: '巡检人电话不能为空', trigger: 'blur' },
   ],

src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts

@@ -9,11 +9,15 @@ import * as ItemApi from "@/api/eam/relationMaintenancePlanItem";
 import {validateroundNumber} from "@/utils/validator";
 import {BasicFaultType} from "@/views/eam/basicFaultType/basicFaultType.data";
 import * as BasicFaultTypeApi from "@/api/eam/basicFaultType";
+import {BasicMaintenanceOption} from "@/views/eam/basicMaintenanceOption/basicMaintenanceOption.data";
+import * as BasicMaintenanceOptionApi from "@/api/eam/basicMaintenanceOption";
+
 
 // 表单校验
 export const EquipmentMaintenanceMainRules = reactive({
   number: [required],
   sources: [required],
+  optionCode:[required],
   equipmentCode: [required],
   type: [required],
   planStartTime: [required],
@@ -112,6 +116,28 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '保养方案',
+    field: 'optionCode',
+    sort: 'custom',
+    isSearch: true,
+    isTable: false,
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择保养方案', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '保养方案信息', // 查询弹窗标题
+        searchAllSchemas: BasicMaintenanceOption.allSchemas, // 查询弹窗所需类
+        searchPage: BasicMaintenanceOptionApi.getBasicMaintenanceOptionPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+  },
   {
     label: '保养计划工单号',
     field: 'planNumber',

src/views/eam/equipmentMaintenanceMain/finishForm2.vue

@@ -2,11 +2,11 @@
   <Dialog v-model="dialogVisible" :title="dialogTitle"  :close-on-click-modal="false">
     <el-form ref="basicFormRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="100px">
       <el-row>
-        <el-col :span="12">
+<!--        <el-col :span="12">-->
-          <el-form-item label="保养人ID" prop="maintenancer">
+<!--          <el-form-item label="保养人ID" prop="maintenancer">-->
-            <el-input v-model="formData.maintenancer" placeholder="请输入保养人" :disabled="isDisabled"/>
+<!--            <el-input v-model="formData.maintenancer" placeholder="请输入保养人" :disabled="isDisabled"/>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-        </el-col>
+<!--        </el-col>-->
         <el-col :span="12">
           <el-form-item label="保养人电话" prop="maintenancePhone">
             <el-input v-model="formData.maintenancePhone" placeholder="请输入保养人电话" />
@@ -71,16 +71,12 @@ const InputRef = ref<InstanceType<typeof ElInput>>()
 const formData = ref({
   id:'',
   number:'',
-  maintenancer: '',
   maintenancePhone: '',
   startTime:'',
   endTime:'',
   status:'5',
 })
 const formRules = reactive({
-  maintenancer: [
-    { required: true, message: '保养人ID不能为空', trigger: 'blur' },
-  ],
   maintenancePhone: [
     { required: true, message: '保养人电话不能为空', trigger: 'blur' },
   ],

src/views/eam/equipmentRepairJobMain/finishForm2.vue

@@ -40,11 +40,11 @@
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="12">
+<!--        <el-col :span="12">-->
-          <el-form-item label="执行人" prop="maintenancer">
+<!--          <el-form-item label="执行人" prop="maintenancer">-->
-            <el-input v-model="formData.maintenancer" placeholder="请输入执行人"/>
+<!--            <el-input v-model="formData.maintenancer" placeholder="请输入执行人"/>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-        </el-col>
+<!--        </el-col>-->
         <el-col :span="12">
           <el-form-item label="维修人电话" prop="maintenancePhone">
             <el-input v-model="formData.maintenancePhone" placeholder="请输入维修人电话" />
@@ -102,7 +102,6 @@ const formData = ref({
   level: '',
   startTime:'',
   endTime:'',
-  maintenancer:'',
   maintenancePhone:'',
   completeResult:'',
   status:'5'
@@ -120,9 +119,6 @@ const formRules = reactive({
   endTime: [
     { required: true, message: '结束时间不能为空', trigger: 'blur' },
   ],
-  maintenancer: [
-    { required: true, message: '维修人ID不能为空', trigger: 'blur' },
-  ],
   maintenancePhone: [
     { required: true, message: '维修人电话不能为空', trigger: 'blur' },
   ],

src/views/eam/equipmentSpotCheckMain/finishForm2.vue

@@ -2,11 +2,11 @@
   <Dialog v-model="dialogVisible" :title="dialogTitle"  :close-on-click-modal="false">
     <el-form ref="basicFormRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="100px">
       <el-row>
-        <el-col :span="12">
+<!--        <el-col :span="12">-->
-          <el-form-item label="巡检人ID" prop="maintenancer">
+<!--          <el-form-item label="巡检人ID" prop="maintenancer">-->
-            <el-input v-model="formData.maintenancer" placeholder="请输入巡检人" :disabled="isDisabled"/>
+<!--            <el-input v-model="formData.maintenancer" placeholder="请输入巡检人" :disabled="isDisabled"/>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-        </el-col>
+<!--        </el-col>-->
         <el-col :span="12">
           <el-form-item label="巡检人电话" prop="maintenancePhone">
             <el-input v-model="formData.maintenancePhone" placeholder="请输入巡检人电话" />
@@ -73,16 +73,12 @@ const InputRef = ref<InstanceType<typeof ElInput>>()
 const formData = ref({
   id:'',
   number:'',
-  maintenancer: '',
   maintenancePhone: '',
   startTime:'',
   endTime:'',
   status:'5',
 })
 const formRules = reactive({
-  maintenancer: [
-    { required: true, message: '巡检人ID不能为空', trigger: 'blur' },
-  ],
   maintenancePhone: [
     { required: true, message: '巡检人电话不能为空', trigger: 'blur' },
   ],

src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts

@@ -308,7 +308,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -325,7 +325,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false
+    isTable: true
   },
   // {
   //   label: '代码',
@@ -543,7 +543,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
-  
+
   {
     label: '从批次',
     field: 'fromBatch',
@@ -563,7 +563,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     isTable: false,
 
   },
-  
+
   {
     label: '从包装号',
     field: 'fromPackingNumber',
@@ -603,8 +603,8 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     isTable: false,
   },
-  
+
-  
+
   {
     label: '库存状态',
     field: 'inventoryStatus',

src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts

@@ -365,7 +365,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
-    isTable: false,
+    isTable: true,
     isForm: false
   },
   {
@@ -383,7 +383,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
-    isTable: false,
+    isTable: true,
     isForm: false
   },
   {
@@ -775,4 +775,4 @@ export const CustomerreceiptRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请选择物料代码', trigger: 'change' }
   ],
-})
+})

src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts

@@ -563,7 +563,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -580,7 +580,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false,
+    isTable: true,
   },
   {
     label: '最后更新时间',

src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts

@@ -328,7 +328,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -345,7 +345,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false,
+    isTable: true,
   },
   // {
   //   label: '代码',
@@ -588,7 +588,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isTable: false,
   },
-  
+
   {
     label: '从包装号',
     field: 'fromPackingNumber',
@@ -608,7 +608,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isTable: false,
   },
-  
+
   {
     label: '从器具号',
     field: 'fromContainerNumber',
@@ -627,7 +627,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isTable: false,
   },
-  
+
   {
     label: '从库位代码',
     field: 'fromLocationCode',

src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts

@@ -148,7 +148,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  
+
   {
     label: '发货计划单号',
     field: 'deliverPlanNumber',
@@ -505,7 +505,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable:false,
+    isTable:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -524,7 +524,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable:false,
+    isTable:true,
     isForm: false
   },
   {
@@ -779,7 +779,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       searchPage: CustomerreturnRequestApi.pageItemCodeToBalance,
       searchCondition: [{
         key:'customerCode', // 查询列表中字段
-        value:'customerCode', // 指主表某字段 
+        value:'customerCode', // 指主表某字段
         message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
         isMainValue: true // 表示查询条件是主表的字段的值
       }
@@ -796,7 +796,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         searchPage: CustomerreturnRequestApi.pageItemCodeToBalance,
         searchCondition: [{
           key:'customerCode', // 查询列表中字段
-          value:'customerCode', // 指主表某字段 
+          value:'customerCode', // 指主表某字段
           message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
           isMainValue: true // 表示查询条件是主表的字段的值
         }
@@ -1363,4 +1363,4 @@ export const CustomerReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSche
     isTableForm: true,
     isForm: true
   },
-]))
+]))

src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts

@@ -542,6 +542,7 @@ export const CustomersettleRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
+    isTable: false,
   },
   {
     label: '创建者',
@@ -550,11 +551,13 @@ export const CustomersettleRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '最后更新时间',
     field: 'updateTime',
     formatter: dateFormatter,
+    isTable: false,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
@@ -570,11 +573,13 @@ export const CustomersettleRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
+    isTable: false
   },
   {
     label: '最后更新者',
     field: 'updater',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
@@ -616,4 +621,4 @@ export const CustomersettleRecordDetailRules = reactive({
   creator: [
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
-})
+})

src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts

@@ -301,6 +301,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: false,
+    isTable: false,
   },
   {
     label: '创建者',
@@ -310,6 +311,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isForm: false,
+    isTable: false,
   },
   {
     label: '申请时间',
@@ -354,6 +356,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: false,
+    isTable: false,
   },
   {
     label: '最后更新者',
@@ -363,6 +366,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isForm: false,
+    isTable: false,
   },
   {
     label: '操作',

src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts

@@ -80,7 +80,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false,
   },
-  
+
   {
     label: '客户月台代码',
     field: 'customerDockCode',
@@ -90,7 +90,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false,
   },
-  
+
   {
     label: '承运商',
     field: 'carrierCode',
@@ -569,7 +569,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -586,7 +586,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false,
+    isTable: true,
   },
   {
     label: '最后更新时间',

src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts

@@ -334,7 +334,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -351,7 +351,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false,
+    isTable: true,
   },
   // {
   //   label: '代码',
@@ -805,4 +805,4 @@ export const DeliverRecordDetailRules = reactive({
   creator: [
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
-})
+})

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts

@@ -112,7 +112,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '客户月台信息', // 查询弹窗标题
         searchAllSchemas: Customerdock.allSchemas, // 查询弹窗所需类
-        searchPage: CustomerdockApi.getCustomerdockPage, // 查询弹窗所需分页方法 
+        searchPage: CustomerdockApi.getCustomerdockPage, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
@@ -524,7 +524,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -543,7 +543,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false,
+    isTable: true,
     isForm: false,
   },
   {
@@ -865,7 +865,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     isTableForm: false
   },
-  
+
   {
     label: '批次',
     field: 'batch',
@@ -1054,4 +1054,4 @@ export const DeliverRequestDetailRules = reactive({
   toLocationCode: [
     { required: true, message: '请选择到库位代码', trigger: 'change' }
   ],
-})
+})

src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts

@@ -214,7 +214,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false,
   },
-  
+
   {
     label: '创建时间',
     field: 'createTime',
@@ -226,7 +226,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -244,7 +244,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false,
+    isTable: true,
     isForm: false,
   },
   {
@@ -641,7 +641,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm: {
       disabled: true,
-      type: 'Select'  
+      type: 'Select'
     },
     form: {
       componentProps: {
@@ -730,8 +730,8 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  
+
-  
+
   {
     label: '备注',
     field: 'remark',
@@ -867,8 +867,8 @@ export const DeliverPlanDetailRules = reactive({
   planQty: [
     { required: true, message: '请输入计划数量', trigger: 'blur' }
   ],
- 
+
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-})
+})

src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts

@@ -214,6 +214,7 @@ export const SaleMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isForm: false,
+    isTable: false
   },
   {
     label: '最后更新时间',
@@ -235,6 +236,7 @@ export const SaleMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: false,
+    isTable: false
   },
   {
     label: '当前阶段',
@@ -778,7 +780,7 @@ export const SaleDetailRules = reactive({
   itemCode: [
     { required: true, message: '请选择物料代码', trigger: 'change' }
   ],
-  
+
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
@@ -910,4 +912,4 @@ export const SaleDetailAndMain = useCrudSchemas(reactive<CrudSchema[]>([
       precision: 6
     }
   },
-]))
+]))

src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts

@@ -95,7 +95,7 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isTable:false
   },
-  
+
   {
     label: '业务类型',
     field: 'businessType',
@@ -107,6 +107,9 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
+    table: {
+      width: 180
+    },
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
@@ -119,7 +122,16 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: false,
-    isTable:false
+    isTable:true
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
   },
   {
     label: '地点ID',

src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts

@@ -222,6 +222,9 @@ export const SaleShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
+    table: {
+      width: 180
+    },
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
@@ -235,7 +238,16 @@ export const SaleShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
     isTableForm: false,
-    isTable: false
+    isTable: true
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
   },
   {
     label: '操作',

src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts

@@ -76,6 +76,9 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
     isTable: false,
     search: {
       component: 'DatePicker',
@@ -101,6 +104,9 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
     isTable: false,
     search: {
       component: 'DatePicker',
@@ -118,7 +124,7 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
- 
+
   {
     label: '过期时间',
     field: 'expiredTime',
@@ -127,6 +133,9 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
     isTable: false,
     search: {
       component: 'DatePicker',
@@ -164,6 +173,9 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'acceptTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
     table: {
       width: 180
     },
@@ -202,6 +214,9 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
     isTable: false,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -389,24 +404,18 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false,
   },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 120
-    },
-    isTable: false,
-  },
   {
     label: '创建时间',
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
     table: {
-      width: 180
+      width: 120
     },
-    isTable: false,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    hiddenInMain: true,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -415,7 +424,16 @@ export const StockupMainJob = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    isTableForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
     isForm: false,
+    isTable: true
   },
   {
     label: '操作',
@@ -440,7 +458,7 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
         table: {
       width: 150
     },
-    hiddenInMain:true 
+    hiddenInMain:true
   },
   {
     label: '包装号',
@@ -449,7 +467,7 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    hiddenInMain:true 
+    hiddenInMain:true
   },
   {
     label: '批次',
@@ -458,7 +476,7 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    hiddenInMain:true 
+    hiddenInMain:true
   },
   {
     label: '库存状态',
@@ -490,7 +508,7 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
     },
     hiddenInMain:true,
   },
-  
+
   {
     label: '物料代码',
     field: 'itemCode',
@@ -600,6 +618,15 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    isTable: false,
+  },
   {
     label: '操作',
     field: 'action',

src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts

@@ -183,6 +183,9 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
     isTable: false,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -197,6 +200,9 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'dueTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -220,21 +226,32 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建时间',
     field: 'createTime',
-    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 180
+    },
     formatter: dateFormatter,
-    search: {
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
       component: 'DatePicker',
       componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width:'100%'},
-        type: 'daterange',
+        type: 'datetime',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
-    },
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
     table: {
-      width: 180
+      width: 130
     },
-    isTable: false,
     isForm: false,
+    isTable: true
   },
   {
     label: '部门',

src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts

@@ -176,12 +176,21 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isTable: false,
+    isTable: true,
     table: {
       width: 180
     },
     isForm: false,
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
   {
     label: '发货日期',
     field: 'deliverDate',
@@ -773,6 +782,15 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTableForm: false,
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
   {
     label: '操作',
     field: 'action',

src/views/wms/inventoryManage/expectin/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Expectin.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="Expectin.allSchemas.searchSchema" @search="searchList" @reset="searchList" />
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -16,7 +16,9 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table ref="tableRef"
+      :selection="true" 
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -26,6 +28,7 @@
       v-model:pageSize="tableObject.pageSize"
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
+      @getSelectionRows="getSelectionRows"
     >
       <template #jobNumber="{row}">
         <el-button type="primary" link @click="openDetail(row, '任务号', row.jobNumber)">
@@ -96,6 +99,8 @@ const HeadButttondata = [
   defaultButtons.defaultFreshBtn(null),//刷新
   defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.mainLisSelectiontDeleteBtn(null), // 批量删除
+
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -123,10 +128,51 @@ const buttonBaseClick = (val, item) => {
       getList()
     }
   } else if (val == 'filtrate') { // 筛选
+  } else if (val == 'selection_delete') { // 批量删除
+    handleSelectionDelete()
   } else { // 其他按钮 
     console.log('其他按钮', item)
   }
 }
+const searchList = (model)=>{
+  selectionRows.value = []
+  setSearchParams(model)
+}
+const selectionRows = ref<any>([])
+const tableRef = ref()
+const getSelectionRows = (currentPage,currentPageSelectionRows) => {
+  console.log("getSelectionRows",currentPage,currentPageSelectionRows)
+  const currentRows = selectionRows.value.find(item=>item.currentPage==currentPage)
+  if(currentRows){
+    currentRows.selectionRows = currentPageSelectionRows
+  }else{
+    selectionRows.value.push({
+      currentPage,
+      selectionRows:currentPageSelectionRows
+    })
+  }
+}
+const handleSelectionDelete = async ()=>{
+  let rows:any = []
+  selectionRows.value.forEach(item=>{
+    rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
+  })
+  if(rows.length==0){
+    return
+  }
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    console.log('批量删除',rows.join(','))
+  await ExpectinApi.deleteExpectinIds(rows.join(','))
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+  getList()
+  } catch {} 
+}
 
 // 列表-操作按钮
 const butttondata = [

src/views/wms/inventoryManage/expectout/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Expectout.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="Expectout.allSchemas.searchSchema" @search="searchList" @reset="searchList" />
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -16,7 +16,9 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table ref="tableRef"
+      :selection="true" 
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -26,6 +28,8 @@
       v-model:pageSize="tableObject.pageSize"
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
+      @getSelectionRows="getSelectionRows"
+
     >
       <template #jobNumber="{row}">
         <el-button type="primary" link @click="openDetail(row, '任务号', row.jobNumber)">
@@ -96,6 +100,7 @@ const HeadButttondata = [
   defaultButtons.defaultFreshBtn(null),//刷新
   defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.mainLisSelectiontDeleteBtn(null), // 批量删除
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -122,12 +127,52 @@ const buttonBaseClick = (val, item) => {
     } else {
       getList()
     }
+  } else if (val == 'selection_delete') { // 批量删除
+    handleSelectionDelete()
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮 
     console.log('其他按钮', item)
   }
 }
-
+const searchList = (model)=>{
+  selectionRows.value = []
+  setSearchParams(model)
+}
+const selectionRows = ref<any>([])
+const tableRef = ref()
+const getSelectionRows = (currentPage,currentPageSelectionRows) => {
+  console.log("getSelectionRows",currentPage,currentPageSelectionRows)
+  const currentRows = selectionRows.value.find(item=>item.currentPage==currentPage)
+  if(currentRows){
+    currentRows.selectionRows = currentPageSelectionRows
+  }else{
+    selectionRows.value.push({
+      currentPage,
+      selectionRows:currentPageSelectionRows
+    })
+  }
+}
+const handleSelectionDelete = async ()=>{
+  let rows:any = []
+  selectionRows.value.forEach(item=>{
+    rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
+  })
+  if(rows.length==0){
+    return
+  }
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    console.log('批量删除',rows.join(','))
+  await ExpectoutApi.deleteExpectoutIds(rows.join(','))
+    message.success(t('common.delSuccess'))
+    tableObject.loading = false
+    // 刷新列表
+  getList()
+  } catch {} 
+}
 // 列表-操作按钮
 const butttondata = [
   // defaultButtons.mainListEditBtn({hasPermi:'wms:expectout:update'}), // 编辑

src/views/wms/inventoryManage/package/package.data.ts

@@ -90,6 +90,9 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'produceDate',
     sort: 'custom',
     formatter: dateFormatter2,
+    detail: {
+      dateFormat : 'YYYY-MM-DD'
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -132,6 +135,9 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'expireDate',
     sort: 'custom',
     formatter: dateFormatter2,
+    detail: {
+      dateFormat : 'YYYY-MM-DD'
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -417,6 +423,36 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150,
     },
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isForm: false,
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
   {
     label: '操作',
     field: 'action',

src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts

@@ -120,6 +120,12 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -128,9 +134,18 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isTable: false,
+    isTable: true,
     isForm: false,
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
   {
     label: '操作',
     field: 'action',
@@ -280,4 +295,4 @@ export const ContainerRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'right'
     }
   }
-]))
+]))

src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts

@@ -212,6 +212,12 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
+    table: {
+      width: 180
+    },
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -223,6 +229,15 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
     isForm: false,
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
   {
     label: '扩展属性',
     field: 'extraProperties',

src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts

@@ -198,6 +198,42 @@ export const InventoryinitRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    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',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
+  
   // {
   //   label: '代码',
   //   field: 'code',
@@ -585,6 +621,7 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false
   },
   {
     label: '最后更新者',
@@ -593,6 +630,7 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false
   },
 ]))
 
@@ -643,4 +681,4 @@ export const InventoryinitRecordDetailRules = reactive({
   creator: [
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
-})
+})

src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts

@@ -286,6 +286,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: false,
+    isTable: false,
   },
   {
     label: '创建者',
@@ -295,6 +296,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isForm: false,
+    isTable: false,
   },
   {
     label: '最后更新时间',
@@ -317,6 +319,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: false,
+    isTable: false,
   },
   {
     label: '最后更新者',
@@ -326,6 +329,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isForm: false,
+    isTable: false,
   },
   {
     label: '操作',
@@ -794,7 +798,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
           key: 'itemCode',
           value: 'itemCode',
           message: '请选择订单行',
-          isTableRowValue: true, 
+          isTableRowValue: true,
           isMainValue:false
         },
         {
@@ -862,7 +866,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
           key: 'itemCode',
           value: 'itemCode',
           message: '请选择订单行',
-          isTableRowValue: true, 
+          isTableRowValue: true,
           isMainValue:false
         },
         {
@@ -1016,7 +1020,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
     isTableForm: false,
-    isForm: false
+    isForm: false,
+    isTable: false,
   },
   {
     label: '最后更新者',
@@ -1026,7 +1031,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     isTableForm: false,
-    isForm: false
+    isForm: false,
+    isTable: false,
   },
   {
     label: '操作',
@@ -1072,7 +1078,7 @@ export const InventoryinitRequestDetailRules = reactive({
   ],
   itemCode: [
     { required: true, message: '请选择物料代码', trigger: 'change' }
-  ], 
+  ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],

src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts

@@ -474,6 +474,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -490,6 +491,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '操作',
@@ -728,6 +730,7 @@ export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
   },
   {
     label: '创建者',
@@ -736,6 +739,7 @@ export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
 ]))
 

src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts

@@ -204,6 +204,7 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -217,6 +218,7 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '创建者',
     field: 'creator',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
@@ -577,4 +579,4 @@ export const ScrapRecordDetailRules = reactive({
   creator: [
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
-})
+})

src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts

@@ -756,6 +756,7 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -775,6 +776,7 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isTableForm: false,
     isForm: false
   },

src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts

@@ -696,4 +696,4 @@ export const TransferissueRecordDetailRules = reactive({
   creator: [
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
-})
+})

src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts

@@ -610,7 +610,7 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       disabled: true
     }
   },
-  
+
   {
     label: '包装号',
     field: 'packingNumber',
@@ -889,7 +889,8 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
     isTableForm: false,
-    isForm: false
+    isForm: false,
+    isTable: false
   },
   {
     label: '最后更新者',
@@ -899,7 +900,8 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     isTableForm: false,
-    isForm: false
+    isForm: false,
+    isTable: false
   },
   {
     label: '操作',

src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts

@@ -295,6 +295,40 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    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',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
   {
     label: '是否可用',
     field: 'available',
@@ -696,4 +730,4 @@ export const TransferreceiptRecordDetailRules = reactive({
   creator: [
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
-})
+})

src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts

@@ -666,7 +666,8 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       }
     },
     isTableForm: false,
-    isForm: false
+    isForm: false,
+    isTable: false,
   },
   {
     label: '最后更新者',
@@ -676,7 +677,8 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     isTableForm: false,
-    isForm: false
+    isForm: false,
+    isTable: false
   },
   {
     label: '操作',

src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue

@@ -157,7 +157,7 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
     defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
-    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
 

src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts

@@ -183,6 +183,7 @@ export const InventorychangeRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false
   },
   {
     label: '创建者',
@@ -191,6 +192,7 @@ export const InventorychangeRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false
   },
   // {
   //   label: '代码',
@@ -727,4 +729,4 @@ export const InventorychangeRecordDetailRules = reactive({
   creator: [
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
-})
+})

src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts

@@ -27,7 +27,7 @@ const businessTypeQueryParams = {
  const businessTypeValue = await getBusinessTypeApi.getBusinesstypePage(businessTypeQueryParams)
  const businessTypeData =businessTypeValue?.list[0]||{}
  console.log(businessTypeValue);
- 
+
  // 获取当前操作人的部门
  import { useUserStore } from '@/store/modules/user'
  import { TableColumn } from '@/types/table'
@@ -37,7 +37,7 @@ import { log } from 'console'
  // id 转str 否则form回显匹配不到
  userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
- 
+
 
 /**
  * @returns {Array} 库存修改申请主表
@@ -272,6 +272,7 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
     isForm: false,
+    isTable: false,
   },
   {
     label: '创建者',
@@ -281,6 +282,7 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     isForm: false,
+    isTable: false,
   },
   {
     label: '最后更新时间',
@@ -293,6 +295,7 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -311,7 +314,8 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    isForm: false
+    isForm: false,
+    isTable: false,
   },
   {
     label: '操作',
@@ -961,7 +965,8 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       }
     },
     isTableForm: false,
-    isForm: false
+    isForm: false,
+    isTable: false,
   },
   {
     label: '最后更新者',
@@ -971,7 +976,8 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     isTableForm: false,
-    isForm: false
+    isForm: false,
+    isTable: false,
   },
   {
     label: '操作',
@@ -998,4 +1004,4 @@ export const InventorychangeRequestDetailRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-})
+})

src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts

@@ -474,66 +474,66 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   //   isTable: false,
   // },
-  // {
+  {
-  //   label: '创建时间',
+    label: '创建时间',
-  //   field: 'createTime',
+    field: 'createTime',
-  //   formatter: dateFormatter,
+    formatter: dateFormatter,
-  //   detail: {
+    detail: {
-  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-  //   },
+    },
-  //   sort: 'custom',
+    sort: 'custom',
-  //   table: {
+    table: {
-  //     width: 180
+      width: 180
-  //   },
+    },
-  //   isTable: false,
+    isTable: true,
-  //   form: {
+    form: {
-  //     component: 'DatePicker',
+      component: 'DatePicker',
-  //     componentProps: {
+      componentProps: {
-  //       type: 'datetime',
+        type: 'datetime',
-  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-  //       valueFormat: 'x',
+        valueFormat: 'x',
-  //     }
+      }
-  //   },
+    },
-  // },
+  },
-  // {
+  {
-  //   label: '创建者',
+    label: '创建者',
-  //   field: 'creator',
+    field: 'creator',
-  //   sort: 'custom',
+    sort: 'custom',
-  //   table: {
+    table: {
-  //     width: 150
+      width: 150
-  //   },
+    },
-  //   isTable: false,
+    isTable: true,
-  // },
+  },
-  // {
+  {
-  //   label: '最后更新时间',
+    label: '最后更新时间',
-  //   field: 'updateTime',
+    field: 'updateTime',
-  //   formatter: dateFormatter,
+    formatter: dateFormatter,
-  //   detail: {
+    detail: {
-  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-  //   },
+    },
-  //   sort: 'custom',
+    sort: 'custom',
-  //   table: {
+    table: {
-  //     width: 180
+      width: 180
-  //   },
+    },
-  //   isTable: false,
+    isTable: false,
-  //   form: {
+    form: {
-  //     component: 'DatePicker',
+      component: 'DatePicker',
-  //     componentProps: {
+      componentProps: {
-  //       type: 'datetime',
+        type: 'datetime',
-  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-  //       valueFormat: 'x',
+        valueFormat: 'x',
-  //     }
+      }
-  //   },
+    },
-  // },
+  },
-  // {
+  {
-  //   label: '最后更新者',
+    label: '最后更新者',
-  //   field: 'updater',
+    field: 'updater',
-  //   sort: 'custom',
+    sort: 'custom',
-  //   table: {
+    table: {
-  //     width: 150
+      width: 150
-  //   },
+    },
-  //   isTable: false,
+    isTable: false,
-  // },
+  },
   // {
   //   label: '状态',
   //   field: 'jobStageStatus',

src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts

@@ -211,6 +211,7 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+
   // {
   //   label: '部门',
   //   field: 'departmentCode',
@@ -238,34 +239,68 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
-  // {
+  {
-  //   label: '创建时间',
+    label: '创建时间',
-  //   field: 'createTime',
+    field: 'createTime',
-  //   formatter: dateFormatter,
+    formatter: dateFormatter,
-  //   detail: {
+    detail: {
-  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-  //   },
+    },
-  //   sort: 'custom',
+    sort: 'custom',
-  //   table: {
+    table: {
-  //     width: 180
+      width: 180
-  //   },
+    },
-  //   form: {
+    form: {
-  //     component: 'DatePicker',
+      component: 'DatePicker',
-  //     componentProps: {
+      componentProps: {
-  //       type: 'datetime',
+        type: 'datetime',
-  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-  //       valueFormat: 'x',
+        valueFormat: 'x',
-  //     }
+      }
-  //   },
+    },
-  // },
+  },
-  // {
+  {
-  //   label: '创建者',
+    label: '创建者',
-  //   field: 'creator',
+    field: 'creator',
-  //   sort: 'custom',
+    sort: 'custom',
-  //   table: {
+    table: {
-  //     width: 150
+      width: 150
-  //   },
+    },
-  // },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    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',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
   // {
   //   label: '代码',
   //   field: 'code',
@@ -595,34 +630,34 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
-  {
+  // {
-    label: '创建时间',
+  //   label: '创建时间',
-    field: 'createTime',
+  //   field: 'createTime',
-    formatter: dateFormatter,
+  //   formatter: dateFormatter,
-    detail: {
+  //   detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
+  //   },
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 180
+  //     width: 180
-    },
+  //   },
-    form: {
+  //   form: {
-      component: 'DatePicker',
+  //     component: 'DatePicker',
-      componentProps: {
+  //     componentProps: {
-        type: 'datetime',
+  //       type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+  //       valueFormat: 'x',
-      }
+  //     }
-    },
+  //   },
-  },
+  // },
-  {
+  // {
-    label: '创建者',
+  //   label: '创建者',
-    field: 'creator',
+  //   field: 'creator',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
   // {
   //   label: '代码',
   //   field: 'code',
@@ -683,4 +718,4 @@ export const InventorymoveRecordDetailRules = reactive({
   creator: [
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
-})
+})

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts

@@ -30,7 +30,7 @@ const queryParams = {
  // id 转str 否则form回显匹配不到
  userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
- 
+
 /**
  * @returns {Array} 库存转移申请主表
  */
@@ -165,7 +165,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   //   isForm: false,
   // },
-  
+
   // {
   //   label: '到库区类型范围',
   //   field: 'toAreaTypes',
@@ -340,68 +340,72 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   //     }
   //   }
   // },
-  // {
+  {
-  //   label: '创建时间',
+    label: '创建时间',
-  //   field: 'createTime',
+    field: 'createTime',
-  //   formatter: dateFormatter,
+    formatter: dateFormatter,
-  //   detail: {
+    detail: {
-  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-  //   },
+    },
-  //   sort: 'custom',
+    sort: 'custom',
-  //   table: {
+    table: {
-  //     width: 180
+      width: 180
-  //   },
+    },
-  //   form: {
+    form: {
-  //     component: 'DatePicker',
+      component: 'DatePicker',
-  //     componentProps: {
+      componentProps: {
-  //       style: { width:'100%'},
+        style: { width:'100%'},
-  //       type: 'datetime',
+        type: 'datetime',
-  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-  //       valueFormat: 'x',
+        valueFormat: 'x',
-  //     }
+      }
-  //   },
+    },
-  //   isForm: false,
+    isForm: false,
-  // },
+    isTable: true
-  // {
+  },
-  //   label: '创建者',
+  {
-  //   field: 'creator',
+    label: '创建者',
-  //   sort: 'custom',
+    field: 'creator',
-  //   table: {
+    sort: 'custom',
-  //     width: 150
+    table: {
-  //   },
+      width: 150
-  //   isForm: false,
+    },
-  // },
+    isForm: false,
-  // {
+    isTable: true
-  //   label: '最后更新时间',
+  },
-  //   field: 'updateTime',
+  {
-  //   formatter: dateFormatter,
+    label: '最后更新时间',
-  //   detail: {
+    field: 'updateTime',
-  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    formatter: dateFormatter,
-  //   },
+    detail: {
-  //   sort: 'custom',
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-  //   table: {
+    },
-  //     width: 180
+    sort: 'custom',
-  //   },
+    table: {
-  //   form: {
+      width: 180
-  //     component: 'DatePicker',
+    },
-  //     componentProps: {
+    form: {
-  //       style: { width:'100%'},
+      component: 'DatePicker',
-  //       type: 'datetime',
+      componentProps: {
-  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: { width:'100%'},
-  //       valueFormat: 'x',
+        type: 'datetime',
-  //     }
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-  //   },
+        valueFormat: 'x',
-  //   isForm: false
+      }
-  // },
+    },
-  // {
+    isForm: false,
-  //   label: '最后更新者',
+    isTable: false
-  //   field: 'updater',
+  },
-  //   sort: 'custom',
+  {
-  //   table: {
+    label: '最后更新者',
-  //     width: 150
+    field: 'updater',
-  //   },
+    sort: 'custom',
-  //   isForm: false
+    table: {
-  // },
+      width: 150
+    },
+    isForm: false,
+    isTable: false
+  },
   {
     label: '操作',
     field: 'action',
@@ -878,4 +882,4 @@ export const InventorymoveRequestDetailRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-})
+})

src/views/wms/productionManage/processproduction/processproductionRecord/processproductionRecordMain.data.ts

@@ -87,6 +87,49 @@ export const ProcessproductionRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     isTableForm: false,
     isForm: false
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    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',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
   {
     label: '删除时间',
     field: 'deletionTime',
@@ -294,6 +337,15 @@ export const ProcessproductionRecordDetail = useCrudSchemas(reactive<CrudSchema[
       width: 150
     },
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
   {
     label: '删除时间',
     field: 'deletionTime',
@@ -353,7 +405,7 @@ export const ProcessproductionRecordDetail = useCrudSchemas(reactive<CrudSchema[
     label: '操作',
     field: 'action',
     isForm: false,
-    hiddenInMain:true, 
+    hiddenInMain:true,
     table: {
       width: 150,
       fixed: 'right'
@@ -364,4 +416,4 @@ export const ProcessproductionRecordDetail = useCrudSchemas(reactive<CrudSchema[
 // 表单校验
 export const ProcessproductionRecordDetailRules = reactive({
   available: [required],
-})
+})

src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts

@@ -142,7 +142,51 @@ export const ProcessproductionRequestMain = useCrudSchemas(reactive<CrudSchema[]
       }
     },
     isTableForm: false,
-    isForm: false
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    formatter: dateFormatter,
+    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',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
   },
   {
     label: '删除时间',
@@ -499,11 +543,32 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive<CrudSchema
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isForm: 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: '创建者',
+    field: 'creator',
     table: {
-      width: 150
+      width: 130
     },
+    isForm: false,
+    isTable: true
   },
   {
     label: '删除时间',

src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts

@@ -155,7 +155,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false,
   },
-  
+
   {
     label: '优先级',
     field: 'priority',
@@ -301,7 +301,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -318,8 +318,40 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: true,
+  },
+
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
     isTable: false,
   },
+
   {
     label: '到仓库代码',
     field: 'toWarehouseCode',
@@ -692,7 +724,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false
   },
-  
+
   {
     label: '库存状态',
     field: 'inventoryStatus',
@@ -705,7 +737,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
 
-  
+
   {
     label: '从库位代码',
     field: 'fromLocationCode',
@@ -722,7 +754,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  
+
   {
     label: '物料描述1',
     field: 'itemDesc1',
@@ -764,7 +796,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
     }
   },
-  
+
   {
     label: '单据号',
     field: 'number',

src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts

@@ -204,7 +204,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false,
+    isTable: true,
   },
   {
     label: '创建时间',
@@ -217,6 +217,37 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: true,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
     isTable: false,
     form: {
       component: 'DatePicker',
@@ -499,7 +530,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
-  
+
   {
     label: '从货主代码',
     field: 'fromOwnerCode',
@@ -657,7 +688,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       component: 'InputNumber',
     }
   },
- 
+
   // {
   //   label: '代码',
   //   field: 'code',

src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue

@@ -159,7 +159,7 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
     defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
-    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
 

src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts

@@ -149,14 +149,14 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '最后更新者',
-    field: 'update',
+    field: 'updater',
     sort: 'custom',
     table: {
       width: 150
     },
     isTable: false,
   },
-  
+
   {
     label: '优先级',
     field: 'priority',
@@ -303,7 +303,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -320,7 +320,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false,
+    isTable: true,
   },
   {
     label: '到仓库代码',
@@ -719,7 +719,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    hiddenInMain:true 
+    hiddenInMain:true
   },
   {
     label: '物料描述2',
@@ -728,7 +728,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    hiddenInMain:true 
+    hiddenInMain:true
   },
   {
     label: '项目代码',
@@ -737,7 +737,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    hiddenInMain:true 
+    hiddenInMain:true
   },
   {
     label: '数量',
@@ -751,7 +751,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
     }
   },
-  
+
   {
     label: '单据号',
     field: 'number',
@@ -759,7 +759,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    hiddenInMain:true 
+    hiddenInMain:true
   },
   {
     label: '备注',
@@ -768,7 +768,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    hiddenInMain:true 
+    hiddenInMain:true
   },
   {
     label: '从货主代码',
@@ -777,7 +777,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    hiddenInMain:true 
+    hiddenInMain:true
   },
   {
     label: '到货主代码',
@@ -786,7 +786,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    hiddenInMain:true 
+    hiddenInMain:true
 
   },
   {
@@ -817,7 +817,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    hiddenInMain:true 
+    hiddenInMain:true
 
   },
   {
@@ -827,7 +827,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false 
+    isTable: false
   },
 ]))
 

src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts

@@ -204,7 +204,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false,
+    isTable: true,
   },
   {
     label: '创建时间',
@@ -217,6 +217,37 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: true,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+
+  {
+    label: '更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
     isTable: false,
     form: {
       component: 'DatePicker',
@@ -501,7 +532,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
-  
+
   {
     label: '从货主代码',
     field: 'fromOwnerCode',
@@ -581,7 +612,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
     hiddenInMain: true
   },
-  
+
   {
     label: '备注',
     field: 'remark',
@@ -622,7 +653,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     hiddenInMain: true
 
   },
-  
+
   {
     label: '物料描述1',
     field: 'itemDesc1',
@@ -663,7 +694,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       component: 'InputNumber',
     }
   },
-  
+
   // {
   //   label: '代码',
   //   field: 'code',
@@ -761,4 +792,4 @@ export const ProductputawayRecordDetailRules = reactive({
   creator: [
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
-})
+})

src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts

@@ -138,7 +138,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -156,7 +156,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false,
+    isTable: true,
     isForm: false
   },
   {
@@ -228,7 +228,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  
+
   {
     label: '最后更新时间',
     field: 'updateTime',
@@ -565,7 +565,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       disabled: true
     }
   },
-  
+
   {
     label: '从库位代码',
     field: 'fromLocationCode',
@@ -582,7 +582,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       disabled: true
     }
   },
-  
+
   {
     label: '器具号',
     field: 'containerNumber',
@@ -658,7 +658,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isTableForm: false,
     isForm: false
   },
-  
+
   {
     label: '物料描述1',
     field: 'itemDesc1',
@@ -713,7 +713,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       precision: 6
     }
   },
-  
+
   {
     label: '从货主代码',
     field: 'fromOwnerCode',
@@ -736,7 +736,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isTableForm: false,
     isForm: false
   },
-  
+
   {
     label: '最后更新时间',
     field: 'updateTime',
@@ -803,4 +803,4 @@ export const ProductputawayRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请选择物料代码', trigger: 'change' }
   ],
-})
+})

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts

@@ -331,15 +331,15 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
+  // {
-    label: '原因',
+  //   label: '原因',
-    field: 'available',
+  //   field: 'available',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    isTable: true,
+  //   isTable: true,
-  },
+  // },
   {
     label: '创建时间',
     field: 'createTime',

src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue

@@ -178,9 +178,9 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:accept'}), // 承接
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:accept'}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
-    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-job-main:abandon'}), // 放弃
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-job-main:abandon'}), // 放弃
     defaultButtons.mainListJobRecBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:execute'}), // 收货
   ]
 }

src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts

@@ -608,7 +608,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 120,
+      width: 150,
       fixed: 'right'
     },
   },

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue

@@ -241,6 +241,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
     defaultParams:{number},
     getListApi: PurchasePlanDetailApi.getPurchasePlanDetailPage // 分页接口
   })
+  tableObject.pageSize = 500
   // 获得表格的各种操作
   const { getList:getList1 } = tableMethods
   await getList1()

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@@ -293,6 +293,14 @@ const basicFormFooter = computed(()=>{
         })
         
       } else {
+        // 切换供应商代码
+        if(formField=='supplierCode'&&val[0][searchField]!=searchFormRef.formModel.supplierCode){
+          tableData.value = []
+        }
+        // 切换订单类型
+        if(formField=='orderType'&&val[0][searchField]!=searchFormRef.formModel.orderType){
+          tableData.value = []
+        }
         const setV = {}
         setV[formField] = val[0][searchField]
         searchFormRef.setValues(setV)
@@ -474,11 +482,19 @@ const handleImport = () => {
   const formRef = ref()
   const openForm = async (type : string, row ?: number) => {
     if(type=='update'){
+      //编辑
       SupplierinvoiceRequestMain.allSchemas.formSchema.forEach((item) => {
+        // 供应商代码
+        if(item.field == 'supplierCode'){
+          item.componentProps.isSearchList = false
+          item.componentProps.disabled = true
+        }
+        // 订单类型
         if(item.field == 'orderType'){
           item.componentProps.disabled = true
         }
-        if(row.status=='1'){
+        // 根据状态判断
+        if(row.status=='1'||row.status=='6'){
           if(item.field == 'procurementCreator'){
             // 采购价格审批人
             item.componentProps.disabled = false
@@ -487,13 +503,53 @@ const handleImport = () => {
             // 税率
             item.componentProps.disabled = false
           }
+          // 调整价差
+          if(item.field == 'discountAmount'){
+            item.componentProps.disabled = false
+          }
+          // 调整税额
+          if(item.field == 'adjustingTaxAmount'){
+            item.componentProps.disabled = false
+          }
+          // 折扣金额
+          if(item.field == 'discountAmount1'){
+            item.componentProps.disabled = false
+          }
+          // 金税票号
+          if(item.field == 'goldenTaxInvoiceNumber'){
+            item.componentProps.disabled = false
+          }
+          // 开票日期
+          if(item.field == 'invoiceTime'){
+            item.componentProps.disabled = false
+          }
         }else{
+          // 采购价格审批人
           if(item.field == 'procurementCreator'){
-            // 采购价格审批人
             item.componentProps.disabled = true
           }
+          // 税率
           if(item.field == 'taxRate'){
-            // 税率
+            item.componentProps.disabled = true
+          }
+          // 调整价差
+          if(item.field == 'discountAmount'){
+            item.componentProps.disabled = true
+          }
+          // 调整税额
+          if(item.field == 'adjustingTaxAmount'){
+            item.componentProps.disabled = true
+          }
+          // 折扣金额
+          if(item.field == 'discountAmount1'){
+            item.componentProps.disabled = true
+          }
+          // 金税票号
+          if(item.field == 'goldenTaxInvoiceNumber'){
+            item.componentProps.disabled = true
+          }
+          // 开票日期
+          if(item.field == 'invoiceTime'){
             item.componentProps.disabled = true
           }
         }
@@ -501,20 +557,47 @@ const handleImport = () => {
       })
       
     }else{
+      // 新增
       SupplierinvoiceRequestMain.allSchemas.formSchema.forEach((item) => {
-        if(item.field == 'orderType'){
+        
-          item.componentProps.disabled = false
+        // 供应商代码
-        }
         if(item.field == 'supplierCode'){
           //默认供应商代码
           item.value = defaultSupplierCode.value
+          item.componentProps.isSearchList = true
+          item.componentProps.disabled = false
+        }
+        // 订单类型
+        if(item.field == 'orderType'){
+          item.componentProps.disabled = false
         }
+
+        //采购价格审批人
         if(item.field == 'procurementCreator'){
-          //采购价格审批人
           item.componentProps.disabled = false
         }
+        // 税率
         if(item.field == 'taxRate'){
-          // 税率
+          item.componentProps.disabled = false
+        }
+        // 调整价差
+        if(item.field == 'discountAmount'){
+          item.componentProps.disabled = false
+        }
+        // 调整税额
+        if(item.field == 'adjustingTaxAmount'){
+          item.componentProps.disabled = false
+        }
+        // 折扣金额
+        if(item.field == 'discountAmount1'){
+          item.componentProps.disabled = false
+        }
+        // 金税票号
+        if(item.field == 'goldenTaxInvoiceNumber'){
+          item.componentProps.disabled = false
+        }
+        // 开票日期
+        if(item.field == 'invoiceTime'){
           item.componentProps.disabled = false
         }
       })
@@ -902,10 +985,10 @@ const handleImport = () => {
           message.warning(t('ts.请添明细数据'))
           return;
         }
-        if(data.subList.length > 999){
+        // if(data.subList.length > 999){
-          message.warning(t('ts.明细数据条数已超过最大数量限制【999条】'))
+        //   message.warning(t('ts.明细数据条数已超过最大数量限制【999条】'))
-          return;
+        //   return;
-        }
+        // }
         await SupplierinvoiceRequestMainApi.createSupplierinvoiceRequestMain(data)
         message.success(t('common.createSuccess'))
       } else {

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@@ -223,14 +223,12 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 0,
         precision: 6,
         disabled: true,
       }
     },
     tableForm: {
       type: 'InputNumber',
-      min: 0,
       precision: 6,
     }
   },
@@ -291,14 +289,12 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 0,
         precision: 6,
         disabled: true,
       }
     },
     tableForm: {
       type: 'InputNumber',
-      min: 0,
       precision: 6,
     }
   },
@@ -313,7 +309,6 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 0,
         precision: 6,
         disabled: true,
       }