From 0007127ac6b22ab2669f55702f7c81f71dae683b Mon Sep 17 00:00:00 2001
From: 86134 <aa>
Date: 星期三, 15 十一月 2023 10:16:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 2 +
src/views/quality/finishedProductInspection/finishedProducter-print.vue | 56 ++++++++++++++++++++++-----
src/views/equipment/equipment/index.vue | 41 +++++++++++++++-----
vue.config.js | 6 ++-
src/views/technology/operation/operation-form.vue | 4 +-
src/views/quality/rawMaterial/index.vue | 1
6 files changed, 85 insertions(+), 25 deletions(-)
diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue
index 7f41a17..9be5723 100644
--- a/src/views/equipment/equipment/index.vue
+++ b/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=>{
diff --git a/src/views/quality/finishedProductInspection/finishedProducter-print.vue b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
index fd826ba..1285e78 100644
--- a/src/views/quality/finishedProductInspection/finishedProducter-print.vue
+++ b/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:{
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index b10d298..182a9a7 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -332,6 +332,7 @@
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
+ console.log(row);
this.$router.push({
name: 'rawMaterialForm',
query: {
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 7b80424..39f55c5 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/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 = [{
diff --git a/src/views/technology/operation/operation-form.vue b/src/views/technology/operation/operation-form.vue
index 765b7e7..6f21354 100644
--- a/src/views/technology/operation/operation-form.vue
+++ b/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">
diff --git a/vue.config.js b/vue.config.js
index 733109c..204c9ea 100644
--- a/vue.config.js
+++ b/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'
--
Gitblit v1.9.3