From 4cc74381fc21fc66f9270e685688691da752f122 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 15 May 2024 15:48:49 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f4123a4e8..74eef9397 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## dev发布2024-05-15-003
+## dev发布2024-05-15-004
 **xxxx.data.ts 文件配置说明**
 **form表单查询弹窗配置**
 form: {

From fd4c1643fe8c754a0bbb8e68f1a282b211b099cf Mon Sep 17 00:00:00 2001
From: zhousq <zhoushaoqiang@sina.com>
Date: Wed, 15 May 2024 16:47:55 +0800
Subject: [PATCH 2/5] =?UTF-8?q?2024-05-15=20=E4=BF=AE=E6=94=B9=20=E6=8E=92?=
 =?UTF-8?q?=E7=8F=AD=E6=97=A5=E5=8E=86-=E5=8D=95=E6=97=A5=E6=8E=92?=
 =?UTF-8?q?=E7=8F=AD=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE=E4=B8=8D=E5=A5=BD?=
 =?UTF-8?q?=E7=94=A8bug=20=EF=BC=9B=E5=88=A0=E9=99=A4=E6=8E=92=E7=8F=AD?=
 =?UTF-8?q?=E6=97=A5=E5=8E=86=E6=97=A0=E6=95=88=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../holidayCalendar/holidayCalendar.data.ts   | 179 ------------------
 src/views/mes/holidayCalendar/index.vue       |  75 --------
 src/views/mes/jobcalendar/index.vue           |   8 -
 src/views/mes/workcalendar/index.vue          |   6 +-
 4 files changed, 5 insertions(+), 263 deletions(-)
 delete mode 100644 src/views/mes/holidayCalendar/holidayCalendar.data.ts
 delete mode 100644 src/views/mes/holidayCalendar/index.vue
 delete mode 100644 src/views/mes/jobcalendar/index.vue

diff --git a/src/views/mes/holidayCalendar/holidayCalendar.data.ts b/src/views/mes/holidayCalendar/holidayCalendar.data.ts
deleted file mode 100644
index 6094de858..000000000
--- a/src/views/mes/holidayCalendar/holidayCalendar.data.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
-
-// 表单校验
-export const HolidayCalendarRules = reactive({
-  endTime: [required],
-  concurrencyStamp: [required],
-})
-
-export const HolidayCalendar = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'ID',
-    field: 'id',
-    sort: 'custom',
-    isForm: false,
-  },
-  {
-    label: '日期',
-    field: 'holidayDate',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
-  {
-    label: '结束时间',
-    field: 'endTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
-  {
-    label: '备用字段一',
-    field: 'textOne',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '备用字段二',
-    field: 'textTwo',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '备用字段三',
-    field: 'textThree',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '备用字段四',
-    field: 'textFour',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '备用字段五',
-    field: 'textFive',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '删除时间',
-    field: 'deleteTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
-  {
-    label: '状态',
-    field: 'status',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'Radio'
-    },
-  },
-  {
-    label: '并发乐观锁',
-    field: 'concurrencyStamp',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    isForm: false,
-  },
-  {
-    label: '删除用户名',
-    field: 'deleter',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '位置ID',
-    field: 'siteId',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
-  }
-]))
diff --git a/src/views/mes/holidayCalendar/index.vue b/src/views/mes/holidayCalendar/index.vue
deleted file mode 100644
index 21eeb6ee8..000000000
--- a/src/views/mes/holidayCalendar/index.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-  <div>
-    <el-calendar>
-      <template #date-cell="{ data }">
-        <div
-          style="height: 100"
-          :class="data.isSelected ? 'is-selected' : ''"
-          @click="handleClick(data.day)"
-        >
-          <div>{{ data.day.split('-').slice(1).join('-') }}</div>
-          <div v-if="arr.find((v) => v.date === data.day)">{{ arr.find((v) => v.date === data.day).content }}
-          </div>
-          <!-- <div>{{ data.isSelected ? '打羽毛球' : '' }}</div>  -->
-        </div>
-      </template>
-    </el-calendar>
-    <!-- 自定义弹出框 -->
-    <el-dialog v-model="dialogFormVisible" title="日程安排" width="600" draggable="true">
-      <el-form :model="calendar" :label-width="100">
-        <el-form-item label="日程内容">
-          <el-input v-model="calendar.content" autocomplete="off" />
-        </el-form-item>
-        <el-form-item label="创建时间">
-          <el-input v-model="calendar.content" autocomplete="off" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="save"> 确定 </el-button>
-          <el-button @click="dialogFormVisible = false"> 取消 </el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { reactive, ref } from 'vue'
-import { HolidayCalendar, HolidayCalendarRules } from './holidayCalendar.data'
-import * as HolidayCalendarApi from '@/api/mes/holidayCalendar'
-
-const dialogTableVisible = ref(false)
-const dialogFormVisible = ref(false)
-const formLabelWidth = '160px'
-
-
-export default {
-  name: 'Calendar',
-  data() {
-    return {
-      value: new Date(),
-      arr: [
-        { date: '2024-04-01', content: '打球' },
-        { date: '2024-04-02', content: '打台球' },
-        { date: '2024-04-03', content: '打篮球' },
-        { date: '2024-04-04', content: '踢足球' }
-      ],
-      dialogFormVisible:false,
-      calendar: {}
-    }
-  },
-  methods: {
-    handleClick(date) {
-      this.dialogFormVisible = true
-      this.calendar.date=date
-    },
-    save(){
-
-    }
-  }
-}
-</script>
-
-<style scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/mes/jobcalendar/index.vue b/src/views/mes/jobcalendar/index.vue
deleted file mode 100644
index acd7a2a6c..000000000
--- a/src/views/mes/jobcalendar/index.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-<template>
-  <el-calendar v-model="value" />
-</template>
-
-<script lang="ts" setup>
-import { ref } from 'vue'
-const value = ref(new Date())
-</script>
\ No newline at end of file
diff --git a/src/views/mes/workcalendar/index.vue b/src/views/mes/workcalendar/index.vue
index 4876ec101..16c054af5 100644
--- a/src/views/mes/workcalendar/index.vue
+++ b/src/views/mes/workcalendar/index.vue
@@ -238,7 +238,7 @@
               </el-table>
             </el-form>
             <div class="demo-drawer__footer">
