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

6 months ago · ffffbd4ebb
70 changed files with 762 additions and 415 deletions
--- a/.env
+++ b/.env
@ -1,5 +1,5 @@
 # 标题
-VITE_APP_TITLE=SFMS管理系统
+VITE_APP_TITLE=富维海拉管理系统

 # 项目本地运行端口号
 VITE_PORT=80
--- a/.env.hella15
+++ b/.env.hella15
@ -4,10 +4,10 @@ NODE_ENV=production
 VITE_DEV=false

 # 请求路径
-VITE_BASE_URL='https://172.21.32.15:55563/api'
+VITE_BASE_URL='https://scp.faway-hella.com/api'

 # 上传路径
-VITE_UPLOAD_URL='https://172.21.32.15:55563/api/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='https://scp.faway-hella.com/api/admin-api/infra/file/upload'

 # 接口前缀
 VITE_API_BASEPATH=
--- a/.env.hella16
+++ b/.env.hella16
@ -4,10 +4,10 @@ NODE_ENV=production
 VITE_DEV=false

 # 请求路径
-VITE_BASE_URL='https://172.21.32.16:55563/api'
+VITE_BASE_URL='https://scptest.faway-hella.com/api'

 # 上传路径
-VITE_UPLOAD_URL='https://172.21.32.16:55563/api/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='https://scptest.faway-hella.com/api/admin-api/infra/file/upload'

 # 接口前缀
 VITE_API_BASEPATH=
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-## dev发布2024-05-16-002
+## dev发布2024-05-17-002
 **xxxx.data.ts 文件配置说明**
 **form表单查询弹窗配置**
 form: {
--- a/index.html
+++ b/index.html
@ -3,16 +3,16 @@
  <head>
    <meta charset="UTF-8" />
    <!-- <link rel="icon" href="/favicon.ico" /> -->
-    <link rel="icon" href="/src/assets/imgs/logo1.png" />
+    <!-- <link rel="icon" href="/src/assets/imgs/logo1.png" /> -->
    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <meta
      name="keywords"
-      content="SFMS管理系统 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统！"
+      content="富维海拉管理系统 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统！"
    />
    <meta
      name="description"
-      content="SFMS管理系统 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统！"
+      content="富维海拉管理系统 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统！"
    />
    <title>%VITE_APP_TITLE%</title>
  </head>
@ -137,7 +137,7 @@
      <div class="app-loading">
        <div class="app-loading-wrap">
          <div class="app-loading-title">
-            <img src="/src/assets/imgs/logo.png" class="app-loading-logo" alt="Logo" />
+            <img src="/src/assets/imgs/logo_white.png" class="app-loading-logo" alt="Logo" />
            <div class="app-loading-title">%VITE_APP_TITLE%</div>
          </div>
          <div class="app-loading-item">
--- a/nginx_prod.conf
+++ b/nginx_prod.conf
@ -73,5 +73,29 @@ http {
 			index index.html index.htm;
 		}
 	}
+	server {
+		listen  56563  ssl;
+		server_name_in_redirect off;
+		server_name		_;
+		ssl_certificate /opt/faway-hella/faway-hella.com.pem;
+		ssl_certificate_key /opt/faway-hella/faway-hella.com.key;
+		location /api/ {
+			proxy_pass http://sfms3.0/;
+			proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header;
+			proxy_set_header X-Forwared-For $proxy_add_x_forwarded_for;
+			proxy_set_header Host $http_host;
+			proxy_set_header X-Real-IP	$remote_addr;
+			proxy_set_header X-Forwarded-For $http_x_forwarded_for;
+		}
+		location /profile/ {
+			alias /opt/profile/;
+			index index.html index.htm;
+		}
+		location / {
+			try_files $uri $uri/ /index.html;
+			root /opt/sfms3.0;
+			index index.html index.htm;
+		}
+	}
 }

--- a/src/api/qms/inspectionJob/inspectionJobMain/index.ts
+++ b/src/api/qms/inspectionJob/inspectionJobMain/index.ts
@ -51,12 +51,14 @@ export const abandonInspectionJobMain = async (id) => {
 export const closeInspectionJobMain = async (id) => {
  return await request.put({ url: `/qms/inspection-job-main/close?id=` + id })
 }
-
+// 发布检验任务
+export const releaseInspectionJobMain = async (id) => {
+  return await request.put({ url: `/qms/inspection-job-main/release?id=` + id })
+}
 // 导出检验申请 Excel
 export const exportInspectionJobMain = async (params) => {
  return await request.download({ url: `/qms/inspection-job-main/export-excel`, params })
 }
-
 // 下载用户导入模板
 export const importTemplate = () => {
  return request.download({ url: '/qms/inspection-job-main/get-import-template' })
--- a/src/api/wms/deliverRecordDetail/index.ts
+++ b/src/api/wms/deliverRecordDetail/index.ts
@ -77,5 +77,5 @@ export const importTemplate = () => {

 // 查询发货记录子列表
 export const getDeliverRecordDetailListToRepeat = async (params) => {
-  return await request.get({ url: `/wms/deliver-record-detail/listToRepeat`, params })
+  return await request.get({ url: `/wms/deliver-record-detail/listToRepeatDeliverReceipt`, params })
 }
--- a/src/api/wms/location/index.ts
+++ b/src/api/wms/location/index.ts
@ -94,4 +94,15 @@ export const selectPageItemAreaToLocation = async (params) => {
  } else {
    return request.get({ url: `/wms/location/pageItemAreaToLocation`, params })
  }
+}
+
+
+export const selectConfigToLocation = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/location/pageConfigToLocationSenior', data })
+  } else {
+    return request.get({ url: `/wms/location/pageConfigToLocation`, params })
+  }
 }
