| src/views/equipment/equipment/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/quality/finishedProductInspection/finishedProducter-print.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/quality/rawMaterial/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/quality/rawMaterial/rawMaterial-form.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/technology/operation/operation-form.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| vue.config.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/views/equipment/equipment/index.vue
@@ -19,23 +19,23 @@ @refreshDataList="getData" ></table-form> <el-dialog title="标签列表" :visible.sync="diaPrintTab" width="500px"> <div class="dia_body" style="height: 400px;overflow-y: auto;padding: 0 10px;"> <el-card class="box-card" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 15px;"> <div class="dia_body"> <el-card class="box-card" id="printRaw" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 30px;"> <el-row> <el-col :span="10" :offset="3">序号：</el-col> <el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col> <el-col :span="8" :offset="1">序号：</el-col> <el-col :span="7" style="font-weight: bold;">{{ i + 1 }}</el-col> </el-row> <el-row> <el-col :span="10" :offset="3">编号：</el-col> <el-col :span="8" :offset="1">编号：</el-col> <el-col :span="10" style="font-weight: bold;">{{ tem.number }}</el-col> </el-row> <el-row> <el-col :span="10" :offset="3">设备名称：</el-col> <el-col :span="10" style="font-weight: bold;">{{ tem.name }}</el-col> <el-col :span="8" :offset="1">设备名称：</el-col> <el-col :span="7" style="font-weight: bold;">{{ tem.name }}</el-col> </el-row> <el-row> <el-col :span="10" :offset="3">设备二维码：</el-col> <el-col :span="10"> <el-col :span="8" :offset="1">设备二维码：</el-col> <el-col :span="7"> <vueQr :text="tem.number" :size="80" :margin="2"></vueQr> </el-col> </el-row> @@ -43,7 +43,7 @@ </div> <span slot="footer" class="dialog-footer"> <el-button @click="diaPrintTab = false">取 消</el-button> <el-button type="primary" @click="diaPrintTab = false">打 印</el-button> <el-button type="primary" @click="printFun()">打 印</el-button> </span> </el-dialog> </basic-container> @@ -58,6 +58,7 @@ import * as fecha from 'element-ui/lib/utils/date' import { remote } from '../../../api/admin/dict' import vueQr from 'vue-qr' import PrintJS from 'print-js' export default { data() { return { @@ -285,6 +286,26 @@ }) }, methods: { printFun() { // this.printDialogVisible = false; this.diaPrintTab = false; PrintJS({ printable: "printRaw", type: "html", // maxWidth: 900, // // header: "原材料检测报告", // style:"@page {margin:2.4cm 2cm ;resolution: 300dpi;}", // targetStyles: ["*"], // ignoreElements: ["no-ignore"],q // orientation: 'portrait' maxWidth:450, targetStyles:['*'], style:"@page {margin:0 ;resolution: 300dpi;portrait}", onPrintDialogClose: this.erexcel=false, targetStyles: ["*"], // 使用dom的所有样式，很重要 font_size: '', }); }, pullEquipFun(){ this.table.toolbar.find((e) => e.text === '同步').loading = true pullEquip().then(res=>{ src/views/quality/finishedProductInspection/finishedProducter-print.vue
@@ -65,18 +65,42 @@ <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>通断/线序</td> <td colspan=7 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>通断: □合格 □不合格</td> <td colspan=7 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>线序: □合格 □不合格</td> height:40.05pt'>检验要求</td> <td colspan=2 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>标准值</td> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>01</td> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>02</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>03</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>04</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>05</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>06</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>07</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>08</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>09</td> <td colspan=2 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>判定</td> </tr> <tbody v-for="(item,index) in father" :key="index"> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'><p>绝缘电阻≥</p><p>______00MΩ</p><p>_____00VDC</p></td> <td colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'><p>测试结</p><p>果最小</p><p>值</p></td> height:40.05pt'> <p class="MsoNormal" align="center" style="text-align:center"><span style="font-family:宋体" v-text="item.rpFather"></span></p> </td> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>产品</td> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; @@ -91,6 +115,10 @@ <td colspan=3 rowspan="3" class=xl6624921 style='border-right:.5pt solid black; border-left:none'><p>□合格</p><p>□不合格</p></td> </tr> </tbody> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=1 class=xl6624921 style='border-right:.5pt solid black; border-left:none'></td> @@ -109,7 +137,7 @@ border-left:none'></td> </tr> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <!-- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=2 rowspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>通断/线序</td> <td colspan=7 class=xl6624921 style='border-right:.5pt solid black; @@ -482,8 +510,8 @@ <td colspan=10 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'><p>发出产品不得出现任何形式的供应商信息，包括缆盘上的标签、电缆</p><p>上供应商名称等</p></td> <td colspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'> □合格 □不合格</td> </tr> border-left:none'> □合格 □不合格</td> --> <!-- </tr> --> <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'> <td colspan=8 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt;text-align: left;'><p> 检验/时间:</p></td> @@ -525,6 +553,7 @@ childrenData: [], typedata:null, num:null, father:[], } }, created(){ @@ -539,6 +568,11 @@ this.product = this.tableData.material this.number = this.tableData.quantity this.typedata = this.tableData.specs this.tableData.children.forEach(el =>{ this.father.push(el.father) console.log("-----",this.father); }) }, }, watch:{ src/views/quality/rawMaterial/index.vue
@@ -332,6 +332,7 @@ }, // 新增 / 修改 addOrUpdateHandle(row) { console.log(row); this.$router.push({ name: 'rawMaterialForm', query: { src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -584,6 +584,7 @@ if(obj.testValue){ arr = obj.testValue.split(",") console.log(arr); } let o = { @@ -603,6 +604,7 @@ ele.children.push(o) }) this.list.push(ele) console.log(this.list,111111111111); } }) this.conclusionTable = [{ src/views/technology/operation/operation-form.vue
@@ -188,7 +188,7 @@ <div class="operation-detail"> <el-tabs type="card" style="width: 100%;height: 100%"> <el-tab-pane label="基础" style="height: 100%"> <!-- <el-tab-pane label="基础" style="height: 100%"> <el-card class="operation-capacity" header="工序能力"> <el-transfer filterable @@ -226,7 +226,7 @@ </div> </el-upload> </el-card> </el-tab-pane> </el-tab-pane> --> <el-tab-pane label="参数" style="height: 100%"> <el-card class="operation-capacity" header="工序参数集模板"> <div slot="header"> vue.config.js
@@ -2,8 +2,10 @@ * 配置参考: * https://cli.vuejs.org/zh/config/ */ const url = 'http://localhost:9999' // const url = 'http://ztt-gateway:9999' // const url = 'http://192.168.0.23:9999' const url = 'http://192.168.0.60:9999' // const url = 'http://ztt-gateway:9999' const localUrl = 'http://localhost:8089' //const localUrl = 'http://10.88.15.95:8089'
