Develop/maxcess-synergy-admin
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码备份

Browse Source
This commit is contained in:
刘晓鹏 2025-06-06 15:51:12 +08:00
parent 7a69ba7cbf
commit aa8bcaaabe
10 changed files with 52 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.production
View File

@ -6,5 +6,5 @@ VITE_API_URL1 = http://58.252.252.77:90
VITE_API_URL2 = https://maxcessth.gatedge.cn:91
VITE_API_File1 = https://maxcessth.gatedge.cn
VITE_API_File = https://maxcess.gatedge.cn
VITE_API_URL = https://maxcess.gatedge.cn:91
VITE_API_File = https://maxcessth.gatedge.cn
VITE_API_URL = https://maxcessth.gatedge.cn:91

2
index.html
View File

@ -24,7 +24,7 @@
* 从金蝶添加订单的GET请求（挂载到window，可在控制台直接调用）
* @param {string} token 认证token
*/
window.addOrderFromKingDee = function() {
window.getMaxcessData = function() {
const apiUrl = 'https://maxcessth.gatedge.cn:91/api/Test2/AddOrderFromKingDee';
const token = document.cookie.split('; ').find(row => row.startsWith(`token=`))?.split('=')[1];
console.log(`正在请求 ${apiUrl}...`); // 提示请求开始

6
src/i18n/pages/materialReceiptNotice/en.ts
View File

@ -83,6 +83,8 @@ export default {
qtxfph:'Input invoice #',
fprq:'Invoice date#',
qxzfprq:'Select Invoice date#',
organizationCode:'Organization Code',
organizationName:'Organization Name'
},
tiaoma:{
pno:'P/NO',
@ -103,6 +105,8 @@ export default {
qdyzddym:'Confirm to print out all',
jcdwdypz:'Downloading printer driver',
noMac:"Don't support Apple Mac computer",
gysjc:'Supplier Name'
gysjc:'Supplier Name',
tjdy:'Total print',
cgbz:'Remarks'
}
};

6
src/i18n/pages/materialReceiptNotice/zh-cn.ts
View File

@ -84,6 +84,8 @@ export default {
qtxfph:'请填写发票号',
fprq:'发票日期',
qxzfprq:'请选择发票日期',
organizationCode:'组织代码',
organizationName:'组织名称'
},
tiaoma:{
pno:'物料编码',
@ -104,6 +106,8 @@ export default {
qdyzddym:'确定要打印整单吗',
jcdwdypz:'检测到无打印插件，正在下载',
noMac:'MAC无打印配置',
gysjc:'供应商简称'
gysjc:'供应商简称',
tjdy:'统计打印',
cgbz:'采购备注'
}
};

6
src/views/materialReceiptNotice/componentPrinting.vue
View File

@ -54,6 +54,7 @@
</el-select>
</div>
<el-button type="primary" size="default" @click="printCheckAllFun">{{ t('message.tiaoma.zddy') }}</el-button>
<el-button type="primary" size="default" @click="printCheckAllFun">{{ t('message.tiaoma.tjdy') }}</el-button>
<el-button type="primary" size="default" @click="defaultPrinterFun">{{ t('message.tiaoma.xzdyj') }}</el-button>
<!-- <el-button type="danger" size="default" v-if="state.timer !== null" @click="printCheckDangerFun">取消打印</el-button> -->
</div>
@ -213,6 +214,8 @@ const getBaoShuTiaoMa = async (topId: any, ceseQty: any, i: number, t:number = -
await listApi()
.setBaoShuTiaoMa({ id: topId, cuseQty: ceseQty })
.then((res: any) => {
console.log(res)
debugger
res.data.barCodeList.forEach((item:any) => {
item.purchaseOrderFBillNo = item.purchaseBillNo
item.packagingQuantity = item.qty
@ -261,11 +264,12 @@ const AddPrintContentZhuhai = (row: any, mainState: boolean = false) => {
LODOP.ADD_PRINT_TEXT(10, 120, 300, 20, `供应商简称：${row.supplierName}`);
LODOP.ADD_PRINT_TEXT(30, 120, 300, 20, `物料编码：${row.materialCode}`);
LODOP.ADD_PRINT_TEXT(50, 120, 300, 20, `包装数量：${row.packagingQuantity}`);
LODOP.ADD_PRINT_TEXT(70, 120, 300, 20, `美塞斯批号：${row.mssSupplierLot}`);
LODOP.ADD_PRINT_TEXT(70, 120, 300, 20, `销售订单号：${row.fdemandbillno}`);
LODOP.ADD_PRINT_TEXT(90, 120, 300, 20, `供应商批号：${row.fSupplierLot}`);
LODOP.ADD_PRINT_TEXT(110, 120, 300, 20, `采购订单号：${row.purchaseOrderFBillNo}`);
LODOP.ADD_PRINT_TEXT(130, 120, 300, 20, `送货日期：${state.indexRow.deliveryDate}`);
LODOP.ADD_PRINT_TEXT(150, 120, 300, 20, `收料通知单单号：${state.indexRow.fBillNo}`);
LODOP.ADD_PRINT_TEXT(170, 120, 300, 20, `采购备注：${state.indexRow.fBillNo}`);
};
//泰国模板

8
src/views/materialReceiptNotice/index.vue
View File

@ -27,6 +27,11 @@
<div class="multi-line-omit">{{ row.supplierName }}</div>
</el-tooltip>
</template>
<template #remark="{ row }">
<el-tooltip :content="row.remark" placement="top">
<div class="multi-line-omit">{{ row.remark }}</div>
</el-tooltip>
</template>
<template #menu-left>
<div class="selectBoxes">
<div class="selectItem">
@ -93,6 +98,7 @@ const state = reactive({
pageSize: 30,
},
option: {
// excelBtn: true,
tip: false,
rowSort: false,
index: false,
@ -111,6 +117,7 @@ const state = reactive({
{ label: computed(() => t('message.index.deliveryNoteNumber2')), prop: 'sheet', width: '135' },
{ label: computed(() => t('message.index.sltzddh')), prop: 'fBillNo', width: '135' },
{ label: computed(() => t('message.index.PO1')), prop: 'purchaseOrderFBillNo', width: '135' },
{ label: computed(() => t('message.index.xsddh')), prop: 'fdemandbillno', width: '135' },
{ label: computed(() => t('message.index.maxcessLot')), prop : 'mssSupplierLot' },
{ label: computed(() => t('message.index.supplierLot')), prop: 'fSupplierLot' },
{ label: computed(() => t('message.index.partNumber')), prop: 'materialCode', width: '120' },
@ -121,6 +128,7 @@ const state = reactive({
{ label: computed(() => t('message.index.shipmentQTY')), prop: 'qty' },
// { label: computed(() => t('message.index.POQTY')), prop: 'purchaseQty' },
{ label: computed(() => t('message.index.unit')), prop: 'unitName' },
{ label: computed(() => t('message.tiaoma.cgbz')), prop: 'remark', width: 140 },
{ label: computed(() => t('message.index.print')), prop: 'print', width: 80 },
{ label: computed(() => t('message.index.deleteText')), prop: 'deleteText', width: 80 },
],

17
src/views/materialReceiptNotice/selectedData.vue
View File

@ -67,7 +67,7 @@
{{ t('message.index.deliveryQTY') }}
</td>
<td style="text-align: center; font-size: 18px; padding: 4px; color: black; border-left: 2px solid black" colspan="4">
{{ t('message.index.maxcessLot') }}
{{ t('message.index.xsddh') }}
</td>
<td style="text-align: center; font-size: 18px; padding: 4px; color: black; border-left: 2px solid black" colspan="6">
{{ t('message.index.supplierLot') }}
@ -93,7 +93,7 @@
{{ item.qty }}
</td>
<td style="text-align: center; font-size: 18px; padding: 4px; color: black; border-left: 2px solid black" colspan="4">
{{ item.mssSupplierLot }}
{{ item.fdemandbillno }}
</td>
<td style="text-align: center; font-size: 18px; padding: 4px; color: black; border-left: 2px solid black" colspan="6">
{{ item.fSupplierLot }}
@ -168,10 +168,10 @@ import htmlToPdfmake from 'html-to-pdfmake';
pdfMake.vfs = pdfFonts.vfs;
pdfMake.fonts = {
AlibabaPuHuiTi: {
normal: import.meta.env.import.meta.env.VITE_API_URL + '/SimHei.ttf',
bold: import.meta.env.import.meta.env.VITE_API_URL + '/SimHei.ttf',
italics: import.meta.env.import.meta.env.VITE_API_URL + '/SimHei.ttf',
bolditalics: import.meta.env.import.meta.env.VITE_API_URL + '/SimHei.ttf',
normal: import.meta.env.VITE_API_File + '/SimHei.ttf',
bold: import.meta.env.VITE_API_File + '/SimHei.ttf',
italics: import.meta.env.VITE_API_File + '/SimHei.ttf',
bolditalics: import.meta.env.VITE_API_File + '/SimHei.ttf',
},
};
const printInitBoxRef = ref();
@ -194,13 +194,18 @@ const splitArrayInto10Parts = (arr:any) => {
resultMin = []
}
})
if (resultMin.length > 0) {
result.push(resultMin);
}
} else {
result.push(arr)
}
return result;
}
const showFun = (list: any) => {
console.log(list)
state.dataList = splitArrayInto10Parts(list);
console.log(state.dataList)
state.show = true;
};
const printElement = () => {

10
src/views/mssPurchaseOrder/index.vue
View File

@ -25,6 +25,11 @@
<template #materialName="{ row }">
<el-tooltip :content="row.materialName" placement="top">
<div class="multi-line-omit">{{ row.materialName }}</div>
</el-tooltip>
</template>
<template #receiveorgName="{ row }">
<el-tooltip :content="row.receiveorgName" placement="top">
<div class="multi-line-omit">{{ row.receiveorgName }}</div>
</el-tooltip>
</template>
<template #chengNuoJiaoQi="{ row }">
@ -178,6 +183,11 @@ const state = reactive({
{ label: computed(() => t('message.index.materialName')), prop: 'materialName', width: '240',filters: true, },
{ label: computed(() => t('message.index.unit')), prop: 'unitName', width: '110',filters: true, },
{ label: computed(() => t('message.index.qty')), prop: 'qty', width: '110',filters: true },
{ label: computed(() => t('message.index.organizationCode')), prop: 'receiveorgCode', width: '180',filters: true },
{ label: computed(() => t('message.index.organizationName')), prop: 'receiveorgName', width: '180',filters: true },
{ label: computed(() => t('message.index.requestDate')), prop: 'fDeliveryDate', width: '165',filters: true },
{
label: computed(() => t('message.index.DocStatus')),

4
src/views/mssPurchaseOrder/purchaseDetails.vue
View File

@ -164,7 +164,9 @@ const state = reactive({
topId: '',
});
const selectionChange = (list: any) => {
state.selectedData = list;
nextTick(() => {
state.selectedData = JSON.parse(JSON.stringify(list));
});
};
const chengNuoJiaoQiPFun = (e: string) => {

2
vite.config.ts
View File

@ -29,7 +29,7 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
hmr: true,
proxy: {
'/api': {
target: 'https://maxcessth.gatedge.cn:91',
target: 'https://maxcess.gatedge.cn:91',
ws: true,
changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, ''),