YT-378Q1关联WMS的菜单 : 客户退货申请，任务，记录

Q2关联WMS的菜单 : 采购退货申请，任务，记录

src/api/wms/switch/index.ts

@@ -52,5 +52,10 @@ export const exportSwitch = async (params) => {
 
 // 下载用户导入模板
 export const importTemplate = () => {
-  return request.download({ url: '/wms/switch/get-import-template' })
+  return request.download({ url: '/wms/switch/get-import-template'})
+}
+
+// 获取开关详情
+export const getSwitchByCode = async (code) => {
+  return await request.get({ url: '/wms/switch/getByCode?code=' + code })
 }

src/components/BasicForm/src/BasicForm.vue

@@ -444,7 +444,7 @@ const tabChange = (item) => {
   tabSheet.value = item.prop
 }
 
-
+console.log(898989,formSchema.value)
 // 列表-按钮
 // const buttondata = [
 //   defaultButtons.mainListEditBtn(null), // 编辑

src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue

@@ -75,6 +75,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { getSwitchByCode } from '@/api/wms/switch'
 const { loadStart, loadDone } = usePageLoading()
 // 客户退货任务主
 defineOptions({ name: 'CustomerreturnJobMain' })
@@ -87,6 +88,28 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...CustomerreturnJobMain.allSchemas.tableColumns,...CustomerreturnJobDetail.allSchemas.tableMainColumns])
 
+const CustomerreturnJobMainAllSchema =ref(JSON.parse(JSON.stringify(CustomerreturnJobMain)))
+// 是否启用QMS开启显示q1q2q3
+const EnableQms = ref(true)
+const updateKey = ref(0)
+const getSwitchByCode1 =async ()  => {
+  await getSwitchByCode("EnableQms").then((res) => {
+    EnableQms.value = res == 'TRUE' ? true : false
+  if (EnableQms.value) {
+    CustomerreturnJobMain.allSchemas = CustomerreturnJobMainAllSchema.value.allSchemas
+  } else {
+    CustomerreturnJobMain.allSchemas.formSchema = CustomerreturnJobMainAllSchema.value.allSchemas.formSchema.filter(item => item.field != 'q1Number')
+    CustomerreturnJobMain.allSchemas.tableColumns = CustomerreturnJobMainAllSchema.value.allSchemas.tableColumns.filter(item => item.field != 'q1Number')
+    CustomerreturnJobMain.allSchemas.tableFormColumns = CustomerreturnJobMainAllSchema.value.allSchemas.tableFormColumns.filter(item => item.field != 'q1Number')
+    CustomerreturnJobMain.allSchemas.tableMainColumns = CustomerreturnJobMainAllSchema.value.allSchemas.tableMainColumns.filter(item => item.field != 'q1Number')
+    CustomerreturnJobMain.allSchemas.detailSchema = CustomerreturnJobMainAllSchema.value.allSchemas.detailSchema.filter(item => item.field != 'q1Number')
+    CustomerreturnJobMain.allSchemas.searchSchema = CustomerreturnJobMainAllSchema.value.allSchemas.searchSchema.filter(item => item.field != 'q1Number')
+}
+    updateKey.value++
+  })
+}
+getSwitchByCode1()
+
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val

src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue

@@ -72,6 +72,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { getSwitchByCode } from '@/api/wms/switch'
 const { loadStart, loadDone } = usePageLoading()
 // 客户退货记录主
 defineOptions({ name: 'CustomerreturnRecordMain' })
@@ -84,6 +85,28 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...CustomerreturnRecordMain.allSchemas.tableColumns,...CustomerreturnRecordDetail.allSchemas.tableMainColumns])
 
+const CustomerreturnRecordMainAllSchema =ref(JSON.parse(JSON.stringify(CustomerreturnRecordMain)))
+// 是否启用QMS开启显示q1q2q3
+const EnableQms = ref(true)
+const updateKey = ref(0)
+const getSwitchByCode1 =async ()  => {
+  await getSwitchByCode("EnableQms").then((res) => {
+    EnableQms.value = res == 'TRUE' ? true : false
+  if (EnableQms.value) {
+    CustomerreturnRecordMain.allSchemas = CustomerreturnRecordMainAllSchema.value.allSchemas
+  } else {
+    CustomerreturnRecordMain.allSchemas.formSchema = CustomerreturnRecordMainAllSchema.value.allSchemas.formSchema.filter(item => item.field != 'q1Number')
+    CustomerreturnRecordMain.allSchemas.tableColumns = CustomerreturnRecordMainAllSchema.value.allSchemas.tableColumns.filter(item => item.field != 'q1Number')
+    CustomerreturnRecordMain.allSchemas.tableFormColumns = CustomerreturnRecordMainAllSchema.value.allSchemas.tableFormColumns.filter(item => item.field != 'q1Number')
+    CustomerreturnRecordMain.allSchemas.tableMainColumns = CustomerreturnRecordMainAllSchema.value.allSchemas.tableMainColumns.filter(item => item.field != 'q1Number')
+    CustomerreturnRecordMain.allSchemas.detailSchema = CustomerreturnRecordMainAllSchema.value.allSchemas.detailSchema.filter(item => item.field != 'q1Number')
+    CustomerreturnRecordMain.allSchemas.searchSchema = CustomerreturnRecordMainAllSchema.value.allSchemas.searchSchema.filter(item => item.field != 'q1Number')
+}
+    updateKey.value++
+  })
+}
+getSwitchByCode1()
+
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val

