From cef34336799e3f059b2555a9f7650f1b66312831 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Thu, 28 Mar 2024 18:39:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E5=9B=9E=E6=94=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productredressJobMain/index.vue           | 116 +---
 .../productredressJobMain.data.ts             | 588 +++++++++++-------
 .../productredressRequestMain/index.vue       |   2 +
 .../productredressRequestMain.data.ts         | 194 +++---
 4 files changed, 501 insertions(+), 399 deletions(-)

diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
index 0f5b83f11..5f6a7d630 100644
--- a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
@@ -27,9 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -38,33 +38,26 @@
     </Table>
   </ContentWrap>
 
-  <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
-    ref="basicFormRef"
-    @success="formsSuccess"
-    :rules="ProductredressJobMainRules"
-    :formAllSchemas="ProductredressJobMain.allSchemas"
-    :apiUpdate="ProductredressJobMainApi.updateProductredressJobMain"
-    :apiCreate="ProductredressJobMainApi.createProductredressJobMain"
-    @searchTableSuccess="searchTableSuccess"
-    :isBusiness="false"
-  />
-
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="ProductredressJobMain.allSchemas" />
-
-  <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/productredress-job-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="ProductredressJobMain.allSchemas"
+    :detailAllSchemas="ProductredressJobDetail.allSchemas"
+    :detailAllSchemasRules="ProductredressJobDetailRules"
+    :apiCreate="ProductredressJobDetailApi.createProductredressJobDetail"
+    :apiUpdate="ProductredressJobDetailApi.updateProductredressJobDetail"
+    :apiPage="ProductredressJobDetailApi.getProductredressJobDetailPage"
+    :apiDelete="ProductredressJobDetailApi.deleteProductredressJobDetail"
+  />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { ProductredressJobMain,ProductredressJobMainRules } from './productredressJobMain.data'
+import { ProductredressJobMain,ProductredressJobMainRules,ProductredressJobDetail, ProductredressJobDetailRules } from './productredressJobMain.data'
 import * as ProductredressJobMainApi from '@/api/wms/productredressJobMain'
+import * as ProductredressJobDetailApi from '@/api/wms/productredressJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
-import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
 
 defineOptions({ name: 'ProductredressJobMain' })
 
@@ -76,15 +69,6 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(ProductredressJobMain.allSchemas.tableColumns)
 
-// 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef) => {
-  nextTick(() => {
-    const setV = {}
-    setV[formField] = val[0][searchField]
-    formRef.setValues(setV)
-  })
-}
-
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -99,29 +83,15 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:productredressJobMain:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:productredressJobMain:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:productredressJobMain:export'}), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:'wms:productredress-job-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
 ]
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
-    openForm('create')
-  } else if (val == 'import') { // 导入
-    handleImport()
-  } else if (val == 'export') { // 导出
+  if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
     getList()
@@ -133,8 +103,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:productredressJobMain:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:productredressJobMain:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi:'wms:productredress-job-main:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:productredress-job-main:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
@@ -152,29 +122,13 @@ const openForm = (type: string, row?: any) => {
   basicFormRef.value.open(type, row)
 }
 
-// form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =ProductredressJobMain.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
-      message.error('失效时间要大于生效时间')
-      return;
-    }
-  }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
-  if (formType === 'create') {
-    await ProductredressJobMainApi.createProductredressJobMain(data)
-    message.success(t('common.createSuccess'))
-  } else {
-    await ProductredressJobMainApi.updateProductredressJobMain(data)
-    message.success(t('common.updateSuccess'))
-  }
-  basicFormRef.value.dialogVisible = false
-  getList()
-}
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+ProductredressJobDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
 
 /** 详情操作 */
 const detailRef = ref()
@@ -211,21 +165,6 @@ const handleExport = async () => {
   }
 }
 
