Merge branch 'hella_online_20240803' into master_hella

README.md

@@ -1,5 +1,6 @@
 ## dev发布2024-06-01-002
 **xxxx.data.ts 文件配置说明**
+
 dictType: DICT_TYPE.INVENTORY_STATUS,
 dictClass: 'string',
 dictAllOption:true,// true 字典中--下拉框中展示全选按钮

src/api/wms/location/index.ts

@@ -128,6 +128,15 @@ export const selectBusinessTypeOutLocation = async (params) => {
     return request.get({ url: `/wms/location/pageBusinessTypeOutLocation`, params })
   }
 }
+export const selectBusinessTypeOutLocationAll = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/location/pageBusinessTypeOutLocationSeniorAll', data })
+  } else {
+    return request.get({ url: `/wms/location/pageBusinessTypeOutLocationAll`, params })
+  }
+}
 
 
 export const selectPageItemAreaToLocation = async (params) => {
@@ -154,3 +163,9 @@ export const selectConfigToLocation = async (params) => {
 export const getLocationByCodes = async (params) => {
   return await request.get({ url: `/wms/location/listByCodes`, params })
 }
+
+
+// 查询库位组列表
+export const getLocationByOverflowAreaTypeByConfig = async (params) => {
+  return await request.get({ url: `/wms/location/queryLocationByOverflowAreaTypeByConfig`, params })
+}

src/api/wms/productionreturnJobDetail/index.ts

@@ -34,6 +34,27 @@ export const getProductionreturnJobDetailPage = async (params) => {
     return await request.get({ url: `/wms/productionreturn-job-detail/page`, params })
   }
 }
+// 查询生产退料任务子列表
+export const getProductionreturnJobDetailPageStore = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productionreturn-job-detail-store/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productionreturn-job-detail-store/page`, params })
+  }
+}
+
+// 查询隔离退料任务子列表
+export const getProductionreturnJobDetailPageHold = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productionreturn-job-detail-hold/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productionreturn-job-detail-hold/page`, params })
+  }
+}
 
 // 查询生产退料任务子详情
 export const getProductionreturnJobDetail = async (id: number) => {

src/api/wms/productionreturnJobMain/index.ts

@@ -81,6 +81,27 @@ export const exportProductionreturnJobMain = async (params) => {
   }
 }
 
+// 导出生产退料任务主 Excel -store
+export const exportProductionreturnJobMainStore = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productionreturn-job-detail-store/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/productionreturn-job-detail-store/export-excel`, params })
+  }
+}
+
+// 导出隔离退料任务主 Excel -hold
+export const exportProductionreturnJobMainHold = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productionreturn-job-detail-hold/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/productionreturn-job-detail-hold/export-excel`, params })
+  }
+}
+
+
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/productionreturn-job-main/get-import-template' })

src/api/wms/productionreturnRecordMain/index.ts

@@ -67,6 +67,24 @@ export const exportProductionreturnRecordMain = async (params) => {
     return await request.download({ url: `/wms/productionreturn-record-main/export-excel`, params })
   }
 }
+// 导出生产退料记录主 Excel -store
+export const exportProductionreturnRecordMainStore = async (params) => {
+  if (params.isSearch){
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productionreturn-job-detail-store/export-excel-senior`, data })
+  }else {
+    return await request.download({ url: `/wms/productionreturn-job-detail-store/export-excel`, params })
+  }
+}
+// 导出隔离退料记录主 Excel -hold
+export const exportProductionreturnRecordMainHold = async (params) => {
+  if (params.isSearch){
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productionreturn-job-detail-hold/export-excel-senior`, data })
+  }else {
+    return await request.download({ url: `/wms/productionreturn-job-detail-hold/export-excel`, params })
+  }
+}
 
 // 下载用户导入模板
 export const importTemplate = () => {

src/api/wms/productputawayRecordMain/index.ts

@@ -74,12 +74,12 @@ export const deleteProductputawayRecordMain = async (id: number) => {
 
 // 导出制品上架记录主 Excel
 export const exportProductputawayRecordMain = async (params) => {
-  params.type = 'assemble'
+
   if (params.isSearch) {
     const cmd = {
       'column':'type',
       'action':'==',
-      'value':'assemble'
+      'value':params.type
     }
     params.filters.push(cmd)
     delete params.isSearch

src/api/wms/productscrapRecordMain/index.ts

@@ -69,4 +69,9 @@ export const exportProductscrapRecordMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/productscrap-record-main/get-import-template' })
+}
+
+// 撤销
+export const revoke = async (requestNumber: number, number: number) => {
+  return await request.get({ url: `/wms/productscrap-record-main/revoke?requestNumber=` + requestNumber + '&number=' + number})
 }

src/api/wms/purchasePlanDetail/index.ts

@@ -40,6 +40,18 @@ export const getPurchasePlanDetailPage = async (params) => {
   }
 }
 
+// 查询要货计划子列表 -- 供应商发货申请添加明细
+export const getPurchasePlanDetailPageClcik = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchase-plan-detail/clickDetailsSenior', data })
+  } else {
+    params = getPageParams(params)
+    return await request.get({ url: `/wms/purchase-plan-detail/clickDetailsPage`, params })
+  }
+}
+
 // 查询采购收货记录子列表
 export const getPurchasePlanDetailList = async (params) => {
     return await request.get({ url: `/wms/purchase-plan-detail/allList`, params })

src/api/wms/purchasereceiptRequestMain/index.ts

@@ -88,6 +88,17 @@ export const exportPurchasereceiptRequestMain = async (params) => {
   }
 }
 
