From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue
index 3734365..4a5424e 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue
+++ b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue
@@ -10,12 +10,12 @@
<el-date-picker
v-model="form.superviseTime"
clearable
- format="yyyy-MM"
+ format="yyyy.M"
placeholder="閫夋嫨鏃ユ湡"
size="small"
style="width: 100%"
type="month"
- value-format="yyyy-MM">
+ value-format="yyyy.M">
</el-date-picker>
</el-form-item>
</el-col>
@@ -38,7 +38,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鐩戠潱鍘熷洜" prop="superviseReason">
- <el-input v-model="form.superviseReason" clearable size="small"></el-input>
+ <el-input v-model="form.superviseReason" clearable disabled size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -94,10 +94,15 @@
},
// 鏂规硶闆嗗悎
methods: {
- openDia(type, row) {
+ openDia(type, row, causeType) {
this.formDia = true
this.operationType = type
this.getUserList()
+ if (causeType == 1) {
+ this.form.superviseReason = '瀹氭湡鐩戠潱'
+ } else {
+ this.form.superviseReason = '鍔ㄦ�佺洃鐫�'
+ }
if (type === 'edit') {
this.searchInfo(row)
}
@@ -143,7 +148,6 @@
this.upLoad = true
updateQualitySuperviseDetail(entity).then(res => {
this.upLoad = false
- if (res.code === 201) return
this.$message.success('淇敼鎴愬姛')
this.closeDia()
}).catch(err => {
@@ -158,7 +162,7 @@
this.$emit('closeDia')
},
getUserList(){
- selectUserCondition({ type: 0 }).then((res) => {
+ selectUserCondition({ type: 2 }).then((res) => {
this.userList = res.data;
})
},
--
Gitblit v1.9.3