cf_cloud/erp
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix-release-1.0.0/yjc-migrate' into fix-release-1.0.0/yjc-migrate

Browse Source
This commit is contained in:
杨建炊 2025-01-25 15:30:29 +08:00
commit 077fa9a6a2
8 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
public/dist/css/463.5c0a41ae.css → public/dist/css/382.5c0a41ae.css vendored
View File

2
public/dist/index.html vendored
View File

@ -1 +1 @@
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><script defer="defer" src="js/chunk-vendors.04652b46.js"></script><script defer="defer" src="js/app.0a4e86cb.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.7e37f273.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html> <!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><script defer="defer" src="js/chunk-vendors.04652b46.js"></script><script defer="defer" src="js/app.22d028f8.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.7e37f273.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

4
public/dist/js/463.09656921.js → public/dist/js/382.6d3d83e3.js vendored
View File

File diff suppressed because one or more lines are too long

1
public/dist/js/382.6d3d83e3.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
public/dist/js/463.09656921.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
public/dist/js/app.0a4e86cb.js → public/dist/js/app.22d028f8.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/app.0a4e86cb.js.map → public/dist/js/app.22d028f8.js.map vendored
View File

File diff suppressed because one or more lines are too long

8
resources/frontend/src/views/plat/orderList.vue
View File

@ -462,6 +462,8 @@ export default {
that.$set(that.tempList[it.seq * 1 - 1], 'print_status', 2) that.$set(that.tempList[it.seq * 1 - 1], 'print_status', 2)
that.$set(that.tempList[it.seq * 1 - 1], 'fail_msg', it.msg) that.$set(that.tempList[it.seq * 1 - 1], 'fail_msg', it.msg)
} }
} else if(json.code == "8"){
console.log("data:image/png;base64, " + content) // 打印预览
} }
} }
that.webSocket.onclose = function() { that.webSocket.onclose = function() {
@ -508,7 +510,7 @@ export default {
let printObject = res.data.data let printObject = res.data.data
console.log(printObject) console.log(printObject)
let parameters = { let parameters = {
"orderType": "print", "orderType": "print", // PRE_View 预览，print 打印
"version": "2", "version": "2",
"parameters": { "parameters": {
"printName": this.printName, "printName": this.printName,
@ -519,7 +521,9 @@ export default {
console.log(key) console.log(key)
parameters.parameters.contents.push({ parameters.parameters.contents.push({
"tempUrl": printObject[key].templateUrl, "tempUrl": printObject[key].templateUrl,
"printData": printObject[key].encryptedData "printData": printObject[key].encryptedData,
"customTempUrl": printObject[key].customer_temp_url,
"customData": printObject[key].customer_temp_data
}) })
} }
this.webSocket.send(JSON.stringify(parameters)) this.webSocket.send(JSON.stringify(parameters))