-/** 导入 */
-const importFormRef = ref()
-const handleImport = () => {
-  importFormRef.value.open()
-}
-// 导入附件弹窗所需的参数
-const importTemplateData = reactive({
-  templateUrl: '',
-  templateTitle: '制品回收任务主导入模版.xlsx'
-})
-// 导入成功之后
-const importSuccess = () => {
-  getList()
-}
-
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {
@@ -238,7 +177,6 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await ProductredressJobMainApi.importTemplate()
 })
 
 </script>
diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
index 1bd45da80..27b28ab57 100644
--- a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
@@ -7,517 +7,667 @@ export const ProductredressJobMainRules = reactive({
 
 export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: 'id',
-    field: 'id',
+    label: '单据号',
+    field: 'number',
     sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
     isForm: false,
+    isSearch: true,
   },
   {
     label: '申请单号',
     field: 'requestNumber',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 180,
+    },
   },
   {
-    label: '生产计划单号',
-    field: 'productionPlanNumber',
-    sort: 'custom',
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
     isSearch: true,
-  },
-  {
-    label: '车间代码',
-    field: 'workShopCode',
-    sort: 'custom',
-  },
-  {
-    label: '班组',
-    field: 'team',
-    sort: 'custom',
-  },
-  {
-    label: '班次',
-    field: 'shift',
-    sort: 'custom',
-  },
-  {
-    label: '明细',
-    field: 'details',
+    isTable: true,
     sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
     label: '申请时间',
     field: 'requestTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width: '100%'},
         type: 'datetime',
-        valueFormat: 'x'
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
     },
+    isForm: false
   },
   {
     label: '要求截止时间',
     field: 'requestDueTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width: '100%'},
         type: 'datetime',
-        valueFormat: 'x'
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
     },
-  },
-  {
-    label: '状态',
-    field: 'status',
-    sort: 'custom',
-    form: {
-      component: 'Radio'
-    },
+    isForm: false
   },
   {
     label: '过期时间',
     field: 'expiredTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width: '100%'},
         type: 'datetime',
-        valueFormat: 'x'
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
     },
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isForm: false,
-  },
-  {
-    label: '最后更新者Id',
-    field: 'updater',
-    sort: 'custom',
-    isForm: false,
-  },
-  {
-    label: '并发乐观锁',
-    field: 'concurrencyStamp',
-    sort: 'custom',
-    isForm: false,
-  },
-  {
-    label: '状态',
-    field: 'jobStageStatus',
-    sort: 'custom',
-    form: {
-      component: 'Radio'
-    },
+    isForm: false
   },
   {
     label: '优先级',
     field: 'priority',
     sort: 'custom',
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
+    isForm:false,
+    isTable:false,
   },
   {
     label: '优先级增量',
     field: 'priorityIncrement',
     sort: 'custom',
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
+    isForm:false,
+    isTable:false,
   },
   {
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
-  },
-  {
-    label: '用户组',
-    field: 'userGroupCode',
-    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    isTable:false,
   },
   {
     label: '承接人用户ID',
     field: 'acceptUserId',
     sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm:false,
+    isTable:false,
   },
   {
     label: '承接人用户名',
     field: 'acceptUserName',
     sort: 'custom',
+    table: {
+      width: 180
+    },
   },
   {
     label: '承接时间',
     field: 'acceptTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width: '100%'},
         type: 'datetime',
-        valueFormat: 'x'
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
     },
+    isForm: false
   },
   {
     label: '完成人用户ID',
     field: 'completeUserId',
     sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm:false,
+    isTable:false,
   },
   {
     label: '完成人用户名',
     field: 'completeUserName',
     sort: 'custom',
+    table: {
+      width: 180
+    },
   },
   {
     label: '完成时间',
     field: 'completeTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width: '100%'},
         type: 'datetime',
-        valueFormat: 'x'
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
     },