-              <el-button @click="handleBatchClose">取 消</el-button>
+              <el-button @click="handleAddClose">取 消</el-button>
               <el-button type="primary" @click="addWork"> 保存 </el-button>
             </div>
           </div>
@@ -661,6 +661,10 @@ const batchAddWork = () => {
 const handleBatchClose = () => {
   batchAddDrawer.value = false
 }
+const handleAddClose = () => {
+  drawer.value = false
+}
+
 const savePlan = async (workList) => {
   await workCalendarApi.createBatch(workList)
   //await workCalendarApi.createObj(workList);

From e6593bf2a69150daa66f44e329fba4decb166254 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Wed, 15 May 2024 16:48:58 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E9=80=80=E6=96=99=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE=E7=A9=BA?=
 =?UTF-8?q?=E7=99=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../relegateRequest/relegateRequest.data.ts   |  1 +
 .../productionreturnRequestMain/index.vue     | 75 ++++++++++++++++---
 .../productionreturnRequestMain.data.ts       | 54 +++++++++++++
 .../inventorymoveRequestMain/index.vue        | 12 +--
 4 files changed, 127 insertions(+), 15 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequest.data.ts b/src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequest.data.ts
index d5dee49f8..de2becfec 100644
--- a/src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequest.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequest.data.ts
@@ -20,6 +20,7 @@ export const RelegateRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     isSearch: true,
+    isForm:false,
   },
   {
     label: '物料代码',
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
index 299e34fef..ff157a819 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
@@ -70,6 +70,7 @@
     :apiDelete="ProductionreturnRequestDetailApi.deleteProductionreturnRequestDetail"
     @searchTableSuccessDetail="searchTableSuccessDetail"
     @detailOpenForm="detailOpenForm"
+    :detailValidate="detailValidate"
   />
 
   <!-- 创建标签 -->
@@ -90,13 +91,14 @@
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/productionreturn-request-main/import" :importTemplateData="importTemplateData"
     @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
-
+  <!-- 标签打印 -->
+  <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-import { ProductionreturnRequestMain,ProductionreturnRequestMainRules,ProductionreturnRequestDetail,ProductionreturnRequestDetailRules,ProductionreturnRequestDetailLabel,ProductionreturnRequestDetailLabelRules } from './productionreturnRequestMain.data'
+import { ProductionreturnRequestMain,ProductionreturnRequestMainRules,ProductionreturnRequestDetail,ProductionreturnRequestDetailRules,ProductionreturnRequestDetailLabel,ProductionreturnRequestDetailLabelRules, SupplierdeliverRequestPackage } from './productionreturnRequestMain.data'
 import * as ProductionreturnRequestMainApi from '@/api/wms/productionreturnRequestMain'
 import * as ProductionreturnRequestDetailApi from '@/api/wms/productionreturnRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -130,6 +132,19 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  let tag = false;
+  if(data.qty <= 0){
+    message.warning('数量必须大于0')
+    tag = false;
+    return tag;
+  }else {
+    tag = true;
+    return tag;
+  }
+}
+
 // 判断 物料类型是否与其他物料类型一致
 const isItemType = async (itemCode, labelTypeParams) => {
   let isType = false
@@ -509,6 +524,34 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 批量打印--生产退料
+const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {
+  console.log('批量打印',val)
+  // let rows:any = []
+  // val.forEach(item=>{
+  //   rows = [...rows,...item.selectionRows.map(item1=>item1.number)]
+  // })
+  if(val.length == 0){
+    message.warning("请先选择要打印的数据!")
+    return
+  }
+  // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
+
+  await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
+      console.log(res)
+      if (labelType.value == 'cg') {
+        const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+        window.open(src.value+'&asn_number='+res)
+      } else {
+        const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+        window.open(src.value+'&asn_number='+res)
+      }
+  }).catch(err => {
+    console.log(err)
+    message.error('创建标签失败')
+  })
+}
+
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
 /** 详情操作 */
