From c863d53a225feffb018e35b4453c1e977eaeca81 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 11 五月 2026 15:24:34 +0800
Subject: [PATCH] 不合格处理：对接OA报错问题修复
---
src/views/business/unpass/components/unPassDialog.vue | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/views/business/unpass/components/unPassDialog.vue b/src/views/business/unpass/components/unPassDialog.vue
index f9ee7ae..af51b98 100644
--- a/src/views/business/unpass/components/unPassDialog.vue
+++ b/src/views/business/unpass/components/unPassDialog.vue
@@ -14,9 +14,9 @@
<el-form-item label="渚涘簲鍟嗗悕绉�:">
<el-input clearable v-model="unPassForm.supplierName" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
</el-form-item>
- <el-form-item label="鐗╂枡鍚嶇О:">
+ <el-form-item label="鐗╂枡鍚嶇О:" prop="materialName">
<el-tooltip class="item" effect="dark" placement="top" :content="unPassForm.materialName">
- <el-input clearable v-model="unPassForm.materialName" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
+ <el-input clearable v-model="unPassForm.materialName" :disabled="type==='view'" size="small" placeholder="璇疯緭鍏�"></el-input>
</el-tooltip>
</el-form-item>
<el-form-item label="鐢熶骇鎵规:">
@@ -42,7 +42,7 @@
</el-date-picker>
</el-form-item>
<el-form-item label="鍒嗙被:" prop="classification">
- <el-select v-model="unPassForm.classification" :disabled="type === 'view'" size="small" placeholder="璇烽�夋嫨">
+ <el-select v-model="unPassForm.classification" :disabled="type === 'view' || !unPassForm.id" size="small" placeholder="璇烽�夋嫨">
<el-option v-for="item in classificationOptions" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
@@ -127,6 +127,9 @@
],
headline: [
{ required: true, message: '璇峰～鍐欐爣棰�', trigger: 'blur' }
+ ],
+ materialName: [
+ { required: true, message: '璇峰～鍐欑墿鏂欏悕绉�', trigger: 'blur' }
]
},
unPassFilesList: [], // 涓嶅悎鏍煎鐞嗛檮浠舵暟鎹�
@@ -154,11 +157,7 @@
}).then(res => {
if (res.code === 200) {
this.unPassForm.feedbackTime = new Date().toISOString().substring(0, 10) // 鎶ユ鏃堕棿
- if(res.data.insOrder && res.data.insOrder.contract==='ZTNS'){
- this.unPassForm.headline = `No.0005-涓ぉ鑰愪笣-澶栬喘鍝佷笉鍚堟牸鍙嶉璇勫鍙婄籂姝ｉ闃叉祦绋�(姝ｅ紡鐗�)-${this.nickName}-${this.unPassForm.feedbackTime}` // 鏍囬
- }else{
- this.unPassForm.headline = `No.0017-涓ぉ绉戞妧-澶栬喘鍝佷笉鍚堟牸鍙嶉璇勫鍙婄籂姝ｉ闃叉祦绋�(姝ｅ紡鐗�)-${this.nickName}-${this.unPassForm.feedbackTime}` // 鏍囬
- }
+ this.unPassForm.headline = `No.0020-涓ぉ鑰愪笣-渚涘簲鍟嗚川閲忓紓甯稿弽棣堟祦绋�-${res.data.insOrderTemplate.supplierName}-${this.unPassForm.feedbackTime}` // 鏍囬
this.unPassForm.feedbackUser = this.nickName // 鍙嶉浜�
this.unPassForm.insOrderId = res.data.insOrder.id // 璁㈠崟id
this.unPassForm.materialName = res.data.insOrder.sampleType // 鐗╂枡鍚嶇О
--
Gitblit v1.9.3