--- a/src/api/wms/printLabelCorrelation/index.ts
+++ b/src/api/wms/printLabelCorrelation/index.ts
@ -0,0 +1,50 @@
+import request from '@/config/axios'
+
+export interface PrintCorrelationVO {
+  id: number
+  number: string
+  labelId: string
+  labelType: string
+  available: string
+}
+
+// 查询打印标签关联列表
+export const getPrintCorrelationPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/print-correlation/senior', data })
+  } else {
+    return await request.get({ url: `/wms/print-correlation/page`, params })
+  }
+}
+
+// 查询打印标签关联详情
+export const getPrintCorrelation = async (id: number) => {
+  return await request.get({ url: `/wms/print-correlation/get?id=` + id })
+}
+
+// 新增打印标签关联
+export const createPrintCorrelation = async (data: PrintCorrelationVO) => {
+  return await request.post({ url: `/wms/print-correlation/create`, data })
+}
+
+// 修改打印标签关联
+export const updatePrintCorrelation = async (data: PrintCorrelationVO) => {
+  return await request.put({ url: `/wms/print-correlation/update`, data })
+}
+
+// 删除打印标签关联
+export const deletePrintCorrelation = async (id: number) => {
+  return await request.delete({ url: `/wms/print-correlation/delete?id=` + id })
+}
+
+// 导出打印标签关联 Excel
+export const exportPrintCorrelation = async (params) => {
+  return await request.download({ url: `/wms/print-correlation/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/print-correlation/get-import-template' })
+}
--- a/src/api/wms/purchasereceiptRecordDetail/index.ts
+++ b/src/api/wms/purchasereceiptRecordDetail/index.ts
@ -101,7 +101,7 @@ export const getPurchasereceiptRecordDetailList = async (params) => {

 // 查询采购收货记录子列表
 export const getPurchasereceiptRecordDetailListToRepeat = async (params) => {
-  return await request.get({ url: `/wms/purchasereceipt-record-detail/listToRepeat`, params })
+  return await request.get({ url: `/wms/purchasereceipt-record-detail/listToRepeatPurchaseReceipt`, params })
 }

 // 查询采购收货记录子详情
--- a/src/assets/imgs/logo_white.png
+++ b/src/assets/imgs/logo_white.png
--- a/src/components/Annex/src/Annex.vue
+++ b/src/components/Annex/src/Annex.vue
@ -3,7 +3,7 @@
  <div class="annex">
    <div class="title flex items-center">
      <!-- <div class="title-txt">附件</div> -->
-      <UploadFile :isShowFile="false" :isShowTip="false" :fileType="fileType" title="添加附件" :upData="upData" :limit="10"
+      <UploadFile :isShowFile="false" :isShowTip="false" :fileType="fileType" :title="t('ts.添加附件')" :upData="upData" :limit="10"
        @update:modelValue="handleAnnexSuccess" v-if="annexData.annexList.length<5"/>
    </div>
    <div class="list">
--- a/src/components/Descriptions/src/Descriptions.vue
+++ b/src/components/Descriptions/src/Descriptions.vue
@ -5,6 +5,7 @@ import { useDesign } from '@/hooks/web/useDesign'
 import { propTypes } from '@/utils/propTypes'
 import { useAppStore } from '@/store/modules/app'
 import { DescriptionsSchema } from '@/types/descriptions'
+const { t } = useI18n() // 国际化

 defineOptions({ name: 'Descriptions' })

@ -99,7 +100,7 @@ const showAll = () =>{
    >
      <div :class="[`${prefixCls}-header__title`, 'relative font-18px font-bold ml-10px']">
        <div class="flex items-center">
-          {{ title }}
+          {{ t(`ts.${title}`).replace('ts.', '') }}
          <ElTooltip v-if="message" :content="message" placement="right">
            <Icon class="ml-5px" icon="ep:warning" />
          </ElTooltip>
@ -119,7 +120,7 @@ const showAll = () =>{
          <template v-if="slots['extra']" #extra>
            <slot name="extra"></slot>
          </template>
-          <ElDescriptionsItem
+          <ElDescriptionsItem 
            v-for="item in schema"
            :key="item.field"
            v-bind="getBindItemValue(item)"
@ -133,7 +134,7 @@ const showAll = () =>{
                :row="{
                  label: item.label
                }"
-                >{{ item.label }}
+                >{{ t(`ts.${item.label}`).replace('ts.', '') }}
              </slot>
            </template>

--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@ -2,14 +2,14 @@
  <div>
    <el-drawer
      v-model="isShowDrawer"
-      title="详情"
+      :title="t(`ts.详情`).replace('ts.','')"
      direction="rtl"
      size="80%"
      v-loading="detailLoading"
    >
      <template #header>
        <div class="font-size-18px">
-          {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ titleNameRef }}</span>
+          {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ t(`ts.${titleNameRef}`).replace('ts.','') }}</span>
        </div>
      </template>
      <Tabs ref="tabRef" :tabsList="tabsList" :current="current" @change="change" />
--- a/src/components/DictTag/src/DictTag.vue
+++ b/src/components/DictTag/src/DictTag.vue
@ -3,6 +3,7 @@ import { defineComponent, PropType, ref } from 'vue'
 import { isHexColor } from '@/utils/color'
 import { ElTag } from 'element-plus'
 import { DictDataType, getDictOptions } from '@/utils/dict'
+const { t } = useI18n() // 国际化

 export default defineComponent({
  name: 'DictTag',
@ -55,7 +56,7 @@ export default defineComponent({
              }
              disableTransitions={true}
            >
-              {dictData.value?.label}
+              {t(`ts.${dictData.value?.label}`).replace('ts.', '')}
          </ElTag>
        )
      } else {
@ -71,7 +72,7 @@ export default defineComponent({
                    }
                    disableTransitions={true}
                  >
-                    {item?.label}
+                    {t(`ts.${item?.label}`).replace('ts.', '')}
                  </ElTag>
          })
        )
--- a/src/components/Remarks/src/Remarks.vue
+++ b/src/components/Remarks/src/Remarks.vue
@ -20,9 +20,9 @@
      </div>
    </div>
    <div class="add-remarks flex items-center mt-20px">
-       <el-input v-model="data.remark" placeholder="请输入备注" />
+       <el-input v-model="data.remark" :placeholder="t('ts.请输入备注')" />
       <el-button class="ml-16px" type="primary" @click="handleSubmitrRemarks" >
-          确定
+          {{t('ts.确定')}}
        </el-button>
    </div>
  </div>
@ -32,6 +32,7 @@
 const message = useMessage() // 消息弹窗
 import * as RemarkApi from '@/api/wms/remark'
 import { formatDate } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化

 defineComponent({
  name: 'Annex'
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@ -303,7 +303,7 @@
    <div class="button flex" v-if="isShowButton">
      <div class="p-12px" @click="handleAddTable">
        <Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer;" />
-        <div>添加明细</div>
+        <div>{{t('ts.添加明细')}}</div>
      </div>
    </div>
  </div>
--- a/src/components/Tabs/src/Tabs.vue
+++ b/src/components/Tabs/src/Tabs.vue
@ -1,7 +1,7 @@
 <!-- tabs组件 -->
 <template>
   <div class="tabs flex items-center">
-      <div :class="current == index ? 'active' : ''" v-for="(item, index) in tabsList" :key="index" @click="change(item, index)">{{ item.label }}</div>
+      <div :class="current == index ? 'active' : ''" v-for="(item, index) in tabsList" :key="index" @click="change(item, index)">{{ t(`ts.${item.label}`).replace('ts.','') }}</div>
    </div>
 </template>

@ -9,6 +9,7 @@
 // const message = useMessage() // 消息弹窗

 import { emit } from "process";
+const { t } = useI18n() // 国际化

 // const { t } = useI18n() // 国际化
 defineComponent({
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@ -42,6 +42,7 @@ import { PropType } from 'vue'
 import { propTypes } from '@/utils/propTypes'
 import { getAccessToken, getTenantId } from '@/utils/auth'
 import type { UploadInstance, UploadUserFile, UploadProps, UploadRawFile } from 'element-plus'
+const { t } = useI18n() // 国际化

 defineOptions({ name: 'UploadFile' })

@ -78,7 +79,7 @@ const uploadHeaders = ref({
 // 文件上传之前判断
 const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
  if (fileList.value.length >= props.limit) {
-    message.error(`上传文件数量不能超过${props.limit}个!`)
+    message.error(`${t('ts.上传文件数量不能超过')}${props.limit}!`)
    return false
  }
  let fileExtension = ''
@ -91,14 +92,14 @@ const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
  })
  const isLimit = file.size < props.fileSize * 1024 * 1024
  if (!isImg) {
-    message.error(`文件格式不正确, 请上传${props.fileType.join('/')}格式!`)
+    message.error(`${t(`ts.${'文件格式不正确, 请上传'}`)}${props.fileType.join('/')}${t('ts.格式')}!`)
    return false
  }
  if (!isLimit) {
-    message.error(`上传文件大小不能超过${props.fileSize}MB!`)
+    message.error(`${t('ts.上传文件大小不能超过')}${props.fileSize}MB!`)
    return false
  }
-  message.success('正在上传文件，请稍候...')
+  message.success(t(`ts.${'正在上传文件，请稍候'}`))
  uploadNumber.value++
 }
 // 处理上传的文件发生变化
@ -107,7 +108,7 @@ const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
 // }
 // 文件上传成功
 const handleFileSuccess: UploadProps['onSuccess'] = (res: any,uploadFile: any): void => {
-  message.success('上传成功')
+  message.success(t('ts.上传成功'))
  const fileListNew = fileList.value
  fileListNew.pop()
  fileList.value = fileListNew
@ -121,11 +122,11 @@ const handleFileSuccess: UploadProps['onSuccess'] = (res: any,uploadFile: any):
 }
 // 文件数超出提示
 const handleExceed: UploadProps['onExceed'] = (): void => {
-  message.error(`上传文件数量不能超过${props.limit}个!`)
+  message.error(`${t('ts.上传文件数量不能过')}${props.limit}!`)
 }
 // 上传错误提示
 const excelUploadError: UploadProps['onError'] = (): void => {
-  message.error('导入数据失败，请您重新上传！')
+  message.error(t(`ts.导入数据失败，请您重新上传`))
 }
 // 删除上传文件
 const handleRemove = (file) => {
--- a/src/layout/components/Logo/src/Logo.vue
+++ b/src/layout/components/Logo/src/Logo.vue
@ -77,7 +77,11 @@ watch(
      ]"
      to="/"
    >
-      <img
+    <img
+        class="h-24px w-144px h-36px"
+        src="@/assets/imgs/logo_white.png"
+      />
+      <!-- <img
        class="h-24px w-[calc(var(--logo-height)-20px)]"
        src="@/assets/imgs/logo_white.svg"
      />
@ -93,7 +97,7 @@ watch(
        ]"
      >
        {{ title }}
-      </div>
+      </div> -->
    </router-link>
  </div>
 </template>
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@ -1063,6 +1063,31 @@ export default {
    采购价格审批人:'Purchasing price approver',
    供应商发货单号:'Supplier\'s invoice number',
    加载中:'loading',
+    请输入备注:'Please enter remarks',
+    '正在上传文件，请稍候':'Please wait while uploading files',
+    上传成功:'upload successful',
+    上传文件数量不能超过:'The number of uploaded files cannot exceed',
+    '导入数据失败，请您重新上传':'Failed to import data, please upload again!',
+    上传文件大小不能超过:'The size of the uploaded file cannot exceed',
+    '文件格式不正确, 请上传':'The file format is incorrect. Please upload it in',
+    格式:'format',
+    收货人:'consignee',
+    联系电话:'phone',
+    送达日期:'delivery date',
+    月台代码:'Platform code',
+    截止日期:'Deadline',
+    仓库代码:'Warehouse code',
+    'ERP单据号(无用)':'ERP document number (useless)',
+    供应商审批人:'Supplier approver',
+    供应商审批时间:'Supplier approval time',
+    快递单号:'courier number',
+    开票日历管理:'Invoicing calendar management',
+    描述:'description',
+    批量删除:'Batch delete'
+
+
+
+

  },
  
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@ -1063,6 +1063,31 @@ export default {
    采购价格审批人:'采购价格审批人',
    供应商发货单号:'供应商发货单号',
    加载中:'加载中',
+    请输入备注:'请输入备注',
+    '正在上传文件，请稍候':'正在上传文件，请稍候...',
+    上传成功:'上传成功',
+    上传文件数量不能超过:'上传文件数量不能超过',
+    '导入数据失败，请您重新上传':'导入数据失败，请您重新上传！',
+    上传文件大小不能超过:'上传文件大小不能超过',
+    '文件格式不正确, 请上传':'文件格式不正确, 请上传',
+    格式:'格式',
+    收货人:'收货人',
+    联系电话:'联系电话',
+    送达日期:'送达日期',
+    月台代码:'月台代码',
+    截止日期:'截止日期',
+    仓库代码:'仓库代码',
+    'ERP单据号(无用)':'ERP单据号(无用)',
+    供应商审批人:'供应商审批人',
+    供应商审批时间:'供应商审批时间',
+    快递单号:'快递单号',
+    开票日历管理:'开票日历管理',
+    描述:'描述',
+    批量删除:'批量删除'
+
+
+
+

  },

--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@ -340,5 +340,6 @@ export enum DICT_TYPE {

  // ========== eam - 业务 - ==========
  DEVICE_TYPE = 'device_type', // 设备类型
+  IS_UPDATED = 'is_updated', //是否可修改

 }
--- a/src/views/eam/basicInspectionOption/basicInspectionOption.data.ts
+++ b/src/views/eam/basicInspectionOption/basicInspectionOption.data.ts
@ -40,7 +40,13 @@ export const BasicInspectionOption = useCrudSchemas(reactive<CrudSchema[]>([
    label: '项是否可修改',
    field: 'isUpdated',
    sort: 'custom',
+    dictType: DICT_TYPE.IS_UPDATED,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isTable: true,
+    isDetail: false,
    isSearch: true,
+    isTableForm: false,
+    isForm: true,
    form: {
      component: 'Switch',
      value: 'TRUE',
@ -100,14 +106,13 @@ export const BasicInspectionOption = useCrudSchemas(reactive<CrudSchema[]>([
    label: '是否可用',
    field: 'available',
    sort: 'custom',
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    },
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isTable: true,
+    isDetail: false,
+    isSearch: false,
+    isTableForm: false,
+    isForm: false,
  },
  {
    label: '删除时间',
--- a/src/views/home/components/supplierIndex.vue
+++ b/src/views/home/components/supplierIndex.vue
@ -231,7 +231,8 @@
 import { set } from 'lodash-es'
 import { EChartsOption } from 'echarts'
 import { lineOptions, pieOptions } from '../echarts-data'
-import { formatDate } from '@/utils/formatTime'
+import { formatDate,dateFormatter } from '@/utils/formatTime'
+
 import * as NotifyMessageApi from '@/api/system/notify/message'
 import * as IndexApi from '@/api/home'
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@ -9,7 +9,7 @@
      >
        <!-- 左上角的 logo + 系统标题 -->
        <div class="relative flex items-center text-white">
-          <img alt="" class="mr-10px h-24px w-48px" src="@/assets/imgs/logo.png" />
+          <img alt="" class="mr-10px w-144px h-36px" src="@/assets/imgs/logo_white.png" />
          <span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span>
        </div>
        <!-- 左边的背景图 + 欢迎语 -->
@ -33,7 +33,7 @@
          class="flex items-center justify-between text-white at-2xl:justify-end at-xl:justify-end"
        >
          <div class="flex items-center at-2xl:hidden at-xl:hidden">
-            <img alt="" class="mr-10px h-48px w-48px" src="@/assets/imgs/logo.png" />
+            <img alt="" class="mr-10px w-144px h-36px" src="@/assets/imgs/logo_white.png" />
            <span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span>
          </div>
          <div class="flex items-center justify-end space-x-10px">
--- a/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts
+++ b/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts
@ -1,8 +1,9 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 import * as AbilityInfoApi from '@/api/mes/abilityInfo'
+import * as UserApi from "@/api/system/user";
 import { AbilityInfo } from '../abilityInfo/abilityInfo.data'
-
+import {searchUser} from "@/views/wms/basicDataManage/orderManage/team/team.data";

 // 表单校验
 export const HrPersonAbilityRules = reactive({
@ -116,6 +117,20 @@ export const HrPersonAbility = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'personCode',
    sort: 'custom',
    isSearch: true,
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchTitle: '人员信息', // 查询弹窗标题
+        searchAllSchemas: searchUser.allSchemas, // 查询弹窗所需类
+        searchField: 'username', // 查询弹窗赋值字段
+        searchPage: UserApi.getUserPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          action: "==",
+          column: 'userType',
+          value: 'WORKER'
+        }]
+      }
+    }
  },
  {
    label: '能力编号',
--- a/src/views/mes/hrPersonAbility/index.vue
+++ b/src/views/mes/hrPersonAbility/index.vue
@ -49,7 +49,7 @@
    @searchTableSuccess="searchTableSuccess"
    :isBusiness="false"
  />
-
+  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess" />
  <!-- 详情 -->
  <Detail ref="detailRef" :isBasic="false" :isBasicMes="true"  :allSchemas="HrPersonAbility.allSchemas" :detailAllSchemas="HrPersonAbility.allSchemas"
  :apiPage="HrPersonAbilityApi.getHrPersonAbilityPage"/>
@ -80,9 +80,17 @@ const tableColumns = ref(HrPersonAbility.allSchemas.tableColumns)
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
  nextTick(() => {
-    const setV = {}
-    setV[formField] = val[0][searchField]
-    formRef.setValues(setV)
+    if (formField === 'ablityCode') {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)    
+    }
+    if (formField === 'personCode') {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)    
+    }
+    
  })
 }

--- a/src/views/mes/opersteps/index.vue
+++ b/src/views/mes/opersteps/index.vue
@ -149,6 +149,16 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  let disabledFlag = false
+  if(type==='update'){
+    disabledFlag = true
+  }
+  Opersteps.allSchemas.formSchema.forEach(item => {
+      if (item.field == 'stepsCode') {
+        item.componentProps.disabled =disabledFlag
+      }
+    })
+  basicFormRef.value.open(type, row)
  basicFormRef.value.open(type, row)
 }

--- a/src/views/mes/opersteps/opersteps.data.ts
+++ b/src/views/mes/opersteps/opersteps.data.ts
@ -5,7 +5,10 @@ import { OperstepsType } from '../operstepsType/operstepsType.data'

 // 表单校验
 export const OperstepsRules = reactive({
-  concurrencyStamp: [required],
+  //concurrencyStamp: [required],
+  stepsCode: [required],
+  stepsName: [required],
+  collectCode: [required],
 })

 export const Opersteps = useCrudSchemas(reactive<CrudSchema[]>([
--- a/src/views/mes/operstepsType/index.vue
+++ b/src/views/mes/operstepsType/index.vue
@ -149,6 +149,15 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  let disabledFlag = false
+  if(type==='update'){
+    disabledFlag = true
+  }
+  OperstepsType.allSchemas.formSchema.forEach(item => {
+      if (item.field == 'collectCode') {
+        item.componentProps.disabled =disabledFlag
+      }
+    })
  basicFormRef.value.open(type, row)
 }

--- a/src/views/mes/orderDay/components/schedule.vue
+++ b/src/views/mes/orderDay/components/schedule.vue
@ -201,7 +201,7 @@
      </el-dialog>
    </ContentWrap>
    <template #footer>
-      <el-button @click="handleClose" >关闭</el-button>
+      <el-button @click="handleClose('dddddd')" >关闭</el-button>
      <el-button  type="primary" @click="publishPlan" >发布计划</el-button>
    </template>
    <SearchTable ref="searchTableRef" @search-table-success="searchTableSuccess" />
@ -471,20 +471,23 @@ const opensearchTable = (
  )

 }
-const handleClose=()=>{
-  dialogVisible.value = false,
-  emit('close')
+const handleClose=(val)=>{
+  dialogVisible.value = false
+  emit('close',val)
 }
 const publishPlan=()=>{
-     message.confirm("确认发布当前计划？","question").then(async () => {
+     message.confirm("确认发布当前计划？","提示").then( () => {
      //isPublish.value=true
      //loading.value = true,
-      try{formLoading.value=true
-      doPublishPlan() }finally{
+      try{
+        formLoading.value=true
+        let promise = doPublishPlan();
+        handleClose(promise)
+      }finally{
        formLoading.value=false;
-        handleClose()
+
      }
-     
+
     }).catch(() => {
      message.info("已取消发布")
     })
@ -517,12 +520,14 @@ const doPublishPlan=  ()=>{

  let res = OrderDayApi.publishPlan(data)

-  res.then(()=>{
-    message.success("计划发布成功")
-  }).catch(()=>{
-    //console.log("---doPublishPlan-- 458--",res.msg)
-    message.error("计划发布失败！")
-  })
+  return res
+
+  // res.then(()=>{
+  //   message.success("计划发布成功")
+  // }).catch(()=>{
+  //   //console.log("---doPublishPlan-- 458--",res.msg)
+  //   message.error("计划发布失败！")
+  // })


 }
--- a/src/views/mes/orderDay/index.vue
+++ b/src/views/mes/orderDay/index.vue
@ -57,7 +57,7 @@
    :isBusiness="false"
    :isSearchFilterButtonHide="true"
    @onChange="valueChange"
-   
+
  />

  <!-- 详情 -->
@ -142,7 +142,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
    if(formField=='workroomCode'){
      getProductlines(val[0][searchField])
    }
-    
+
 })

 }
@ -156,9 +156,9 @@ const valueChange=(filed,cur)=>{
        //item.componentProps.required = cur==='ENABLE'?false:true
      }
    })
-    
+
  }
- 
+
 }

 // 字段设置 更新主列表字段
@ -199,10 +199,12 @@ const buttonBaseClick = (val, item) => {
    console.log('其他按钮', item)
  }
 }
-const publishClosed=()=>{
-    //console.log('orderday-publishClosed-200')
-      getList()
-   
+const publishClosed=(val)=>{
+    console.log('orderday-publishClosed-200',val)
+  nextTick?.(()=>{
+    getList()
+  })
+
 }
 // 根据状态返回该按钮是否显示
 const isShowMainButton = (row,val) => {
@ -227,7 +229,7 @@ const butttondata = (row) => {
      type: 'warning',
      icon: '',
      color: '',
-      hasPermi: 'mes:orderDay:update'}), // 
+      hasPermi: 'mes:orderDay:update'}), //
    // defaultButtons.mainListHandleBtn({label: '发布',
    //   name: 'publish',
    //   hide: isShowMainButton(row,['2']),
@ -268,25 +270,24 @@ const openForm = (type: string, row?: any) => {

 // form表单提交
 const formsSuccess = async (formType,data) => {
-  
+
  if (formType === 'create') {
-    let ret= OrderDayApi.createOrderDay(data)
-    if(ret===undefined || ret===null){
-      message.error(t('common.networkError'))
-    }else{
-      message.success(t('common.createSuccess'))
-    }
-   
+    await OrderDayApi.createOrderDay(data)
+    // if(ret===undefined || ret===null){
+    //   message.error(t('common.networkError'))
+    // }else{
+    //   message.success(t('common.createSuccess'))
+    // }
+
  } else {
-    let ret= OrderDayApi.updateOrderDay(data)
-    if(ret.code==0){
-      message.success(t('common.updateSuccess'))
-    }else{
-      message.error(t('common.networkError'))
-    }
-    
+    await OrderDayApi.updateOrderDay(data)
+    // if(ret.code==0){
+    //   message.success(t('common.updateSuccess'))
+    // }else{
+    //   message.error(t('common.networkError'))
+    // }
+
  }
-  
  basicFormRef.value.dialogVisible = false
  await getList()
 }
@ -301,7 +302,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
    //console.log('orderDay-openDetail-303',row)
    sDetailRef.value.open(row, titleName)
  }
-  
+
 }
 /** 发布操作 */
 const scheduleDetailRef = ref()
@ -336,9 +337,10 @@ const handleExport = async () => {
    exportLoading.value = false
  }
 }
-const stopPlan =  (id) => {
-    OrderDayApi.stopPlan(id)
-  
+const stopPlan = async (id) => {
+    await  OrderDayApi.stopPlan(id)
+    getList()
+
 }
 /** 导入 */
 const importFormRef = ref()
--- a/src/views/mes/orderDay/orderDay.data.ts
+++ b/src/views/mes/orderDay/orderDay.data.ts
@ -8,9 +8,9 @@ import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/w

 // 表单校验
 export const OrderDayRules = reactive({
-  // batchCode: [
-  //   { required: false, message: '请输入一个日计划编号', trigger: 'blur' }
-  // ],
+  batchCode: [
+    { required: true, message: '请输入产品批次码', trigger: 'blur' }
+  ],
  // planNoMonth: [
  //   { required: true, message: '请输入一个月计划编号', trigger: 'blur' }
  // ],
@ -49,6 +49,7 @@ export const OrderDay = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'id',
    sort: 'custom',
    isForm: false,
+    isTable: false,
    width: '60px',
  },
  {
@ -365,7 +366,7 @@ export const OrderDay = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'remark',
    sort: 'custom',
    isSearch: false,
-    isTable:false,
+    // isTable:false,
  },
  {
    label: '操作',
--- a/src/views/mes/processroute/components/configDialog.vue
+++ b/src/views/mes/processroute/components/configDialog.vue
@ -42,7 +42,7 @@
              <el-table-column prop="name" label="工序名称" />
              <el-table-column prop="oper" label="操作" width="60">
                <template #default="scope">
-                  <el-button size="mini" type="text"  @click="deleteNode(scope.row)"
+                  <el-button size="mini" type="text"  @click="deleteNode(scope.row,scope.$index)"
                    >移除</el-button
                  >
                </template>
@ -250,10 +250,16 @@ const searchTableSuccess = (formField, searchField, val, type, row) => {
    })
  }
 }
-const deleteNode=(row)=>{
-    processData.value.splice(processData.value.indexOf(row),1)
+const deleteNode=(row,index:number)=>{
+    //console.log('row------',index)
+    //showProcessNodeData.value.splice(index,1)
+    processData.value.splice((page.value.current-1)*page.value.size+index,1)
    page.value.total=processData.value.length
    page.value.current=1
+    showProcessNodeData.value=processData.value.slice(1,1+page.value.size);
+    
+    //page.value.current=1
+    //showProcessNodeData.value=processData.value.slice((page.value.current-1)*page.value.size,page.value.size)
    graph.value.removeNode(row.code)
  }

@ -278,6 +284,9 @@ const openDetail =  (row: any) => {
    materialData.value = []
    mouldData.value = []
    workStationList.value = []
+    processData.value=[]
+    showProcessNodeData.value = []
+    showMaterialsData.value = []
    graph.value.on('node:dblclick', ({ e, x, y, node, view }) => {
      nodeClick(e, x, y, node, view)
    })
@ -297,6 +306,7 @@ const handleDrawerClose = () => {
    //console.log(graph.value.toJSON())
    rowData.value=null
  }
+  emit('close')
 }
 //**获取 工序信息 */
 const getProcessInfo = async (id: any) => {
@ -440,15 +450,15 @@ const saveResult = async () => {
    processrouteId: processRouteId.value
  }

-  let res = ProcessrouteApi.saveGraphData(gdata)
-  if (res) {
-    message.success('保存成功！')
-  } else {
-    message.error('保存失败！')
-  }
+  await ProcessrouteApi.saveGraphData(gdata)
+  // if (res) {
+  //   message.success('保存成功！')
+  // } else {
+  //   message.error('保存失败！')
+  // }
  isShowDrawer.value = false
  handleDrawerClose()
-  emit('close')
+  //emit('close',)
  //return res
 }

--- a/src/views/mes/processroute/index.vue
+++ b/src/views/mes/processroute/index.vue
@ -157,16 +157,25 @@ const buttonTableClick = async (val, row) => {
    openDetail(row)
  }
 }
-const dailogClose=() => {
-  console.log('close');
-  nextTick?.(()=>{
-    getList()
-  })
+const dailogClose= () => {
+  //console.log('dailogClose--confge',getList());
+  //nextTick?.(()=>{
+  getList()
+  //})

 }
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  let disabledFlag = false
+  if(type==='update'){
+    disabledFlag = true
+  }
+  Processroute.allSchemas.formSchema.forEach(item => {
+      if (item.field == 'processrouteCode') {
+        item.componentProps.disabled =disabledFlag
+      }
+    })
  basicFormRef.value.open(type, row)
 }

--- a/src/views/mes/processroute/processroute.data.ts
+++ b/src/views/mes/processroute/processroute.data.ts
@ -4,11 +4,9 @@ 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],
+  processrouteCode: [{ required: true, message: '请输入工艺路线编码！', trigger: 'blur' },],
+  processName: [{ required: true, message: '请输入工艺路线名称！', trigger: 'blur' },],
+  productCode: [{ required: true, message: '请输入产品编码！', trigger: 'blur' },],
 })

 export const Processroute = useCrudSchemas(reactive<CrudSchema[]>([
@ -59,15 +57,7 @@ export const Processroute = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'processrouteCode',
    sort: 'custom',
    isSearch: true,
-    // form: {
-    //   component: 'Input',
-
-    //   componentProps: {
-    //     slots:{
-    //       default:}
-    //     disabled: true
-    //   }
-    // }
+   
  },

  {
--- a/src/views/mes/productBackline/index.vue
+++ b/src/views/mes/productBackline/index.vue
@ -106,8 +106,8 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
  defaultButtons.defaultAddBtn({hasPermi:'mes:product-backline:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'mes:product-backline:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'mes:product-backline:export'}), // 导出
+  // defaultButtons.defaultImportBtn({hasPermi:'mes:product-backline:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'mes:product-backline:export'}), // 导出
  defaultButtons.defaultFreshBtn(null), // 刷新
  defaultButtons.defaultFilterBtn(null), // 筛选
  defaultButtons.defaultSetBtn(null), // 设置
--- a/src/views/mes/productOffline/index.vue
+++ b/src/views/mes/productOffline/index.vue
@ -106,8 +106,8 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
  defaultButtons.defaultAddBtn({hasPermi:'mes:product-offline:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'mes:product-offline:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'mes:product-offline:export'}), // 导出
+  // defaultButtons.defaultImportBtn({hasPermi:'mes:product-offline:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'mes:product-offline:export'}), // 导出
  defaultButtons.defaultFreshBtn(null), // 刷新
  defaultButtons.defaultFilterBtn(null), // 筛选
  defaultButtons.defaultSetBtn(null), // 设置
--- a/src/views/mes/workScheduling/components/qualifiedCheck.vue
+++ b/src/views/mes/workScheduling/components/qualifiedCheck.vue
@ -7,38 +7,37 @@
    width="600px"
  >
    <template #title>{{ dialogTitle }} </template>
-    <el-form :model="form">
-      <el-form-item label="工序">
-         <el-input v-model="form.processCode" disabled />
+    <el-form :model="baseform"  ref="baseformRef">
+      <el-form-item label="工序" prop="processCode">
+         <el-input v-model="baseform.processCode" disabled />
      </el-form-item>
-      <el-form-item label="生产人员">
-        <el-select v-model="form.personSelected" multiple>
+      <el-form-item label="生产人员" prop="personSelected" :rules="[{ required: true, message: '请选择报工人', trigger: 'blur' }]">
+        <el-select v-model="baseform.personSelected" multiple >
          <el-option v-for="item in personOption" :key="item.workerCode" :label="item.workerName" :value="item.workerCode" />
        </el-select>
      </el-form-item>
-      <el-form-item label="质检人员">
-        <el-input v-model="form.checkPerson"  />
+      <el-form-item label="质检人员" prop="checkPerson" :rules="[{ required: true, message: '请填写质检人登录名', trigger: 'blur' }]">
+        <el-input v-model="baseform.checkPerson"  />
      </el-form-item>
-      <el-form-item label="合格数量" @change="handleCount" :key="qcount">
+      <el-form-item label="合格数量"  prop="qualified"  :rules="[{ required: true, message: '请填写合格数量', trigger: 'blur' }]">
        <el-input-number
-          v-model="form.qualified"
-          @change="handleCount"
+          v-model="baseform.qualified"
+          @change="handleCount" :key="qcount"
        ></el-input-number>
      </el-form-item>
-      <el-form-item label="不合格数量">
-        <el-input-number  v-model="form.unqualified" @change="handleCount" :key="qcount"></el-input-number>
+      <el-form-item label="不合格数量"  prop="unqualified" :rules="[{ required: true, message: '请填写不合格数量', trigger: 'blur' }]">
+        <el-input-number  v-model="baseform.unqualified" @change="handleCount" :key="qcount"></el-input-number >
      </el-form-item>
-      <el-form-item label="不合格原因">
-        <el-input v-model="form.remark"></el-input>
+      <el-form-item label="不合格原因" prop="remark" :rules="[{ required: true, message: '请填写不合格原因', trigger: 'blur' }]">
+        <el-input v-model="baseform.remark"></el-input>
      </el-form-item>
    </el-form>
-  
-    <template #footer>
+      <template #footer>
      <el-button @click="dialogVisible = false">关闭</el-button>
      <el-button type="primary"  :disabled="saveFlag" @click="saveReport">保存</el-button>
-    </template> </Dialog
-  >
-</template>
+    </template>
+   </Dialog>
+  </template>
 <script lang="ts" setup>
 import { Dialog } from '@/components/Dialog'
 import * as workschedulingApi from '@/api/mes/workScheduling'
@ -51,7 +50,8 @@ const formLoading = ref(false)
 const personOption=ref([])
 const saveFlag=ref(false)
 const planDayCode=ref()
-const form = reactive({
+const baseformRef=ref()
+const baseform = reactive({
  id:0,
  planDayCode: "",
  processCode:"",
@ -66,16 +66,17 @@ const openDetail = async (row: any, titleName: any,code:string) => {
  //console.log('row-68',row)
  dialogVisible.value = true
  dialogTitle.value = titleName
-  form.processCode=row.nodeCode
-  form.personSelected=[]
-  form.planDayCode=code
-  form.personSelected=[]
-  form.qualified=0
-  form.unqualified=0
-  form.id=row.id
+  baseform.processCode=row.nodeCode
+  baseform.personSelected=[]
+  baseform.planDayCode=code
+  baseform.personSelected=[]
+  baseform.qualified=0
+  baseform.unqualified=0
+  baseform.id=row.id
  planDayCode.value=code
  getCurrentWorkerList(row.nodeCode)
-  
+
+
 }

 //获取工序人员
@ -86,42 +87,53 @@ const getCurrentWorkerList = async (val) => {
    processCode: val
  }
  personOption.value = await workschedulingApi.getCurrentWorkerList(params)
-  
+
+
 }
 const qcount=ref(0)
 //数量处理
 const handleCount = () => {
  qcount.value++
-  if (form.qualified> rowData.value.planCount - form.unqualified) {
+  if (baseform.qualified> rowData.value.planCount - baseform.unqualified) {
    message.alert('合格数量超限！计划总数【'+rowData.value.planCount+'】')
-    form.qualified =rowData.value.planCount - form.unqualified
+    baseform.qualified =rowData.value.planCount - baseform.unqualified

    return
  } 
  
-  if (form.unqualified> rowData.value.planCount -form.qualified ) {
+  if (baseform.unqualified> rowData.value.planCount -baseform.qualified ) {
    message.alert('不合格数量超限！')
-    form.unqualified =rowData.value.planCount-form.qualified
+    baseform.unqualified =rowData.value.planCount-baseform.qualified
    return
  }
 }
 //提交质检
-const saveReport = async() => {
- 
-  saveFlag.value = true
-  try {
-    await workschedulingApi.processQualified(form)
-  }finally{
-    saveFlag.value = false
-    dialogVisible.value = false
-    emit('close')
-  }
+const saveReport = () => {
+  if (!baseformRef) return
+  baseformRef.value.validate((valid) => {
+    if (valid) {
+      saveFlag.value = true
+      try {
+        workschedulingApi.processQualified(baseform)
+      }finally{
+        saveFlag.value = false
+        dialogVisible.value = false
+        emit('close')
+      }
+    } else {
+      console.log('请确认数据的正确！')
+    }
+  })
+  
  //console.log("report-saveReport-82",data)
  //await workschedulingApi.reportWorkByProcess(data)
- 
+
+
 }
 // 传递给父类
 const emit = defineEmits(['success', 'close'])
 defineOptions({ name: 'qualifiedCheck' })
 defineExpose({ openDetail }) // 提供 open 方法，用于打开弹窗
+
+  
 </script>
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@ -369,7 +369,7 @@
        // 总数量值是 样品份数 乘 每份样品量
        allSamplePieceSize.value += parseFloat((parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) * parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize)).toFixed(2))
        // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-        if(!item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList){
+        if (!item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList) {
          // 单个录入时
          if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 0) {
            // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
@ -397,7 +397,7 @@
            )
          }
        }
-       
+
        // 编辑判断上限下限目标值是否必填
        if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping) {
          rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
@ -425,17 +425,17 @@
        设置采样数量，默认第一个包装采样数量<总数量，显示数量字段，第二个包装和剩下的总数量对比，以此类推，
        第一个包装采样数量>总数量 则显示总数量
      */
-     
+
      for (let i = 0; i < data.value.packageList.length; i++) {
-        if(data.value.packageList[i].sampleAmount==null){
-         if (allSamplePieceSize.value > data.value.packageList[i].amount) {
-           data.value.packageList[i].sampleAmount = data.value.packageList[i].amount
-           allSamplePieceSize.value = parseFloat((allSamplePieceSize.value - data.value.packageList[i].amount).toFixed(2))
-         } else {
-           data.value.packageList[i].sampleAmount = allSamplePieceSize.value
-           allSamplePieceSize.value = 0
-           // return;
-         } 
+        if (data.value.packageList[i].sampleAmount == null) {
+          if (allSamplePieceSize.value > data.value.packageList[i].amount) {
+            data.value.packageList[i].sampleAmount = data.value.packageList[i].amount
+            allSamplePieceSize.value = parseFloat((allSamplePieceSize.value - data.value.packageList[i].amount).toFixed(2))
+          } else {
+            data.value.packageList[i].sampleAmount = allSamplePieceSize.value
+            allSamplePieceSize.value = 0
+            // return;
+          }
        }
      }
      // data.value.packageList.forEach(item=>{
@ -604,14 +604,11 @@
      let numberList = []//判断合格数量和不合格数量之和是否等于主表数量
      let parseFloatList = []//判断合格数量和不合格数量是否是整数
      data.value.subList.forEach((item, index) => {
-        
-        console.log("woxianlai")
-        console.log(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList)
        if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
          arrBol.push(
            item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
              (cur, key) => {
-                return cur.qualifiedQuantity==='' || cur.unqualifiedQuantity===''
+                return cur.qualifiedQuantity === '' || cur.unqualifiedQuantity === ''
              }
            )
          )
@ -657,8 +654,6 @@
          )
        }
      })
-      console.log("wolaile")
-      console.log(arrBol)
      let isEmpty1 = arrBol.some(item => item == true)
      let isEmptyNumberList = numberList.some(item => item == true)
      let isParseFloat = parseFloatList.some(item => item == true)
@ -732,7 +727,7 @@
          arrBol.push(
            item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
              (cur, key) => {
-                return !cur.qualifiedQuantity || !cur.unqualifiedQuantity
+                return cur.qualifiedQuantity === '' || cur.unqualifiedQuantity === ''
              }
            )
          )
--- a/src/views/qms/inspectionJob/index.vue
+++ b/src/views/qms/inspectionJob/index.vue
@ -159,6 +159,15 @@
      return true
    }
  }
+  
+  // 根据状态返回该按钮是否显示
+  const isShowMainButton2 = (row, val) => {
+    if (val.indexOf(row.isStaging) > -1) {
+      return false
+    } else {
+      return true
+    }
+  }

  // 列表-操作按钮
  const butttondata = (row) => {
@ -167,6 +176,7 @@
      defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'qms:inspection-job-main:close'}), // 关闭
      defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2']),hasPermi:'qms:inspection-job-main:abandon'}), // 放弃
      defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2']),hasPermi:'qms:inspection-job-main:execute'}), // 执行
+      defaultButtons.mainListOrderPubBtn({hide:isShowMainButton2(row,['TRUE']),hasPermi:'qms:inspection-job-main:execute'}), // 发布
      defaultButtons.mainListPackageBtn(null), // 包装
    ]
  }
@ -185,6 +195,8 @@ const list = ref([])
    handleAbandon(row.id)
  } else if (val == 'mainJobClo') { // 关闭
    handleClose(row.id)
+  }  else if (val == 'mainOrderPub') { // 发布
+    handleRelease(row.id)
  } else if (val == 'mainJobAcc') { // 承接
    handleAccept(row.id)
  }
@ -220,6 +232,18 @@ const list = ref([])
      await getList()
    } catch { }
  }
+  /** 发布按钮操作 */
+  const handleRelease = async (id : number) => {
+    try {
+      // 发布的二次确认
+      await message.confirm('确认发布吗？')
+      // 发起发布
+      await InspectionJobMainApi.releaseInspectionJobMain(id)
+      message.success('发布成功！')
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
  // 承接
  const handleAccept = async (id : number) => {
    try {
--- a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
+++ b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 import * as ItemApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 import * as SupplierApi from '@/api/wms/supplier'
@ -38,7 +38,7 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '申请日期',
    field: 'applicationDate',
    sort: 'custom',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
    isSearch: false,
    search: {
      component: 'DatePicker',
@ -57,8 +57,11 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
      }
    },
    table: {
-      width: 175
-    }
+      width: 120
+    },
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
  },
  {
    label: '申请时间',
--- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
@ -256,7 +256,7 @@ const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
 const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
 // 标签打印
 const handlePoint = async (row) => {
-  window.open(src.value+'&number='+row.relateNumber)
+  window.open(src.value+'&asn_number='+row.relateNumber)
 }

 // form表单提交
--- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
@ -256,7 +256,7 @@ const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
 const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
 // 标签打印
 const handlePoint = async (row) => {
-  window.open(src.value+'&number='+row.relateNumber)
+  window.open(src.value+'&asn_number='+row.relateNumber)
 }

 // form表单提交
--- a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
@ -240,7 +240,7 @@ const BASE_URL = 'http://dev.ccwin-in.com:25110'
 const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
 // 标签打印
 const handlePoint = async (row) => {
-  window.open(src.value+'&number='+row.relateNumber)
+  window.open(src.value+'&asn_number='+row.relateNumber)
 }

 /** 导入 */
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@ -786,7 +786,6 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'uom',
    dictType: DICT_TYPE.UOM,
    dictClass: 'string',
-    isTable: true,
    sort: 'custom',
    table: {
      width: 150
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@ -567,9 +567,6 @@ const resetShow = async () => {
      item.tableForm.isInpuFocusShow = true
      item.tableForm.disabled = false
    }
-    if(item.field == 'uom') {
-      item.tableForm.disabled = false
-    }
    if(item.field == 'available') {
      item.tableForm.disabled = false
    }
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
@ -1,7 +1,7 @@
 <template>
  <ContentWrap>
    <!-- 搜索工作栏 -->
-    <Search :schema="SaleShipmentMainRecord.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...SaleShipmentMainRecord.allSchemas.searchSchema,...SaleShipmentDetailRecord.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
  </ContentWrap>

    <!-- 列表头部 -->
@ -12,11 +12,12 @@
      @updataTableColumns="updataTableColumns"
      @searchFormClick="searchFormClick"
      :allSchemas="SaleShipmentMainRecord.allSchemas"
+      :detailAllSchemas="SaleShipmentDetailRecord.allSchemas"
    />

  <!-- 列表 -->
  <ContentWrap>
-    <Table
+    <Table v-clientTable
      :columns="tableColumns"
      :data="tableObject.tableList"
      :loading="tableObject.loading"
@ -27,9 +28,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 }">
@ -51,18 +52,25 @@
  />

  <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="SaleShipmentMainRecord.allSchemas" />
+  <Detail 
+    ref="detailRef" 
+    :isBasic="true" 
+    :allSchemas="SaleShipmentMainRecord.allSchemas" 
+    :detailAllSchemas="SaleShipmentDetailRecord.allSchemas"
+    :detailAllSchemasRules="SaleShipmentDetailRecordRules"
+    :apiPage="SaleShipmentDetailRecordApi.getSaleShipmentDetailRecordPage"
+    />

  <!-- 导入 -->
 </template>

 <script setup lang="ts">
 import download from '@/utils/download'
-import { SaleShipmentMainRecord,SaleShipmentMainRecordRules } from './saleShipmentMainRecord.data'
+import { SaleShipmentMainRecord,SaleShipmentMainRecordRules,SaleShipmentDetailRecord,SaleShipmentDetailRecordRules } from './saleShipmentMainRecord.data'
 import * as SaleShipmentMainRecordApi from '@/api/wms/saleShipmentMainRecord'
+import * as SaleShipmentDetailRecordApi from '@/api/wms/saleShipmentDetailRecord'
 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: 'SaleShipmentMainRecord' })
@ -73,8 +81,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(SaleShipmentMainRecord.allSchemas.tableColumns)
-
+const tableColumns = ref([...SaleShipmentMainRecord.allSchemas.tableColumns,...SaleShipmentDetailRecord.allSchemas.tableMainColumns])
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
  nextTick(() => {
@ -90,7 +97,7 @@ const updataTableColumns = (val) => {
 }

 const { tableObject, tableMethods } = useTable({
-  getListApi: SaleShipmentMainRecordApi.getSaleShipmentMainRecordPage // 分页接口
+  getListApi: SaleShipmentDetailRecordApi.getSaleShipmentDetailRecordPage // 分页接口
 })

 // 获得表格的各种操作
@ -98,8 +105,8 @@ const { getList, setSearchParams } = tableMethods

 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:saleShipmentMainRecord:create'}), // 新增
-  defaultButtons.defaultExportBtn({hasPermi:'wms:saleShipmentMainRecord:export'}), // 导出
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:sale-shipment-main-record:create'}), // 新增
+  defaultButtons.defaultExportBtn({hasPermi:'wms:sale-shipment-main-record:export'}), // 导出
  defaultButtons.defaultFreshBtn(null), // 刷新
  defaultButtons.defaultFilterBtn(null), // 筛选
  defaultButtons.defaultSetBtn(null), // 设置
@ -129,8 +136,8 @@ const buttonBaseClick = (val, item) => {

 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:saleShipmentMainRecord:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:saleShipmentMainRecord:delete'}), // 删除
+  // defaultButtons.mainListEditBtn({hasPermi:'wms:sale-shipment-main-record:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-record:delete'}), // 删除
 ]

 // 列表-操作按钮事件
@ -189,7 +196,7 @@ const handleExport = async () => {
    // 发起导出
    exportLoading.value = true
    const data = await SaleShipmentMainRecordApi.exportSaleShipmentMainRecord(tableObject.params)
-    download.excel(data, '销售发运记录主.xlsx')
+    download.excel(data, '销售发运记录.xlsx')
  } catch {
  } finally {
    exportLoading.value = false
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
@ -11,25 +11,32 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'number',
    sort: 'custom',
    isSearch: true,
+    table: {
+      width: 200,
+    }
  },
  {
    label: '申请单号',
    field: 'requestNumber',
    sort: 'custom',
    isSearch: true,
+    table: {
+      width: 200,
+    }
  },
  {
    label: '客户代码',
    field: 'customerCode',
    sort: 'custom',
-    isSearch: true,
+    table: {
+      width: 150,
+    }
  },
  {
    label: '发票时间',
    field: 'invoiceTime',
    sort: 'custom',
    formatter: dateFormatter,
-    isSearch: true,
    search: {
      component: 'DatePicker',
      componentProps: {
@ -38,6 +45,9 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
      }
    },
+    table: {
+      width: 200,
+    },
    form: {
      component: 'DatePicker',
      componentProps: {
@ -51,7 +61,6 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'executeTime',
    sort: 'custom',
    formatter: dateFormatter,
-    isSearch: true,
    search: {
      component: 'DatePicker',
      componentProps: {
@ -67,32 +76,34 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
        valueFormat: 'x'
      }
    },
+    table: {
+      width: 200,
+    }
  },
  {
    label: '是否可用',
    field: 'available',
    sort: 'custom',
-    isSearch: true,
+    isTable:false
  },
  {
    label: '部门',
    field: 'departmentCode',
    sort: 'custom',
-    isSearch: true,
+    isTable:false
  },
  
  {
    label: '业务类型',
    field: 'businessType',
    sort: 'custom',
-    isSearch: true,
+    isTable:false
  },
  {
    label: '创建时间',
    field: 'createTime',
    sort: 'custom',
    formatter: dateFormatter,
-    isSearch: true,
    search: {
      component: 'DatePicker',
      componentProps: {
@ -102,12 +113,13 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
      }
    },
    isForm: false,
+    isTable:false
  },
  {
    label: '地点ID',
    field: 'siteId',
    sort: 'custom',
-    isSearch: true,
+    isTable:false
  },
  {
    label: '操作',
@ -125,121 +137,133 @@ export const SaleShipmentDetailRecordRules = reactive({
 })

 export const SaleShipmentDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    isSearch: true,
-  },
  {
    label: '销售订单号',
    field: 'soNumber',
    sort: 'custom',
-    isSearch: true,
+    table: {
+      width: 200,
+    }
  },
  {
    label: '销售订单行',
    field: 'soLine',
    sort: 'custom',
-    isSearch: true,
+    table: {
+      width: 150,
+    }
  },
  {
    label: '从货主代码',
    field: 'fromOwnerCode',
    sort: 'custom',
-    isSearch: true,
+    isTable:false
  },
  {
    label: '包装号',
    field: 'packingNumber',
    sort: 'custom',
-    isSearch: true,
+    isTable:false
  },
  {
    label: '批次',
    field: 'batch',
    sort: 'custom',
-    isSearch: true,
+    table: {
+      width: 150,
+    }
  },
  {
    label: '库存状态',
    field: 'inventoryStatus',
    sort: 'custom',
-    isSearch: true,
    form: {
      component: 'Radio'
    },
+    isTable:false
  },
  {
    label: '从库位代码',
    field: 'fromLocationCode',
    sort: 'custom',
-    isSearch: true,
+    table: {
+      width: 130,
+    }
  },
  {
    label: '主表ID',
    field: 'masterId',
    sort: 'custom',
-    isSearch: true,
    form: {
      component: 'InputNumber',
      value: 0
    },
+    isTable:false
  },
  {
    label: '物品代码',
    field: 'itemCode',
    sort: 'custom',
-    isSearch: true,
+    table: {
+      width: 150,
+    }
  },
  {
    label: '物品名称',
    field: 'itemName',
    sort: 'custom',
-    isSearch: true,
+    table: {
+      width: 150,
+    }
  },
  {
    label: '物品描述1',
    field: 'itemDesc1',
    sort: 'custom',
-    isSearch: true,
+    isTable:false
  },
  {
    label: '物品描述2',
    field: 'itemDesc2',
    sort: 'custom',
-    isSearch: true,
+    isTable:false
  },
  {
    label: '项目代码',
    field: 'projectCode',
    sort: 'custom',
-    isSearch: true,
+    isTable:false
  },
  {
    label: '数量',
    field: 'qty',
    sort: 'custom',
-    isSearch: true,
  },
  {
    label: '计量单位',
    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
    sort: 'custom',
-    isSearch: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
  },
  {
    label: '备注',
    field: 'remark',
    sort: 'custom',
-    isSearch: true,
+    isTable:false
  },
  {
    label: '创建时间',
    field: 'createTime',
    sort: 'custom',
    formatter: dateFormatter,
-    isSearch: true,
    search: {
      component: 'DatePicker',
      componentProps: {
@ -248,28 +272,30 @@ export const SaleShipmentDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
      }
    },
-    isForm: false,
+    isTable: false,
  },
  {
    label: '并发乐观锁',
    field: 'concurrencyStamp',
    sort: 'custom',
-    isSearch: true,
+    isTable:false
  },
  {
    label: '地点ID',
    field: 'siteId',
    sort: 'custom',
-    isSearch: true,
    form: {
      component: 'InputNumber',
      value: 0
    },
+    isTable:false
  },
  {
    label: '操作',
    field: 'action',
    isForm: false,
+    hiddenInMain:true,
+    isTable:false,
    table: {
      width: 150,
      fixed: 'right'
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
@ -108,15 +108,20 @@ const trueFalse = ref(false)
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
  nextTick(() => {
    if (type == 'tableForm') {
-      row['soLine'] = val[0]['lineNumber']
-      row['soNumber'] = val[0]['number']    
-      row['itemCode'] = val[0]['itemCode']
-      row['projectCode'] = val[0]['projectCode']
-      row['uom'] = val[0]['uom']
+      if(formField == 'soLine') {
+        row['soLine'] = val[0]['lineNumber']
+        row['soNumber'] = val[0]['number']    
+        row['itemCode'] = val[0]['itemCode']
+        row['projectCode'] = val[0]['projectCode']
+        row['uom'] = val[0]['uom']
+      }else if(formField == 'fromLocationCode'){
+        row['fromLocationCode'] = val[0]['code']
+      }
    }else {
      const setV = {}
-    if(formField == 'CustomerCode') {
-      setV['CustomerCode'] = val[0]['CustomerCode']
+      setV[formField] = val[0][searchField]    
+      if(formField == 'CustomerCode') {
+        setV['CustomerCode'] = val[0]['CustomerCode']
      } else {
        setV[formField] = val[0][searchField]
      }
@ -214,7 +219,7 @@ const butttondata = (row,$index) => {
  }
    return [
  defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:sale-shipment-main-request:update'}), // 编辑
-  defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:sale-shipment-main-request:close'}), // 关闭
+  defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4']),hasPermi:'wms:sale-shipment-main-request:close'}), // 关闭
  defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:sale-shipment-main-request:reAdd'}), //重新添加
  defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:sale-shipment-main-request:submit'}), // 提交审批
  defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:refused'}), // 驳回
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
@ -53,7 +53,6 @@ export const SaleShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '客户代码',
    field: 'customerCode',
    sort: 'custom',
-    isSearch: true,
    table: {
      width: 150
    },
@ -79,7 +78,6 @@ export const SaleShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '发票时间',
    field: 'invoiceTime',
    sort: 'custom',
-    isSearch: true,
    table: {
      width: 180
    },
@ -249,6 +247,15 @@ export const SaleShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([

 // 表单校验
 export const SaleShipmentDetailRules = reactive({
+  soLine: [
+    { required: true, message: '请选择订单行', trigger: 'blur' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请输选择客户库位', trigger: 'blur' }
+  ],
+  qty: [
+    { required: true, message: '请输入开票数量', trigger: 'blur' }
+  ],
 })

 export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
@ -256,7 +263,6 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
    label: '销售订单号',
    field: 'soNumber',
    sort: 'custom',
-    isSearch: true,
    table: {
      width: 200
    },
@ -321,7 +327,6 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
    label: '物料代码',
    field: 'itemCode',
    sort: 'custom',
-    isSearch: true,
    tableForm: {
      type: 'Select',
      disabled: true
@ -499,9 +504,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'action',
    isDetail: false,
    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
+    hiddenInMain:true,
+    isTableForm:false,
  }
 ]))
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@ -133,17 +133,17 @@ const buttonBaseClick = (val, item) => {

 // 列表-操作按钮
 const butttondata = [
-  {
-    label: '标签信息',
-    name: 'bqxx',
-    hide: false,
-    type: 'primary',
-    icon: '',
-    color: '',
-    link: true,
-    float:'right',
-    hasPermi: ''
-  },
+  // {
+  //   label: '标签信息',
+  //   name: 'bqxx',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: '',
+  //   color: '',
+  //   link: true,
+  //   float:'right',
+  //   hasPermi: ''
+  // },
  defaultButtons.mainListPointBtn(null), // 标签打印
  // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑
  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除
@ -178,20 +178,31 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }

 const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
-
+const labelType = ref('') // 标签类别 采购还是制造等
 // 标签打印
 const handlePoint = async (row) => {
  console.log(row.packingNumber,445555555555555);
  PackageApi.getBalanceToPackage(row.packingNumber).then(res => {
-    console.log(res,66666666666);
-     // 判断是采购还是制造
-  if (res.asnNumber !== null && res.asnNumber !== '') {
+    console.log(777,res);
+      if (res.productionLineCode != null) {
+        labelType.value = 'zz'
+      } else {
+        labelType.value = 'cg'
+      }
+      PackageApi.batchPrintingLable((res.number)).then((resLable) =>{
+        console.log(159,resLable )
+ // 判断是采购还是制造
+ if (labelType.value == 'cg') {
    const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
-    window.open(src.value+'&id='+res.id)
+    console.log(159,resLable )
+    window.open(src.value+'&asn_number='+resLable)
  } else {
    const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
-    window.open(src.value+'&id='+res.id)
+    window.open(src.value+'&asn_number='+resLable)
  }
+    })
+  }).catch(err => {
+    console.log(err)
  })
 }

--- a/src/views/wms/inventoryManage/package/index.vue
+++ b/src/views/wms/inventoryManage/package/index.vue
@ -260,10 +260,10 @@ const handlePoint = async (row) => {
  // 判断是采购还是制造
  if (row.asnNumber !== null && row.asnNumber !== '') {
    const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
-    window.open(src.value+'&id='+row.id)
+    window.open(src.value+'&asn_number='+row.id)
  } else {
    const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
-    window.open(src.value+'&id='+row.id)
+    window.open(src.value+'&asn_number='+row.id)
  }
 }

--- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts
@ -493,10 +493,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
    isForm: false,
    hiddenInMain:true,
    isTableForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
+    isTable: false
  }
 ]))

--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
@ -66,6 +66,7 @@ import download from '@/utils/download'
 import { PackageoverMain,PackageoverMainRules, PackageoverDetail, PackageoverDetailRules } from './packageoverRecordMain.data'
 import * as PackageoverRecordMainApi from '@/api/wms/packageoverRecordMain'
 import * as PackageoverRecordDetailApi from '@/api/wms/packageoverRecordDetail'
+import * as printLabelCorrelationApi from '@/api/wms/printLabelCorrelation'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as PackageApi from '@/api/wms/package'
 import { getAccessToken } from '@/utils/auth'
@ -149,18 +150,22 @@ const handlePoint = async (row) => {
      } else {
        labelType.value = 'cg'
      }
-    }
-  }).catch(err => {
-    console.log(err)
-  })
-  // 判断是采购还是制造
-  if (labelType.value == 'cg') {
+      PackageApi.batchPrintingLable(res.list.map(item1=>item1.number).join(',')).then((resLable) =>{
+            console.log(159,resLable )
+
+ // 判断是采购还是制造
+ if (labelType.value == 'cg') {
    const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
-    window.open(src.value+'&request_number='+row.number)
+    window.open(src.value+'&asn_number='+resLable)
  } else {
    const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
-    window.open(src.value+'&request_number='+row.number)
+    window.open(src.value+'&asn_number='+resLable)
  }
+    })
+    }
+  }).catch(err => {
+    console.log(err)
+  })
 }

 /** 详情操作 */
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
@ -74,7 +74,7 @@
  <!-- 导入 -->
  <ImportForm ref="importFormRef" url="/wms/packageover-request-main/import" :importTemplateData="importTemplateData" @success="importSuccess" 
  :updateIsDisable="true" :coverIsDisable="true" :mode="2"/>
-</template>
+ </template>

 <script setup lang="ts">
 import download from '@/utils/download'
@ -93,7 +93,7 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...PackageoverRequestMain.allSchemas.tableColumns,...PackageoverRequestDetail.allSchemas.tableMainColumns])
-
+const isCreateLabel = ref(false)
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
  tableColumns.value = val
@ -188,6 +188,8 @@ const HeadButttondata = [
  // },
 ]

+const labelType = ref('') // 标签类别 采购还是制造等 
+
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
  if (val == 'add') { // 新增
@ -311,6 +313,8 @@ const buttonTableClick = async (val, row) => {
    openForm('update', row)
  } else if (val == 'delete') { // 删除
    handleDelete(row.masterId)
+  }else if (val == 'point') { // 标签打印
+    handlePoint(row)
  }
 }

@ -410,6 +414,26 @@ const submitForm = async (formType, data) => {
  }
 }

+const searchTableRef = ref()
+const labelPrint = async (row) => {
+  tableObject.loading = true
+  const defaultParams = {'moduleName':'productreturn_predict','recordNumber':row.number}
+  const {tableObject:tableObjectPrint ,tableMethods} = useTable({
+    defaultParams,
+    getListApi: PackageApi.getLabelDetailPage  // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList:getListPrint } = tableMethods
+  getListPrint()
+  tableObject.loading = false
+  const tableColumns = PackageoverRequestMain.allSchemas.tableFormColumns
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width || 150
+  })
+  searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
+}
+
 /** 导入 */
 const importFormRef = ref()
 const handleImport = () => {
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue
@ -109,10 +109,10 @@ const handlePoint = async (row) => {
  // 判断是采购还是制造
  if (labelType == 'cg') {
    const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
-    window.open(src.value+'&request_number='+row.number)
+    window.open(src.value+'&asn_number='+row.number)
  } else {
    const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
-    window.open(src.value+'&request_number='+row.number)
+    window.open(src.value+'&asn_number='+row.number)
  }
 }
 // 头部按钮事件
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts
@ -133,6 +133,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '优先级',
    field: 'priority',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 150
    },
@ -144,6 +145,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '优先级增量',
    field: 'priorityIncrement',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 150
    },
@ -218,6 +220,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '备注',
    field: 'remark',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 150
    },
@ -226,6 +229,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '业务类型',
    field: 'businessType',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 150
    },
@ -234,6 +238,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '部门',
    field: 'departmentCode',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 150
    },
@ -243,7 +248,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'autoComplete',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -262,7 +267,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'allowModifyLocation',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -281,7 +286,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'allowModifyQty',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -300,7 +305,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'allowBiggerQty',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -319,7 +324,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'allowSmallerQty',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -338,7 +343,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'allowModifyInventoryStatus',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -357,7 +362,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'allowContinuousScanning',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -376,7 +381,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'allowPartialComplete',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -395,7 +400,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'allowModifyBatch',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -414,7 +419,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'allowModifyPackingNumber',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -428,14 +433,6 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
      }
    }
  },
-  // {
-  //   label: '状态',
-  //   field: 'jobStageStatus',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
  {
    label: '承接时间',
    field: 'acceptTime',
@ -444,6 +441,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
      dateFormat: 'YYYY-MM-DD HH:mm:ss'
    },
    sort: 'custom',
+    isTable:false,
    table: {
      width: 180
    },
@ -460,6 +458,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '承接人',
    field: 'acceptUserId',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -475,6 +474,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable:false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -488,6 +488,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '完成人',
    field: 'completeUserId',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -503,6 +504,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable:false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -516,6 +518,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '创建者',
    field: 'creator',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -528,6 +531,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
      dateFormat: 'YYYY-MM-DD HH:mm:ss'
    },
    sort: 'custom',
+    isTable:false,
    table: {
      width: 180
    },
@ -544,6 +548,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '最后更新者',
    field: 'updater',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -629,6 +634,7 @@ export const TransferissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
    label: '单据号',
    field: 'number',
    sort: 'custom',
+    hiddenInMain:true,
    table: {
      width: 180
    },
@ -742,6 +748,7 @@ export const TransferissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
    label: '从货主代码',
    field: 'fromOwnerCode',
    sort: 'custom',
+    hiddenInMain:true,
    table: {
      width: 150
    },
@ -750,6 +757,7 @@ export const TransferissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
    label: '到货主代码',
    field: 'toOwnerCode',
    sort: 'custom',
+    hiddenInMain:true,
    table: {
      width: 150
    },
@ -758,6 +766,7 @@ export const TransferissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
    label: '项目代码',
    field: 'projectCode',
    sort: 'custom',
+    hiddenInMain:true,
    table: {
      width: 150
    },
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts
@ -204,6 +204,7 @@ export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
  {
    label: '出库事务类型',
    field: 'outTransactionType',
+    isTable:false,
    sort: 'custom',
    table: {
      width: 150
@ -213,6 +214,7 @@ export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '入库事务类型',
    field: 'inTransactionType',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -221,6 +223,7 @@ export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '业务类型',
    field: 'businessType',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -230,7 +233,7 @@ export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'interfaceType',
    dictType: DICT_TYPE.INTERFACE_TYPE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -240,6 +243,7 @@ export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '部门',
    field: 'departmentCode',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -248,6 +252,7 @@ export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '备注',
    field: 'remark',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -260,6 +265,7 @@ export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
      dateFormat: 'YYYY-MM-DD HH:mm:ss'
    },
    sort: 'custom',
+    isTable:false,
    table: {
      width: 180
    },
@ -276,25 +282,18 @@ export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '创建者',
    field: 'creator',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
  },
-  // {
-  //   label: '代码',
-  //   field: 'code',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
  {
    label: '是否可用',
    field: 'available',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
    isSearch: true,
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -376,6 +375,7 @@ export const TransferissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
    label: '单据号',
    field: 'number',
    sort: 'custom',
+    hiddenInMain:true,
    table: {
      width: 180
    },
@ -454,6 +454,7 @@ export const TransferissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
    label: '从器具号',
    field: 'fromContainerNumber',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -462,6 +463,7 @@ export const TransferissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
    label: '到器具号',
    field: 'toContainerNumber',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -497,6 +499,7 @@ export const TransferissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
    label: '从货主代码',
    field: 'fromOwnerCode',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -528,6 +531,7 @@ export const TransferissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
  {
    label: '到货主代码',
    field: 'toOwnerCode',
+    isTable:false,
    sort: 'custom',
    table: {
      width: 150
@ -605,6 +609,7 @@ export const TransferissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
    label: '项目代码',
    field: 'projectCode',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -631,20 +636,12 @@ export const TransferissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
      filterable: true
    }
  },
-  // {
-  //   label: '代码',
-  //   field: 'code',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
  {
    label: '接口类型',
    field: 'interfaceType',
    dictType: DICT_TYPE.INTERFACE_TYPE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
@ -306,6 +306,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
        disabled: true
      }
    },
+    isTable: false,
    isForm: false,
  },
  {
@ -313,6 +314,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'departmentCode',
    sort: 'custom',
    isForm: false,
+    isTable: false,
    table: {
      width: 150
    },
@ -337,7 +339,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'autoCommit',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    isForm: false,
    sort: 'custom',
    table: {
@ -358,7 +360,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'autoAgree',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    isForm: false,
    sort: 'custom',
    table: {
@ -379,7 +381,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'autoExecute',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    isForm: false,
    sort: 'custom',
    table: {
@ -445,6 +447,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
        valueFormat: 'x',
      }
    },
+    isTable:false,
    isForm: false,
  },
  {
@ -454,6 +457,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable:false,
    isForm: false,
  },
  {
@ -476,6 +480,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
        valueFormat: 'x',
      }
    },
+    isTable:false,
    isForm: false,
  },
  {
@ -485,6 +490,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable:false,
    isForm: false,
  },
  {
@ -541,6 +547,7 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
    table: {
      width: 180
    },
+    hiddenInMain:true,
    isTableForm: false,
    form: {
      componentProps: {
@ -765,6 +772,8 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
    table: {
      width: 150
    },
+    isTable:false,
+    hiddenInMain:true,
    isTableForm: false,
    isForm: false,
  },
@ -775,6 +784,8 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
    table: {
      width: 150
    },
+    isTable:false,
+    hiddenInMain:true,
    isTableForm: false,
    isForm: false,
  },
@ -785,6 +796,8 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
    table: {
      width: 150
    },
+    isTable:false,
+    hiddenInMain:true,
    isTableForm: false,
    isForm: false
  },
@ -890,6 +903,7 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
    field: 'action',
    isDetail: false,
    isForm: false ,
+    hiddenInMain: true,
    table: {
      width: 150,
      fixed: 'right'
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts
@ -196,6 +196,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '优先级',
    field: 'priority',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -207,6 +208,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '优先级增量',
    field: 'priorityIncrement',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -218,6 +220,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '业务类型',
    field: 'businessType',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -226,6 +229,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '部门',
    field: 'departmentCode',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -234,6 +238,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '备注',
    field: 'remark',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -243,7 +248,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'autoComplete',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -262,7 +267,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'allowModifyLocation',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -281,7 +286,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'allowModifyQty',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -300,7 +305,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'allowBiggerQty',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -319,7 +324,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'allowSmallerQty',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -338,7 +343,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'allowModifyInventoryStatus',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -357,7 +362,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'allowContinuousScanning',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -376,7 +381,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'allowPartialComplete',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -395,7 +400,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'allowModifyBatch',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -414,7 +419,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'allowModifyPackingNumber',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -439,6 +444,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable: false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -452,6 +458,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '承接人',
    field: 'acceptUserId',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 150
    },
@ -467,6 +474,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable: false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -480,6 +488,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '完成人',
    field: 'completeUserId',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 150
    },
@ -491,6 +500,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    detail: {
      dateFormat: 'YYYY-MM-DD HH:mm:ss'
    },
+    isTable: false,
    sort: 'custom',
    table: {
      width: 180
@ -508,6 +518,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '创建者',
    field: 'creator',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 150
    },
@ -523,6 +534,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable: false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -536,6 +548,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '最后更新者',
    field: 'updater',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 150
    },
@ -621,6 +634,7 @@ export const TransferreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
    label: '单据号',
    field: 'number',
    sort: 'custom',
+    hiddenInMain:true,
    table: {
      width: 180
    },
@ -677,6 +691,7 @@ export const TransferreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
    label: '器具号',
    field: 'containerNumber',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -734,6 +749,7 @@ export const TransferreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
    label: '从货主代码',
    field: 'fromOwnerCode',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -742,6 +758,7 @@ export const TransferreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
    label: '到货主代码',
    field: 'toOwnerCode',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -750,6 +767,7 @@ export const TransferreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
    label: '项目代码',
    field: 'projectCode',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts
@ -213,6 +213,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '出库事务类型',
    field: 'outTransactionType',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -221,6 +222,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '入库事务类型',
    field: 'inTransactionType',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -229,6 +231,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '业务类型',
    field: 'businessType',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -237,6 +240,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '部门',
    field: 'departmentCode',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -246,7 +250,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'interfaceType',
    dictType: DICT_TYPE.INTERFACE_TYPE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -256,6 +260,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '备注',
    field: 'remark',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 150
    },
@ -268,6 +273,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
      dateFormat: 'YYYY-MM-DD HH:mm:ss'
    },
    sort: 'custom',
+    isTable: false,
    table: {
      width: 180
    },
@ -284,25 +290,18 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '创建者',
    field: 'creator',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 150
    },
  },
-  // {
-  //   label: '代码',
-  //   field: 'code',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
  {
    label: '是否可用',
    field: 'available',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
    isSearch: true,
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -384,6 +383,7 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
    label: '单据号',
    field: 'number',
    sort: 'custom',
+    hiddenInMain:true,
    table: {
      width: 180
    },
@ -478,6 +478,7 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
    label: '从器具号',
    field: 'fromContainerNumber',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -486,6 +487,7 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
    label: '到器具号',
    field: 'toContainerNumber',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -521,6 +523,7 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
    label: '项目代码',
    field: 'projectCode',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -583,6 +586,7 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
    label: '从货主代码',
    field: 'fromOwnerCode',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -591,6 +595,7 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
    label: '到货主代码',
    field: 'toOwnerCode',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -600,7 +605,7 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
    field: 'interfaceType',
    dictType: DICT_TYPE.INTERFACE_TYPE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -614,14 +619,6 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
      width: 150
    },
  },
-  // {
-  //   label: '任务明细ID',
-  //   field: 'jobDetailId',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
  {
    label: '创建时间',
    field: 'createTime',
@ -650,14 +647,6 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
      width: 150
    },
  },
-  // {
-  //   label: '代码',
-  //   field: 'code',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
 ]))

 //表单校验
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
@ -190,6 +190,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    table: {
      width: 150
    },
+    isTable:false,
    form: {
      value: 'TransferReceipt',
      componentProps: {
@ -201,6 +202,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    label: '部门',
    field: 'departmentCode',
    sort: 'custom',
+    isTable:false,
    isForm: false,
    table: {
      width: 150
@ -235,7 +237,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    field: 'autoCommit',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    isForm: false,
    sort: 'custom',
    table: {
@ -256,7 +258,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    field: 'autoAgree',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    isForm: false,
    sort: 'custom',
    table: {
@ -277,7 +279,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    field: 'autoExecute',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    isForm: false,
    sort: 'custom',
    table: {
@ -325,6 +327,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    table: {
      width: 180
    },
+    isTable: false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -342,6 +345,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    table: {
      width: 150
    },
+    isTable: false,
    isForm: false,
  },
  {
@ -363,6 +367,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
        valueFormat: 'x',
      }
    },
+    isTable: false,
    isForm: false,
  },
  {
@ -372,6 +377,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    table: {
      width: 150
    },
+    isTable: false,
    isForm: false,
  },
  {
@ -437,6 +443,7 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    table: {
      width: 180
    },
+    hiddenInMain:true,
    isTableForm: false,
    form: {
      componentProps: {
@ -496,6 +503,7 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    label: '器具号',
    field: 'containerNumber',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -553,6 +561,7 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    label: '项目代码',
    field: 'projectCode',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -561,6 +570,7 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    label: '从货主代码',
    field: 'fromOwnerCode',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -569,6 +579,7 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    label: '到货主代码',
    field: 'toOwnerCode',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -676,6 +687,7 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
      width: 150,
      fixed: 'right'
    },
+    hiddenInMain:true,
    isTableForm:false,
  }
 ]))
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@ -630,10 +630,10 @@ const handlePoint = async (row) => {
  if (isCreateLabel.value) {
    if (labelType.value == 'cg') {
      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
-      window.open(src.value+'&request_number='+row.number)
+      window.open(src.value+'&asn_number='+row.number)
    } else {
      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
-      window.open(src.value+'&request_number='+row.number)
+      window.open(src.value+'&asn_number='+row.number)
    }
  } else {
    message.warning('请先创建标签')
--- a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
@ -53,6 +53,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
    label: '出库事务类型',
    field: 'outTransactionType',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -61,6 +62,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
    label: '入库事务类型',
    field: 'inTransactionType',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -370,6 +372,7 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive<CrudSchema[
    label: '器具号',
    field: 'containerNumber',
    sort: 'custom',
+    isTable:false,
    table: {
      width: 150
    },
@ -532,22 +535,6 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive<CrudSchema[
      width: 150
    },
  },
-  // {
-  //   label: '任务明细ID',
-  //   field: 'jobDetailId',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  // {
-  //   label: '代码',
-  //   field: 'code',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
  {
    label: '接口类型',
    field: 'interfaceType',
@ -599,8 +586,9 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive<CrudSchema[
    label: '操作',
    field: 'action',
    isDetail: false,
-    isForm: false ,
-    isTable:false,
+    isForm: false,
+    hiddenInMain:true,
+    isTable:true,
    table: {
      width: 150,
      fixed: 'right'
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
@ -135,6 +135,7 @@ const buttonOperationClick = async (row, label, index)=> {
    return
  }
  detatableDataBom.params.itemCode = row.itemCode
+  detatableDataBom.params.masterId = row.id
  DialogTitle.value = '物料代码:【' + row.itemCode + '】 Bom 信息'
  bomModelVisible.value = true
  await getDetailListBom()
@ -181,7 +182,7 @@ const tableFormButton = async (val , row) => {
    bomModelVisible.value = true
    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
    detatableDataBom.params = {
-      masterId: row.masterId
+      masterId: row.id
    }
    await getDetailListBom()
  }
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@ -103,11 +103,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
        searchDetailSchemas: PurchasereceiptRecordDetail.allSchemas,
        searchAllSchemas: PurchasereceiptRecordMain.allSchemas, // 查询弹窗所需类
        searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        },
+        searchCondition: [
        {
          key: 'supplierCode',
          value: 'supplierCode',
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue
@ -241,7 +241,7 @@ const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
 const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
 // 标签打印
 const handlePoint = async (id) => {
-  window.open(src.value+'&id='+id)
+  window.open(src.value+'&asn_number='+id)
 }

 /** 导入 */