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

src/locales/en-US.ts

@@ -726,6 +726,7 @@ export default {
     从货主代码:'Code from the shipper',
     到货主代码:'Shipper code',
     查看其他包装规格:'See other packaging formats',
+    查看子包装:'See sub packaging formats',
     包装规格:'Packing specifications',
     单据打印:'Document printing',
     明细列表:'Itemized list',

src/locales/zh-CN.ts

@@ -726,6 +726,7 @@ export default {
     从货主代码:'从货主代码',
     到货主代码:'到货主代码',
     查看其他包装规格:'查看其他包装规格',
+    查看子包装:'查看子包装',
     包装规格:'包装规格',
     单据打印:'单据打印',
     明细列表:'明细列表',

src/views/wms/basicDataManage/documentSetting/switch/index.vue

@@ -134,7 +134,6 @@ const butttondata = (row, $index)=>{
   const hiddenArray = ['CreatePutawayRequestAfterInspectRecordCreated',
     'CreateBackflushRecordAfterProductreceiptRecordCreated',
     'CreateProductputawayRequestAfterProductreceiptRecordCreated',
-    'ExecuteProductreceiptJobPredictIsCreatePutawayRequest',
     'CreatePurchasePlanAfterDiscretePurchaseOrderPublished',
     'ExemptItemCreatePutawayRequestAfterPurchaseReceiptRecordCreated',
     'CreatePurchaseReceiptRequestAfterSupplierDeliverRecordCreated'

src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts

@@ -688,8 +688,16 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    isTableForm: false,
+    isTableForm: true,
     isForm: false,
+    tableForm: {
+      disabled: true
+    },
+    form:{
+      componentProps:{
+        disabled:true,
+      }
+    }
   },
   {
     label: '包装号',

src/views/wms/productionManage/productionplan/productionMain/index.vue

@@ -465,7 +465,6 @@ const getSwitch = async ()=>{
 const autoCreatePlanRequest = async (row)=>{
   // 生成备料计划
   try {
-    
     if(planSwitch.value) {
       // /generatePreparetoissue?number
       let PreparetoissueRes = await  ProductionMainApi.generatePreparetoissue(row.number)

src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue

@@ -331,6 +331,8 @@ const buttonTableClick = async (val, row) => {
       console.log(err)
     })
   } else if (val == 'mainPlanSub') { // 提交审批
+    // 重新获取开关数据
+    await getSwitch()
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
@@ -384,6 +386,8 @@ const buttonTableClick = async (val, row) => {
         })
         // 生成备料计划
         tableObject.loading = true
+        // 重新获取开关数据
+        await getSwitch()
         autoCreatePlanRequest(row)
       }
     })
@@ -541,10 +545,12 @@ const tableSelectionDelete = (selection) => {
 
 // 主子数据 提交
 const submitForm = async (formType, submitData) => {
-    let data = {...submitData}
+  // 重新获取开关数据
-    if(data.masterId){
+  getSwitch()
-      data.id = data.masterId
+  let data = {...submitData}
-    }
+  if(data.masterId){
+    data.id = data.masterId
+  }
   if(tableData.value.find(item => (item.planQty <= 0))) {
     message.warning('数量必须大于0')
     return

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

@@ -331,7 +331,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 
 // 详情 table 操作扩展 按钮
 const buttondataTable = ref([{
-    label: '查看其他包装规格',
+    label: '查看子包装',
     name: 'viewParentPickingNumber',
     hide: false,
     type: 'primary',

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

@@ -261,7 +261,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 
 // 详情 table 操作扩展 按钮
 const buttondataTable = ref([{
-    label: t('ts.查看其他包装规格'),
+    label: t('ts.查看子包装'),
     name: 'viewParentPickingNumber',
     hide: false,
     type: 'primary',

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

@@ -610,7 +610,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 
 // 详情 table 操作扩展 按钮
 const buttondataTable = ref([{
-    label: '查看其他包装规格',
+    label: '查看子包装',
     name: 'viewParentPickingNumber',
     hide: false,
     type: 'primary',