src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue

@@ -60,6 +60,7 @@
     @onEnter="onEnter"
     @inputNumberChange="inputNumberChange"
     @clearSearchInput="clearSearchInput"
+    :key="updateKey"
   />
   <!-- 添加明细：采购收货记录单号 -->
   <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
@@ -119,6 +120,7 @@ import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { getSwitchByCode } from '@/api/wms/switch'
 const { loadStart, loadDone } = usePageLoading()
 // 客户退货申请
 defineOptions({ name: 'CustomerreturnRequestMain' })
@@ -131,8 +133,30 @@ const routeName = ref()
 const customerCode = ref()
 const genLabelId = ref(); //主表ID
 routeName.value = route.name
-const tableColumns = ref([...CustomerreturnRequestMain.allSchemas.tableColumns,...CustomerreturnRequestDetail.allSchemas.tableMainColumns])
+const CustomerreturnRequestMainAllSchema =ref(JSON.parse(JSON.stringify(CustomerreturnRequestMain)))
-
+const tableColumns = ref([...CustomerreturnRequestMain.allSchemas.tableColumns, ...CustomerreturnRequestDetail.allSchemas.tableMainColumns])
+
+// 是否启用QMS开启显示q1q2q3
+const EnableQms = ref(true)
+const updateKey = ref(0)
+const getSwitchByCode1 =async ()  => {
+  await getSwitchByCode("EnableQms").then((res) => {
+    EnableQms.value = res == 'TRUE' ? true : false
+  if (EnableQms.value) {
+    CustomerreturnRequestMain.allSchemas = CustomerreturnRequestMainAllSchema.value.allSchemas
+  } else {
+    CustomerreturnRequestMain.allSchemas.formSchema = CustomerreturnRequestMainAllSchema.value.allSchemas.formSchema.filter(item => item.field != 'q1Number')
+    CustomerreturnRequestMain.allSchemas.tableColumns = CustomerreturnRequestMainAllSchema.value.allSchemas.tableColumns.filter(item => item.field != 'q1Number')
+    CustomerreturnRequestMain.allSchemas.tableFormColumns = CustomerreturnRequestMainAllSchema.value.allSchemas.tableFormColumns.filter(item => item.field != 'q1Number')
+    CustomerreturnRequestMain.allSchemas.tableMainColumns = CustomerreturnRequestMainAllSchema.value.allSchemas.tableMainColumns.filter(item => item.field != 'q1Number')
+    CustomerreturnRequestMain.allSchemas.detailSchema = CustomerreturnRequestMainAllSchema.value.allSchemas.detailSchema.filter(item => item.field != 'q1Number')
+    CustomerreturnRequestMain.allSchemas.searchSchema = CustomerreturnRequestMainAllSchema.value.allSchemas.searchSchema.filter(item => item.field != 'q1Number')
+    console.log(344,CustomerreturnRequestMain.allSchemas)
+    }
+    updateKey.value++
+  })
+}
+getSwitchByCode1()
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -561,6 +585,7 @@ const showLabelSuccess = async (formField, searchField, val, formRef, type, row)
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {
   originTableData.value = []
+ 
   if(type == "update"){
     CustomerreturnRequestMain.allSchemas.formSchema.forEach((item) => {
       if(item.field == 'deliverRecordNumber'){
@@ -577,6 +602,7 @@ const openForm =async (type: string, row?: number) => {
       // }
     })
   }else {
+    
     CustomerreturnRequestMain.allSchemas.formSchema.forEach((item) => {
       if(item.field == 'deliverRecordNumber'){
         item.componentProps.isSearchList = true
@@ -831,8 +857,11 @@ const searchFormClick = (searchData) => {
 }
 
 /** 初始化 **/
+
 onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await CustomerreturnRequestMainApi.importTemplate()
+
+ 
 })
 </script>

src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue

@@ -283,7 +283,7 @@ const detailRef = ref()
 const chooseRow = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
   chooseRow.value = row
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicCustomerStatementMain')
+  detailRef.value.openDetail( chooseRow.value, titleName, titleValue, 'basicCustomerStatementMain')
 }
 
 /** 删除按钮操作 */
@@ -531,7 +531,7 @@ const changeTabs = async (item) => {
   }
 }
 // 点击子表按钮事件
-const detailButtonBaseClick = (val, item, detailTableObject) => {
+const detailButtonBaseClick =async (val, item, detailTableObject) => {
   console.log(val, item, detailTableObject)
   if (val == 'export') {
     // 子表导出明细
@@ -545,7 +545,12 @@ const detailButtonBaseClick = (val, item, detailTableObject) => {
     }
   }else if (val == 'againContrast') {
     // 重新对比
-    tapRematch(chooseRow.value.id)
+    try{
+      await tapRematch(chooseRow.value.id)
+      chooseRow.value = 3
+    } catch {
+      
+    }
   }else if (val == 'confirmResults') {
     // 确认对比结果
     tapConfirmationContrast(chooseRow.value.id)

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

@@ -35,6 +35,7 @@
       v-model:pageSize="tableObject.pageSize"
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
+      :key="updateKey"
     >
       <template #number="{ row }">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
@@ -73,6 +74,7 @@
     @submitForm="submitForm"
     @onEnter="onEnter"
     @onChange="onChangeForm"
+    :key="updateKey"
   >
   <template #hahaha>
       <el-button style="width:100%" type="primary" @click="chooseReceiptList">选择收货单明细</el-button>
@@ -123,6 +125,7 @@
     @searchTableSuccessDetail="searchTableSuccessDetail"
     @detailOpenForm="detailOpenForm"
     :detailValidate="detailValidate"
+    :key="updateKey"
   />
 
   <!-- 创建标签 -->
@@ -183,6 +186,7 @@ import { async } from '@antv/x6/lib/registry/marker/async'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { getSwitchByCode } from '@/api/wms/switch'
 const { loadStart, loadDone } = usePageLoading()
 // 采购退货申请
 defineOptions({ name: 'PurchasereturnRequestMainNew' })
@@ -200,6 +204,30 @@ const tableColumns = ref([
 
 const isShowButton = ref(true)
 
+
+const PurchasereturnRequestMainNewAllSchema =ref(JSON.parse(JSON.stringify(PurchasereturnRequestMainNew)))
+// 是否启用QMS开启显示q1q2q3
+const EnableQms = ref(true)
+const updateKey = ref(0)
+const getSwitchByCode1 =async ()  => {
+  await getSwitchByCode("EnableQms").then((res) => {
+    EnableQms.value = res == 'TRUE' ? true : false
+    if (EnableQms.value) {
+      PurchasereturnRequestMainNew.allSchemas = PurchasereturnRequestMainNewAllSchema.value.allSchemas
+    } else {
+      PurchasereturnRequestMainNew.allSchemas.formSchema = PurchasereturnRequestMainNewAllSchema.value.allSchemas.formSchema.filter(item => item.field != 'q2Number')
+      PurchasereturnRequestMainNew.allSchemas.tableColumns = PurchasereturnRequestMainNewAllSchema.value.allSchemas.tableColumns.filter(item => item.field != 'q2Number')
+      PurchasereturnRequestMainNew.allSchemas.tableFormColumns = PurchasereturnRequestMainNewAllSchema.value.allSchemas.tableFormColumns.filter(item => item.field != 'q2Number')
+      PurchasereturnRequestMainNew.allSchemas.tableMainColumns = PurchasereturnRequestMainNewAllSchema.value.allSchemas.tableMainColumns.filter(item => item.field != 'q2Number')
+      PurchasereturnRequestMainNew.allSchemas.detailSchema = PurchasereturnRequestMainNewAllSchema.value.allSchemas.detailSchema.filter(item => item.field != 'q2Number')
+      PurchasereturnRequestMainNew.allSchemas.searchSchema = PurchasereturnRequestMainNewAllSchema.value.allSchemas.searchSchema.filter(item => item.field != 'q2Number')
+    }
+    console.log(999,PurchasereturnRequestMainNew.allSchemas)
+    updateKey.value++
+  })
+}
+getSwitchByCode1()
+
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val

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

@@ -261,7 +261,7 @@ export const PurchasereturnRequestMainNew = useCrudSchemas(
       }
     },
     {
-      label: 'Q2通知单号',
+      label: 'Q2通知单号11',
       field: 'q2Number',
       sort: 'custom',
       isSearch: false,