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

src/components/BasicForm/src/BasicForm.vue

@@ -393,7 +393,13 @@ const props = defineProps({
   fixedScrollHieght:{
     type:Boolean,
     default:false
-  }
+  },
+  // 默认不显示包装号，采购收货记录显示包装号
+  isShowPackNumber:{
+    type: Boolean,
+    required: false,
+    default: false
+  },
 })
 
 const { t } = useI18n() // 国际化
@@ -444,7 +450,7 @@ const tabSheet = ref('TableForm')
 
 routeName.value = route.name
 const formHeight = ref({})
-if (!wsCache.get('ShowPackingNumber')) {
+if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) {
   if (formSchema.value) {
       formSchema.value = formSchema.value.filter(item => item.field != 'packingNumber' &&  item.field != 'fromPackingNumber')
   }
@@ -845,7 +851,7 @@ const submitForm = async () => {
       // 主子表——提交请求
       try {
         const data = unref(formRef)?.formModel
-          if (!wsCache.get('ShowPackingNumber')  ) {
+          if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) {
           data.packingNumber=''
           data.fromPackingNumber=''
         }
@@ -857,7 +863,7 @@ const submitForm = async () => {
       // 编辑
       try {
         const data = unref(formRef)?.formModel
-        if (!wsCache.get('ShowPackingNumber')  ) {
+        if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) {
           data.packingNumber=''
           data.fromPackingNumber=''
         }
@@ -874,7 +880,7 @@ const submitForm = async () => {
     try {
       const data = unref(formRef)?.formModel
       // 清空包装号
-       if (!wsCache.get('ShowPackingNumber') ) {
+       if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) {
           data.packingNumber=''
           data.fromPackingNumber=''
         }

src/components/Detail/src/Detail.vue

@@ -62,6 +62,8 @@
             v-model:pageSize="tableObjectRef.pageSize"
             v-model:currentPage="tableObjectRef.currentPage"
             v-model:sort="tableObjectRef.sort"
+            :isShowPackNumber="isShowPackNumber"
+            
           >
             <!-- <template #action="{ row }">
               <ButtonBase
@@ -79,6 +81,7 @@
             v-model:pageSize="tableObjectRef.pageSize"
             v-model:currentPage="tableObjectRef.currentPage"
             v-model:sort="tableObjectRef.sort"
+            :isShowPackNumber="isShowPackNumber"
           >
             <template v-for="name in Object.keys($slots)" :key="name" #[name]="{ row }">
               <slot :name="name" :row="row"></slot>
@@ -143,6 +146,7 @@
               v-model:pageSize="tableObjectRef.pageSize"
               v-model:currentPage="tableObjectRef.currentPage"
               v-model:sort="tableObjectRef.sort"
+              :isShowPackNumber="isShowPackNumber"
             />
           </ContentWrap> 
 
@@ -488,11 +492,17 @@ const props = defineProps({
     required: false,
     default: () => []
   },
+  // 默认不显示包装号，采购收货记录显示包装号
+  isShowPackNumber:{
+    type: Boolean,
+    required: false,
+    default: false
+  },
 })
 const allSchemas = ref(props.allSchemas)
 const detailAllSchemasRef = ref(props.detailAllSchemas)
 const detailAllSchemasRules = ref(props.detailAllSchemasRules)
-if (!wsCache.get('ShowPackingNumber')) {
+if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) {
   if (allSchemas.value) {
     allSchemas.value.detailSchema = props.allSchemas.detailSchema.filter(item => item.field != 'packingNumber')
   }

src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue

@@ -308,7 +308,7 @@ const verifyData = async () => {
   }else if(data.status==2){
     try {
     // 确认
-    await message.confirm('已存在相同客户编号及年月的对账单，是否确认覆盖？')
+    await message.confirm('已存在相同客户代码及年月的客户对账单，是否确认覆盖？')
     //确定走的
     submitForm();
     // await PurchasepriceApi.deletePurchaseprice(id)
@@ -320,7 +320,7 @@ const verifyData = async () => {
     //取消走的
   }
   }else if(data.status==3){
-    await message.alertWarning('已存在相同客户编号及年月的对账单，且已提交，无法导入。')
+    await message.alertWarning('已存在相同客户代码及年月的客户对账单，且已提交，无法导入。')
   }
 }
 
@@ -414,6 +414,8 @@ const submitFormError = (): void => {
 /** 重置表单 */
 const resetForm = () => {
   // 重置上传状态和文件
+  queryParams.customerCode = ''
+  queryParams.yearsMonthStr = ''
   formLoading.value = false
   uploadRef.value?.clearFiles()
   fileList.value = []

src/components/ImportForm/src/ImportCustomerStatementForm.vue

@@ -308,7 +308,7 @@ const verifyData = async () => {
   }else if(data.status==2){
     try {
     // 确认
-    await message.confirm('已存在相同客户编号及年月的对账单，是否确认导入？注意：如确认则上一版本对账单将自动作废。')
+    await message.confirm('已存在相同客户代码及年月的客户对账单，是否确认导入？注意：如确认则上一版本对账单将自动作废。')
     //确定走的
     submitForm();
     // await PurchasepriceApi.deletePurchaseprice(id)
@@ -320,7 +320,7 @@ const verifyData = async () => {
     //取消走的
   }
   }else if(data.status==3){
-    await message.alertWarning('已存在相同客户编号及年月的对账单，且已提交，无法导入。')
+    await message.alertWarning('已存在相同客户代码及年月的客户对账单，且已提交，无法导入。')
   }
 }
 
@@ -414,6 +414,8 @@ const submitFormError = (): void => {
 /** 重置表单 */
 const resetForm = () => {
   // 重置上传状态和文件
+  queryParams.customerCode = ''
+  queryParams.yearsMonthStr = ''
   formLoading.value = false
   uploadRef.value?.clearFiles()
   fileList.value = []

src/components/ImportForm/src/ImportCustomerStatementShareForm.vue

@@ -265,7 +265,7 @@ const verifyData = async () => {
   }else if(data.status==2){
     try {
     // 确认
-    await message.confirm('已存在相同客户编号及年月的对账单，是否确认导入？注意：如确认则上一版本对账单将自动作废。')
+    await message.confirm('已存在相同客户代码及年月的客户对账单，是否确认导入？注意：如确认则上一版本对账单将自动作废。')
     //确定走的
     submitForm();
     // await PurchasepriceApi.deletePurchaseprice(id)
@@ -278,7 +278,7 @@ const verifyData = async () => {
     alert(123);
   }
   }else if(data.status==3){
-    await message.alertWarning('已存在相同客户编号及年月的对账单，且已确认分摊金额，无法导入')
+    await message.alertWarning('已存在相同客户代码及年月的客户对账单，且已确认分摊金额，无法导入')
   }
 }
 
@@ -372,6 +372,8 @@ const submitFormError = (): void => {
 /** 重置表单 */
 const resetForm = () => {
   // 重置上传状态和文件
+  queryParams.customerCode = ''
+  queryParams.yearsMonthStr = ''
   formLoading.value = false
   uploadRef.value?.clearFiles()
   fileList.value = []

src/components/ImportForm/src/ImportSupplierMoldCostForm.vue

@@ -412,6 +412,8 @@ const submitFormError = (): void => {
 
 /** 重置表单 */
 const resetForm = () => {
+  queryParams.supplierCode = ''
+  queryParams.yearsMonthStr = ''
   // 重置上传状态和文件
   formLoading.value = false
   uploadRef.value?.clearFiles()

src/components/Table/src/Table.vue

@@ -65,6 +65,7 @@ export default defineComponent({
     rowKey: propTypes.string.def(''),
     // true 取消父子关联; false 关联
     isCheckStrictly: propTypes.bool.def(false),
+    isShowPackNumber:propTypes.bool.def(false),// 默认不显示包装号，采购收货记录显示包装号
   },
   emits: ['update:pageSize', 'update:currentPage', 'register', 'update:sort','getSelectionRows','rowClick'],
   setup(props, { attrs, slots, emit, expose }) {
@@ -103,8 +104,8 @@ export default defineComponent({
 
     const setColumn = (columnProps: TableSetPropsType[], columnsChildren?: TableColumn[]) => {
       let { columns } = unref(getProps)
-      
+      console.log(888,props.isShowPackNumber)
-      if (!wsCache.get('ShowPackingNumber')) {
+      if (!wsCache.get('ShowPackingNumber')&&!props.isShowPackNumber) {
         if (columns) {
           columns = columns.filter(item => item.field != 'packingNumber' && item.field != 'fromPackingNumber'&& item.field != 'toPackingNumber')
         }
@@ -346,7 +347,9 @@ export default defineComponent({
         showOverflowTooltip,
         border
       } = unref(getProps)
-      if (!wsCache.get('ShowPackingNumber')) {
+      
+      console.log(999,props.isShowPackNumber)
+      if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) {
         if (columns) {
          columns = columns.filter(item => item.field != 'packingNumber' && item.field != 'fromPackingNumber'&& item.field != 'toPackingNumber')
         }

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

@@ -127,6 +127,7 @@ import {
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import {getLabelDetailPage} from "@/api/wms/package";
 const { loadStart, loadDone } = usePageLoading()
 // 装配收货记录主
 defineOptions({ name: 'ProductreceiptRecordMainA' })
@@ -238,7 +239,7 @@ const butttondata = (row,$index) => {
   }
   return [
   // defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
-  defaultButtons.mainPutawayRequestCpBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" || row.recoveryRequestFlag == "TRUE"}),// 生成采购上架申请
+  // defaultButtons.mainPutawayRequestCpBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" || row.recoveryRequestFlag == "TRUE"}),// 生成采购上架申请
   defaultButtons.mainListPointBtn(null), // 标签打印
   defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示
   ]
@@ -318,17 +319,17 @@ const labelPrint = async (row) => {
     }
   }
   const defaultParams = {
-    moduleName: 'productreceipt_assemble',
+    moduleName: 'productreceipt_assemble',
-    tableName: 'record_productreceipt_main',
+    // tableName: 'record_productreceipt_main',
-    recordNumber: row.number,
+    recordNumber: row.requestNumber,
-    number: row.number == null ? row.number : row.packingNumber,
+//     number: row.number == null ? row.number : row.packingNumber,
-    itemCode: row.itemCode,
+//     itemCode: row.itemCode,
-    batch: row.batch
+//     batch: row.batch
-  }
+ }
   const {tableObject:tableObjectPrint ,tableMethods} = useTable({
     defaultParams,
     // getListApi: PackageApi.getProductreceiptLabelDetailPage  // 分页接口
-    getListApi: PackageApi.getLabelDetailPageByRecordId  // 分页接口
+    getListApi: PackageApi.getLabelDetailPage  // 分页接口
   })
 
   // 获得表格的各种操作

src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue

@@ -35,6 +35,7 @@
       v-model:pageSize="tableObject.pageSize"
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
+      :isShowPackNumber="true"
     >
       <template #number="{ row }">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
@@ -59,6 +60,7 @@
     :tableAllSchemas="PurchasereceiptRecordDetail.allSchemas"
     :tableFormRules="PurchasereceiptRecordDetailRules"
     :isBusiness="true"
+    :isShowPackNumber="true"
   />
 
   <!-- 详情 -->
@@ -73,6 +75,7 @@
     @changeTabs="changeTabs"
     :buttondataTable="buttondataTable"
     @tableFormButton="tableFormButton"
+    :isShowPackNumber="true"
   />
 
   <!-- 记录子包装弹窗 -->
@@ -86,6 +89,7 @@
     :isShowButton="false"
     :isShowReduceButton="false"
     :isShowFooterButtton="false"
+    :isShowPackNumber="true"
   />
 
   <!-- 缺货子包装弹窗 -->
@@ -99,6 +103,7 @@
     :isShowButton="false"
     :isShowReduceButton="false"
     :isShowFooterButtton="false"
+    :isShowPackNumber="true"
   />
   <el-dialog
     v-model="showQualityReport"
@@ -242,9 +247,9 @@ const butttondata = (row, $index) => {
       hasPermi: 'wms:purchasereceipt-record-main:createPutawayRequest',
       hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE'
     }), // 生成采购上架申请
-    defaultButtons.mainPurchasereturnRecordBtn({
+    // defaultButtons.mainPurchasereturnRecordBtn({
-      hide: (row.isPutaway==1 && row.putawayRequestFlag == 'FALSE')?false:true
+    //   hide: (row.isPutaway==1 && row.putawayRequestFlag == 'FALSE')?false:true
-    }), // 生成采购退后记录申请
+    // }), // 生成采购退后记录申请
     //defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), // 查看质检报告
     defaultButtons.mainListPlanCheckQualityReportBtn({ hide: isShowSourceTypeButton(row) }), // 查看质检报告
     defaultButtons.mainListPrintInspectionBtn({ hide: isShowSCPAndQMSButton() })

src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -726,7 +726,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     sortTableDefault:15,
-    hiddenInMain:true
+    hiddenInMain: true,
+    isForm: false,
+    isTable:false
   },
   {
     label: '到包装号',

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

@@ -35,6 +35,7 @@
       v-model:pageSize="tableObject.pageSize"
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
+      :isShowPackNumber="true"
     >
       <template #number="{ row }">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
@@ -59,6 +60,7 @@
     :tableAllSchemas="PurchasereceiptRecordDetail.allSchemas"
     :tableFormRules="PurchasereceiptRecordDetailRules"
     :isBusiness="true"
+    :isShowPackNumber="true"
   />
 
   <!-- 详情 -->
@@ -73,6 +75,7 @@
     @changeTabs="changeTabs"
     :buttondataTable="buttondataTable"
     @tableFormButton="tableFormButton"
+    :isShowPackNumber="true"
   />
 
   <!-- 记录子包装弹窗 -->

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -726,7 +726,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     sortTableDefault:15,
-    hiddenInMain:true
+    hiddenInMain: true,
+    isForm: false,
+    isTable:false,
   },
   {
     label: '到包装号',

src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue

@@ -35,6 +35,7 @@
       v-model:pageSize="tableObject.pageSize"
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
+      :isShowPackNumber="true"
     >
       <template #number="{ row }">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
@@ -59,6 +60,7 @@
     :tableAllSchemas="PurchasereceiptRecordDetail.allSchemas"
     :tableFormRules="PurchasereceiptRecordDetailRules"
     :isBusiness="true"
+    :isShowPackNumber="true"
   />
 
   <!-- 详情 -->
@@ -73,6 +75,7 @@
     @changeTabs="changeTabs"
     :buttondataTable="buttondataTable"
     @tableFormButton="tableFormButton"
+    :isShowPackNumber="true"
   />
 
   <!-- 记录子包装弹窗 -->
@@ -86,6 +89,7 @@
     :isShowButton="false"
     :isShowReduceButton="false"
     :isShowFooterButtton="false"
+    :isShowPackNumber="true"
   />
 
   <!-- 缺货子包装弹窗 -->
@@ -99,6 +103,7 @@
     :isShowButton="false"
     :isShowReduceButton="false"
     :isShowFooterButtton="false"
+    :isShowPackNumber="true"
   />
   <el-dialog
     v-model="showQualityReport"

src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -726,7 +726,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     sortTableDefault:15,
-    hiddenInMain:true
+    hiddenInMain: true,
+    isForm: false,
+    isTable: false,
   },
   {
     label: '到包装号',