sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

hella_online_20240829
chenfang 2 months ago
parent
7a5fc104a3 27558cf203
commit
fb1e2a074b
9 changed files with 52 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/locales/en-US.ts
  2. 1
      src/locales/zh-CN.ts
  3. 18
      src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
  4. 13
      src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
  5. 24
      src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
  6. 2
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
  7. 2
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
  8. 2
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
  9. 4
      src/views/wms/reportList/index.vue

1
src/locales/en-US.ts
View File

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

1
src/locales/zh-CN.ts
View File

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

18
src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
View File

@ -40,6 +40,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
}, },
isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 180 width: 180
@ -60,6 +61,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
}, },
isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 180 width: 180
@ -80,6 +82,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
}, },
isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 180 width: 180
@ -97,6 +100,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '从仓库代码', label: '从仓库代码',
field: 'fromWarehouseCode', field: 'fromWarehouseCode',
sort: 'custom', sort: 'custom',
isTable: false,
table: { table: {
width: 150 width: 150
}, },
@ -105,6 +109,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '到仓库代码', label: '到仓库代码',
field: 'toWarehouseCode', field: 'toWarehouseCode',
sort: 'custom', sort: 'custom',
isTable: false,
table: { table: {
width: 150 width: 150
}, },
@ -113,6 +118,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '从库区代码范围', label: '从库区代码范围',
field: 'fromAreaCodes', field: 'fromAreaCodes',
sort: 'custom', sort: 'custom',
isTable: false,
table: { table: {
width: 150 width: 150
}, },
@ -121,6 +127,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '到库区代码范围', label: '到库区代码范围',
field: 'toAreaCodes', field: 'toAreaCodes',
sort: 'custom', sort: 'custom',
isTable: false,
table: { table: {
width: 150 width: 150
}, },
@ -131,7 +138,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.AREA_TYPE, dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string', dictClass: 'string',
isSearch: true, isSearch: true,
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -142,7 +149,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'toAreaTypes', field: 'toAreaTypes',
dictType: DICT_TYPE.AREA_TYPE, dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -154,7 +161,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom', sort: 'custom',
dictType: DICT_TYPE.INVENTORY_STATUS, dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
table: { table: {
width: 150 width: 150
}, },
@ -174,7 +181,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom', sort: 'custom',
dictType: DICT_TYPE.INVENTORY_STATUS, dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
table: { table: {
width: 150 width: 150
}, },
@ -451,6 +458,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '部门', label: '部门',
field: 'departmentCode', field: 'departmentCode',
sort: 'custom', sort: 'custom',
isTable: false,
table: { table: {
width: 120 width: 120
}, },
@ -459,6 +467,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '备注', label: '备注',
field: 'remark', field: 'remark',
sort: 'custom', sort: 'custom',
isTable: false,
table: { table: {
width: 150 width: 150
}, },
@ -608,6 +617,7 @@ export const PackageoverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
label: '单据号', label: '单据号',
field: 'number', field: 'number',
sort: 'custom', sort: 'custom',
isTable: false,
table: { table: {
width: 150 width: 150
}, },

13
src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts
View File

