From 9862248787934f4242ac9636e0c4d5b8ee0870b8 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期二, 20 十月 2026 16:45:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue
index 6df339c..ac8d0e0 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue
+++ b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue
@@ -38,7 +38,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鐩戠潱鍘熷洜" prop="superviseReason">
- <el-input v-model="form.superviseReason" clearable disabled size="small"></el-input>
+ <el-input v-model="form.superviseReason" clearable placeholder="璇疯緭鍏ョ洃鐫ｅ師鍥�" size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -94,15 +94,10 @@
},
// 鏂规硶闆嗗悎
methods: {
- openDia(type, row, causeType) {
+ openDia(type, row) {
this.formDia = true
this.operationType = type
this.getUserList()
- if (causeType == 1) {
- this.form.superviseReason = '瀹氭湡鐩戠潱'
- } else {
- this.form.superviseReason = '鍔ㄦ�佺洃鐫�'
- }
if (type === 'edit') {
this.searchInfo(row)
}
@@ -115,6 +110,12 @@
},
searchInfo (row) {
this.form = {...row}
+ // 瀵煎叆鐨勫巻鍙叉暟鎹彲鑳芥槸瀹屾暣鏃ユ湡锛�2026/3/15锛夛紝鏈堜唤閫夋嫨鍣ㄩ渶瑕� YYYY.M 鎵嶈兘鍥炴樉
+ const text = row.superviseTime ? String(row.superviseTime).trim() : ''
+ const matched = text.match(/^(\d{4})\s*[./骞�-]\s*(\d{1,2})(?:\s*[./鏈�-]\s*\d{1,2}\s*鏃�?)?$/)
+ if (matched && Number(matched[2]) >= 1 && Number(matched[2]) <= 12) {
+ this.form.superviseTime = `${matched[1]}.${Number(matched[2])}`
+ }
},
// 鎻愪氦琛ㄥ崟
submitForm () {
@@ -162,8 +163,9 @@
this.$emit('closeDia')
},
getUserList(){
- selectUserCondition({ type: 2 }).then((res) => {
- this.userList = res.data;
+ // 璐ㄩ噺鐩戠潱闈㈠悜鍏ㄥ疄楠屽, 浜哄憳鍒楄〃涓嶆寜閮ㄩ棬绛涢��
+ selectUserCondition({ type: 1 }).then((res) => {
+ this.userList = res.data || [];
})
},
}
--
Gitblit v1.9.3