From 8837c26b0a0c19e872d8251fad0bafe2f149ef61 Mon Sep 17 00:00:00 2001 From: licp <lichunping@guanfang.com.cn> Date: 星期日, 28 四月 2024 10:50:52 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master --- src/components/view/b1-inspection-order.vue | 63 +++++++++++++++++++++++++------ 1 files changed, 50 insertions(+), 13 deletions(-) diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue index 2dc793d..c44ece1 100644 --- a/src/components/view/b1-inspection-order.vue +++ b/src/components/view/b1-inspection-order.vue @@ -86,7 +86,7 @@ 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> @@ -290,7 +290,37 @@ }, createUser: { select: [] - } + }, + orderType: { + select: [] + }, + processing: { + select: [{ + value: 1, + label: '瀹為獙瀹ゅ鐞�' + },{ + value: 0, + label: '濮旀墭鍗曚綅鍙栧洖' + }] + }, + isLeave: { + select: [{ + value: 1, + label: '鐣欐牱' + },{ + value: 0, + label: '涓嶇暀鏍�' + }] + }, + send: { + select: [{ + value: 1, + label: '鑷彇' + },{ + value: 0, + label: '鍏朵粬' + }] + } }, selectField: {}, requiredAdd: [], @@ -322,8 +352,7 @@ label: '涓嶅悎鏍�', type: 'danger' }] - }, - inspectionValueType: {select: []} + } }, selectField: {}, spanConfig:{ @@ -380,7 +409,7 @@ this.getUserMenu() this.getAuthorizedPerson() this.getInsStateDicts() - this.selectEnumByCategoryForInspectionValueType() + this.selectEnumByCategoryForOrderType() }, methods: { getAuthorizedPerson() { @@ -452,7 +481,15 @@ this.dataDialogVisible = true; }, // 涓嬭浇鎶ュ憡 - download(row) {}, + 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(); + }, // 瀹℃牳 handleVerify(row) { // this.verifyDialogVisible = true; @@ -553,13 +590,13 @@ this.componentDataDataLook.tagField.insState.select = data }) }, - selectEnumByCategoryForInspectionValueType() { - this.$axios.post(this.$api.enums.selectEnumByCategory, { - category: "妫�楠屽�肩被鍨�" - }).then(res => { - this.componentDataDataLook.tagField.inspectionValueType.select = res.data - }) - }, + selectEnumByCategoryForOrderType() { + this.$axios.post(this.$api.enums.selectEnumByCategory, { + category: "妫�楠岀被鍒�" + }).then(res => { + this.componentData.tagField.orderType.select = res.data + }) + }, } } </script> -- Gitblit v1.9.3