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

4 months ago · fb1e2a074b
9 changed files with 52 additions and 15 deletions
--- a/src/locales/en-US.ts
+++ b/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',
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@ -726,6 +726,7 @@ export default {
    从货主代码:'从货主代码',
    到货主代码:'到货主代码',
    查看其他包装规格:'查看其他包装规格',
+    查看子包装:'查看子包装',
    包装规格:'包装规格',
    单据打印:'单据打印',
    明细列表:'明细列表',
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
@ -40,6 +40,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    detail: {
      dateFormat: 'YYYY-MM-DD HH:mm:ss'
    },
+    isTable: false,
    sort: 'custom',
    table: {
      width: 180
@ -60,6 +61,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    detail: {
      dateFormat: 'YYYY-MM-DD HH:mm:ss'
    },
+    isTable: false,
    sort: 'custom',
    table: {
      width: 180
@ -80,6 +82,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    detail: {
      dateFormat: 'YYYY-MM-DD HH:mm:ss'
    },
+    isTable: false,
    sort: 'custom',
    table: {
      width: 180
@ -97,6 +100,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '从仓库代码',
    field: 'fromWarehouseCode',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 150
    },
@ -105,6 +109,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '到仓库代码',
    field: 'toWarehouseCode',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 150
    },
@ -113,6 +118,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '从库区代码范围',
    field: 'fromAreaCodes',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 150
    },
@ -121,6 +127,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '到库区代码范围',
    field: 'toAreaCodes',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 150
    },
@ -131,7 +138,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    dictType: DICT_TYPE.AREA_TYPE,
    dictClass: 'string',
    isSearch: true,
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -142,7 +149,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'toAreaTypes',
    dictType: DICT_TYPE.AREA_TYPE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -154,7 +161,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    sort: 'custom',
    dictType: DICT_TYPE.INVENTORY_STATUS,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    table: {
      width: 150
    },
@ -174,7 +181,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    sort: 'custom',
    dictType: DICT_TYPE.INVENTORY_STATUS,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    table: {
      width: 150
    },
@ -451,6 +458,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '部门',
    field: 'departmentCode',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 120
    },
@ -459,6 +467,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '备注',
    field: 'remark',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 150
    },
@ -608,6 +617,7 @@ export const PackageoverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
    label: '单据号',
    field: 'number',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 150
    },
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
@ -15,6 +15,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '任务单据号',
    field: 'jobNumber',
    sort: 'custom',
+    isTable: false,
    isSearch: true,
    table: {
      width: 180
@ -24,6 +25,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '仓库代码',
    field: 'warehouseCode',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 120
    },
@ -32,6 +34,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '出库事务类型',
    field: 'outTransactionType',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 150
    },
@ -40,6 +43,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '入库事务类型',
    field: 'inTransactionType',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 150
    },
@ -48,6 +52,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '执行时间',
    field: 'executeTime',
    sort: 'custom',
+    isTable: false,
    formatter: dateFormatter,
    detail: {
      dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -70,6 +75,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '生效日期',
    field: 'activeDate',
    sort: 'custom',
+    isTable: false,
    formatter: dateFormatter2,
    detail: {
      dateFormat: 'YYYY-MM-DD'
@ -92,6 +98,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '申请时间',
    field: 'requestTime',
    sort: 'custom',
+    isTable: false,
    formatter: dateFormatter,
    detail: {
      dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -114,6 +121,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '截止时间',
    field: 'dueTime',
    sort: 'custom',
+    isTable: false,
    formatter: dateFormatter,
    detail: {
      dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -156,7 +164,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'available',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -180,6 +188,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '创建者',
    field: 'creator',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 150
    },
@ -191,6 +200,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
    detail: {
      dateFormat: 'YYYY-MM-DD HH:mm:ss'
    },
+    isTable: false,
    sort: 'custom',
    table: {
      width: 180
@ -257,6 +267,7 @@ export const PackageoverDetail = useCrudSchemas(reactive<CrudSchema[]>([
    label: '单据号',
    field: 'number',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 180
    },
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
@ -79,6 +79,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
        valueFormat: 'x',
      }
    },
+    isTable: false,
    isForm: false,
  },
  {
@ -101,6 +102,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
        valueFormat: 'x',
      }
    },
+    isTable: false,
  },
  {
    label: '从仓库代码',
@ -109,6 +111,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
    form: {
      // labelMessage: '信息提示说明！！！',
      componentProps: {
@ -143,6 +146,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
    form: {
      componentProps: {
        disabled: true
@ -155,7 +159,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    dictType: DICT_TYPE.AREA_TYPE,
    dictClass: 'string',
    isSearch: true,
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -167,7 +171,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'toAreaTypes',
    dictType: DICT_TYPE.AREA_TYPE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -181,6 +185,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
    isForm: false
  },
  {
@ -190,6 +195,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
    isForm: false
  },
  {
@ -211,6 +217,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'departmentCode',
    sort: 'custom',
    isForm: false,
+    isTable: false,
    table: {
      width: 150
    },
@ -243,6 +250,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    label: '业务类型',
    field: 'businessType',
    sort: 'custom',
+    isTable: false,
    table: {
      width: 150
    },
@ -259,7 +267,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'autoCommit',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    isForm: false,
    sort: 'custom',
    table: {
@ -280,7 +288,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'autoAgree',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isTable: true,
+    isTable: false,
    isForm: false,
    sort: 'custom',
    table: {
@ -302,7 +310,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
    isForm: false,
-    isTable: true,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -345,6 +353,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    detail: {
      dateFormat: 'YYYY-MM-DD HH:mm:ss'
    },
+    isTable: false,
    sort: 'custom',
    table: {
      width: 180
@ -366,6 +375,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
    isForm: false,
  },
  {
@ -379,6 +389,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable: false,
    form: {
      component: 'DatePicker',
      componentProps: {
@ -396,6 +407,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
    isForm: false,
  },
  {
@ -424,6 +436,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 180
    },
+    isTable: false,
    isTableForm: false,
    form: {
      componentProps: {
@ -868,6 +881,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTable: false,
  },
  {
    label: '创建时间',
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/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',
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/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',
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/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',
--- a/src/views/wms/reportList/index.vue
+++ b/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>