+    isForm: false
   },
   {
     label: '到仓库代码',
     field: 'toWarehouseCode',
     sort: 'custom',
+    isForm:false,
+    isTable:false,
   },
   {
     label: '到库区代码范围',
     field: 'toAreaCodes',
     sort: 'custom',
+    isForm:false,
+    isTable:false,
   },
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
     sort: 'custom',
+    isForm:false,
+    isTable:false,
   },
   {
     label: '到库区类型范围',
     field: 'toAreaTypes',
     sort: 'custom',
-  },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-  },
-  {
-    label: '收货类型',
-    field: 'type',
-    sort: 'custom',
-                form: {
-                  component: 'SelectV2'
-                },
+    isForm:false,
+    isTable:false,
   },
   {
     label: '业务类型',
     field: 'businessType',
     sort: 'custom',
-                form: {
-                  component: 'SelectV2'
-                },
+    isForm:false,
+    isTable:false,
   },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isForm: false,
-  },
-  {
-    label: '创建者id',
-    field: 'creator',
-    sort: 'custom',
-    isForm: false,
+    isForm:false,
+    isTable:false,
   },
   {
     label: '自动完成',
     field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
     sort: 'custom',
+    isForm:false,
+    isTable:false,
   },
   {
     label: '允许修改库位',
     field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
     sort: 'custom',
+    isForm:false,
+    isTable:false,
   },
   {
     label: '允许修改数量',
     field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
     sort: 'custom',
+    isForm:false,
+    isTable:false,
   },
   {
     label: '允许大于推荐数量',
     field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
     sort: 'custom',
+    isForm:false,
+    isTable:false,
   },
   {
     label: '允许小于推荐数量',
     field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
     sort: 'custom',
+    isForm:false,
+    isTable:false,
   },
   {
     label: '允许修改库存状态',
     field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
     sort: 'custom',
-    form: {
-      component: 'Radio'
-    },
+    isForm:false,
+    isTable:false,
   },
   {
     label: '允许连续扫描',
     field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
     sort: 'custom',
+    isForm:false,
+    isTable:false,
   },
   {
     label: '允许部分完成',
     field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
     sort: 'custom',
+    isForm:false,
+    isTable:false,
   },
   {
     label: '允许修改批次',
     field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
     sort: 'custom',
+    isForm:false,
+    isTable:false,
   },
   {
     label: '允许修改箱码',
     field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
     sort: 'custom',
+    isForm:false,
+    isTable:false,
   },
   {
     label: '入库库存状态范围',
     field: 'inInventoryStatuses',
     sort: 'custom',
+    isForm:false,
+    isTable:false,
   },
   {
     label: '出库库存状态范围',
     field: 'outInventoryStatuses',
     sort: 'custom',
+    isForm:false,
+    isTable:false,
   },
   {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
-  }
-]))
-
-// 表单校验
-export const ProductredressJobDetailRules = reactive({
-})
-
-export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
+    label: '创建者',
+    field: 'creator',
     sort: 'custom',
+    table: {
+      width: 150
+    },
     isForm: false,
   },
   {
-    label: '生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '工位代码',
-    field: 'workStationCode',
-    sort: 'custom',
-  },
-  {
-    label: '工序代码',
-    field: 'processCode',
-    sort: 'custom',
-  },
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-  },
-  {
-    label: '器具号',
-    field: 'containerNumber',
-    sort: 'custom',
-  },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-  },
-  {
-    label: '生产日期',
-    field: 'produceDate',
+    label: '创建时间',
+    field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width: '100%'},
         type: 'datetime',
-        valueFormat: 'x'
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
     },
+    isForm: false
   },
   {
-    label: '过期日期',
-    field: 'expireDate',
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
     form: {
       component: 'DatePicker',
       componentProps: {
+        style: {width: '100%'},
         type: 'datetime',
-        valueFormat: 'x'
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
     },
+    isForm: false
   },
+]))
+
+// 表单校验
+export const ProductredressJobDetailRules = reactive({
+})
+
+export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
-    form: {
-      component: 'Radio'
+    table: {
+      width: 180
     },
   },
   {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-  },
