From ce2570f8555ff6668da4f149521b4620bdd9d8bf Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 23 九月 2026 15:25:22 +0800
Subject: [PATCH] feat(order): 添加订单委托要求字段并优化界面流程 - 新增分包内容、样品处置、结果评价、报告交付方式等委托要求字段 - 添加分包单位信息、报告寄送地址、收件人电话等关联信息录入功能 - 更新订单状态标签，新增作废状态和全部状态页签 - 调整报告准备页面审批流程，防止审核人和批准人为同一人
---
src/views/business/productOrder/components/addView.vue | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/src/views/business/productOrder/components/addView.vue b/src/views/business/productOrder/components/addView.vue
index cd295a3..5019a6c 100644
--- a/src/views/business/productOrder/components/addView.vue
+++ b/src/views/business/productOrder/components/addView.vue
@@ -70,6 +70,13 @@
</div>
<span v-else class="order-detail__empty">鏆傛湭缁戝畾鍘熷璁板綍妯℃澘</span>
</el-descriptions-item>
+ <el-descriptions-item v-if="isNewJuOrder" label="鍒嗗寘鍐呭">{{ subcontractTypeLabel }}</el-descriptions-item>
+ <el-descriptions-item v-if="isNewJuOrder" label="鏍峰搧澶勭疆">{{ sampleDisposalLabel }}</el-descriptions-item>
+ <el-descriptions-item v-if="isNewJuOrder" label="瀵圭粨鏋滆瘎浠�">{{ resultEvaluationLabel }}</el-descriptions-item>
+ <el-descriptions-item v-if="isNewJuOrder" label="鎶ュ憡浜や粯鏂瑰紡">{{ reportDeliveryLabel }}</el-descriptions-item>
+ <el-descriptions-item v-if="isNewJuOrder && addObj.subcontractType === 1" label="鍒嗗寘鍗曚綅淇℃伅" :span="4">{{ addObj.subcontractCompany || '-' }}</el-descriptions-item>
+ <el-descriptions-item v-if="isNewJuOrder && addObj.reportDelivery === 2" label="鎶ュ憡瀵勯�佸湴鍧�" :span="2">{{ addObj.reportAddress || '-' }}</el-descriptions-item>
+ <el-descriptions-item v-if="isNewJuOrder && addObj.reportDelivery === 2" label="鏀朵欢浜哄強鐢佃瘽" :span="2">{{ addObj.reportReceiver || '-' }}</el-descriptions-item>
<el-descriptions-item label="澶囨敞" :span="4">{{ addObj.remark || '-' }}</el-descriptions-item>
</el-descriptions>
<el-form v-show="false" ref="addObj" :inline="true" :model="addObj" :rules="addObjRules" label-width="108px"
@@ -677,7 +684,6 @@
import {
addInsOrder, addInsOrderTemplate, delInsOrderTemplate,
getQuarterOnOrder, selectInsOrderTemplateById,
- selectOrderManDay,
updateInsOrder,
upInsOrder,
upInsOrderOfState
@@ -706,6 +712,28 @@
item => String(item.value) === String(this.addObj.orderType)
)
return hit ? hit.label : (this.addObj.orderType || '-')
+ },
+ // 鏂拌仛鐩寸粦妯℃澘涓嬪崟锛氬睍绀哄鎵樿姹傚瓧娈�
+ isNewJuOrder() {
+ return (this.boundTemplateList || []).length > 0
+ },
+ subcontractTypeLabel() {
+ if (this.addObj.subcontractType === 1) return '鏈�'
+ if (this.addObj.subcontractType === 0) return '鏃�'
+ return '-'
+ },
+ sampleDisposalLabel() {
+ const map = {1: '濮旀墭鏂瑰彇鍥�', 2: '妫�娴嬫柟澶勭疆'}
+ return map[this.addObj.sampleDisposal] || '-'
+ },
+ resultEvaluationLabel() {
+ if (this.addObj.resultEvaluation === 1) return '鏄�'
+ if (this.addObj.resultEvaluation === 0) return '鍚�'
+ return '-'
+ },
+ reportDeliveryLabel() {
+ const map = {1: '鑷彇', 2: '蹇��', 3: '鐢靛瓙浼犻��'}
+ return map[this.addObj.reportDelivery] || '-'
},
},
dicts: ['check_type1', 'urgency_level', 'form_type', 'sample_status_list', 'sys_sub_lab'],
@@ -1415,17 +1443,10 @@
company: this.addObj.company
}).then(res => {
this.saveLoad = false
- this.$message.success('鎻愪氦鎴愬姛')
- selectOrderManDay({
- id: this.currentId
- }).then(ress => {
- this.distributeData.orderId = this.currentId
- this.distributeData.appointed = ress.data
- })
- setTimeout(() => {
- this.distributeData.sonLaboratory = this.newJuLaboratoryList.length > 0 ? this.newJuLaboratoryList[0].value : ''
- this.issuedDialogVisible = true;
- }, 1000)
+ this.$message.success('瀹℃牳閫氳繃')
+ this.closeOpenPage()
+ }).catch(() => {
+ this.saveLoad = false
})
} else {
// 涓嶉�氳繃
--
Gitblit v1.9.3