From 275d9a3c158173842449782201b9be2c243dd58b Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 九月 2023 18:00:43 +0800
Subject: [PATCH] 	modified:   .env.development 	modified:   src/main.js 	new file:   src/styles/fonts/element-icons.ttf 	new file:   src/styles/fonts/element-icons.woff 	new file:   src/styles/icon.css 	modified:   src/views/inspectionManagement/commissionInspection/addCommision.vue 	modified:   src/views/laboratory/organizational/index.vue

---
 src/views/inspectionManagement/commissionInspection/addCommision.vue |  139 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 136 insertions(+), 3 deletions(-)

diff --git a/src/views/inspectionManagement/commissionInspection/addCommision.vue b/src/views/inspectionManagement/commissionInspection/addCommision.vue
index c077f91..10a9d5c 100644
--- a/src/views/inspectionManagement/commissionInspection/addCommision.vue
+++ b/src/views/inspectionManagement/commissionInspection/addCommision.vue
@@ -2,6 +2,79 @@
 	<div class="add_commision">
 		<div class="content-main">
 			<div class="firstBox">
+				<div class="printCommision" >
+				<table height="30px" id="printCommision">
+					<tr>
+						<td colspan="8">
+							<img :src="imgSrc" style="position: absolute;left: 50px;top:26px">
+							<h1 style="display: inline;">濮旀墭妫�楠岀敵璇峰崟</h1>
+						</td>
+					</tr>
+					<tr>
+						<td colspan="2">濮旀墭缂栧彿</td>
+						<td colspan="2">{{infoForm.commisioncode}}</td>
+						<td colspan="2">濮旀墭鍗曚綅</td>
+						<td colspan="2">{{infoForm.department}}</td>
+					</tr>
+					<tr>
+						<td colspan="2">鑱旂郴浜�</td>
+						<td colspan="2">{{infoForm.contacter}}</td>
+						<td colspan="2">鑱旂郴鐢佃瘽</td>
+						<td colspan="2">{{infoForm.tel}}</td>
+					</tr>
+					<tr>
+						<td colspan="2">鑱旂郴鍦板潃</td>
+						<td colspan="2">{{infoForm.address}}</td>
+						<td colspan="2">瀹屾垚鏈熼檺</td>
+						<td colspan="2">{{infoForm.deadline}}</td>
+					</tr>
+					<tr>
+						<td colspan="2">閫佹牱鏃堕棿</td>
+						<td colspan="2">{{infoForm.time}}</td>
+						<td colspan="2">閫佹牱浜�</td>
+						<td colspan="2">{{infoForm.sender}}</td>
+					</tr>
+					<tr>
+						<td colspan="2">閫佹牱浜虹數璇�</td>
+						<td colspan="2">{{infoForm.sendertel}}</td>
+						<td colspan="2">鎶ュ憡鏁伴噺</td>
+						<td colspan="2">{{infoForm.num}}</td>
+					</tr>
+					<tr>
+						<td colspan="2">閫佹牱鏂瑰紡</td>
+						<td colspan="6">
+							<ul>
+								<li>
+									<i :class="`${infoForm.way == 1 ? 'el-icon-success' : 'el-icon-circle-check'}`"></i> 閫佹牱
+								</li>
+								<li>
+									<i :class="`${infoForm.way == 2 ? 'el-icon-success' : 'el-icon-circle-check'}`"></i> 涓婇棬
+								</li>
+							</ul>
+						</td>
+					</tr>
+					<tbody colspan="8"  v-for="(item,index) in sampleNameList" :key="index">
+						<tr>
+							<td colspan="2">鏍峰搧</td>
+							<td colspan="2">{{item}}</td>
+							<td colspan="2">璇勫畾鏍囧噯</td>
+							<td colspan="2">{{standardList[index]}}</td>
+						</tr>
+						<tr>
+							<td colspan="2">璇曢獙椤圭洰</td>
+							<td colspan="6">
+								<p style="text-align:left;margin-left:20px" v-for="(data,index) in testProjectList[index]" :key="index">
+								{{index+1 + "銆�" + data}}
+								</p>
+							</td>
+						</tr>
+					</tbody>
+					<tr>
+						<td colspan="2">澶囨敞</td>
+						<td colspan="6">{{infoForm.other}}</td>
+					</tr>
+				</table>
+			</div>
 				<div class="title">濮旀墭淇℃伅</div>
 				<div class="tableBox">
 					<div class="tableBox-header">
@@ -87,14 +160,14 @@
 								</el-col>
 								<el-col :span="5">
 									<el-form-item label="瀹屾垚鏈熼檺锛�">