-  {
-    label: '订单号',
-    field: 'woNumber',
-    sort: 'custom',
-  },
-  {
-    label: '订单行',
-    field: 'woLine',
-    sort: 'custom',
-  },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-  },
-  {
-    label: '包装规格',
-    field: 'packUnit',
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
+    table: {
+      width: 150
+    },
   },
+  // {
+  //   label: '生产日期',
+  //   field: 'produceDate',
+  //   sort: 'custom',
+  //   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',
+  //     }
+  //   },
+  //   isForm: false
+  // },
+  // {
+  //   label: '过期日期',
+  //   field: 'expireDate',
+  //   sort: 'custom',
+  //   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',
+  //     }
+  //   },
+  //   isForm: false
+  // },
   {
     label: '物品代码',
     field: 'itemCode',
     sort: 'custom',
+    table: {
+      width: 150
+    },
   },
   {
     label: '物品名称',
     field: 'itemName',
     sort: 'custom',
+    table: {
+      width: 150
+    },
   },
   {
     label: '物品描述1',
     field: 'itemDesc1',
     sort: 'custom',
+    table: {
+      width: 150
+    },
   },
   {
     label: '物品描述2',
     field: 'itemDesc2',
     sort: 'custom',
+    table: {
+      width: 150
+    },
   },
   {
     label: '项目代码',
     field: 'projectCode',
     sort: 'custom',
+    table: {
+      width: 150
+    },
   },
   {
     label: '数量',
     field: 'qty',
     sort: 'custom',
+    table: {
+      width: 150
+    },
   },
   {
     label: '计量单位',
     field: 'uom',
     sort: 'custom',
+    table: {
+      width: 150
+    },
   },
   {
-    label: '主表ID',
-    field: 'masterId',
+    label: '包装规格',
+    field: 'packUnit',
     sort: 'custom',
-    form: {
-      component: 'InputNumber',
-      value: 0
+    table: {
+      width: 150
     },
   },
   {
-    label: '单据号',
-    field: 'number',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
+    table: {
+      width: 150
+    },
   },
+  // {
+  //   label: '单据号',
+  //   field: 'number',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
-    label: '备注',
-    field: 'remark',
+    label: '库存状态',
+    field: 'inventoryStatus',
     sort: 'custom',
+    table: {
+      width: 150
+    },
   },
   {
-    label: '创建时间',
-    field: 'createTime',
+    label: '到库位代码',
+    field: 'toLocationCode',
     sort: 'custom',
-    formatter: dateFormatter,
-    isForm: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'woNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'woLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
   },
   {
-    label: '创建者Id',
+    label: '创建者',
     field: 'creator',
     sort: 'custom',
-    isForm: false,
+    table: {
+      width: 150
+    },
   },
   {
-    label: '最后更新时间',
-    field: 'updateTime',
+    label: '创建时间',
+    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',
+      }
+    },
+    isForm: false
   },
   {
-    label: '最后更新者Id',
+    label: '最后更新者',
     field: 'updater',
     sort: 'custom',
     isForm: false,
+    table: {
+      width: 150
+    },
   },
   {
-    label: '到货主代码',
-    field: 'toOwnerCode',
+    label: '最后更新时间',
+    field: 'updateTime',
     sort: 'custom',
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     table: {
-      width: 150,
-      fixed: 'right'
-    }
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
   }
 ]))
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
index f00d7de53..c6c489b4e 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
@@ -131,6 +131,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['packQty'] = val[0]['packQty']
         row['packUnit'] = val[0]['packUnit']
         row['inventoryStatus'] = val[0]['inventoryStatus']
+        row['toLocationCode'] = val[0]['locationCode']
       }
       // 明细查询页赋值
       row[formField] = val[0][searchField]
@@ -155,6 +156,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
         setV['packQty'] = val[0]['packQty']
         setV['packUnit'] = val[0]['packUnit']
         setV['inventoryStatus'] = val[0]['inventoryStatus']
