From 083c818af77d33d619dba3dc20f94e996225a1c7 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 16 五月 2024 10:28:39 +0800
Subject: [PATCH] 增加人事系统对接

---
 src/components/view/b1-inspection-order.vue |   55 ++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 4ebd08c..a5f0a23 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -15,16 +15,17 @@
 		display: flex;
 		align-items: center;
 		height: 50px;
+    width: 230px;
 	}
 
 	.search_label {
-		width: 120px;
+		width: 90px;
 		font-size: 14px;
 		text-align: right;
 	}
 
 	.search_input {
-		width: calc(100% - 120px);
+		width: calc(100% - 90px);
 	}
 
 	.table {
@@ -86,9 +87,32 @@
 							v-model="componentData.entity.entrustCode" @keyup.enter.native="refreshTable()"></el-input></div>
 				</div>
 				<div class="search_thing">
-					<div class="search_label">鏍峰搧绫诲瀷锛�</div>
+					<div class="search_label">鏍峰搧鍚嶇О锛�</div>
 					<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
 							v-model="componentData.entity.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
+				</div>
+        <div class="search_thing">
+        	<div class="search_label">鏍峰搧鍨嬪彿锛�</div>
+        	<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+        			v-model="componentData.entity.sampleModel" @keyup.enter.native="refreshTable()"></el-input></div>
+        </div>
+        <div class="search_thing">
+					<div class="search_label">鏍峰搧缂栧彿锛�</div>
+					<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+							v-model="componentData.entity.sampleCode" @keyup.enter.native="refreshTable()"></el-input></div>
+				</div>
+        <div class="search_thing">
+					<div class="search_label">涓嬪崟鏃堕棿锛�</div>
+					<div class="search_input">
+            <el-date-picker style="width:100%" v-model="componentData.entity.createTime"
+            type="date"
+            size="small"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            clearable
+            placeholder="閫夋嫨鏃ユ湡">
+            </el-date-picker>
+          </div>
 				</div>
 				<div class="search_thing" style="padding-left: 30px;">
 					<el-button size="small" @click="refresh()">閲� 缃�</el-button>
@@ -143,10 +167,10 @@
 				</span>
 			</el-dialog>
 			<!-- 涓嬪彂 -->
-			<el-dialog title="妫�楠屼笅鍙�" :visible.sync="issuedDialogVisible" width="400px" :before-close="handleClose">
+			<el-dialog title="妫�楠屽垎閰�" :visible.sync="issuedDialogVisible" width="400px" :before-close="handleClose">
 				<div class="body" style="max-height: 60vh;">
 					<el-row>
-						<el-col class="search_thing" :span="22">
+						<el-col class="search_thing" style="width: 95%;">
 							<div class="search_label"><span class="required-span">* </span>绾﹀畾鏃堕棿锛�</div>
 							<div class="search_input">
 								<el-date-picker size="small" v-model="distributeData.appointed" type="date" placeholder="閫夋嫨鏃ユ湡"
@@ -154,7 +178,7 @@
 								</el-date-picker>
 							</div>
 						</el-col>
-						<el-col class="search_thing" :span="22">
+						<el-col class="search_thing" style="width: 95%;">
 							<div class="search_label"><span class="required-span" v-show="distributeData.type==2">* </span>鎸囨淳浜哄憳锛�</div>
 							<div class="search_input">
 								<el-select v-model="distributeData.userId" placeholder="璇烽�夋嫨" size="small" style="width: 100%;" clearable>
@@ -218,6 +242,9 @@
 					entity: {
 						entrustCode: null,
 						sampleType: null,
+            sampleName: null,
+            sampleModel: null,
+            sampleCode: null,
 						state: 0,
 						orderBy: {
 							field: 'id',
@@ -482,13 +509,15 @@
 			},
 			// 涓嬭浇鎶ュ憡
 			download(row) {
-        // console.log(row);
-        let url = row.url;
-        const link = document.createElement('a');
-        link.href = this.javaApi + url;
-        link.target = '_blank';
-        document.body.appendChild(link);
-        link.click();
+        let url = row.urlS?row.urlS:row.url;
+        if(url){
+          url = url.split('.')[0]+'.pdf'
+          const link = document.createElement('a');
+          link.href = this.javaApi + url;
+          link.target = '_blank';
+          document.body.appendChild(link);
+          link.click();
+        }
       },
 			// 瀹℃牳
 			handleVerify(row) {

--
Gitblit v1.9.3