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 |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue
index 8ce627d..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>
@@ -162,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