+        setV['toLocationCode'] = val[0]['locationCode']
       }
     setV[formField] = val[0][searchField]
     formRef.setValues(setV)
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
index c49fca4f8..974240ab1 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
@@ -112,42 +112,61 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'toWarehouseCode',
     sort: 'custom',
     isForm:false,
+    table: {
+      width: 150
+    },
   },
   {
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
     isForm:false,
+    table: {
+      width: 150
+    },
   },
   {
     label: '自动提交',
     field: 'autoCommit',
     sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
     isForm:false,
+    isTable:false,
   },
   {
     label: '自动通过',
     field: 'autoAgree',
     sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
     isForm:false,
+    isTable:false,
   },
   {
     label: '自动执行',
     field: 'autoExecute',
     sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
     isForm:false,
+    isTable:false,
   },
   {
     label: '直接生成记录',
     field: 'directCreateRecord',
     sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
     isForm:false,
+    isTable:false,
   },
   {
     label: '业务类型',
     field: 'businessType',
     sort: 'custom',
     isForm:false,
+    isTable:false,
   },
   {
     label: '备注',
@@ -158,31 +177,44 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '到库区类型范围',
     field: 'toAreaTypes',
     sort: 'custom',
+    dictType: DICT_TYPE.AREA_TYPE,
+    dictClass: 'string',
     isForm:false,
+    isTable:false,
   },
   {
     label: '到库区代码范围',
     field: 'toAreaCodes',
     sort: 'custom',
     isForm:false,
+    isTable:false,
   },
   {
     label: '入库库存状态范围',
     field: 'inInventoryStatuses',
     sort: 'custom',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
     isForm:false,
+    isTable:false,
   },
   {
     label: '出库库存状态范围',
     field: 'outInventoryStatuses',
     sort: 'custom',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
     isForm:false,
+    isTable:false,
   },
   {
-    label: '创建者用户名',
+    label: '创建者',
     field: 'creator',
     sort: 'custom',
     isForm: false,
+    table: {
+      width: 150
+    },
   },
   {
     label: '创建时间',
@@ -207,10 +239,13 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false
   },
   {
-    label: '最后更新者用户名',
+    label: '最后更新者',
     field: 'updater',
     sort: 'custom',
     isForm: false,
+    table: {
+      width: 150
+    },
   },
   {
     label: '最后更新时间',
@@ -239,7 +274,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'action',
     isForm: false,
     table: {
-      width: 150,
+      width: 180,
       fixed: 'right'
     }
   }
@@ -250,90 +285,6 @@ export const ProductredressRequestDetailRules = reactive({
 })
 
 export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  // {
-  //   label: '生产线代码',
-  //   field: 'productionLineCode',
-  //   sort: 'custom',
-  //   isSearch: true,
-  // },
-  // {
-  //   label: '工位代码',
-  //   field: 'workStationCode',
-  //   sort: 'custom',
-  // },
-  // {
-  //   label: '目标库位',
-  //   field: 'toLocationCode',
-  //   sort: 'custom',
-  // },
-  // {
-  //   label: '工序代码',
-  //   field: 'processCode',
-  //   sort: 'custom',
-  // },
-
-  // {
-  //   label: '器具号',
-  //   field: 'containerNumber',
-  //   sort: 'custom',
-  // },
-  
-  // {
-  //   label: '生产日期',
-  //   field: 'produceDate',
-  //   sort: 'custom',
-  //   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',
-  //     }
-  //   },
-  //   isForm: false
-  // },
-  // {
-  //   label: '过期日期',
-  //   field: 'expireDate',
-  //   formatter: dateFormatter,
-  //   detail: {
-  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
-  //   },
-  //   sort: 'custom',
-  //   table: {
-  //     width: 180
-  //   },
-  //   form: {
-  //     component: 'DatePicker',
-  //     componentProps: {
-  //       style: {width: '100%'},
-  //       type: 'datetime',
-  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
-  //       valueFormat: 'x',
-  //     }
-  //   },
-  //   isForm: false
-  // },
-
-  // {
-  //   label: '订单号',
-  //   field: 'woNumber',
-  //   sort: 'custom',
-  // },
-  // {
-  //   label: '订单行',
-  //   field: 'woLine',
-  //   sort: 'custom',
-  // },
-
   // {
   //   label: 'BOM版本',
   //   field: 'bomVersion',