+
+// 导出采购M型收货申请主 Excel
+export const exportPurchasereceiptRequestMainOrderTypeM = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereceipt-request-main/export-excel-senior-orderTypeM`, data })
+  } else {
+    return await request.download({ url: `/wms/purchasereceipt-request-main/export-excel-orderTypeM`, params })
+  }
+}
+
 // 导出备件收货申请
 export const exportSparereceiptRequestMain = async (params) => {
   if (params.isSearch) {

src/api/wms/supplierinvoiceRecordMain/index.ts

@@ -52,6 +52,12 @@ export const deleteSupplierinvoiceRecordMain = async (id: number) => {
   return await request.delete({ url: `/wms/supplierinvoice-record-main/delete?id=` + id })
 }
 
+// 发票回转
+export const reverseSupplierinvoiceRecordMain = async (data: SupplierinvoiceRecordMainVO) => {
+  return await request.post({ url: `/wms/supplierinvoice-record-main/reverse`, data })
+}
+
+
 // 导出供应商发票记录主 Excel
 export const exportSupplierinvoiceRecordMain = async (params) => {
   console.log(params)

src/api/wms/unplannedissueRecordMain/index.ts

@@ -59,3 +59,8 @@ export const exportUnplannedissueRecordMain = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/unplannedissue-record-main/get-import-template' })
 }
+
+// 撤销
+export const revoke = async (id: number) => {
+  return await request.get({ url: `/wms/unplannedissue-record-main/revoke?id=` + id })
+}

src/api/wms/unplannedreceiptRecordMain/index.ts

@@ -68,4 +68,9 @@ export const exportUnplannedreceiptRecordMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/unplannedreceipt-record-main/get-import-template' })
+}
+
+// 撤销
+export const revoke = async (id: number) => {
+  return await request.get({ url: `/wms/unplannedreceipt-record-main/revoke?id=` + id })
 }

src/components/BasicForm/src/BasicForm.vue

@@ -150,6 +150,7 @@
   <SearchTable
     ref="searchTableRef"
     :showSearchTableQueryFields="showSearchTableQueryFields"
+    :hiddenFilterBtnFields="hiddenFilterBtnFields"
     :isCheckStrictly="isCheckStrictly"
     @searchTableSuccess="searchTableSuccess"
   >
@@ -359,6 +360,11 @@ const props = defineProps({
     required: false,
     default: []
   },
+  hiddenFilterBtnFields:{
+    type: Array,
+    required: false,
+    default: []
+  },
   // 失去焦点之后是否进行校验，
   isJiaoyan: {
     type: Boolean,
@@ -537,11 +543,14 @@ const opensearchTable = (
                 return
               }
             }
-            filters.push({
-              action: searchCondition[i].action,
-              column: searchCondition[i].key,
-              value: formRef.value.formModel[searchCondition[i].value]
-            })
+            if(formRef.value.formModel[searchCondition[i].value]){
+              filters.push({
+                action: searchCondition[i].action,
+                column: searchCondition[i].key,
+                value: formRef.value.formModel[searchCondition[i].value]
+              })
+            }
+            
           } else {
             filters.push({
               action: searchCondition[i].action,

src/components/Descriptions/src/Descriptions.vue

@@ -146,9 +146,10 @@ const showAll = () =>{
                 }}
               </slot>
               <slot v-else-if="item.valueFilter">
-                {{
+                <el-tag v-if="item.dictType" :type="item.dictType">{{ item.valueFilter(data[item.field]) }}</el-tag>
+                <span v-else>{{
                   item.valueFilter(data[item.field])
-                }}
+                }}</span>
               </slot>
               <slot v-else-if="item.dictType">
                 <div v-if="data[item.field]&&Array.isArray(data[item.field])" >

src/components/Detail/src/Detail.vue

@@ -209,6 +209,7 @@ import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import DetailTable from '@/components/DetailTable/src/DetailTable.vue'
 import { SearchTable } from '@/components/SearchTable'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 
 defineOptions({ name: 'Detail' })
 
@@ -443,6 +444,23 @@ const props = defineProps({
     default: 8
   }
 })
+const filterPermissionAnnexTable = ()=>{
+  return props.annexTable.filter(item=>{
+    const { wsCache } = useCache()
+    const permissions = wsCache.get(CACHE_KEY.USER).permissions
+    const all_permission = '*:*:*'
+    if(item?.hasPermi&&item?.hasPermi.length > 0){
+      const hasPermissions = permissions.find((permission: string) => {
+        return all_permission === permission || item?.hasPermi === permission
+      })
+      if(!hasPermissions){
+        console.log('hasPermi',item)
+        return false
+      }
+    }
+    return true
+  })
+}
 const isShowDrawer = ref(false)
 const detailLoading = ref(false)
 const tabsList = ref(JSON.parse(JSON.stringify(props.tabs ? props.tabs : '')))
@@ -471,7 +489,7 @@ if(props.slotDetailTabList){
 }
 
 
-let otherList = [...props.annexTable,{
+let otherList = [...filterPermissionAnnexTable(),{
     label:props.annexAlias.label,
     prop:'Annex'
   },{
@@ -482,7 +500,7 @@ let otherList = [...props.annexTable,{
     prop:'ChangeRecord'
 }]
 if(props.annexAlias.hidden){
-  otherList = [...props.annexTable,{
+  otherList = [...filterPermissionAnnexTable(),{
       label:'备注',
       prop:'Remarks'
     },{
@@ -548,9 +566,12 @@ const getFileList = async () => {
     detailLoading.value = false
   }
 }
+
+
 // 获取其他附件列表篇
 const getAnnexFileList =  async (row) => {
-  props.annexTable?.forEach(async (item) => {
+  let annexTable = filterPermissionAnnexTable()
+  annexTable?.forEach(async (item) => {
     let requstData = {...remarksData.data,tableName: item?.tableName} 
     if(item?.queryParams){
       item?.queryParams?.forEach(queryItem => {

src/locales/en-US.ts

@@ -1283,6 +1283,10 @@ export default {
     '确认撤销报工吗？': 'Are you sure to cancel the job application?',
     '收货数量不可以大于订单数量!': 'The received quantity cannot exceed the order quantity',
     撤销报工成功:'Revocation of work report successful',
+    生产日期不能小于:'The date of production cannot be less than',
+    生产日期不能大于当前系统日期:'The production date cannot be greater than the current system date',
+    发票回转:'Return of invoice',
+    发票回转成功:'The invoice has been successfully forwarded'
   },
 
 

src/locales/zh-CN.ts

@@ -1280,6 +1280,10 @@ export default {
     '确认撤销报工吗？': "确认撤销报工吗？",
     '收货数量不可以大于订单数量!':'收货数量不可以大于订单数量',
     撤销报工成功:'撤销报工成功',
+    生产日期不能小于:'生产日期不能小于',
+    生产日期不能大于当前系统日期:'生产日期不能大于当前系统日期',
+    发票回转:'发票回转',
+    发票回转成功:'发票回转成功'
   },
 
 }

src/views/login/components/QRCodePDA.vue

@@ -0,0 +1,17 @@
+<template>
+  <div style="position: absolute; bottom: 50px;right:0;display: flex; flex-direction: column;align-items: flex-end;">
+    <div style="position: relative;" v-show="showCode">
+      <Icon icon="ep:close" style="position: absolute;right: 5px;top: 5px" @click="handleClose"/>
+      <img alt="" style="margin-bottom: 10px;" width="120" height="120"/>
+    </div>
+    <el-button type="primary" link @click="handleClose">PDA按照程序下载链接</el-button>
+  </div>
+</template>
+<script setup lang="ts">
+
+const showCode = ref(false)
+const handleClose = ()=>{
+  showCode.value = !showCode.value
+}
+</script>
+<style lang="scss" scoped></style>

src/views/login/components/index.ts

@@ -4,5 +4,6 @@ import LoginFormTitle from './LoginFormTitle.vue'
 import RegisterForm from './RegisterForm.vue'
 import QrCodeForm from './QrCodeForm.vue'
 import SSOLoginVue from './SSOLogin.vue'
+import QRCodePDA from './QRCodePDA.vue'
 
-export { LoginForm, MobileForm, LoginFormTitle, RegisterForm, QrCodeForm, SSOLoginVue }
+export { LoginForm, MobileForm, LoginFormTitle, RegisterForm, QrCodeForm, SSOLoginVue,QRCodePDA }

src/views/login/login.vue

@@ -43,7 +43,7 @@
         </div>
         <!-- 右边的登录界面 -->
         <Transition appear enter-active-class="animate__animated animate__bounceInRight">
-          <div
+          <div style="position: relative"
             class="m-auto h-full w-[100%] flex items-center at-2xl:max-w-500px at-lg:max-w-500px at-md:max-w-500px at-xl:max-w-500px"
           >
             <!-- 账号登录 -->
@@ -56,7 +56,10 @@
             <RegisterForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
             <!-- 三方登录 -->
             <SSOLoginVue class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
+            <!-- PDA端APK程序下载的二维码 -->
+            <!-- <QRCodePDA class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)"/> -->
           </div>
+
         </Transition>
       </div>
     </div>
@@ -70,7 +73,7 @@ import { useAppStore } from '@/store/modules/app'
 import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
 import { LocaleDropdown } from '@/layout/components/LocaleDropdown'
 
-import { LoginForm, MobileForm, QrCodeForm, RegisterForm, SSOLoginVue } from './components'
+import { LoginForm, MobileForm, QrCodeForm, RegisterForm, SSOLoginVue,QRCodePDA } from './components'
 
 defineOptions({ name: 'Login' })
 

src/views/qms/inspectionQ2/index.vue

@@ -49,6 +49,15 @@
   <BasicForm
     ref="basicFormRef"
     @success="formsSuccess"
+     :sumFormDataByForm="
+      (formRef, formModel) => {
+        const { claimAddress } = formModel
+        formRef.value.setValues({
+          installPackageUrl: claimAddress
+        })
+      }
+    "
+    :hiddenFilterBtnFields="['purchaseReceiptNumber']"
     :rules="Q2Rules"
     :formAllSchemas="Q2.allSchemas"
     :apiUpdate="Q2Api.updateQ2"
@@ -150,6 +159,14 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     if (formField == 'lightItemCode') {
       setV['lightItemCode'] = val[0].code
       setV['lightItemName'] = val[0].name
+
+      setV['standardCostPrice'] = ''
+      setV['lightQty'] = 0
+      setV['claimAmount'] = ''
+      setV['otherClaimAmount'] = 0
+      setV['summaryAmount'] = 0
+      setV['disbursementAmount'] = 0
+      setV['remainingAmount'] = 0
        const params2 = {
         by: 'ASC',
         filters: [{ column: 'itemCode', action: '==', value: val[0].code }],
@@ -186,14 +203,6 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
       setV['SupplierCode'] = ''
       setV['SupplierName'] = ''
       setV['itemName'] = ''
-      setV['standardCostPrice'] = ''
-      setV['lightQty'] = 0
-      setV['claimAmount'] = ''
-      setV['otherclaimAmount'] = 0
-      setV['summaryAmount'] = 0
-      setV['disbursementAmount'] = 0
-      setV['remainingAmount'] = 0
-      setV['purchaseReceiptNumber'] = ''
       setV['uom'] = val[0].supplierUom
 
       Q2Api.getEmail().then((res) => {
@@ -239,24 +248,6 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
           })
         }
       })
-
-      // const params2 = {
-      //   by: 'ASC',
-      //   filters: [{ column: 'itemCode', action: '==', value: val[0].itemCode }],
-      //   pageNo: 1,
-      //   pageSize: 500,
-      //   sort: ''
-      // }
-      // params2.isSearch = true
-      // StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
-      //   if (res.list?.length > 0) {
-      //     priceObj.value = res.list[0]
-      //     formRef.setValues({
-      //       standardCostPrice: priceObj.value.price
-      //     })
-      //   }
-      // })
-
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
     }
@@ -264,6 +255,8 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
 }
 
 const onChange = (field, e) => {
+  console.log('onChange',field)
+  console.log(basicFormRef.value.formRef.formModel)
   if (field == 'lightQty') {
     basicFormRef.value.formRef.formModel.claimAmount = (
       parseFloat(basicFormRef.value.formRef.formModel.lightQty) *
@@ -272,7 +265,7 @@ const onChange = (field, e) => {
     ).toFixed(6)
     basicFormRef.value.formRef.formModel.summaryAmount = (
       parseFloat(basicFormRef.value.formRef.formModel.claimAmount) +
-      parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount)
+      parseFloat(basicFormRef.value.formRef.formModel.otherClaimAmount||0)
     ).toFixed(6)
     basicFormRef.value.formRef.formModel.remainingAmount = (
       parseFloat(basicFormRef.value.formRef.formModel.summaryAmount) -
@@ -287,17 +280,17 @@ const onChange = (field, e) => {
     ).toFixed(6)
     basicFormRef.value.formRef.formModel.summaryAmount = (
       parseFloat(basicFormRef.value.formRef.formModel.claimAmount) +
-      parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount)
+      parseFloat(basicFormRef.value.formRef.formModel.otherClaimAmount)
     ).toFixed(6)
     basicFormRef.value.formRef.formModel.remainingAmount = (
       parseFloat(basicFormRef.value.formRef.formModel.summaryAmount) -
       parseFloat(basicFormRef.value.formRef.formModel.disbursementAmount)
     ).toFixed(6)
   }
-  if (field == 'otherclaimAmount') {
+  if (field == 'otherClaimAmount') {
     basicFormRef.value.formRef.formModel.summaryAmount = (
       parseFloat(basicFormRef.value.formRef.formModel.claimAmount) +
-      parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount)
+      parseFloat(basicFormRef.value.formRef.formModel.otherClaimAmount)
     ).toFixed(6)
     basicFormRef.value.formRef.formModel.remainingAmount = (
       parseFloat(basicFormRef.value.formRef.formModel.summaryAmount) -
@@ -307,7 +300,7 @@ const onChange = (field, e) => {
   if (field == 'claimAmount') {
     basicFormRef.value.formRef.formModel.summaryAmount = (
       parseFloat(basicFormRef.value.formRef.formModel.claimAmount) +
-      parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount)
+      parseFloat(basicFormRef.value.formRef.formModel.otherClaimAmount)
     ).toFixed(6)
     basicFormRef.value.formRef.formModel.remainingAmount = (
       parseFloat(basicFormRef.value.formRef.formModel.summaryAmount) -
@@ -324,6 +317,7 @@ const onChange = (field, e) => {
 
   if (field == 'supplierCode') {
     basicFormRef.value.formRef.formModel.supplierName = ''
+    basicFormRef.value.formRef.formModel.purchaseReceiptNumber = ''
     const paramsCustomer = {
       by: 'ASC',
       filters: [
@@ -446,6 +440,19 @@ const handleFinish = async (id: number) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+    if (row && row.claimAddress?.trim()) {
+    row.filePathList = row.claimAddress.split(',')
+  }
+
+  if (row && row.filePathList && row.filePathList.length > 0) {
+    row.filePathListView = row.filePathList.map((item) => {
+      return {
+        name: item,
+        url: item
+      }
+    })
+  }
+
   basicFormRef.value.open(type, row)
   if(!row || !row.claimAmount){
    nextTick(() => {
@@ -463,6 +470,24 @@ const openForm = (type: string, row?: any) => {
         disbursementAmount: 0
       })
     })
+     const currentTime = new Date().getTime()
+    const fileId = Q2.allSchemas.formSchema.find((item) => item.field == 'fileId')
+    const uploadFile = Q2.allSchemas.formSchema.find(
+      (item) => item.field == 'claimAddress'
+    )
+    if (fileId) {
+      fileId['value'] = currentTime
+    }
+    if (uploadFile) {
+      uploadFile['componentProps']['upData']['tableId'] = currentTime
+      uploadFile['componentProps']['modelValue'] = []
+    }
+  }
+  else if (type == 'update') {
+    const uploadFile = Q2.allSchemas.formSchema.find(
+      (item) => item.field == 'claimAddress'
+    )
+    uploadFile['componentProps']['modelValue'] = row.filePathListView
   }
 }
 
@@ -482,6 +507,10 @@ const formsSuccess = async (formType, data) => {
     message.error('整灯数量不能为0')
     return
   }
+  if (!data.standardCostPrice) {
+    message.error('标准成本价格不能为0或空')
+    return
+  }
   if (data.activeTime == 0) data.activeTime = null
   if (data.expireTime == 0) data.expireTime = null
 

src/views/qms/inspectionQ2/inspectionQ2.data.ts

@@ -25,7 +25,7 @@ export const Q2Rules = reactive({
   supplierCode: [{ required: true, message: '请选择供应商代码', trigger: 'change' }],
   purchaseReceiptNumber: [
     { required: true, message: '请选择采购收货单号', trigger: 'change' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 255, message: '不得超过255个字符', trigger: 'blur' }
   ],
   claimTime: [{ required: true, message: '请选择索赔日期', trigger: 'change' }],
   lightItemCode: [{ required: true, message: '请选择整灯物料代码', trigger: 'change' }],
@@ -390,7 +390,7 @@ export const Q2 = useCrudSchemas(
     },
     {
       label: '其他索赔金额',
-      field: 'otherclaimAmount',
+      field: 'otherClaimAmount',
       sort: 'custom',
       isSearch: false,
       isTable: true,
@@ -470,7 +470,6 @@ export const Q2 = useCrudSchemas(
         // labelMessage: '信息提示说明！！！',
         componentProps: {
           enterSearch: true,
-          multiple: true,
           isSearchList: true, // 开启查询弹窗
           searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
           searchField: 'number', // 查询弹窗赋值字段
@@ -597,6 +596,39 @@ export const Q2 = useCrudSchemas(
       }
     },
 
+    {
+      label: '索赔单附件',
+      field: 'claimAddressName',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      isTable: true,
+      isDetail: false,
+      table: {
+        width: 150
+      }
+    },
+
+    {
+      label: '索赔单附件',
+      field: 'claimAddress',
+      sort: 'custom',
+      isTable: false,
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'UploadFile',
+        componentProps: {
+          upData: {
+            tableName: 'basicInspectionQ2',
+            tableId: ''
+          },
+          fileType: ['doc', 'xls', 'ppt', 'txt'],
+          modelValue: []
+        }
+      }
+    },
     {
       label: '状态',
       field: 'status',

src/views/qms/inspectionQ3/inspectionQ3.data.ts

@@ -126,7 +126,6 @@ export const InspectionQ3Main = useCrudSchemas(
         // labelMessage: '信息提示说明！！！',
         componentProps: {
           enterSearch: true,
-          multiple: true,
           isSearchList: true, // 开启查询弹窗
           searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
           searchField: 'number', // 查询弹窗赋值字段

src/views/qms/inspectionRecord/index.vue

@@ -247,7 +247,7 @@ const butttondata = (row) => {
     // defaultButtons.mainListOrderCOMPLETEBtn({ hide: isShowMainButton(row, ['INCOMPLETE']) }), // 完成
    
     defaultButtons.mainApplyDecisionBtn({
-      hide: isShowMainButton(row, null),
+      // hide: isShowMainButton(row, null),
       hasPermi: 'qms:inspection-recode-main:edit'
     }), // 使用决策
     // defaultButtons.mainListDeleteBtn(null), // 删除
@@ -281,13 +281,13 @@ const buttonTableClick = async (val, row) => {
     // 编辑
     // 评估代码值是1，接收时候，使用决策下拉列表是全部合格
     if (row.estimateCode == 1) {
-      InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => {
+      InspectionRecordUser.allSchemas.formSchema.forEach((itemColumn) => {
         if (itemColumn.field == 'useDecision') {
           itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value == 1)
         }
       })
     } else if (row.estimateCode == 2) {
-      InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => {
+      InspectionRecordUser.allSchemas.formSchema.forEach((itemColumn) => {
         if (itemColumn.field == 'useDecision') {
           itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value != 1)
         }
@@ -338,7 +338,7 @@ const basicFormRef = ref()
 /** 使用决策操作操作 */
 const formRef = ref()
 const rowData = ref()
-const openUseForm = async (type: string, row?: number) => {
+const openUseForm = async (type: string, row?: any) => {
   tableData.value = [] // 重置明细数据
   rowData.value = row
   formRef.value.open(type, row)
@@ -430,7 +430,9 @@ const submitForm = async (formType, data) => {
       message.success(t('common.updateSuccess'))
     }
     formRef.value.dialogVisible = false
+    if (!data.isPublished) {
     handleOrderPub(rowData.value)
+    }
     // 刷新当前列表
     getList()
   } finally {

src/views/qms/inspectionRecord/useAddForm.vue

@@ -140,7 +140,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
     if(row.estimateCode == 1){
       data.value.useDecision = '1'
     }else{
-      data.value.useDecision =''
+      data.value.useDecision =row.useDecision||''
     }
     // 全部合格时合格数量==数量
     if(data.value.useDecision == 1){

src/views/wms/basicDataManage/itemManage/bom/index.vue

@@ -199,14 +199,17 @@ const formsSuccess = async (formType,data) => {
           return
       }
       basicFormRef.value.formLoading = true
-      if (formType === 'create') {
-        await BomApi.createBom(data)
-        message.success(t('common.createSuccess'))
-      } else {
-        await BomApi.updateBom(data)
-        message.success(t('common.updateSuccess'))
+      try {
+        if (formType === 'create') {
+          await BomApi.createBom(data)
+          message.success(t('common.createSuccess'))
+        } else {
+          await BomApi.updateBom(data)
+          message.success(t('common.updateSuccess'))
+        }
+      } finally {
+        basicFormRef.value.formLoading = false
       }
-      basicFormRef.value.formLoading = false
       basicFormRef.value.dialogVisible = false
       if (formType === 'create') {
         getList()

src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts

@@ -383,7 +383,7 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
+  // {
     // label: '库位',
     // field: 'location',
     // sort: 'custom',
@@ -418,7 +418,7 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
     //   }
     // },
     // isSearch: true
-  },
+  // },
   // {
   //   label: '是否确认接收',
   //   field: 'isRecive',

src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue

@@ -445,6 +445,26 @@
                 </el-select> -->
               </el-form-item>
             </el-col>
+            <!-- 溢出库位 -->
+            <el-col key="溢出库位col" :span="24">
+              <el-form-item key="溢出库位formItem" label="溢出库位"  prop="warehouse" >
+                  <el-select key="溢出库位Value"
+                    v-model="formData.configuration.overflowLocationCode"
+                    placeholder="请选择溢出库位"
+                    style="flex: 1;margin-left: 10px;"
+                    clearable
+                    multiple
+                    collapse-tags
+                  >
+                    <el-option
+                      v-for="cur in options.overflowLocationCodes"
+                      :key="'溢出库位Value'+cur.code"
+                      :label="cur.code"
+                      :value="cur.code"
+                    />
+                  </el-select>
+              </el-form-item>
+            </el-col>
             <!-- 优先空位库 -->
             <el-col key="优先空位库col" :span="24">
               <el-form-item key="优先空位库formItem" label="优先空位库">
@@ -577,7 +597,7 @@ import { getCustomerList } from '@/api/wms/customer'
 import { getWarehouseList } from '@/api/wms/warehouse'
 import { getAreaList } from '@/api/wms/areabasic'
 import { getLocationgroupList } from '@/api/wms/locationgroup'
-import { getLocationList } from '@/api/wms/location'
+import { getLocationList,getLocationByOverflowAreaTypeByConfig } from '@/api/wms/location'
 import * as RuleApi from '@/api/wms/rule'
 import * as WarehouseApi from '@/api/wms/warehouse'
 import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
@@ -657,7 +677,9 @@ const formData = ref({
     // 行排序方向
     RowOrder: 'ASC',
     // 列排序方向
-    ColumOrder: 'ASC'
+    ColumOrder: 'ASC',
+    //溢出库位
+    overflowLocationCode:''
   }
 })
 // 验证规则
@@ -726,7 +748,8 @@ const options = reactive({
   ],
   //仓库列表
   warehouseList: [],
-  originWarehouseList: []
+  originWarehouseList: [],
+  overflowLocationCodes:[]
 })
 // 弹窗按钮
 const Butttondata = ref([
@@ -1074,6 +1097,9 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       }
       if (data.configuration) {
         formData.value.configuration = JSON.parse(data.configuration)
+        if(!Array.isArray(formData.value.configuration.overflowLocationCode)&&formData.value.configuration.overflowLocationCode.length>0){
+          formData.value.configuration.overflowLocationCode = formData.value.configuration.overflowLocationCode.split(',')
+        }
       }
       
       // 判断是获取客户列表还是供应上列表
@@ -1175,6 +1201,10 @@ const submitForm = async () => {
         Value:str
       }
     })
+    let configuration = {...formData.value.configuration}
+    if(Array.isArray(configuration.overflowLocationCode)){
+      configuration.overflowLocationCode = configuration.overflowLocationCode.join(',')
+    }
     let data = {
       id: formData.value.id,
       strategyCode: formData.value.strategyCode, //策略代码
@@ -1184,7 +1214,7 @@ const submitForm = async () => {
       status: formData.value.status ? 0 : 1, //状态
       //规则条件集合
       condition: JSON.stringify(arr),
-      configuration: JSON.stringify(formData.value.configuration)
+      configuration:JSON.stringify(configuration)
     }
     if (formType.value === 'create') {
       await RuleApi.createRule(data)
@@ -1252,11 +1282,23 @@ const resetForm = () => {
       // 行排序方向
       RowOrder: 'ASC',
       // 列排序方向
-      ColumOrder: 'ASC'
+      ColumOrder: 'ASC',
+      //溢出库位
+      overflowLocationCode:''
     }
   }
 }
 
+
+// 获取溢出库位
+const getOverflowLocationCodes = async ()=>{
+  let overflowLocationCodes =  await getLocationByOverflowAreaTypeByConfig({})
+  options.overflowLocationCodes = overflowLocationCodes || []
+
+}
+
+getOverflowLocationCodes()
+
 </script>
 <style scoped lang="scss">
 .item {

src/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data.ts

@@ -88,7 +88,6 @@ export const QadCostcentre = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: false,
     isSearch: true,
     search: {
       component: 'DatePicker',

src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue

@@ -61,6 +61,7 @@
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
     :isShowButton = isShowButton
+    @inputNumberChange="inputNumberChange"
   />
  <!-- 详情 -->
  <Detail
@@ -128,6 +129,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['itemCode'] = item['itemCode']
           newRow['projectCode'] = item['projectCode']
           newRow['uom'] = item['uom']
+          newRow['subSettleQty'] = item['subSettleQty']
           tableData.value.push(newRow)
         })
 
@@ -355,13 +357,31 @@ const openForm = (type: string, row?: any) => {
   basicFormRef.value.open(type, row)
 }
 
-
+const inputNumberChange = (field, val,row, index) => {
+  if(field=='qty'){
+    if(row['subSettleQty']!=null&&row['qty']>row['subSettleQty']){
+      message.error(`物料${row['itemCode']}最大数量为${row['subSettleQty']}`) 
+    }
+  }
+  console.log('inputNumberChange',field, val,row, index)
+}
 // 主子数据 提交
 const submitForm = async (formType, submitData) => {
   let data = {...submitData}
   if(data.masterId){
     data.id = data.masterId
   }
+  let flag = true
+  tableData.value.forEach(item=>{
+    if(item['subSettleQty']!=null&&item['qty']>item['subSettleQty']){
+      flag = false
+      message.error(`物料${item['itemCode']}最大数量为${item['subSettleQty']}`) 
+    }
+  })
+  if(!flag){
+    return
+  }
+
   data.subList = tableData.value // 拼接子表数据参数
   let isExist = false
   tableData.value.forEach(item => {

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

@@ -335,6 +335,9 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true
       }
     },
+    tableForm:{
+      disabled: true
+    }
   },
   {
     label: '销售订单行',
@@ -344,8 +347,9 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm:{
+      disabled:true,
       multiple: true,
-      isInpuFocusShow: true, // 开启查询弹窗
+      // isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择销售订单行',
       searchField: 'lineNumber',
       searchTitle: '销售订单信息',
@@ -527,6 +531,9 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm:{
+      type:'InputNumber'
+    }
   },
   {
     label: '计量单位',

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

@@ -412,7 +412,7 @@ export const Balance = useCrudSchemas(
         component: 'DatePicker',
         componentProps: {
           valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
+          type: 'datetimerange',
           defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
         }
       }

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

@@ -224,7 +224,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isTable: true,
+    isTable: false,
     isForm: false,
   },
   {
@@ -234,7 +234,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
       width: 130
     },
     isForm: false,
-    isTable: true
+    isTable: false
   },
   {
     label: '最后更新时间',
@@ -511,6 +511,9 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -519,10 +522,31 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isTable: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    table: {
+      width: 150
+    },
+    isTable: true,
     isForm: false,
     isTableForm: false
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
   {
     label: '地点ID',
     field: 'siteId',

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

@@ -126,7 +126,7 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isSearch: true,
+    isSearch: false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -135,7 +135,7 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isTable: true,
+    isTable: false,
     isForm: false,
   },
   {
@@ -145,7 +145,7 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 130
     },
     isForm: false,
-    isTable: true
+    isTable: false
   },
   {
     label: '最后更新时间',
@@ -274,6 +274,20 @@ export const ContainerRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -282,9 +296,19 @@ export const ContainerRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isTable: false,
+    isTable: true,
+    isForm: false,
+    isTableForm: false,
+    isSearch: true,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
     isForm: false,
-    isTableForm: false
+    isTable: true
   },
   {
     label: '地点ID',

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

@@ -228,7 +228,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isTable: true,
+    isTable: false,
     table: {
       width: 180
     },
@@ -241,7 +241,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
       width: 130
     },
     isForm: false,
-    isTable: true
+    isTable: false
   },
   {
     label: '最后更新时间',
@@ -489,13 +489,31 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isTable: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTable: true,
     table: {
       width: 180
     },
     isForm: false,
     isTableForm: false
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
   {
     label: '地点ID',
     field: 'siteId',

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts

@@ -518,6 +518,15 @@ export const PackageoverDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    isTable: true,
+    table: {
+      width: 150
+    },
+  },
   // {
   //   label: '创建时间',
   //   field: 'createTime',

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts

@@ -470,12 +470,12 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
         searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
         searchCondition:[
-        //   {
-        //   key: 'locationCode',
-        //   value: 'fromLocationCode',
-        //   message: '请填写从库位代码！',
-        //   isMainValue: true
-        // },
+          {
+          key: 'warehouseCode',
+          value: 'fromWarehouseCode',
+          message: '请填写从仓库代码！',
+          isMainValue: true
+        },
         {
           key: 'inventoryStatus',
           value: 'OK',
@@ -492,12 +492,12 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
       searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
       searchCondition:[
-      //   {
-      //   key: 'locationCode',
-      //   value: 'fromLocationCode',
-      //   message: '请填写从库位代码！',
-      //   isMainValue: true
-      // },
+        {
+        key: 'warehouseCode',
+        value: 'fromWarehouseCode',
+        message: '请填写从仓库代码！',
+        isMainValue: true
+      },
       {
         key: 'inventoryStatus',
         value: 'OK',

src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts

@@ -44,9 +44,6 @@ export const PackagesplitMain = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
-    table: {
-      width: 180
-    },
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -183,9 +180,6 @@ export const PackagesplitMain = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
-    table: {
-      width: 180
-    },
     form: {
       component: 'DatePicker',
       componentProps: {

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

@@ -169,6 +169,14 @@ export const ScrapJobMain = useCrudSchemas(
         width: 150
       },
     },
+    {
+      label: '订单号',
+      field: 'orderNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+    },
     {
       label: 'Q1通知单号',
       field: 'q1Number',
@@ -353,6 +361,14 @@ export const ScrapJobMain = useCrudSchemas(
         width: 150
       }
     },
+    {
+      label: '通知单描述',
+      field: 'noticeRemark',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
     {
       label: '备注',
       field: 'remark',
@@ -879,14 +895,14 @@ export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '项目代码',
+  //   field: 'projectCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '备注',
     field: 'remark',

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

@@ -178,6 +178,14 @@ export const ScrapRecordMain = useCrudSchemas(
         width: 150
       },
     },
+    {
+      label: '订单号',
+      field: 'orderNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+    },
     {
       label: 'Q1通知单号',
       field: 'q1Number',
@@ -356,6 +364,14 @@ export const ScrapRecordMain = useCrudSchemas(
         width: 150
       }
     },
+    {
+      label: '通知单描述',
+      field: 'noticeRemark',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
     {
       label: '备注',
       field: 'remark',
@@ -690,14 +706,14 @@ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '项目代码',
+  //   field: 'projectCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '备注',
     field: 'remark',

src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue

@@ -190,6 +190,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
       console.log("报废出库主表")
       const setV = {}
       if (formField == 'q1Number') {
+        setV['noticeRemark'] = val[0]['desc']
         ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
           if (item.field == 'q2Number' || item.field == 'q3Number') {
             item.componentProps.enterSearch = false
@@ -199,6 +200,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         })
       }
       if (formField == 'q2Number') {
+        setV['noticeRemark'] = val[0]['desc']
         ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
           if (item.field == 'q1Number' || item.field == 'q3Number') {
             item.componentProps.enterSearch = false
@@ -208,6 +210,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         })
       }
       if (formField == 'q3Number') {
+        setV['noticeRemark'] = val[0]['desc']
         ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
           if (item.field == 'q1Number' || item.field == 'q2Number') {
             item.componentProps.enterSearch = false
@@ -245,6 +248,9 @@ const clearSearchInput = (field) => {
         item.componentProps.disabled = false
       }
     })
+    formRef.value.formRef.setValues({
+      noticeRemark:''
+    })
   }
   if (field == 'q2Number') {
     ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
@@ -254,6 +260,9 @@ const clearSearchInput = (field) => {
         item.componentProps.disabled = false
       }
     })
+    formRef.value.formRef.setValues({
+      noticeRemark:''
+    })
   }
   if (field == 'q3Number') {
     ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
@@ -263,6 +272,9 @@ const clearSearchInput = (field) => {
         item.componentProps.disabled = false
       }
     })
+    formRef.value.formRef.setValues({
+      noticeRemark:''
+    })
   }
 }
 // 查询页面返回——详情

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

@@ -616,11 +616,18 @@ export const ScrapRequestMain = useCrudSchemas(
         }
       }
     },
+    {
+      label: '通知单描述',
+      field: 'noticeRemark',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
     {
       label: '备注',
       field: 'remark',
       sort: 'custom',
-      isTable: false,
       table: {
         width: 150
       }

src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue

@@ -128,17 +128,33 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+const isShowRevokeButton = (row,val) => {
+  if (val.indexOf(row.revokeFlag) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
 // 列表-操作按钮
 const butttondata = (row,$index) => {
   const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
   if(findIndex>-1&&findIndex<$index){
-    return []
+    return [
+      defaultButtons.backoutBtn({hide:isShowRevokeButton(row,['FALSE'])}) // 撤销
+    ]
   }
-  return []
+  return [
+  defaultButtons.backoutBtn({hide:isShowRevokeButton(row,['FALSE'])}) // 撤销
+  ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  if (val == 'backout') { // 撤销
+    await UnplannedissueRecordMainApi.revoke(row.masterId)
+    buttonBaseClick('refresh',null)
+  }
 }
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()

src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts

@@ -481,6 +481,16 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 120,
+      fixed: 'right'
+    },
+  }
 ]))
 
 //表单校验

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue

@@ -128,17 +128,33 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+const isShowRevokeButton = (row,val) => {
+  if (val.indexOf(row.revokeFlag) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
 // 列表-操作按钮
 const butttondata = (row,$index) => {
   const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
   if(findIndex>-1&&findIndex<$index){
-    return []
+    return [
+      defaultButtons.backoutBtn({hide:isShowRevokeButton(row,['FALSE'])}) // 撤销
+    ]
   }
-  return []
+  return [
+    defaultButtons.backoutBtn({hide:isShowRevokeButton(row,['FALSE'])}) // 撤销
+  ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  if (val == 'backout') { // 撤销
+    await UnplannedreceiptRecordMainApi.revoke(row.masterId)
+    buttonBaseClick('refresh',null)
+  }
 }
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts

@@ -467,6 +467,16 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 120,
+      fixed: 'right'
+    },
+  }
 ]))
 
 //表单校验

src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts

@@ -24,6 +24,7 @@ export const IssueJobMain = useCrudSchemas(
       table: {
         width: 180
       },
+      isSearch: true,
       sortTableDefault: 1
     },
     {

src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts

@@ -24,6 +24,7 @@ export const IssueRecordMain = useCrudSchemas(
       table: {
         width: 180
       },
+      isSearch:true,
       sortTableDefault: 1
     },
     {
@@ -33,6 +34,7 @@ export const IssueRecordMain = useCrudSchemas(
       table: {
         width: 180
       },
+      isSearch:true,
       sortTableDefault: 1
     },
     {
@@ -356,6 +358,15 @@ export const IssueRecordMain = useCrudSchemas(
       },
       sortTableDefault: 6
     },
+    {
+      label: '发料数量', //  子表数据 只是为了展示
+      field: 'qty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 6
+    },
     {
       label: '批次', //  子表数据 只是为了展示
       field: 'fromBatch',

src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts

@@ -246,6 +246,7 @@ export const IssueRequestMain = useCrudSchemas(
       dictClass: 'string',
       isForm: false,
       isTable: true,
+      isSearch: true,
       sort: 'custom',
       table: {
         width: 150

src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts

@@ -471,6 +471,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
       width: 150
     },
     isSearch: false,
+    isTable:false,
     hiddenInMain: true
   },
   {

src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue

@@ -117,7 +117,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ProductionreturnJobDetailApi.getProductionreturnJobDetailPage // 分页接口
+  getListApi: 'ProductionreturnJobMain'==routeName.value?ProductionreturnJobDetailApi.getProductionreturnJobDetailPageStore:ProductionreturnJobDetailApi.getProductionreturnJobDetailPageHold // 分页接口
+  //getListApi: ProductionreturnJobDetailApi.getProductionreturnJobDetailPage // 分页接口
+
+
 })
 
 // 获得表格的各种操作
@@ -274,8 +277,18 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
+    // if('ProductionreturnJobMain'==routeName.value){
+    //   //生产退料任务导出
+    //   const data = await ProductionreturnJobMainApi.exportProductionreturnJobMainStore(tableObject.params)
+    //   download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    // }else{
+    //   // 隔离退料任务导出
+    //   const data = await ProductionreturnJobMainApi.exportProductionreturnJobMainHold(tableObject.params)
+    //   download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    // }
     const data = await ProductionreturnJobMainApi.exportProductionreturnJobMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    
   } catch {
   } finally {
     loadDone()

src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue

@@ -159,8 +159,16 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    const data = await ProductionreturnRecordMainApi.exportProductionreturnRecordMain(tableObject.params)
-    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    if('ProductionreturnRecordMain'==routeName.value){
+      //生产退料记录导出
+      const data = await ProductionreturnRecordMainApi.exportProductionreturnRecordMainStore(tableObject.params)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    }else{
+      // 隔离退料记录导出
+      const data = await ProductionreturnRecordMainApi.exportProductionreturnRecordMainHold(tableObject.params)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+    }
+    
   } catch {
   } finally {
     loadDone()

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue

@@ -209,6 +209,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           } else {
             row['batch'] = '000000'
           }
+          row['packUnit'] = val[0]['packUnit']
+          row['packQty'] = val[0]['packQty']
           // HL-4885 聂喜婷：@邱晨 @王宇飞 先把数量的校验拿掉
           // 修改 tableform 属性 数量最大值设置为库存余额中数量
           // TODO: tableFormColumns 修改属性目前只限于整个列 并不满足行要求 例如： 第一条数据最大10 第二条数据最大20 那么第一条数据会变成最大20限制
@@ -226,10 +228,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['fromLocationCode'] = item['rawLocationCode']
           tableData.value.push(newRow)
         })
-      } else if(formField == 'packUnit') {
-        row['packUnit'] = val[0]['packUnit']
-        row['packQty'] = val[0]['packQty']
-      } else {
+      }
+      // else if(formField == 'packUnit') {
+      //   row['packUnit'] = val[0]['packUnit']
+      //   row['packQty'] = val[0]['packQty']
+      // }
+      else {
         row[formField] = val[0][searchField]
       }
     } else {
@@ -453,8 +457,8 @@ const buttonTableClick = async (val, row) => {
             // 修改 tableform 属性
             detailListTableColumns.tableFormColumns.map(itemColumns => {
             if(itemColumns.field == 'productionLineCodePackage') {
-              // itemColumns.tableForm.isInpuFocusShow = false
-              // itemColumns.tableForm.disabled = true
+              itemColumns.tableForm.isInpuFocusShow = false
+              itemColumns.tableForm.disabled = true
               ProductionreturnRequestDetailLabelRules.productionLineCodePackage[0].required = false
             }
             if(itemColumns.field == 'supplierItemCode') {
@@ -473,8 +477,8 @@ const buttonTableClick = async (val, row) => {
             }
             if(itemColumns.field == 'productionLineCodePackage') {
               item.productionLineCodePackage = item.productionLineCode
-              // itemColumns.tableForm.isInpuFocusShow = true
-              // itemColumns.tableForm.disabled = false
+              itemColumns.tableForm.isInpuFocusShow = true
+              itemColumns.tableForm.disabled = true
               ProductionreturnRequestDetailLabelRules.productionLineCodePackage[0].required = true
             }
           })

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

@@ -521,9 +521,9 @@ export const ProductionreturnRequestMainRules = reactive({
   workshopCode: [
     { required: true, message: '请选择车间', trigger: 'change' }
   ],
-  productionLineCode: [
-    { required: true, message: '请选择生产线代码', trigger: 'change' }
-  ],
+  // productionLineCode: [
+  //   { required: true, message: '请选择生产线代码', trigger: 'change' }
+  // ],
 })
 
 /**
@@ -623,21 +623,34 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
       searchTitle: '工位信息', // 查询弹窗标题
       searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
       searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
-      searchCondition:[{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      },{
-        key: 'workshopCode',
-        value: 'workshopCode',
-        message: '请选择车间信息！',
-        isMainValue: true
-      },{
-        key: 'productionLineCode',
-        value: 'productionLineCode',
-        message: '请选择生产线信息！',
-        isMainValue: true
-        }],
+      searchCondition: [
+        {
+          key: 'available',
+          value: 'TRUE',
+          action: '==', // 查询拼接条件
+          isSearch: true, // 使用自定义拼接条件
+          isMainValue: false
+        },
+        {
+          key: 'workshopCode',
+          value: 'workshopCode',
+          message: '请选择车间信息！',
+          action: '==', // 查询拼接条件
+          isSearch: true, // 使用自定义拼接条件
+          isMainValue: false, // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
+          isFormModel:true, // filters中添加筛选的数据--取于formModel
+          required:true, // 前置添加必有，和isFormModel结合使用
+        },
+        {
+          key: 'productionLineCode', // 查询列表中字段
+          value: 'productionLineCode', // 指查询具体值
+          action: '==', // 查询拼接条件
+          isSearch: true, // 使用自定义拼接条件
+          isMainValue: false, // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
+          isFormModel:true, // filters中添加筛选的数据--取于formModel
+          required:false, // 前置添加必有，和isFormModel结合使用
+        },
+      ],
       verificationPage: WorkstationApi.getWorkstationByCodes, // 校验数去焦点输入是否正确的方法
       isShowTableFormSearch: true,
       isRepeat: true,//是否可以重复添加该条数据
@@ -651,10 +664,33 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
       }], // 失去焦点校验参数
     },
   },
+  {
+    label: '来源库位',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    isDetail:false,
+    isTable:true,
+    isTableForm: true,
+    isForm: false,
+  },
   {
     label: '目标库位',
     field: 'toLocationCode',
     sort: 'custom',
+    table: {
+      width: 150
+    },
     tableForm: {
       multiple: true,//多选
       isInpuFocusShow: true, // 开启查询弹窗
@@ -698,26 +734,6 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
       }
     }
   },
-  {
-    label: '原料库位',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    },
-    isDetail:false,
-    isTable:false,
-    isTableForm: true,
-    isForm: false,
-  },
   {
     label: '物料代码',
     field: 'itemCode',
@@ -914,23 +930,6 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
       }
     }
   },
-  {
-    label: '来源库位',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
   {
     label: '从货主',
     field: 'fromOwnerCode',
@@ -1035,32 +1034,33 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
     isTable:true,
     isTableForm: true,
     tableForm: {
-      enterSearch:true,
-      isInpuFocusShow: true,
-      isSearchList: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择包装规格', // 输入框占位文本
-      searchField: 'packUnit', // 查询弹窗赋值字段
-      searchTitle: '物料包装信息', // 查询弹窗标题
-      searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
-      searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      },{
-        key: 'itemCode',
-        value: 'itemCode',
-        message: '请先选择物料代码！',
-        isMainValue: true
-        }],
-    verificationParams: [{
-      key: 'packUnit',
-      action: '==',
-      value: '',
-      isMainValue: false,
-      isSearch: true,
-      isFormModel: true,
-    }], // 失去焦点校验参数
+      disabled: true
+    //   enterSearch:true,
+    //   isInpuFocusShow: true,
+    //   isSearchList: true, // 开启查询弹窗
+    //   searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+    //   searchField: 'packUnit', // 查询弹窗赋值字段
+    //   searchTitle: '物料包装信息', // 查询弹窗标题
+    //   searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+    //   searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
+    //   searchCondition: [{
+    //     key: 'available',
+    //     value: 'TRUE',
+    //     isMainValue: false
+    //   },{
+    //     key: 'itemCode',
+    //     value: 'itemCode',
+    //     message: '请先选择物料代码！',
+    //     isMainValue: true
+    //     }],
+    // verificationParams: [{
+    //   key: 'packUnit',
+    //   action: '==',
+    //   value: '',
+    //   isMainValue: false,
+    //   isSearch: true,
+    //   isFormModel: true,
+    // }], // 失去焦点校验参数
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -1169,6 +1169,15 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
   }
 ]))
 
+
+const validateQty = (rule: any, value: any, callback: any,a,b) => {
+  if (!value) {
+    callback(new Error('包装数量必须大于0'));
+  } else {
+    callback();
+  }
+}
+
 //表单校验
 export const ProductionreturnRequestDetailRules = reactive({
   workStationCode: [
@@ -1183,9 +1192,12 @@ export const ProductionreturnRequestDetailRules = reactive({
   // packingNumber: [
   //   { required: true, message: '请选择包装号', trigger: 'change' }
   // ],
-  // batch: [
-  //   { required: true, message: '请输入批次', trigger: 'blur' }
-  // ],
+  qty:[
+    { validator:validateQty, message: '数量必须大于0', trigger: 'change'}
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
   inventoryStatus: [
     { required: true, message: '请选择库存状态', trigger: 'change' }
   ],
@@ -1195,6 +1207,12 @@ export const ProductionreturnRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请输入物料代码', trigger: 'blur' }
   ],
+  packUnit: [
+    { required: true, message: '请输入包装规格', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入标包数量', trigger: 'blur' }
+  ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
@@ -1355,22 +1373,6 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
       }
     }
   },
-  {
-    label: '来源生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
   {
     label: '来源工位代码',
     field: 'workStationCode',

src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue

@@ -57,7 +57,7 @@
     :isBusiness="true"
     @handleAddTable="handleAddTable"
     @handleDeleteTable="handleDeleteTable"
-    @searchTableSuccess="searchTableSuccess"
+    @searchTableSuccess="searchTableSuccessAdd"
     @submitForm="submitForm"
   />
 
@@ -172,7 +172,87 @@ const isItemType = async (itemCode, labelTypeParams) => {
   if (!isType) labelType.value = labelTypeOld
   return isType
 }
+// 查询页面返回
+const searchTableSuccessAdd = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(async () => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      if(formField == 'itemCode') {
+        if(tableData.value.find(item1=>item1['itemCode'] == val[0]['itemCode'])){
+          message.warning(`物料${val[0]['itemCode']}已经存在`)
+          return
+        }
 
+        let itemRes = await ItembasicApi.getItembasicPage({
+          pageSize: 10,
+          pageNo: 1,
+          code: val[0]['itemCode'],
+          sort: '',
+          by: 'ASC',
+        })
+        let rowType = ''
+        if (itemRes.list.length > 0) {
+          // 判断物料 可采购 可制造
+          if (itemRes.list[0].enableMake == "FALSE") {
+            rowType = 'cg'
+          } else {
+            rowType = 'zz'
+          }
+        }
+        console.log('rowType',rowType)
+        console.log('tableData',tableData.value)
+        
+        let currentLabelType = row['labelType']
+        row['labelType'] = ''
+        if(tableData.value.find(item=>item['labelType']&&item['labelType']!=rowType)){
+          if(currentLabelType){
+            row['labelType'] = currentLabelType
+          }
+          message.warning('当前物料可制造与其他数据不一致，请重新选择！')
+        }else {
+          row['labelType'] = rowType
+          row['batch'] = val[0]['batch']==''?formatTime(new Date(), 'yyyyMMdd'):val[0]['batch']
+          row['itemCode'] = val[0]['itemCode']
+          row['uom'] = val[0]['uom']
+          row['inventoryStatus'] = val[0]['inventoryStatus']
+          row['qty'] = Number(val[0]['qty'])
+          row['packUnit'] = val[0]['packUnit']
+          row['packQty'] = val[0]['packQty']
+          // HL-4885 聂喜婷：@邱晨 @王宇飞 先把数量的校验拿掉
+          // 修改 tableform 属性 数量最大值设置为库存余额中数量
+            // ProductionreturnRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+            //   if(item.field == 'qty' && Number(val[0]['qty'])>item.tableForm.min) {
+            //     item.tableForm.max = Number(val[0]['qty'])
+            //   }
+            //   // if(item.field == 'batch') {
+            //   //   item.tableForm.disabled = false
+            //   // }
+            // })
+        }
+      } else if(formField == 'workStationCode') {
+        val.forEach(item=>{
+          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+          newRow['workStationCode'] = item['code']
+          newRow['fromLocationCode'] = item['rawLocationCode']
+          newRow['checkId'] = item['id']
+          tableData.value.push(newRow)
+        })
+      }
+      // else if(formField == 'packUnit') {
+      //   row['packUnit'] = val[0]['packUnit']
+      //   row['packQty'] = val[0]['packQty']
+      // }
+      else {
+        row[formField] = val[0][searchField]
+      }
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      tableData.value = [] // 重置明细数据
+      formRef.setValues(setV)
+    }
+  })
+}
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(async () => {
@@ -194,6 +274,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           row['uom'] = val[0]['uom']
           row['inventoryStatus'] = val[0]['inventoryStatus']
           row['qty'] = Number(val[0]['qty'])
+          row['packUnit'] = val[0]['packUnit']
+          row['packQty'] = val[0]['packQty']
           // HL-4885 聂喜婷：@邱晨 @王宇飞 先把数量的校验拿掉
           // 修改 tableform 属性 数量最大值设置为库存余额中数量
             // ProductionreturnRequestDetail.allSchemas.tableFormColumns.forEach(item => {
@@ -212,10 +294,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['fromLocationCode'] = item['rawLocationCode']
           tableData.value.push(newRow)
         })
-      } else if(formField == 'packUnit') {
-        row['packUnit'] = val[0]['packUnit']
-        row['packQty'] = val[0]['packQty']
-      } else {
+      }
+      // else if(formField == 'packUnit') {
+      //   row['packUnit'] = val[0]['packUnit']
+      //   row['packQty'] = val[0]['packQty']
+      // }
+      else {
         row[formField] = val[0][searchField]
       }
     } else {
@@ -434,8 +518,8 @@ const buttonTableClick = async (val, row) => {
             // 修改 tableform 属性
             detailListTableColumns.tableFormColumns.map(itemColumns => {
             if(itemColumns.field == 'productionLineCodePackage') {
-              // itemColumns.tableForm.isInpuFocusShow = false
-              // itemColumns.tableForm.disabled = true
+              itemColumns.tableForm.isInpuFocusShow = false
+              itemColumns.tableForm.disabled = true
               ProductionreturnRequestDetailNoLabelRules.productionLineCodePackage[0].required = false
             }
             if(itemColumns.field == 'supplierItemCode') {
@@ -454,8 +538,8 @@ const buttonTableClick = async (val, row) => {
             }
             if(itemColumns.field == 'productionLineCodePackage') {
               item.productionLineCodePackage = item.productionLineCode
-              // itemColumns.tableForm.isInpuFocusShow = true
-              // itemColumns.tableForm.disabled = false
+              itemColumns.tableForm.isInpuFocusShow = true
+              itemColumns.tableForm.disabled = true
               ProductionreturnRequestDetailNoLabelRules.productionLineCodePackage[0].required = true
             }
           })
@@ -469,18 +553,18 @@ const buttonTableClick = async (val, row) => {
 
   } else if (val == 'mainHandle') { // 处理
     // 判断 是否已创建标签
-    // let isCreateLabel = false
-    // await PackageApi.getPackagePage({
-    //   requestNumber: row.number
-    // }).then(res => {
-    //   if (res) {
-    //     if (res.list.length > 0) isCreateLabel = true
-    //   }
-    // })
-    // if (!isCreateLabel) {
-    //   message.warning('请先创建标签')
-    //   return
-    // }
+    let isCreateLabel = false
+    await PackageApi.getPackagePage({
+      requestNumber: row.number
+    }).then(res => {
+      if (res) {
+        if (res.list.length > 0) isCreateLabel = true
+      }
+    })
+    if (!isCreateLabel) {
+      message.warning('请先创建标签')
+      return
+    }
     tableObject.loading = true
     ProductionreturnRequestMainNoApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
@@ -504,6 +588,7 @@ const buttonTableClick = async (val, row) => {
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {
   tableData.value = [] // 重置明细数据
+  labelType.value = ''
   // 编辑时 车间代码不可修改
   if (type == 'update') {
     // 修改 tableform 属性

src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts

@@ -17,6 +17,9 @@ import * as ItempackagingApi from '@/api/wms/itempackage'
 import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
 import * as LocationApi from '@/api/wms/location'
 import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
+
 const { t } = useI18n() // 国际化
 
 /**
@@ -129,20 +132,29 @@ export const ProductionreturnRequestDetail = useCrudSchemas(
           {
             key: 'available',
             value: 'TRUE',
+            action: '==', // 查询拼接条件
+            isSearch: true, // 使用自定义拼接条件
             isMainValue: false
           },
           {
             key: 'workshopCode',
             value: 'workshopCode',
             message: '请选择车间信息！',
-            isMainValue: true
+            action: '==', // 查询拼接条件
+            isSearch: true, // 使用自定义拼接条件
+            isMainValue: false, // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
+            isFormModel:true, // filters中添加筛选的数据--取于formModel
+            required:true, // 前置添加必有，和isFormModel结合使用
           },
           {
-            key: 'productionLineCode',
-            value: 'productionLineCode',
-            message: '请选择生产线信息！',
-            isMainValue: true
-          }
+            key: 'productionLineCode', // 查询列表中字段
+            value: 'productionLineCode', // 指查询具体值
+            action: '==', // 查询拼接条件
+            isSearch: true, // 使用自定义拼接条件
+            isMainValue: false, // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
+            isFormModel:true, // filters中添加筛选的数据--取于formModel
+            required:false, // 前置添加必有，和isFormModel结合使用
+          },
         ],
         verificationPage: WorkstationApi.getWorkstationByCodes, // 校验数去焦点输入是否正确的方法
         isShowTableFormSearch: true,
@@ -159,10 +171,30 @@ export const ProductionreturnRequestDetail = useCrudSchemas(
         ] // 失去焦点校验参数
       }
     },
+    {
+      label: '来源库位',
+      field: 'fromLocationCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTableForm: true,
+      tableForm: {
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
     {
       label: '目标库位',
       field: 'toLocationCode',
       sort: 'custom',
+      table: {
+        width: 150
+      },
       tableForm: {
         multiple: true,//多选
         isInpuFocusShow: true, // 开启查询弹窗
@@ -405,23 +437,6 @@ export const ProductionreturnRequestDetail = useCrudSchemas(
         }
       }
     },
-    {
-      label: '来源库位',
-      field: 'fromLocationCode',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      isTableForm: false,
-      tableForm: {
-        disabled: true
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
     {
       label: '从货主',
       field: 'fromOwnerCode',
@@ -533,29 +548,30 @@ export const ProductionreturnRequestDetail = useCrudSchemas(
       table: {
         width: 120
       },
-      isTable:false,
+      isTable:true,
       isTableForm:true,
       tableForm: {
-        isInpuFocusShow: true,
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择包装规格', // 输入框占位文本
-        searchField: 'packUnit', // 查询弹窗赋值字段
-        searchTitle: '物料包装信息', // 查询弹窗标题
-        searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
-        searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
-        searchCondition: [
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          },
-          {
-            key: 'itemCode',
-            value: 'itemCode',
-            message: '请先选择物料代码！',
-            isMainValue: true
-          }
-        ]
+        disabled: true
+        // isInpuFocusShow: true,
+        // isSearchList: true, // 开启查询弹窗
+        // searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+        // searchField: 'packUnit', // 查询弹窗赋值字段
+        // searchTitle: '物料包装信息', // 查询弹窗标题
+        // searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+        // searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
+        // searchCondition: [
+        //   {
+        //     key: 'available',
+        //     value: 'TRUE',
+        //     isMainValue: false
+        //   },
+        //   {
+        //     key: 'itemCode',
+        //     value: 'itemCode',
+        //     message: '请先选择物料代码！',
+        //     isMainValue: true
+        //   }
+        // ]
       },
       form: {
         // labelMessage: '信息提示说明！！！',
@@ -589,7 +605,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(
       table: {
         width: 120
       },
-      isTable: false,
+      isTable: true,
       isTableForm: true,
       tableForm: {
         disabled: true
@@ -667,6 +683,14 @@ export const ProductionreturnRequestDetail = useCrudSchemas(
   ])
 )
 
+const validateQty = (rule: any, value: any, callback: any,a,b) => {
+  if (!value) {
+    callback(new Error('包装数量必须大于0'));
+  } else {
+    callback();
+  }
+}
+
 //表单校验
 export const ProductionreturnRequestDetailRules = reactive({
   workStationCode: [
@@ -681,6 +705,9 @@ export const ProductionreturnRequestDetailRules = reactive({
   // packingNumber: [
   //   { required: true, message: '请选择包装号', trigger: 'change' }
   // ],
+  qty:[
+    { validator:validateQty, message: '数量必须大于0', trigger: 'change'}
+  ],
   batch: [
     { required: true, message: '请输入批次', trigger: 'blur' }
   ],
@@ -693,11 +720,19 @@ export const ProductionreturnRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请输入物料代码', trigger: 'blur' }
   ],
+  packUnit: [
+    { required: true, message: '请输入包装规格', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入标包数量', trigger: 'blur' }
+  ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
 })
 
+
+
 /**
  * @returns {Array} 隔离退料申请子表创建标签
  */
@@ -710,8 +745,25 @@ export const ProductionreturnRequestDetailNoLabel = useCrudSchemas(reactive<Crud
       width: 150
     },
     tableForm:{
-      disabled: true
-    }
+      multiple:true,
+      disabled:true,
+      // isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchField: 'itemCode', // 查询弹窗赋值字段
+      searchTitle: '生产线物料关系信息', // 查询弹窗标题
+      searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'itemCode',
+        value:'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }],
+    },
   },
   {
     label: '供应商代码',
@@ -843,22 +895,6 @@ export const ProductionreturnRequestDetailNoLabel = useCrudSchemas(reactive<Crud
       }
     }
   },
-  {
-    label: '来源生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
   {
     label: '来源工位代码',
     field: 'workStationCode',

src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts

@@ -56,6 +56,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     isForm:false,
     isTable: true,
+    isSearch: true,
     sort: 'custom',
     sortTableDefault:1,
     table: {

src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts

@@ -59,8 +59,13 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         isMainValue: false
       },{
         key: 'isIn',
-        value: 'in',
+        value: 'out',
         isMainValue: false
+      },
+      {
+        key:'available', // 查询列表中字段
+        value:'TRUE', // 指查询具体值
+        isMainValue: false // 表示查询条件不是主表的字段的值
       }],
       isRepeat:true,
       verificationParams: [{
@@ -89,8 +94,13 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
             isMainValue: false
           },{
             key: 'isIn',
-            value: 'in',
+            value: 'out',
             isMainValue: false
+          },
+          {
+            key:'available', // 查询列表中字段
+            value:'TRUE', // 指查询具体值
+            isMainValue: false // 表示查询条件不是主表的字段的值
           }],
         verificationParams: [{
           key: 'code',
@@ -127,6 +137,11 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         key: 'isIn',
         value: 'in',
         isMainValue: false
+      },
+      {
+        key:'available', // 查询列表中字段
+        value:'TRUE', // 指查询具体值
+        isMainValue: false // 表示查询条件不是主表的字段的值
       }],
       isRepeat:true,
       verificationParams: [{
@@ -157,6 +172,11 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
             key: 'isIn',
             value: 'in',
             isMainValue: false
+          },
+          {
+            key:'available', // 查询列表中字段
+            value:'TRUE', // 指查询具体值
+            isMainValue: false // 表示查询条件不是主表的字段的值
           }],
         verificationParams: [{
           key: 'code',

src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue

@@ -158,6 +158,7 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
+    tableObject.params.type = 'predict'
     const data = await ProductputawayRecordMainApi.exportProductputawayRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {

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

@@ -158,6 +158,7 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
+    tableObject.params.type = 'assemble'
     const data = await ProductputawayRecordMainApi.exportProductputawayRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {

src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue

@@ -28,6 +28,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
+      <template #recoveryRequestFlag="{row}">
+        <el-tag>{{ row.recoveryRequestFlag=='TRUE'?'是':'否' }}</el-tag>
+      </template>
       <template #number="{row}">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
           <span>{{ row.number }}</span>
@@ -200,7 +203,7 @@ const butttondata = (row,$index) => {
   // defaultButtons.mainInspectRequestBtn({hasPermi:'wms:productreceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
   defaultButtons.mainInspectRequestBtn({hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
   defaultButtons.mainListPointBtn(null), // 标签打印
-  defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示
+  // defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示
 ]
 }
 

src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts

@@ -569,6 +569,24 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
+  {
+    label: '是否已撤销',
+    field: 'recoveryRequestFlag',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    detail:{
+      dictType:'primary',
+      valueFilter:(value)=>{
+        if(value=='TRUE'){
+          return `是`
+        }else{
+          return '否'
+        }
+      }
+    }
+  },
   {
     label: '单据号',
     field: 'number',

src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts

@@ -42,7 +42,8 @@ const queryParams = {
 }
 const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
 const requestsettingData = data?.list[0] || {}
-
+const shiftList = await ShiftApi.getShiftPage({available:'TRUE',pageSize: 500,pageNo: 1,sort:'',by: 'ASC'})
+console.log('shiftList',shiftList)
 // 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
 import { TableColumn } from '@/types/table'
@@ -232,30 +233,48 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault: 1001,
     form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择班次',
-        searchField: 'code',
-        searchTitle: '班次信息',
-        searchAllSchemas: Shift.allSchemas,
-        searchPage: ShiftApi.getShiftPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+      component:'Select',
+      componentProps:{
+          options:shiftList.list,
+          optionsAlias: {
+            labelField: 'code',
+            valueField: 'code'
+          },
+          verificationParams: [{
+            key: 'code',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
       }
     }
+    // form: {
+    //   // labelMessage: '信息提示说明！！！',
+    //   componentProps: {
+    //     enterSearch: true,
+    //     isSearchList: true,
+    //     searchListPlaceholder: '请选择班次',
+    //     searchField: 'code',
+    //     searchTitle: '班次信息',
+    //     searchAllSchemas: Shift.allSchemas,
+    //     searchPage: ShiftApi.getShiftPage,
+    //     searchCondition: [{
+    //       key: 'available',
+    //       value: 'TRUE',
+    //       isMainValue: false
+    //     }],
+    //     verificationParams: [{
+    //       key: 'code',
+    //       action: '==',
+    //       value: '',
+    //       isMainValue: false,
+    //       isSearch: true,
+    //       isFormModel: true,
+    //     }], // 失去焦点校验参数
+    //   }
+    // }
   },
   {
     label: '收货类型',
@@ -575,9 +594,9 @@ export const ProductreceiptRequestMainRules = reactive({
   // team: [
   //   { required: true, message: '请选择班组代码', trigger: 'change' }
   // ],
-  // shift: [
-  //   { required: true, message: '请选择班次代码', trigger: 'change' }
-  // ],
+  shift: [
+    { required: true, message: '请选择班次代码', trigger: 'change' }
+  ],
   // departmentCode: [
   //   { required: true, message: '请输入部门', trigger: 'blur' }
   // ],

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue

@@ -28,6 +28,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
+      <template #recoveryRequestFlag="{row}">
+        <el-tag>{{ row.recoveryRequestFlag=='TRUE'?'是':'否' }}</el-tag>
+      </template>
       <template #number="{row}">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
           <span>{{ row.number }}</span>
@@ -237,7 +240,7 @@ const butttondata = (row,$index) => {
   defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
   defaultButtons.mainPutawayRequestCpBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请
   defaultButtons.mainListPointBtn(null), // 标签打印
-  defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示
+  // defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示
   ]
 }
 

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts

@@ -42,6 +42,25 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: false
   },
+  {
+    label: '是否已撤销',
+    field: 'recoveryRequestFlag',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    detail:{
+      dictType:'primary',
+      valueFilter:(value)=>{
+        if(value=='TRUE'){
+          return `是`
+        }else{
+          return '否'
+        }
+      }
+    }
+    
+  },
   {
     label: '生产计划单号',
     field: 'productionPlanNumber',

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts

@@ -43,6 +43,8 @@ const queryParams = {
  const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
  const requestsettingData =data?.list[0]||{}
 
+ const shiftList = await ShiftApi.getShiftPage({available:'TRUE',pageSize: 500,pageNo: 1,sort:'',by: 'ASC'})
+ console.log('shiftList',shiftList)
  // 获取当前操作人的部门
  import { useUserStore } from '@/store/modules/user'
  import { TableColumn } from '@/types/table'
@@ -240,30 +242,48 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault: 1001,
     form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        enterSearch: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择班次',
-        searchField: 'code',
-        searchTitle: '班次信息',
-        searchAllSchemas: Shift.allSchemas,
-        searchPage: ShiftApi.getShiftPage,
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+      component:'Select',
+      componentProps:{
+          options:shiftList.list,
+          optionsAlias: {
+            labelField: 'code',
+            valueField: 'code'
+          },
+          verificationParams: [{
+            key: 'code',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
       }
     }
+    // form: {
+    //   // labelMessage: '信息提示说明！！！',
+    //   componentProps: {
+    //     enterSearch: true,
+    //     isSearchList: true,
+    //     searchListPlaceholder: '请选择班次',
+    //     searchField: 'code',
+    //     searchTitle: '班次信息',
+    //     searchAllSchemas: Shift.allSchemas,
+    //     searchPage: ShiftApi.getShiftPage,
+    //     searchCondition: [{
+    //       key: 'available',
+    //       value: 'TRUE',
+    //       isMainValue: false
+    //     }],
+    //     verificationParams: [{
+    //       key: 'code',
+    //       action: '==',
+    //       value: '',
+    //       isMainValue: false,
+    //       isSearch: true,
+    //       isFormModel: true,
+    //     }], // 失去焦点校验参数
+    //   }
+    // }
   },
   {
     label: '收货类型',
@@ -585,9 +605,9 @@ export const ProductreceiptRequestMainRules = reactive({
   // team: [
   //   { required: true, message: '请选择班组代码', trigger: 'change' }
   // ],
-  // shift: [
-  //   { required: true, message: '请选择班次代码', trigger: 'change' }
-  // ],
+  shift: [
+    { required: true, message: '请选择班次代码', trigger: 'change' }
+  ],
   // departmentCode: [
   //   { required: true, message: '请输入部门', trigger: 'blur' }
   // ],
@@ -1096,13 +1116,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        precision: 6
+        max:9999,
+        // precision: 6
       },
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6
+      max:9999,
+      // precision: 6
     }
   },
   {

src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts

@@ -521,6 +521,14 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '包装号',
     field: 'packingNumber',

src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts

@@ -406,6 +406,14 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '包装号',
     field: 'packingNumber',

src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts

@@ -7,6 +7,10 @@ import * as WorkshopApi from '@/api/wms/workshop'
 import * as BalanceApi  from '@/api/wms/balance'
 import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 import * as getBusinessTypeApi  from '@/api/wms/businesstype/index'
+
+import * as WorkstationApi from '@/api/wms/workstation'
+import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
+
 const businessTypeQueryParams = {
   pageSize:10,
   pageNo:1,
@@ -418,6 +422,9 @@ export const ProductredressRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
 
 // 表单校验
 export const ProductredressRequestDetailRules = reactive({
+  workStationCode: [
+    { required: true, message: '请选择工位代码', trigger: 'change' }
+  ],
 })
 
 export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
@@ -495,7 +502,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         isMainValue: false, // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
         isFormModel:true, // filters中添加筛选的数据--取于formModel
         required:true, // 前置添加必有，和isFormModel结合使用
-        message: '请选择客户代码！', // 前置添加没填的提示语
+        message: '请选择生产线代码！', // 前置添加没填的提示语
       }
 
       ]
@@ -566,6 +573,77 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
+  {
+    label: '工位代码',
+    field: 'workStationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: true,
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '工位信息', // 查询弹窗标题
+      searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+      searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+      searchCondition: [
+        {
+          key: 'productionLineCode',
+          value: 'productionLineCode',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }
+      ],
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择工位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '工位信息', // 查询弹窗标题
+        searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类
+        searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'productionLineCode',
+            value: 'productionLineCode',
+            message: '请填写生产线代码！',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    }
+  },
   {
     label: '包装号',
     field: 'packingNumber',

src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue

@@ -238,17 +238,33 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+const isShowRevokeButton = (row,val) => {
+  if (val.indexOf(row.revokeFlag) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
 // 列表-操作按钮
 const butttondata = (row,$index) => {
   const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
   if(findIndex>-1&&findIndex<$index){
-    return []
+    return [
+      defaultButtons.backoutBtn({hide:isShowRevokeButton(row,['FALSE'])}) // 撤销
+    ]
   }
-  return []
+  return [
+    defaultButtons.backoutBtn({hide:isShowRevokeButton(row,['FALSE'])}) // 撤销
+  ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  if (val == 'backout') { // 撤销
+    await  ProductscrapRecordMainApi.revoke(row.requestNumber, row.number)
+    buttonBaseClick('refresh',null)
+  }
 }
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()

src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts

@@ -409,6 +409,16 @@ export const ProductscrapRecordMain = useCrudSchemas(
           activeValue: 'TRUE'
         }
       }
+    },
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 120,
+        fixed: 'right'
+      },
     }
   ])
 )

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue

@@ -183,14 +183,14 @@ const isShowSourceTypeButton = (row) => {
 const butttondata = (row,$index) => {
   const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
   if(findIndex>-1&&findIndex<$index){
-    return [defaultButtons.mainListPrintInspectionBtn(null)]
+    return [defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')})]
   }
   return [
    defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
    defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请
    //defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), // 查看质检报告
     defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告
-    defaultButtons.mainListPrintInspectionBtn(null),
+    defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')})
   ]
 }
 

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue

@@ -701,7 +701,7 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params)
+    const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMainOrderTypeM(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue

@@ -143,15 +143,15 @@ const butttondata = (row,$index) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'documentPrint') {
     // 单据打印
-    handleDocumentPrint(row.id)
+    handleDocumentPrint(row.requestNumber,row.itemCode)
   }
 }
 
 // 单据打印
 const BASE_URL = getJmreportBaseUrl()
 const documentSrc = ref(BASE_URL + '/jmreport/view/920874172025987072?token=' + getAccessToken())
-const handleDocumentPrint = async (id) => {
-  window.open(documentSrc.value + '&id=' + id)
+const handleDocumentPrint = async (requestNumber,itemCode) => {
+  window.open(documentSrc.value + '&requestNumber=' + requestNumber +'&itemCode=' + itemCode)
 }
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()

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

@@ -562,7 +562,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
     sortTableDefault: 1004,
-    hiddenInMain:true,
+    hiddenInMain:false,
     isForm:false,
     tableForm:{
       type:'InputNumber',

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue

@@ -562,7 +562,10 @@ const butttondata = (row, $index) => {
     defaultButtons.mainListEditBtn({
       hide: isShowMainButton(row, ['1']),
       hasPermi: 'wms:purchasereturn-request-main:update'
-    }) // 编辑
+    }), // 编辑
+    defaultButtons.mainListDocumentPrintBtn({
+      hide: isShowMainButton(row, ['8']) 
+    })// 打印标签
     // {
     //   label: '生成标签',
     //   name: 'ssbq',
@@ -608,12 +611,23 @@ const buttonTableClick = async (val, row) => {
     genLabelId.value = row.masterId
     await getDetailList()
     formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
-  } else if (val == 'point') {
+  }
+   else if (val == 'documentPrint') {
+    // 单据打印
+    handleDocumentPrint(row.number,row.itemCode)
+  }else if (val == 'point') {
     // 标签打印
     labelPrint(row)
   }
 }
 
+// 单据打印
+const BASE_URL2 = getJmreportBaseUrl()
+const documentSrc = ref(BASE_URL2 + '/jmreport/view/920874172025987072?token=' + getAccessToken())
+const handleDocumentPrint = async (number,itemCode) => {
+  window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode)
+}
+
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = async (type: string, row?: number) => {

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue

@@ -465,7 +465,10 @@ const butttondata = (row, $index) => {
     defaultButtons.mainListEditBtn({
       hide: isShowMainButton(row, ['1']),
       hasPermi: 'wms:purchasereturn-request-main:update'
-    }) // 编辑
+    }),// 编辑
+    defaultButtons.mainListDocumentPrintBtn({
+      hide: isShowMainButton(row, ['8']) 
+    })// 打印标签
     // {
     //   label: '生成标签',
     //   name: 'ssbq',
@@ -511,12 +514,23 @@ const buttonTableClick = async (val, row) => {
     genLabelId.value = row.masterId
     await getDetailList()
     formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
-  } else if (val == 'point') {
+  }
+  else if (val == 'documentPrint') {
+    // 单据打印
+    handleDocumentPrint(row.number,row.itemCode)
+  }else if (val == 'point') {
     // 标签打印
     labelPrint(row)
   }
 }
 
+// 单据打印
+const BASE_URL2 = getJmreportBaseUrl()
+const documentSrc = ref(BASE_URL2 + '/jmreport/view/920874172025987072?token=' + getAccessToken())
+const handleDocumentPrint = async (number,itemCode) => {
+  window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode)
+}
+
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = async (type: string, row?: Object) => {

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

@@ -22,7 +22,7 @@ import { Q2 } from '@/views/qms/inspectionQ2/inspectionQ2.data'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 
-let locationList = await LocationApi.selectBusinessTypeOutLocation({
+let locationList = await LocationApi.selectBusinessTypeOutLocationAll({
   businessType:'PurchaseReturn',
   isIn:'out'
 })

src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/index.vue

@@ -231,7 +231,7 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
   const HeadButttondata = [
     // defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchase-main:create' }), // 新增
     // defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-main:import' }), // 导入
-    defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-main-wms:export' }), // 导出
+    defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-main:export' }), // 导出
     // defaultButtons.mainListSelectionOrderPubBtn(null), // 批量发布
     defaultButtons.defaultFreshBtn(null), // 刷新
     defaultButtons.defaultFilterBtn(null), // 筛选

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue

@@ -56,6 +56,7 @@
     :annexTable="[{
       label: '质检明细',
       prop: 'uploadFile',
+      hasPermi:'wms:supplierdeliver-request-main:uploadCheck',
       tableName:'SupplierdeliverInspectionDetail',
       hasSubDetail:true, // 附件中是否展示明细表
       showPreview:true, // 附件中是否展示预览按钮
@@ -240,7 +241,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any) => {
     getListApi: SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage // 分页接口
   })
   const { getList:requestGetList } = requestTableMethods
-  requestTableObject.params.requestNumber = row.requestNumber
+  requestTableObject.params.number = row.requestNumber
   await requestGetList()
   if(requestTableObject.tableList.length>0){
     row.annexMasterId = requestTableObject.tableList[0].masterId

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

@@ -106,6 +106,8 @@
         tableName: 'SupplierdeliverInspectionDetail',
         hasSubDetail: true, // 附件中是否展示明细表
         showPreview: true, // 附件中是否展示预览按钮
+        hiddenUpload:false,
+        hiddenDelete:false,
         fileType: ['pdf', 'jpg', 'png', 'jpeg'],
         align: 'left',
         //明细表数据

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

@@ -208,7 +208,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         newRow['planQty'] = item['planQty']
         newRow['shippedQty'] = item['shippedQty']
         newRow['qty'] = item['planQty'] - item['shippedQty']
-        newRow['produceDate'] = dayjs().valueOf() // 是否允许超发
+        newRow['minProduceDate'] = item['minProduceDate'] // 最小生产日期
+        newRow['produceDate'] = dayjs().valueOf() // 是否允许超发        
         let produceDateStr = formatDate(newRow['produceDate'],'YYYYMMDD');
         newRow['batch'] = produceDateStr
         newRow['supplierBatch'] = produceDateStr
@@ -289,6 +290,7 @@ const getSearchTableData = async (number,formField,searchField,isAll)=>{
     newRow['planQty'] = row['planQty']
     newRow['shippedQty'] = row['shippedQty']
     newRow['qty'] = row['planQty'] - row['shippedQty']
+    newRow['minProduceDate'] = row['minProduceDate'] // 最小生产日期
     newRow['produceDate'] = dayjs().valueOf() // 是否允许超发
     let produceDateStr = formatDate(newRow['produceDate'],'YYYYMMDD');
     newRow['batch'] = produceDateStr
@@ -319,6 +321,21 @@ const submitForm = async (formType, submitData) => {
   if(data.masterId){
     data.id = data.masterId
   }
+  let flag = true
+  let currentTime = dayjs().valueOf()
+  tableData.value.forEach(item=>{
+    if(item['minProduceDate']&&item['produceDate']<item['minProduceDate']){
+      flag = false
+      message.error(`${item['itemCode']}${t('ts.生产日期不能小于')}${formatDate(item['minProduceDate'],'YYYY-MM-DD')}`)
+    }
+    if(item['produceDate']>currentTime){
+      flag = false
+      message.error(`${item['itemCode']}${t('ts.生产日期不能大于当前系统日期')}`)
+    }
+  })
+  if(!flag){
+    return
+  }
   data.subList = tableData.value // 拼接子表数据参数
   let isHave = data.subList.some((item) => {
     console.log("CCCCC",item.expireDate)
@@ -415,6 +432,17 @@ const inputNumberChange = (field, val,row, index) => {
 const formFormDateChange = (field, val,row, index) => {
   console.log('formFormDateChange',field, val,row, index)
   if(field == 'produceDate'){
+    if(row['minProduceDate']&&val<row['minProduceDate']){
+      message.error(`${row['itemCode']}${t('ts.生产日期不能小于')}${formatDate(row['minProduceDate'],'YYYY-MM-DD')}`)
+      // row['produceDate'] = row['minProduceDate']
+    }
+
+    let currentTime = dayjs().valueOf()
+    if(val>currentTime){
+      val = currentTime
+      message.error(`${row['itemCode']}${t('ts.生产日期不能大于当前系统日期')}`)
+      // row['produceDate'] = currentTime
+    }
     let produceDateStr = formatDate(val,'YYYYMMDD');
     row.batch = produceDateStr
     row.supplierBatch = produceDateStr

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@@ -1036,7 +1036,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         searchField: 'number',
         searchTitle: '要货计划信息',
         searchAllSchemas: PurchasePlanDetail.allSchemas,
-        searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage,
+        searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPageClcik,
         searchCondition: [
           {
             key: 'number',
@@ -1070,7 +1070,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       searchField: 'number',
       searchTitle: '要货计划信息',
       searchAllSchemas: PurchasePlanDetail.allSchemas,
-      searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage,
+      searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPageClcik,
       searchCondition: [
         {
           key: 'number',

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

@@ -44,17 +44,20 @@
     </Table>
   </ContentWrap>
 
-  <!-- 表单弹窗：添加/修改 -->
+  <!-- 表单弹窗：发票回转 -->
+  <!-- 
+  :apiUpdate="BasicEamProductionlineApi.updateBasicEamProductionline"
+    :apiCreate="BasicEamProductionlineApi.createBasicEamProductionline"
+    @searchTableSuccess="searchTableSuccess" -->
   <BasicForm
-    ref="formRef"
-    @success="getList"
-    :rules="SupplierinvoiceRecordMainRules"
-    :formAllSchemas="SupplierinvoiceRecordMain.allSchemas"
-    :tableAllSchemas="SupplierinvoiceRecordDetail.allSchemas"
-    :tableFormRules="SupplierinvoiceRecordDetailRules"
-    :isBusiness="true"
+    ref="basicFormRef"
+    @success="submitForm"
+    :rules="SupplierinvoiceRecordMainTransferRules"
+    :formAllSchemas="SupplierinvoiceRecordMainTransfer.allSchemas"
+    :isBusiness="false"
   />
 
+
   <!-- 详情 -->
   <Detail
     ref="detailRef"
@@ -143,7 +146,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { SupplierinvoiceRecordMain,SupplierinvoiceRecordMainRules,SupplierinvoiceRecordDetail,SupplierinvoiceRecordDetailRules,SupplierinvoiceRecordDetailMain } from './supplierinvoiceRecordMain.data'
+import { SupplierinvoiceRecordMain,SupplierinvoiceRecordMainRules,SupplierinvoiceRecordDetail,SupplierinvoiceRecordDetailRules,SupplierinvoiceRecordDetailMain,SupplierinvoiceRecordMainTransfer,SupplierinvoiceRecordMainTransferRules } from './supplierinvoiceRecordMain.data'
 import * as SupplierinvoiceRecordMainApi from '@/api/wms/supplierinvoiceRecordMain'
 import * as SupplierinvoiceRecordDetailApi from '@/api/wms/supplierinvoiceRecordDeatil'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -154,6 +157,8 @@ import {getAccessToken} from "@/utils/auth";
 import {getJmreportBaseUrl} from "@/utils/systemParam";
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import dayjs from 'dayjs'
+
 const { loadStart, loadDone } = usePageLoading()
 // 供应商发票记录主
 defineOptions({ name: 'SupplierinvoiceRecordMain' })
@@ -234,7 +239,7 @@ const handleSelectionPoint = async ()=>{
 // 列表-操作按钮
 const butttondata = (row,$index) => {
   return [
-  {
+      {
         label: t('ts.查看明细'),
         name: 'open_detail',
         type: 'primary',
@@ -242,16 +247,54 @@ const butttondata = (row,$index) => {
         color: '',
         hasPermi: '',
         link: true, // 文本展现按钮
+      },
+      {
+        label: t('ts.发票回转'),
+        name: 'transfer',
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: 'wms:supplierinvoice-record-main:reverse',
+        hide:!(row['status']==5&&!!row['voucherNumber']),
+        link: true, // 文本展现按钮
       }
   ]
 }
-
+/** 添加/修改操作 */
+const basicFormRef = ref()
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'open_detail') { // 查看明细
       openDetail(row, '单据号', row.number)
+    }else if(val == 'transfer'){
+      //发票回转
+      basicFormRef.value.open('create', row)
+      nextTick(()=>{
+        basicFormRef.value.formRef.setValues({
+          reversepostingdate:dayjs().valueOf(),
+          tcCInvoiceRemark:`回转${row['supplierName']}发票 ${row['goldenTaxInvoiceNumber']}`
+        })
+      })
+
     }
 }
+
+//发票回转
+const submitForm = async (formType, data) => {
+  data.reverseInvoiceJournal = 'APINVCOR'
+  data.adjustmentJournal = 'APADJ'
+  console.log('发票回转',formType, data)
+  loadStart()
+  try{
+    await SupplierinvoiceRecordMainApi.reverseSupplierinvoiceRecordMain(data)
+    message.success(t('ts.发票回转成功'))
+    basicFormRef.value.dialogVisible = false
+    buttonBaseClick('refresh', null)
+  } finally {
+    loadDone()
+  }
+}
+
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
 /** 详情操作 */

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

@@ -45,7 +45,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
     },
     sortTableDefault:2,
-    isForm: false
+    isForm: false,
+    isSearch:true
   },
   {
     label: '税率',
@@ -119,7 +120,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true
   },
   {
-    label: '未税差额',
+    label: '未税尾差',
     field: 'beforeTaxDiffAmount',
     formatter: accountantFormart,
     table: {
@@ -130,7 +131,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm:false
   },
   {
-    label: '税额差异',
+    label: '税额尾差',
     field: 'taxAmountDiff',
     formatter: accountantFormart,
     table: {
@@ -141,7 +142,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm:false
   },
   {
-    label: '价税合计差额',
+    label: '价税合计尾差',
     field: 'totalTaxDiffAmount',
     formatter: accountantFormart,
     table: {
@@ -153,7 +154,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   
   {
-    label: '系统税额',
+    label: '供应商维护税额',
     field: 'taxAmount',
     formatter: accountantFormart,
     sort: 'custom',
@@ -166,7 +167,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '未税金额',
+    label: '发票未税金额',
     field: 'beforeTaxAmount',
     formatter: accountantFormart,
     table: {
@@ -177,7 +178,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm:false
   },
   {
-    label: '税额',
+    label: '发票税额',
     field: 'totalTaxAmount',
     formatter: accountantFormart,
     table: {
@@ -188,7 +189,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm:false
   },
   {
-    label: '价税合计金额',
+    label: '发票价税合计',
     field: 'adTaxAmount',
     formatter: accountantFormart,
     table: {
@@ -225,12 +226,12 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:5,
   },
   {
-    label: '系统价税合计',//税后金额
+    label: '供应商维护价税合计',//税后金额
     field: 'afterTaxAmount',
     formatter: accountantFormart,
     sort: 'custom',
     table: {
-      width: 150
+      width: 160
     },
     sortTableDefault:9,
     form: {
@@ -260,12 +261,12 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
 
   {
-    label: '系统未税金额',
+    label: '供应商维护未税金额',
     field: 'amount',
     formatter: accountantFormart,
     sort: 'custom',
     table: {
-      width: 150
+      width: 160
     },
     sortTableDefault:8,
     form: {
@@ -467,6 +468,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:6,
     isForm: false
   },
+  
   {
     label: '业务类型',
     field:'businessType',
@@ -672,6 +674,56 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   //   isTable: false,
   //   isForm: false,
   // },
+  
+  {
+    label: '回转时间',
+    field: 'reversepostingdate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:11,
+  },
+  {
+    label: '说明',//回转说明	
+    field: 'tcCInvoiceRemark',
+    sortTableDefault:11,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '回转凭证号',
+    field: 'transferNumber',
+    sort: 'custom',
+    table: {
+      width: 200,
+    },
+    sortTableDefault:11,
+    isTable:true,
+    isForm: false
+  },
+  // {
+  //   label: '冲销日记帐',
+  //   field: 'reverseInvoiceJournal',
+  //   sortTableDefault:11,
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '调整账代码',
+  //   field: 'adjustmentJournal',
+  //   sortTableDefault:11,
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+
   {
     label: '采购审批时间',
     field: 'procurementCreateTime',
@@ -808,7 +860,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 150,
+      width: 200,
       fixed: 'right'
     },
   }
@@ -835,6 +887,14 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isTable: false,
     isDetail: true,
   },
+  {
+    label: '价差',
+    field: '',
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
   {
     label: 'SCP系统数据',
     field: '',
@@ -842,9 +902,9 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isForm: false,
     isSearch: false,
     isTable: false,
-    isDetail: true,
+    isDetail: false,
   },
-
+  
   {
     label: '单据号',
     field: 'number',
@@ -868,10 +928,9 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isDetail: true,
   },
   {
-    label: '系统价税合计',
-    field: 'afterTaxAmount',
+    label: '系统未税金额',
+    field: 'purchaseAmountTotalMain',
     formatter: accountantFormart,
-    
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -881,7 +940,6 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
   {
     label: '财务凭证号',
     field: 'voucherNumber',
-   
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -900,10 +958,9 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isDetail: true,
   },
   {
-    label: '系统未税金额',
-    field: 'amount',
+    label: '价差合计',
+    field: 'differencePriceTotalMain',
     formatter: accountantFormart,
-    
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -936,9 +993,8 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isDetail: true,
   },
   {
-    label: '系统税额',
-    field: 'taxAmount',
-    formatter: accountantFormart,
+    label: '',
+    field: '',
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -966,16 +1022,25 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isSearch: false,
     isDetail: true,
   },
+  // {
+  //   label: '尾差',
+  //   field: 'totalDifference',
+  //   sortTableDefault: 6,
+  //   isForm: false,
+  //   isTable: false,
+  //   isSearch: false,
+  //   isDetail: false,
+  // },
   {
-    label: '系统采购价格',
-    field: 'purchaseAmountTotalMain',
-    formatter: accountantFormart,
+    label: '尾差',
+    field: '',
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
     isSearch: false,
     isDetail: true,
   },
+  
   {
     label: '采购价格审批人',
     field: 'procurementCreatorName',
@@ -999,9 +1064,10 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isDetail: true,
   },
   {
-    label: '总价差',
-    field: 'differencePriceTotalMain',
+    label: '供应商维护价税合计',
+    field: 'afterTaxAmount',
     formatter: accountantFormart,
+    
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1011,14 +1077,14 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
   {
     label: '采购价格审批时间',
     field: 'procurementCreateTime',
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     sortTableDefault: 1003,
     isForm: false,
     isTable: false,
     isSearch: false,
     isDetail: true,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
   },
   {
     label: '税率(%)',
@@ -1033,8 +1099,10 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     },
   },
   {
-    label: '',
-    field: '',
+    label: '供应商维护未税金额',
+    field: 'amount',
+    formatter: accountantFormart,
+    
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1053,7 +1121,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isDetail: true,
   },
   {
-    label: '价税合计',
+    label: '发票价税合计',
     field: 'adTaxAmount',
     formatter: accountantFormart,
     
@@ -1064,15 +1132,15 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isDetail: true,
   },
   {
-    label: '',
-    field: '',
+    label: '供应商维护税额',
+    field: 'taxAmount',
+    formatter: accountantFormart,
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
     isSearch: false,
     isDetail: true,
   },
-
   {
     label: '财务审批人',
     field: 'financialCreatorName',
@@ -1085,7 +1153,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isDetail: true,
   },
   {
-    label: '未税金额',
+    label: '发票未税金额',
     field: 'beforeTaxAmount',
     formatter: accountantFormart,
     
@@ -1096,29 +1164,29 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isDetail: true,
   },
   {
-    label: '尾差',
-    field: 'totalDifference',
+    label: '',
+    field: '',
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
     isSearch: false,
-    isDetail: false,
+    isDetail: true,
   },
   {
     label: '财务审批时间',
     field: 'financialCreateTime',
     formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
     isSearch: false,
     isDetail: true,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
   },
   {
-    label: '税额',
+    label: '发票税额',
     field: 'totalTaxAmount',
     formatter: accountantFormart,
     
@@ -1129,15 +1197,14 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isDetail: true,
   },
   {
-    label: '价税合计差额(价税合计-系统价税合计)',
+    label: '价税合计尾差',
     field: 'totalTaxDiffAmount',
     formatter: accountantFormart,
-    
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
     isSearch: false,
-    isDetail: false,
+    isDetail: true,
   },
   {
     label: '财务过账日期',
@@ -1162,7 +1229,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isDetail: true,
   },
   {
-    label: '未税差额(未税金额-系统未税金额)',
+    label: '未税尾差',
     field: 'beforeTaxDiffAmount',
     formatter: accountantFormart,
     
@@ -1170,13 +1237,77 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isForm: false,
     isTable: false,
     isSearch: false,
-    isDetail: false,
+    isDetail: true,
+  },
+  {
+    label: '回转凭证号',
+    field: 'transferNumber',
+    sort: 'custom',
+  },
+  {
+    label: '',
+    field: '',
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '',
+    field: '',
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '回转时间',
+    field: 'reversepostingdate',
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+  },
+  {
+    label: '',
+    field: '',
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '',
+    field: '',
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '说明', //回转说明	
+    field: 'tcCInvoiceRemark',
+  },
+  {
+    label: '',
+    field: '',
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
+  },
+  {
+    label: '',
+    field: '',
+    isForm: false,
+    isTable: false,
+    isSearch: false,
+    isDetail: true,
   },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
-   
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1197,7 +1328,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isDetail: true,
   },
   {
-    label: '税额差异（税额-系统税额）',
+    label: '税额尾差',
     field: 'taxAmountDiff',
     formatter: accountantFormart,
     
@@ -1205,21 +1336,10 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isForm: false,
     isTable: false,
     isSearch: false,
-    isDetail: false,
+    isDetail: true,
   },
-  // {
-  //   label: '创建时间',
-  //   field: 'createTime',
-  //   formatter: dateFormatter,
-  //   sortTableDefault:1000,
-  //   detail: {
-  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
-  //   },
-  //   isForm: false,
-  //   isTable: false,
-  //   isSearch: false,
-  //   isDetail: true,
-  // }
+  
+
 ]))
 //表单校验
 export const SupplierinvoiceRecordMainRules = reactive({
@@ -1478,7 +1598,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '差额',
+    label: '单价差额',
     field: 'differencePrice',
     table: {
       width: 150
@@ -1493,46 +1613,46 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       disabled: true
     }
   },
-  {
-    label: '未税差额',
-    field: 'untaxedDifference',
-    formatter: accountantFormart,
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6,
-      }
-    },
-    tableForm: {
-      type: 'InputNumber',
-      min: 0,
-      precision: 6,
-    }
-  },
-  {
-    label: '含税差额',
-    field: 'taxInclusiveDifference',
-    formatter: accountantFormart,
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6,
-      }
-    },
-    tableForm: {
-      type: 'InputNumber',
-      min: 0,
-      precision: 6,
-    }
-  },
+  // {
+  //   label: '未税差额',
+  //   field: 'untaxedDifference',
+  //   formatter: accountantFormart,
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       min: 0,
+  //       precision: 6,
+  //     }
+  //   },
+  //   tableForm: {
+  //     type: 'InputNumber',
+  //     min: 0,
+  //     precision: 6,
+  //   }
+  // },
+  // {
+  //   label: '含税差额',
+  //   field: 'taxInclusiveDifference',
+  //   formatter: accountantFormart,
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       min: 0,
+  //       precision: 6,
+  //     }
+  //   },
+  //   tableForm: {
+  //     type: 'InputNumber',
+  //     min: 0,
+  //     precision: 6,
+  //   }
+  // },
   {
     label: '收货日期',
     field: 'deliveryDate',
@@ -1620,3 +1740,75 @@ export const SupplierinvoiceRecordDetailRules = reactive({
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
 })
+
+
+// 发票回转
+export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '冲销日记帐',
+    field: 'reverseInvoiceJournal',
+    form: {
+      componentProps: {
+        value:'APINVCOR',
+        disabled: true,
+      }
+    },
+  },
+  {
+    label: '调整账代码',
+    field: 'adjustmentJournal',
+    form: {
+      componentProps: {
+        value:'APADJ',
+        disabled: true,
+      }
+    },
+  },
+  {
+    label: '过账日期',
+    field: 'reversepostingdate',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    sortTableDefault:11,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '说明',
+    field: 'tcCInvoiceRemark',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: true,
+    isDetail:false,
+    form: {
+      componentProps: {
+        type:"textarea",
+        maxlength:50,
+        showWordLimit:true
+      }
+    }
+  }
+]))
+
+
+//表单校验
+export const SupplierinvoiceRecordMainTransferRules = reactive({
+  reversepostingdate: [
+    { required: true, message: '请选择过账日期', trigger: 'change' }
+  ]
+})
+

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

@@ -172,6 +172,7 @@
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
     @sumFormDataHandle="sumFormDataHandle"
+    @onChange="onChange"
   >
     <template #selectionsActionspoLine="{ selections }">
       <div style="text-align: left; margin-right: 10px">
@@ -382,7 +383,7 @@ const searchList = (model) => {
   selectionRows.value = []
   let model1 = {
     ...model,
-    statuss: model.status.join(',')?model.status.join(','):''
+    statuss: model.status.join(',') ? model.status.join(',') : ''
   }
   delete model1.status
   setSearchParams(model1)
@@ -436,6 +437,13 @@ const searchTableSuccessDetail = async (
 
 // })
 
+const onChange = (field, cur) => {
+  console.log('onChange',field)
+  if(field=='orderType'){
+    tableData.value = []
+  }
+}
+
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, searchFormRef, type, row) => {
   nextTick(() => {
@@ -673,6 +681,12 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'purchase_mainPlanSub') {
     // 采购审批通过
     // handleApp(row.id)
+    // 校验是否可以开票
+    const res = await checkInvoicingCalendar()
+    if (res?.flag) {
+      message.alertWarning(res.msg)
+      return
+    }
     if (row.balanceStatementStatus) {
       formPurchasePassRef.value.open('update', row, null, '采购审批通过', '采购审批通过')
     } else {
@@ -796,7 +810,7 @@ const openForm = async (type: string, row?: any) => {
 
       // if (item.field == 'procurementCreator') {
       //   item.componentProps.options = procurementCreators.value
-        
+
       // }
     })
   }
@@ -813,21 +827,21 @@ const openForm = async (type: string, row?: any) => {
   }
   if (row && row.procurementCreator) row.procurementCreator = Number(row.procurementCreator)
   // 校验是否可以开票
-  SupplierinvoiceRequestMainApi.checkInvoicingCalendar({}).then((res) => {
-    if (res.flag) {
-      message.alertWarning(res.msg)
-      return
-    }
-    tableData.value = [] // 重置明细数据
-    formRef.value.open(type, row)
-    // if(type=='create'){
-    //   nextTick(() => {
-    //   formRef.value.formRef.setValues({
-    //       procurementCreator:procurementCreators.value[0].id
-    //       })
-    //   })
-    // }
+  const res = await checkInvoicingCalendar()
+  if (res?.flag) {
+    message.alertWarning(res.msg)
+    return
+  }
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+   // 校验是否可以开票
+const checkInvoicingCalendar = async () => {
+  let resData = ''
+  await SupplierinvoiceRequestMainApi.checkInvoicingCalendar({}).then((res) => {
+    resData = res
   })
+  return resData
 }
 const defaultSupplierCode = ref('')
 const getDefaultSupplier = async () => {
@@ -860,7 +874,8 @@ const detailAnnexTable = ref([
     tableName: 'invoice',
     hiddenDelete: false,
     hiddenUpload: false,
-    fileSize: 20
+    fileSize: 20,
+    fileType:['pdf']
   },
   {
     label: t('ts.货运单附件'),
@@ -983,6 +998,12 @@ const handleOpe = async (id: number) => {
 /** 提交审批按钮操作 */
 const handleSub = async (id: number) => {
   try {
+    // 校验是否可以开票
+    const res = await checkInvoicingCalendar()
+    if (res?.flag) {
+      message.alertWarning(res.msg)
+      return
+    }
     // 提交审批的二次确认
     await message.confirm(t('ts.是否提交审批所选中数据？'))
     tableObject.loading = true
@@ -1081,6 +1102,12 @@ const handleTur = async (id: number, cause: string) => {
 /** 发票寄出确认按钮操作 */
 const handleInvoiceSentOut = async (id: number) => {
   try {
+    // 校验是否可以开票
+    const res = await checkInvoicingCalendar()
+    if (res?.flag) {
+      message.alertWarning(res.msg)
+      return
+    }
     // 驳回的二次确认
     await message.confirm(t('ts.是否确认发票寄出选中数据？'))
     tableObject.loading = true
@@ -1165,7 +1192,7 @@ const genRecords = async (id: number) => {
 
 /** 导出按钮操作 */
 const handleExport = async () => {
- console.log(111)
+  console.log(111)
   let rows: any = []
   selectionRows.value.forEach((item) => {
     rows = [...rows, ...item.selectionRows.map((item1) => item1.number)]
@@ -1181,8 +1208,8 @@ const handleExport = async () => {
   } else {
     paramsData = { ...paramsData, checkNums: rows }
   }
-  if (!paramsData.createTime || paramsData.createTime && paramsData.createTime.length == 0) {
-  delete paramsData.createTime
+  if (!paramsData.createTime || (paramsData.createTime && paramsData.createTime.length == 0)) {
+    delete paramsData.createTime
   }
   try {
     // 导出的二次确认
@@ -1410,11 +1437,16 @@ const getLoginUserRoleList = async () => {
 
 /** 初始化 **/
 onMounted(async () => {
-  
-  SupplierinvoiceRequestMain.allSchemas.formSchema.forEach(async item=>{
-    if(item.field == 'procurementCreator'){
+  SupplierinvoiceRequestMain.allSchemas.formSchema.forEach(async (item) => {
+    if (item.field == 'procurementCreator') {
       //采购审批人
-      const procurementCreators = await SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({ roleCode: 'purchase',pageSize: 1000,pageNo: 1,sort: '',by: 'ASC' })
+      const procurementCreators = await SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({
+        roleCode: 'purchase',
+        pageSize: 1000,
+        pageNo: 1,
+        sort: '',
+        by: 'ASC'
+      })
       item.componentProps.options = procurementCreators.list
     }
   })

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

@@ -201,6 +201,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '供应商名称',
     field: 'supplierName',
     sort: 'custom',
+    isSearch:true,
     table: {
       width: 180,
     },
@@ -250,11 +251,11 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '系统未税金额',
+    label: '供应商维护未税金额',
     field: 'amount',
     formatter: accountantFormart,
     table: {
-      width: 150
+      width: 160
     },
     sortTableDefault:8,
     form: {
@@ -305,7 +306,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   //   isTableForm:false
   // },
   // {
-  //   label: '价税合计金额',
+  //   label: '发票价税合计',
   //   field: 'adTaxAmount',
   //   formatter: accountantFormart,
   //   table: {
@@ -316,7 +317,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   //   isTableForm:false
   // },
   {
-    label: '系统税额',
+    label: '供应商维护税额',
     field: 'taxAmount',
     formatter: accountantFormart,
     table: {
@@ -336,11 +337,11 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '系统价税合计',
+    label: '供应商维护价税合计',
     field: 'afterTaxAmount',
     formatter: accountantFormart,
     table: {
-      width: 150
+      width: 160
     },
     sortTableDefault:7,
     form: {
@@ -441,7 +442,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '未税金额',
+    label: '发票未税金额',
     field: 'beforeTaxAmount',
     formatter: accountantFormart,
     table: {
@@ -458,7 +459,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isTableForm:false,
   },
   {
-    label: '税额',
+    label: '发票税额',
     field: 'totalTaxAmount',
     formatter: accountantFormart,
     table: {
@@ -475,7 +476,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isTableForm:false,
   },
   {
-    label: '价税合计金额',
+    label: '发票价税合计',
     field: 'adTaxAmount',
     formatter: accountantFormart,
     table: {
@@ -518,7 +519,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     sortTableDefault:5,
   },
   {
-    label: '未税差额',
+    label: '未税尾差',
     field: 'beforeTaxDiffAmount',
     formatter: accountantFormart,
     table: {
@@ -535,7 +536,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isTableForm:false,
   },
   {
-    label: '税额差异',
+    label: '税额尾差',
     field: 'taxAmountDiff',
     formatter: accountantFormart,
     table: {
@@ -552,7 +553,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isTableForm:false,
   },
   {
-    label: '价税合计差额',
+    label: '价税合计尾差',
     field: 'totalTaxDiffAmount',
     formatter: accountantFormart,
     table: {
@@ -598,7 +599,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     sortTableDefault:10,
     form:{
       componentProps: {
-        maxlength:23,
+        maxlength:20,
         showWordLimit:true
       }
     }
@@ -1143,7 +1144,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: 'SCP系统数据',
+    label: '价差',
     field: '',
     sort: 'custom',
     isForm: false,
@@ -1151,7 +1152,16 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isTable: false,
     isDetail: true,
   },
-
+  {
+    label: 'SCP系统数据',
+    field: '',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isDetail: false,
+  },
+  
   {
     label: '单据号',
     field: 'number',
@@ -1175,10 +1185,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '系统价税合计',
-    field: 'afterTaxAmount',
+    label: '系统未税金额',
+    field: 'purchaseAmountTotalMain',
     formatter: accountantFormart,
-    
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1206,10 +1215,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '系统未税金额',
-    field: 'amount',
+    label: '价差合计',
+    field: 'differencePriceTotalMain',
     formatter: accountantFormart,
-    
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1242,9 +1250,8 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '系统税额',
-    field: 'taxAmount',
-    formatter: accountantFormart,
+    label: '',
+    field: '',
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1273,15 +1280,23 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '系统采购价格',
-    field: 'purchaseAmountTotalMain',
-    formatter: accountantFormart,
+    label: '尾差',
+    field: '',
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
     isSearch: false,
     isDetail: true,
   },
+  // {
+  //   label: '尾差',
+  //   field: 'totalDifference',
+  //   sortTableDefault: 6,
+  //   isForm: false,
+  //   isTable: false,
+  //   isSearch: false,
+  //   isDetail: false,
+  // },
   {
     label: '采购价格审批人',
     field: 'procurementCreatorName',
@@ -1305,9 +1320,10 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '总价差',
-    field: 'differencePriceTotalMain',
+    label: '供应商维护价税合计',
+    field: 'afterTaxAmount',
     formatter: accountantFormart,
+    
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1339,8 +1355,10 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     },
   },
   {
-    label: '',
-    field: '',
+    label: '供应商维护未税金额',
+    field: 'amount',
+    formatter: accountantFormart,
+    
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1359,7 +1377,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '价税合计',
+    label: '发票价税合计',
     field: 'adTaxAmount',
     formatter: accountantFormart,
     
@@ -1370,15 +1388,15 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '',
-    field: '',
+    label: '供应商维护税额',
+    field: 'taxAmount',
+    formatter: accountantFormart,
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
     isSearch: false,
     isDetail: true,
   },
-
   {
     label: '财务审批人',
     field: 'financialCreatorName',
@@ -1391,7 +1409,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '未税金额',
+    label: '发票未税金额',
     field: 'beforeTaxAmount',
     formatter: accountantFormart,
     
@@ -1402,13 +1420,13 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '尾差',
-    field: 'totalDifference',
+    label: '',
+    field: '',
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
     isSearch: false,
-    isDetail: false,
+    isDetail: true,
   },
   {
     label: '财务审批时间',
@@ -1424,7 +1442,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '税额',
+    label: '发票税额',
     field: 'totalTaxAmount',
     formatter: accountantFormart,
     
@@ -1435,15 +1453,14 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '价税合计差额(价税合计-系统价税合计)',
+    label: '价税合计尾差',
     field: 'totalTaxDiffAmount',
     formatter: accountantFormart,
-    
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
     isSearch: false,
-    isDetail: false,
+    isDetail: true,
   },
   {
     label: '财务过账日期',
@@ -1468,7 +1485,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '未税差额(未税金额-系统未税金额)',
+    label: '未税尾差',
     field: 'beforeTaxDiffAmount',
     formatter: accountantFormart,
     
@@ -1476,8 +1493,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isForm: false,
     isTable: false,
     isSearch: false,
-    isDetail: false,
+    isDetail: true,
   },
+  
   {
     label: '备注',
     field: 'remark',
@@ -1502,7 +1520,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '税额差异（税额-系统税额）',
+    label: '税额尾差',
     field: 'taxAmountDiff',
     formatter: accountantFormart,
     
@@ -1510,7 +1528,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isForm: false,
     isTable: false,
     isSearch: false,
-    isDetail: false,
+    isDetail: true,
   },
   
 

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

@@ -242,11 +242,11 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '系统未税金额',
+    label: '供应商维护未税金额',
     field: 'amount',
     formatter: accountantFormart,
     table: {
-      width: 150
+      width: 160
     },
     sortTableDefault:8,
     form: {
@@ -286,7 +286,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   //   isTableForm:false
   // },
   // {
-  //   label: '税额',
+  //   label: '发票税额',
   //   field: 'totalTaxAmount',
   //   formatter: accountantFormart,
   //   table: {
@@ -297,7 +297,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   //   isTableForm:false
   // },
   // {
-  //   label: '价税合计金额',
+  //   label: '发票价税合计',
   //   field: 'adTaxAmount',
   //   formatter: accountantFormart,
   //   table: {
@@ -308,7 +308,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   //   isTableForm:false
   // },
   {
-    label: '系统税额',
+    label: '供应商维护税额',
     field: 'taxAmount',
     formatter: accountantFormart,
     table: {
@@ -328,11 +328,11 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '系统价税合计',
+    label: '供应商维护价税合计',
     field: 'afterTaxAmount',
     formatter: accountantFormart,
     table: {
-      width: 150
+      width: 160
     },
     sortTableDefault:7,
     form: {
@@ -433,7 +433,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '未税金额',
+    label: '发票未税金额',
     field: 'beforeTaxAmount',
     formatter: accountantFormart,
     table: {
@@ -450,7 +450,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isTableForm:false,
   },
   {
-    label: '税额',
+    label: '发票税额',
     field: 'totalTaxAmount',
     formatter: accountantFormart,
     table: {
@@ -467,7 +467,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isTableForm:false,
   },
   {
-    label: '价税合计金额',
+    label: '发票价税合计',
     field: 'adTaxAmount',
     formatter: accountantFormart,
     table: {
@@ -510,7 +510,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     sortTableDefault:5,
   },
   {
-    label: '未税差额',
+    label: '未税尾差',
     field: 'beforeTaxDiffAmount',
     formatter: accountantFormart,
     table: {
@@ -527,7 +527,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isTableForm:false,
   },
   {
-    label: '税额差异',
+    label: '税额尾差',
     field: 'taxAmountDiff',
     formatter: accountantFormart,
     table: {
@@ -544,7 +544,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isTableForm:false,
   },
   {
-    label: '价税合计差额',
+    label: '价税合计尾差',
     field: 'totalTaxDiffAmount',
     formatter: accountantFormart,
     table: {
@@ -590,7 +590,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     sortTableDefault:10,
     form:{
       componentProps: {
-        maxlength:23,
+        maxlength:20,
         showWordLimit:true
       }
     }
@@ -1158,7 +1158,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: 'SCP系统数据',
+    label: '价差',
     field: '',
     sort: 'custom',
     isForm: false,
@@ -1166,7 +1166,16 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isTable: false,
     isDetail: true,
   },
-
+  {
+    label: 'SCP系统数据',
+    field: '',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isDetail: false,
+  },
+  
   {
     label: '单据号',
     field: 'number',
@@ -1190,10 +1199,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '系统价税合计',
-    field: 'afterTaxAmount',
+    label: '系统未税金额',
+    field: 'purchaseAmountTotalMain',
     formatter: accountantFormart,
-    
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1203,7 +1211,6 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
   {
     label: '财务凭证号',
     field: 'voucherNumber',
-   
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1214,6 +1221,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     label: '供应商名称',
     field: 'supplierName',
     sort: 'custom',
+    
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1221,10 +1229,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '系统未税金额',
-    field: 'amount',
+    label: '价差合计',
+    field: 'differencePriceTotalMain',
     formatter: accountantFormart,
-    
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1257,9 +1264,8 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '系统税额',
-    field: 'taxAmount',
-    formatter: accountantFormart,
+    label: '',
+    field: '',
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1288,15 +1294,23 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '系统采购价格',
-    field: 'purchaseAmountTotalMain',
-    formatter: accountantFormart,
+    label: '尾差',
+    field: '',
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
     isSearch: false,
     isDetail: true,
   },
+  // {
+  //   label: '尾差',
+  //   field: 'totalDifference',
+  //   sortTableDefault: 6,
+  //   isForm: false,
+  //   isTable: false,
+  //   isSearch: false,
+  //   isDetail: false,
+  // },
   {
     label: '采购价格审批人',
     field: 'procurementCreatorName',
@@ -1320,9 +1334,10 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '总价差',
-    field: 'differencePriceTotalMain',
+    label: '供应商维护价税合计',
+    field: 'afterTaxAmount',
     formatter: accountantFormart,
+    
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1354,8 +1369,10 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     },
   },
   {
-    label: '',
-    field: '',
+    label: '供应商维护未税金额',
+    field: 'amount',
+    formatter: accountantFormart,
+    
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1374,7 +1391,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '价税合计',
+    label: '发票价税合计',
     field: 'adTaxAmount',
     formatter: accountantFormart,
     
@@ -1385,15 +1402,15 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '',
-    field: '',
+    label: '供应商维护税额',
+    field: 'taxAmount',
+    formatter: accountantFormart,
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
     isSearch: false,
     isDetail: true,
   },
-
   {
     label: '财务审批人',
     field: 'financialCreatorName',
@@ -1406,7 +1423,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '未税金额',
+    label: '发票未税金额',
     field: 'beforeTaxAmount',
     formatter: accountantFormart,
     
@@ -1417,13 +1434,13 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '尾差',
-    field: 'totalDifference',
+    label: '',
+    field: '',
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
     isSearch: false,
-    isDetail: false,
+    isDetail: true,
   },
   {
     label: '财务审批时间',
@@ -1439,7 +1456,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '税额',
+    label: '发票税额',
     field: 'totalTaxAmount',
     formatter: accountantFormart,
     
@@ -1450,15 +1467,14 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '价税合计差额(价税合计-系统价税合计)',
+    label: '价税合计尾差',
     field: 'totalTaxDiffAmount',
     formatter: accountantFormart,
-    
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
     isSearch: false,
-    isDetail: false,
+    isDetail: true,
   },
   {
     label: '财务过账日期',
@@ -1483,7 +1499,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '未税差额(未税金额-系统未税金额)',
+    label: '未税尾差',
     field: 'beforeTaxDiffAmount',
     formatter: accountantFormart,
     
@@ -1491,13 +1507,13 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isForm: false,
     isTable: false,
     isSearch: false,
-    isDetail: false,
+    isDetail: true,
   },
+  
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
-   
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1518,7 +1534,7 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '税额差异（税额-系统税额）',
+    label: '税额尾差',
     field: 'taxAmountDiff',
     formatter: accountantFormart,
     
@@ -1526,21 +1542,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isForm: false,
     isTable: false,
     isSearch: false,
-    isDetail: false,
+    isDetail: true,
   },
-  // {
-  //   label: '创建时间',
-  //   field: 'createTime',
-  //   formatter: dateFormatter,
-  //   sortTableDefault:1000,
-  //   detail: {
-  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
-  //   },
-  //   isForm: false,
-  //   isTable: false,
-  //   isSearch: false,
-  //   isDetail: true,
-  // },
+  
 
 ]))
 const singlePriceFormart = (row, column, cellValue) => {