north-glass-erp/northglass-erp/public/importTemplate.xlsxBinary files differ
north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue
@@ -56,7 +56,6 @@ } } } } else { ElMessage.warning(res.msg) router.push("/login") @@ -79,6 +78,8 @@ }); // 输入的值 const newValue = event.target.innerText; const parts = newValue.split('：'); const result = parts[1]; // 获取冒号后的部分 // 获取映射中所有的键 const keys = Object.keys(propertyMapping); @@ -100,11 +101,11 @@ // 根据 propertyName 更新属性 if (propertyName === 'productAbbreviation' && prefix === obj.processId.substring(0, 11)) { obj.productAbbreviation = newValue; obj.productAbbreviation = result; } if (propertyName === 'project' && orderId === obj.orderId) { obj.project = newValue; obj.project = result; } }); } @@ -118,9 +119,9 @@ <div v-for="(item1,id) in lastList" :class="company.printLabel.className.custom.entiretyName()"> <div class="row4">{{ faceOrientation }}</div> <div v-for="(item,id) in labelList" :class="company.printLabel.className.custom.contentRowName()"> <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row1">{{ item.title }}</div> <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row1" contenteditable="true" @input="updateProductName($event, id)" v-text="item.title+'：'+item1[item.name]"></div> <!-- <div class="row2" style="width: 100%;"><input class="contentRow2" v-model="item1[item.name]" @keyup="updataProductName()" style="border: none;"/></div>--> <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row2" style="width: 100%;" contenteditable="true" @input="updateProductName($event, id)" v-text="item1[item.name]"></div> <!-- <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row2" style="width: 100%;" contenteditable="true" @input="updateProductName($event, id)" v-text="item1[item.name]"></div>--> </div> <div v-html="company.printLabel.custom(item1)"></div> </div> @@ -155,7 +156,7 @@ body { overflow: hidden; font-family: Arial; font-size: 10px; font-size: 7px; } #printButton { @@ -216,14 +217,13 @@ } .contentRow .row1 { width: 20%; font-weight: bolder; width: 100%; } .entirety_finished .row4 { font-weight: bolder; text-align: right; margin-right: 10px; margin-right: 20px; } .contentRow .row1, .contentRow .row2 { @@ -238,7 +238,7 @@ @page { size: auto; /* auto is the initial value */ margin: 18mm 4mm 0mm 4mm; /* this affects the margin in the printer settings */ margin: 13mm 5mm 0mm 7mm; /* this affects the margin in the printer settings */ } @media print { north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelSemi.vue
@@ -110,8 +110,8 @@ <div v-for="(item1,id) in lastList" :class="company.printLabel.className.semi.entiretyName()"> <div class="row4">{{ faceOrientation }}</div> <div v-for="(item,id) in labelList" :class="company.printLabel.className.semi.contentRowName()"> <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row1" >{{ item.title }}</div> <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row2">{{ item1[item.name] }}</div> <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row1" >{{ item.title }}：{{ item1[item.name] }}</div> <!-- <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row2">{{ item1[item.name] }}</div>--> </div> <div v-html="company.printLabel.customSemi(item1)"></div> </div> @@ -127,7 +127,7 @@ body{ overflow: hidden; font-family: 'Microsoft YaHei', '微软雅黑', sans-serif; font-family: Arial; } @@ -172,18 +172,15 @@ } .contentRow .row1{ width: 30%; font-weight: bolder; width: 100%; } .entirety_semi .row4{ font-weight: bolder; text-align: right; } .contentRow .row1,.contentRow .row2{ text-align: left; font-weight: bolder; } @page { north-glass-erp/northglass-erp/src/components/pp/PrintRepairCustomLabelSemi.vue
@@ -110,13 +110,14 @@ <div v-for="(item1,id) in lastList" class="entirety_semi"> <div class="row4">{{faceOrientation}}</div> <div v-for="(item,id) in labelList" class="contentRow"> <div class="row1" v-if="item1[item.name] != null && item1[item.name] !== ''">{{ item.title }}:</div> <div class="row2" v-if="item1[item.name] != null && item1[item.name] !== ''">{{ item1[item.name] }}</div> <div class="row1" v-if="item1[item.name] != null && item1[item.name] !== ''">{{ item.title }}：{{ item1[item.name] }}</div> <!-- <div class="row2" v-if="item1[item.name] != null && item1[item.name] !== ''">{{ item1[item.name] }}</div>--> </div> <div class="row3"> <label>W:{{ item1.width }}</label> <label>H:{{ item1.height }}</label> </div> @@ -133,7 +134,7 @@ body{ overflow: hidden; font-family: 'Microsoft YaHei', '微软雅黑', sans-serif; font-family: Arial; } @@ -177,23 +178,20 @@ } .row1{ width: 30%; font-weight: bolder; width: 100%; } .row4{ font-weight: bolder; text-align: right; } .row1,.row2{ text-align: left; font-weight: bolder; } @page { size: auto; /* auto is the initial value */ margin: 0mm 2mm 2mm 2mm; /* this affects the margin in the printer settings */ margin: 2mm 2mm 2mm 2mm; /* this affects the margin in the printer settings */ }
@@ -160,7 +160,7 @@ <template v-for="(item1,index1) in item.productDetail" :key="index1"> <tr > <td>{{item1.orderNumber}}</td> <td>{{ item1.otherColumns?.S02}}</td> <td class="notChangeRow">{{ item1.otherColumns?.S02}}</td> <td>{{ item1.otherColumns?.S03}}</td> <td class="notChangeRow">{{ item1.otherColumns?.S01}}</td> <td>{{item1.width}}*{{item1.height}}</td> north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
@@ -336,8 +336,8 @@ :close-on-click-modal="false" :close-on-press-escape="false" v-model="titleStyleVisible"> <!-- <tag-style style="width: 100%;height: 100%"/>--> <tag-style-designer style="width: 100%;height: 100%"/> <tag-style style="width: 100%;height: 100%"/> <!-- <tag-style-designer style="width: 100%;height: 100%"/>--> </el-dialog> <el-dialog