-										<el-date-picker v-model="infoForm.deadline" type="date" placeholder="閫夋嫨鏃ユ湡" style="width: 200px;"
+										<el-date-picker value-format="yyyy-MM-dd" v-model="infoForm.deadline" type="date" placeholder="閫夋嫨鏃ユ湡" style="width: 200px;"
 											size="small">
 										</el-date-picker>
 									</el-form-item>
 								</el-col>
 								<el-col :span="5">
 									<el-form-item label="閫佹牱鏃堕棿锛�">
-										<el-date-picker v-model="infoForm.time" type="date" placeholder="閫夋嫨鏃ユ湡" style="width: 200px;">
+										<el-date-picker value-format="yyyy-MM-dd" v-model="infoForm.time" type="date" placeholder="閫夋嫨鏃ユ湡" style="width: 200px;">
 										</el-date-picker>
 									</el-form-item>
 								</el-col>
@@ -138,7 +211,7 @@
 							<el-button type="primary" size="small" @click="submitInspection"
 								style="background-color: rgb(1, 102, 226);">鎻愪氦</el-button>
 							<!-- 鐐瑰嚮杩斿洖锛屽綋鍓嶉〉闈㈠�间负false -->
-							<el-button type="primary" size="mini" style="background-color: rgb(1, 102, 226); ">鎵撳嵃濮旀墭鍗�</el-button>
+							<el-button type="primary" size="mini" style="background-color: rgb(1, 102, 226); " @click="printCommision">鎵撳嵃濮旀墭鍗�</el-button>
 						</div>
 					</el-form>
 				</div>
@@ -222,6 +295,7 @@
 </template>
 
 <script>
+	import PrintJS from 'print-js'
 	import {
 		getSampleName,
 		getModelSpecification,
@@ -235,6 +309,10 @@
 	export default {
 		data() {
 			return {
+				sampleNameList:[],
+				standardList:[],
+				testProjectList:[],
+				imgSrc: require("@/assets/404_images/logo.png"),
 				currentPage: 0,
 				searchData: '',
 				infoForm: {
@@ -311,6 +389,20 @@
 			this.getSampleName()
 		},
 		methods: {
+			printCommision(){
+				console.log(this.infoForm);
+				PrintJS({
+					printable: "printCommision",
+					type: "html",
+					css: [
+						"https://unpkg.com/element-ui/lib/theme-chalk/fonts/element-icons.ttf",
+						"https://unpkg.com/element-ui/lib/theme-chalk/fonts/element-icons.woff",
+						"https://unpkg.com/element-ui/lib/theme-chalk/icon.css"
+					],
+					targetStyles: ["*"],
+					ignoreElements: ["no-ignore"],
+				});
+			},
 			getlink(viewId) {
 				if (viewId == null) {
 					this.$message.error('褰撳墠閾炬帴涓嶅湪鏈夋晥鏈熷唴,绯荤粺鑷姩鍏抽棴')
@@ -356,6 +448,12 @@
 				})
 			},
 			addInspection() {
+				let sName = this.addPointerForm.sampleName;
+				this.sampleoptions.forEach(a=>{
+					if(a.key == sName) this.sampleNameList.push(a.value);
+				})
+				this.standardList.push(this.addPointerForm.addway);
+				this.testProjectList.push(this.addPointerForm.experiment);
 				let exper = this.addPointerForm.experiment[0]
 				for (let i = 1; i < this.addPointerForm.experiment.length; i++) {
 					exper += ',' + this.addPointerForm.experiment[i]
@@ -380,6 +478,7 @@
 					addway: '',
 					speName: ''
 				}
+				console.log(this.sampleNameList);
 			},
 			async submitInspection() {
 				let sampledeliveryway
@@ -473,6 +572,40 @@
 </script>
 
 <style lang="scss" scoped>
+	.printCommision{
+		display: none;
+		width: 90%;
+		height:100px;
+		table {
+			width: 100%;
+			border-collapse: collapse;
+			font-size: 18px;
+		}
+
+		table,
+		tr,
+		th,
+		td {
+			border: 2px solid black;
+			text-align: center;
+			font-family: '寰蒋闆呴粦';
+			ul{
+				list-style: none;
+				width: 500px;
+			}
+			ul li{
+				display: inline;
+				width:100px;
+				margin: 0 25px;
+			}
+		}
+
+		tr,
+		td,
+		th {
+			padding: 20px 10px;
+		}
+	}
 	.content-main {
 		padding: 20px 40px;
 		background-color: #f0f2f5;

--
Gitblit v1.9.3