@ -15,6 +15,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '任务单据号', label: '任务单据号',
field: 'jobNumber', field: 'jobNumber',
sort: 'custom', sort: 'custom',
isTable: false,
isSearch: true, isSearch: true,
table: { table: {
width: 180 width: 180
@ -24,6 +25,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '仓库代码', label: '仓库代码',
field: 'warehouseCode', field: 'warehouseCode',
sort: 'custom', sort: 'custom',
isTable: false,
table: { table: {
width: 120 width: 120
}, },
@ -32,6 +34,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '出库事务类型', label: '出库事务类型',
field: 'outTransactionType', field: 'outTransactionType',
sort: 'custom', sort: 'custom',
isTable: false,
table: { table: {
width: 150 width: 150
}, },
@ -40,6 +43,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '入库事务类型', label: '入库事务类型',
field: 'inTransactionType', field: 'inTransactionType',
sort: 'custom', sort: 'custom',
isTable: false,
table: { table: {
width: 150 width: 150
}, },
@ -48,6 +52,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '执行时间', label: '执行时间',
field: 'executeTime', field: 'executeTime',
sort: 'custom', sort: 'custom',
isTable: false,
formatter: dateFormatter, formatter: dateFormatter,
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -70,6 +75,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '生效日期', label: '生效日期',
field: 'activeDate', field: 'activeDate',
sort: 'custom', sort: 'custom',
isTable: false,
formatter: dateFormatter2, formatter: dateFormatter2,
detail: { detail: {
dateFormat: 'YYYY-MM-DD' dateFormat: 'YYYY-MM-DD'
@ -92,6 +98,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '申请时间', label: '申请时间',
field: 'requestTime', field: 'requestTime',
sort: 'custom', sort: 'custom',
isTable: false,
formatter: dateFormatter, formatter: dateFormatter,
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -114,6 +121,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '截止时间', label: '截止时间',
field: 'dueTime', field: 'dueTime',
sort: 'custom', sort: 'custom',
isTable: false,
formatter: dateFormatter, formatter: dateFormatter,
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -156,7 +164,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'available', field: 'available',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -180,6 +188,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '创建者', label: '创建者',
field: 'creator', field: 'creator',
sort: 'custom', sort: 'custom',
isTable: false,
table: { table: {
width: 150 width: 150
}, },
@ -191,6 +200,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
}, },
isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 180 width: 180
@ -257,6 +267,7 @@ export const PackageoverDetail = useCrudSchemas(reactive<CrudSchema[]>([
label: '单据号', label: '单据号',
field: 'number', field: 'number',
sort: 'custom', sort: 'custom',
isTable: false,
table: { table: {
width: 180 width: 180
}, },

24
src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
View File

@ -79,6 +79,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'x', valueFormat: 'x',
} }
}, },
isTable: false,
isForm: false, isForm: false,
}, },
{ {
@ -101,6 +102,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'x', valueFormat: 'x',
} }
}, },
isTable: false,
}, },
{ {
label: '从仓库代码', label: '从仓库代码',
@ -109,6 +111,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
form: { form: {
// labelMessage: '信息提示说明！！！', // labelMessage: '信息提示说明！！！',
componentProps: { componentProps: {
@ -143,6 +146,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
form: { form: {
componentProps: { componentProps: {
disabled: true disabled: true
@ -155,7 +159,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.AREA_TYPE, dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string', dictClass: 'string',
isSearch: true, isSearch: true,
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -167,7 +171,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'toAreaTypes', field: 'toAreaTypes',
dictType: DICT_TYPE.AREA_TYPE, dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -181,6 +185,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isForm: false isForm: false
}, },
{ {
@ -190,6 +195,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isForm: false isForm: false
}, },
{ {
@ -211,6 +217,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'departmentCode', field: 'departmentCode',
sort: 'custom', sort: 'custom',
isForm: false, isForm: false,
isTable: false,
table: { table: {
width: 150 width: 150
}, },
@ -243,6 +250,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '业务类型', label: '业务类型',
field: 'businessType', field: 'businessType',
sort: 'custom', sort: 'custom',
isTable: false,
table: { table: {
width: 150 width: 150
}, },
@ -259,7 +267,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'autoCommit', field: 'autoCommit',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
isForm: false, isForm: false,
sort: 'custom', sort: 'custom',
table: { table: {
@ -280,7 +288,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'autoAgree', field: 'autoAgree',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
isForm: false, isForm: false,
sort: 'custom', sort: 'custom',
table: { table: {
@ -302,7 +310,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isForm: false, isForm: false,
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -345,6 +353,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
}, },
isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 180 width: 180
@ -366,6 +375,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isForm: false, isForm: false,
}, },
{ {
@ -379,6 +389,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -396,6 +407,7 @@ export const PackageoverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isForm: false, isForm: false,
}, },
{ {
@ -424,6 +436,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
isTableForm: false, isTableForm: false,
form: { form: {
componentProps: { componentProps: {
@ -868,6 +881,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '创建时间', label: '创建时间',

2
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
View File

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

2
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
View File

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

2
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
View File

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

4
src/views/wms/reportList/index.vue
View File

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

Write Preview
Loading…
Cancel
Save