@@ -657,18 +700,32 @@ const handlePoint = async (row) => {
   })
   // 判断是采购还是制造
   if (isCreateLabel.value) {
-    if (labelType.value == 'cg') {
-      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
-      window.open(src.value+'&request_number='+row.number)
-    } else {
-      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
-      window.open(src.value+'&request_number='+row.number)
-    }
+    labelPrint(row)
   } else {
     message.warning('请先创建标签')
   }
 }
 
+const searchTableRef = ref()
+const labelPrint = async (row) => {
+  tableObject.loading = true
+  const defaultParams = {'moduleName':'productreceipt_predict','recordNumber':row.number}
+  const {tableObject:tableObjectPrint ,tableMethods} = useTable({
+    defaultParams,
+    getListApi: PackageApi.getLabelDetailPage  // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList:getListPrint } = tableMethods
+  getListPrint()
+  tableObject.loading = false
+  const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width || 150
+  })
+  searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
+}
+
   /** 导入 */
   const importFormRef = ref()
   const handleImport = () => {
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index ea9a67180..a33ac4b96 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -1338,3 +1338,57 @@ export const ProductionreturnRequestDetailLabelRules = reactive({
   ]
 })
 
+
+export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+  },
+{
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    },
+  },
+{
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'SelectV2'
+    },
+    table: {
+      width: 150,
+    },
+  },
+
+]))
+
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index 0c45941bd..f9714a35c 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -117,7 +117,7 @@ const { tableObject, tableMethods } = useTable({
   }
   fromInventoryStatus.value = 'OK'
   toInventoryStatus.value = "HOLD"
-  businessType.value = 'OkToHoldRequest'
+  businessType.value = 'OkToHold'
   importFileName.value = '合格转隔离申请'
 } else if ( routeName.value == 'HoldtookRequestMain') {
   tableObject.params = {
@@ -126,7 +126,7 @@ const { tableObject, tableMethods } = useTable({
   }
   fromInventoryStatus.value = 'HOLD'
   toInventoryStatus.value = "OK"
-  businessType.value = 'HoldToOkRequest'
+  businessType.value = 'HoldToOk'
   importFileName.value = '隔离转合格申请'
 } else if ( routeName.value == 'HoldtoscrapRequestMain') {
   tableObject.params = {
@@ -135,7 +135,7 @@ const { tableObject, tableMethods } = useTable({
   }
   fromInventoryStatus.value = 'HOLD'
   toInventoryStatus.value = "SCRAP"
-  businessType.value = 'HoldToScrapRequest'
+  businessType.value = 'HoldToScrap'
   importFileName.value = '隔离转报废申请'
 } else if ( routeName.value == 'OktoscrapRequestMain') {
   tableObject.params = {
@@ -144,7 +144,7 @@ const { tableObject, tableMethods } = useTable({
   }
   fromInventoryStatus.value = 'OK'
   toInventoryStatus.value = "SCRAP"
-  businessType.value = 'OkToScrapRequest'
+  businessType.value = 'OkToScrap'
   importFileName.value = '合格转报废申请'
 } else if ( routeName.value == 'ScraptoholdRequestMain') {
   tableObject.params = {
@@ -153,11 +153,11 @@ const { tableObject, tableMethods } = useTable({
   }
   fromInventoryStatus.value = 'SCRAP'
   toInventoryStatus.value = "HOLD"
-  businessType.value = 'ScrapToHoldRequest'
+  businessType.value = 'ScrapToHold'
   importFileName.value = '报废转隔离申请'
 } else if( routeName.value == 'InventorymoveRequestMain'){
   fromInventoryStatus.value = null
-  businessType.value = 'InventorymoveRequest'
+  businessType.value = 'Move'
   importFileName.value = '库存移动申请'
 }else {
   tableObject.params = {

From 1aba0dee33934e174bf6bba488a31ae6096e2704 Mon Sep 17 00:00:00 2001
From: zhousq <zhoushaoqiang@sina.com>
Date: Wed, 15 May 2024 17:01:36 +0800
Subject: [PATCH 4/5] =?UTF-8?q?2024-05-15=20=20=E5=A2=9E=E5=8A=A0=E6=A8=A1?=
 =?UTF-8?q?=E5=85=B7=E7=B1=BB=E5=9E=8B=E3=80=81=E8=83=BD=E5=8A=9B=E7=9F=A9?=
 =?UTF-8?q?=E9=98=B5=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/abilityInfo/abilityInfo.data.ts         | 2 +-
 src/views/mes/hrPersonAbility/hrPersonAbility.data.ts | 2 +-
 src/views/mes/patternType/patternType.data.ts         | 2 +-
 src/views/mes/workScheduling/components/reportAll.vue | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/mes/abilityInfo/abilityInfo.data.ts b/src/views/mes/abilityInfo/abilityInfo.data.ts
index 37f01205e..16db7dc40 100644
--- a/src/views/mes/abilityInfo/abilityInfo.data.ts
+++ b/src/views/mes/abilityInfo/abilityInfo.data.ts
@@ -140,7 +140,7 @@ export const AbilityInfo = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'remark',
     sort: 'custom',
     isSearch: false,
-    isTable: false
+    isTable: true
   },
   {
     label: '状态',
diff --git a/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts b/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts
index 02febd8b6..81c779e86 100644
--- a/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts
+++ b/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts
@@ -178,7 +178,7 @@ export const HrPersonAbility = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'remark',
     sort: 'custom',
     isSearch: false,
-    isTable: false
+    isTable: true
   },
   {
     label: '状态',
diff --git a/src/views/mes/patternType/patternType.data.ts b/src/views/mes/patternType/patternType.data.ts
index 3ec104df8..1095f1138 100644
--- a/src/views/mes/patternType/patternType.data.ts
+++ b/src/views/mes/patternType/patternType.data.ts
@@ -140,6 +140,6 @@ export const PatternType = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'remark',
     sort: 'custom',
     isSearch: false,
-    isTable: false
+    isTable: true
   }
 ]))
diff --git a/src/views/mes/workScheduling/components/reportAll.vue b/src/views/mes/workScheduling/components/reportAll.vue
index 085008f86..060d02c43 100644
--- a/src/views/mes/workScheduling/components/reportAll.vue
+++ b/src/views/mes/workScheduling/components/reportAll.vue
@@ -9,7 +9,7 @@
     <template #title>{{ dialogTitle }} </template>
       <el-button type="primary" @click="addRow" style="float:right;;">添加</el-button>
     <el-table :data="tableData" style="border: 1px;stripe; width:1300px ;"  >
-      <el-table-column prop="processName" label="工序名称"  width="200px">
+      <el-table-column prop="processCodeSelected" label="工序名称"  width="200px" >
         <template #default="scope">
           <el-select v-model="scope.row.processCodeSelected" @change="processChange" value-key="processCode">
           <el-option v-for="item in processOption" :key="item.processCode" :label="item.processName" :value="item.processCode" />

From 28a01b0a678c216cef1d741a043cb3f8970fbf27 Mon Sep 17 00:00:00 2001
From: zhousq <zhoushaoqiang@sina.com>
Date: Wed, 15 May 2024 17:08:29 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BF=85=E5=A1=AB=E9=A1=B9=EF=BC=8C=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=8E=BB=E6=8E=89ID=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/processroute/processroute.data.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/mes/processroute/processroute.data.ts b/src/views/mes/processroute/processroute.data.ts
index 36a782b64..077aecc88 100644
--- a/src/views/mes/processroute/processroute.data.ts
+++ b/src/views/mes/processroute/processroute.data.ts
@@ -4,6 +4,11 @@ import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 // 表单校验
 export const ProcessrouteRules = reactive({
+  processrouteCode: [required],
+  processName: [required],
+  productCode: [required],
+  ablityCode: [required],
+  ablityCode: [required],
 })
 
 export const Processroute = useCrudSchemas(reactive<CrudSchema[]>([
@@ -26,6 +31,7 @@ export const Processroute = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'id',
     sort: 'custom',
     isForm: false,
+    isTable: false,
   },
   
   {