wilson
/
rongxing-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
Rui_Li 4 years ago
parent
2cabb5725b dd8a3605b8
commit
53537f4ce6
3 changed files with 54 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/utils/LodopFuncs.js
  2. 2
      src/views/modules/rawMaterials/sluggishMaterialWarning.vue
  3. 102
      src/views/modules/shopOrder/shopOrder/shopOrder.vue

1
src/utils/LodopFuncs.js
View File

@ -22,6 +22,7 @@ function getLodop() {
var LODOP
try {
LODOP = getCLodop()
//LODOP.SET_LICENSES("", "13F0BE83846277CB60918577C6281375", "", "");
if (!LODOP && document.readyState !== 'complete') {
MessageBox.alert('C-Lodop打印控件还没准备好，请稍后再试！')
return

2
src/views/modules/rawMaterials/sluggishMaterialWarning.vue
View File

@ -762,7 +762,7 @@ export default {
let sumColumnList = this.columnList;
sumColumnList = sumColumnList.map(item => {
return item = {
tableId: item.tableId,
tableId: item.tableId,
tableName: item.tableName,
columnProp: item.columnProp,
columnLabel: item.columnLabel,

102
src/views/modules/shopOrder/shopOrder/shopOrder.vue
View File

@ -1780,65 +1780,67 @@ export default {
let bom = this.orderSoBom[i]
sumTop += 40
let top = 40 * (i + 1)
let xZTop = 310 + top
let cTop = 279 + top
let xhTop = 310 + top
let xZTop1 = 270 + top
let xZTop2 = xZTop1 +40
let xhTop1 = 310 + top
let xhTop2 = xhTop1 + 1
let label = 279 + top
LODOP.ADD_PRINT_LINE(310, 74, xZTop, 75, 0, 1);
LODOP.ADD_PRINT_LINE(310,178,xZTop,179,0,1);
LODOP.ADD_PRINT_LINE(310,372,xZTop,373,0,1);
LODOP.ADD_PRINT_LINE(310,458,xZTop,459,0,1);
LODOP.ADD_PRINT_LINE(310,520,xZTop,521,0,1);
LODOP.ADD_PRINT_LINE(310,653,xZTop,654,0,1);
LODOP.ADD_PRINT_TEXT(319,20,48,30,"1");
LODOP.ADD_PRINT_LINE(xZTop2,74,xZTop1,75,0,1);
LODOP.ADD_PRINT_LINE(xZTop2,178,xZTop1,179,0,1);
LODOP.ADD_PRINT_LINE(xZTop2,372,xZTop1,373,0,1);
LODOP.ADD_PRINT_LINE(xZTop2,458,xZTop1,459,0,1);
LODOP.ADD_PRINT_LINE(xZTop2,520,xZTop1,521,0,1);
LODOP.ADD_PRINT_LINE(xZTop2,653,xZTop1,654,0,1);
LODOP.ADD_PRINT_TEXT(label,20,48,30,(i+1));
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.ADD_PRINT_TEXT(label,75,100,30,bom.componentPartNo);
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
LODOP.ADD_PRINT_TEXT(319,75,100,30,bom.componentPartNo);
LODOP.ADD_PRINT_TEXT(label,181,189,30,bom.partDesc);
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
LODOP.ADD_PRINT_TEXT(319,181,189,30, bom.partDesc);
LODOP.ADD_PRINT_TEXT(319,374,83,30, bom.defaultLocationID);
LODOP.ADD_PRINT_TEXT(label,374,83,30,bom.defaultLocationID);
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
LODOP.ADD_PRINT_TEXT(319,459,58,30,bom.spec);
LODOP.ADD_PRINT_TEXT(label,459,58,30,bom.spec);
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
LODOP.ADD_PRINT_TEXT(319,523,124,30,bom.qtyRequired);
LODOP.ADD_PRINT_TEXT(label,523,124,30,bom.qtyRequired);
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
LODOP.ADD_PRINT_TEXT(319,655,114,30, bom.qtyReserved);
LODOP.ADD_PRINT_TEXT(label,655,114,30,bom.qtyReserved);
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
LODOP.ADD_PRINT_LINE(310,15,xZTop,16,0,1);
LODOP.ADD_PRINT_LINE(xhTop,16,xhTop+1,772,0,1);
LODOP.ADD_PRINT_LINE(311,16,310,772,0,1);
LODOP.ADD_PRINT_LINE(310,772,xZTop,773,0,1);
LODOP.ADD_PRINT_LINE(xZTop2,15,xZTop1,16,0,1);
LODOP.ADD_PRINT_LINE(xhTop2,16,xhTop1,772,0,1);
LODOP.ADD_PRINT_LINE(xZTop2,772,xZTop1,773,0,1);
// LODOP.ADD_PRINT_LINE(310, 74, xZTop, 75, 0, 1);
// LODOP.ADD_PRINT_LINE(310, 178, xZTop, 179, 0, 1);
// LODOP.ADD_PRINT_LINE(310, 372, xZTop, 373, 0, 1);
// LODOP.ADD_PRINT_LINE(310, 458, xZTop, 459, 0, 1);
// LODOP.ADD_PRINT_LINE(310, 520, xZTop, 521, 0, 1);
// LODOP.ADD_PRINT_LINE(310, 653, xZTop, 654, 0, 1);
// LODOP.ADD_PRINT_TEXT(cTop, 20, 48, 30, (i + 1));
// LODOP.SET_PRINT_STYLEA(0, "FontSize", 9);
// LODOP.ADD_PRINT_TEXT(cTop, 75, 100, 30, bom.componentPartNo);
// LODOP.SET_PRINT_STYLEA(0, "FontSize", 9);
// LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
// LODOP.ADD_PRINT_TEXT(cTop, 181, 189, 30, bom.partDesc);
// LODOP.SET_PRINT_STYLEA(0, "FontSize", 9);
// LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
// LODOP.ADD_PRINT_TEXT(cTop, 374, 83, 30, bom.defaultLocationID);
// LODOP.SET_PRINT_STYLEA(0, "FontSize", 9);
// LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
// LODOP.ADD_PRINT_TEXT(cTop, 459, 58, 30, bom.spec+"666");
// LODOP.SET_PRINT_STYLEA(0, "FontSize", 9);
// LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
// LODOP.ADD_PRINT_TEXT(cTop, 523, 124, 30, bom.qtyRequired);
// LODOP.SET_PRINT_STYLEA(0, "FontSize", 9);
// LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
// LODOP.ADD_PRINT_TEXT(cTop, 655, 114, 30, bom.qtyReserved+"100");
// LODOP.SET_PRINT_STYLEA(0, "FontSize", 9);
// LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
// LODOP.ADD_PRINT_LINE(310, 15, xZTop, 16, 0, 1);
// LODOP.ADD_PRINT_LINE(xhTop, 16, xhTop + 1, 772, 0, 1);
// LODOP.ADD_PRINT_LINE(311, 16, 310, 772, 0, 1);
// LODOP.ADD_PRINT_LINE(310, 772, xZTop, 773, 0, 1);
// LODOP.ADD_PRINT_LINE(xZTop+40, 74, xZTop, 75, 0, 1);
// LODOP.ADD_PRINT_LINE(xZTop+40,178,xZTop,179,0,1);
// LODOP.ADD_PRINT_LINE(xZTop+40,372,xZTop,373,0,1);
// LODOP.ADD_PRINT_LINE(xZTop+40,458,xZTop,459,0,1);
// LODOP.ADD_PRINT_LINE(xZTop+40,520,xZTop,521,0,1);
// LODOP.ADD_PRINT_LINE(xZTop+40,653,xZTop,654,0,1);
// LODOP.ADD_PRINT_TEXT(label,20,48,30,(i+1));
// LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
// LODOP.ADD_PRINT_TEXT(label,75,100,30,bom.componentPartNo);
// LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
// LODOP.ADD_PRINT_TEXT(label,181,189,30, bom.partDesc);
// LODOP.ADD_PRINT_TEXT(label,374,83,30, bom.defaultLocationID);
// LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
// LODOP.ADD_PRINT_TEXT(label,459,58,30,bom.spec);
// LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
// LODOP.ADD_PRINT_TEXT(label,523,124,30,bom.qtyRequired);
// LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
// LODOP.ADD_PRINT_TEXT(label,655,114,30, bom.qtyReserved);
// LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
// LODOP.ADD_PRINT_LINE(label,15,xZTop,16,0,1);
// LODOP.ADD_PRINT_LINE(xhTop,16,xhTop+1,772,0,1);
// LODOP.ADD_PRINT_LINE(311,16,310,772,0,1);
// LODOP.ADD_PRINT_LINE(xZTop+40,772,xZTop,773,0,1);
}
let oneTop = sumTop + 310
let towTop = sumTop + 360

Write Preview
Loading…
Cancel
Save