@@ -343,6 +294,9 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '单据号',
     field: 'number',
     sort: 'custom',
+    table: {
+      width: 180
+    },
     isForm: false,
     isTableForm: false,
   },
@@ -370,7 +324,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         },{
           key: 'packingNumber', // 查询列表中字段
           value: '', // 指查询具体值
-          action: '!=', // 查询拼接条件
+          action: 'isNotStr', // 查询拼接条件
           isSearch: true, // 使用自定义拼接条件
           isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
         }]
@@ -391,7 +345,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       },{
         key: 'packingNumber', // 查询列表中字段
         value: '', // 指查询具体值
-        action: '!=', // 查询拼接条件
+        action: 'isNotStr', // 查询拼接条件
         isSearch: true, // 使用自定义拼接条件
         isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
       }]
@@ -401,6 +355,9 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '物品名称',
     field: 'itemName',
     sort: 'custom',
+    table: {
+      width: 150
+    },
     isForm: false,
     isTableForm: false,
   },
@@ -408,6 +365,9 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '物品描述1',
     field: 'itemDesc1',
     sort: 'custom',
+    table: {
+      width: 150
+    },
     isForm: false,
     isTableForm: false,
   },
@@ -415,6 +375,9 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '物品描述2',
     field: 'itemDesc2',
     sort: 'custom',
+    table: {
+      width: 150
+    },
     isForm: false,
     isTableForm: false,
   },
@@ -422,6 +385,9 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '项目代码',
     field: 'projectCode',
     sort: 'custom',
+    table: {
+      width: 150
+    },
     isForm: false,
     isTableForm: false,
   },
@@ -429,6 +395,9 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '数量',
     field: 'qty',
     sort: 'custom',
+    table: {
+      width: 150
+    },
     tableForm: {
       disabled: true
     },
@@ -442,6 +411,25 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '计量单位',
     field: 'uom',
     sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '库位',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
     tableForm: {
       disabled: true
     },
@@ -455,6 +443,9 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '包装号',
     field: 'packingNumber',
     sort: 'custom',
+    table: {
+      width: 150
+    },
     tableForm: {
       disabled: true
     },
@@ -469,6 +460,9 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'batch',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150
+    },
     tableForm: {
       disabled: true
     },
@@ -482,6 +476,9 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '包装数量',
     field: 'packQty',
     sort: 'custom',
+    table: {
+      width: 150
+    },
     tableForm: {
       disabled: true
     },
@@ -495,6 +492,9 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '包装规格',
     field: 'packUnit',
     sort: 'custom',
+    table: {
+      width: 150
+    },
     tableForm: {
       disabled: true
     },
@@ -508,6 +508,9 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '库存状态',
     field: 'inventoryStatus',
     sort: 'custom',
+    table: {
+      width: 150
+    },
     tableForm: {
       disabled: true
     },
@@ -521,11 +524,17 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    table: {
+      width: 150
+    },
   },
   {
-    label: '创建者用户名',
+    label: '创建者',
     field: 'creator',
     sort: 'custom',
+    table: {
+      width: 150
+    },
     isTableForm: false,
     isForm: false,
   },
@@ -553,9 +562,12 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isForm: false
   },
   {
-    label: '最后更新者用户名',
+    label: '最后更新者',
     field: 'updater',
     sort: 'custom',
+    table: {
+      width: 150
+    },
     isForm: false,
     isTableForm: false,
   },