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/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/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',

src/views/wms/reportList/index.vue

@@ -6,12 +6,12 @@
 </template>
 
 <script setup lang="ts">
-import { getAccessToken } from '@/utils/auth'
+import { getAccessToken , getTenantId} from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 // const url = ref('http://localhost:12080/jmreport/view/881686740529258496')
 const route = useRoute() // 路由对象
 
 const str = route.path.split('/')[3]
-const url = ref(getJmreportBaseUrl() + '/jmreport/view/'+ str+ '?token='+ getAccessToken())
+const url = ref(getJmreportBaseUrl() + '/jmreport/view/'+ str+ '?token='+ getAccessToken()+'&tenant_id='+getTenantId())
 console.log(url);
 </script>