From 0d52b6525080922ad9b9ab5be499b860689b42e6 Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Mon, 8 Apr 2024 16:57:51 +0800
Subject: [PATCH] '123'

---
 .../web/controller/quot/QuotController.java   |  8 ++
 .../technicalConfirm/index.vue                | 74 ++++++++++++++++---
 2 files changed, 73 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
index 7876e6f..49768c2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
@@ -231,18 +231,26 @@ public class QuotController extends BaseController
             if(quotJsxzGroup.indexOf("TL")!=-1){
                 quotJsqr.setQuotJsqrTlApprovalStatus("1");
                 quotJsqr.setQuotJsqrTlOperateStatus("0");
+                quotJsqr.setQuotJsqrTlCheckState("0");
+                quotJsqr.setQuotJsqrTlLeaderState("0");
             }
             if(quotJsxzGroup.indexOf("DY")!=-1){
                 quotJsqr.setQuotJsqrDyApprovalStatus("1");
                 quotJsqr.setQuotJsqrDyOperateStatus("0");
+                quotJsqr.setQuotJsqrDyCheckState("0");
+                quotJsqr.setQuotJsqrDyLeaderState("0");
             }
             if(quotJsxzGroup.indexOf("ZY")!=-1){
                 quotJsqr.setQuotJsqrZyApprovalStatus("1");
                 quotJsqr.setQuotJsqrZyOperateStatus("0");
+                quotJsqr.setQuotJsqrZyCheckState("0");
+                quotJsqr.setQuotJsqrZyLeaderState("0");
             }
             if(quotJsxzGroup.indexOf("QT")!=-1){
                 quotJsqr.setQuotJsqrQtApprovalStatus("1");
                 quotJsqr.setQuotJsqrQtOperateStatus("0");
+                quotJsqr.setQuotJsqrQtCheckState("0");
+                quotJsqr.setQuotJsqrQtLeaderState("0");
             }
 
             quotJsqr.setCreateBy(getUsername());
diff --git a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue
index f60b85f..130aa33 100644
--- a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue
+++ b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue
@@ -220,7 +220,14 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="特缆操作状态" prop="quotJsqrTlOperateStatus">
-                <el-input v-model="form.quotJsqrTlOperateStatus" :disabled="true"/>
+                <el-select v-model="form.quotJsqrTlOperateStatus" :disabled="true">
+                  <el-option
+                    v-for="dict in dict.type.quot_jsxz_group_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -237,7 +244,14 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="特缆审核状态" prop="quotJsqrTlCheckState">
-                <el-input v-model="form.quotJsqrTlCheckState" :disabled="true"/>
+                <el-select v-model="form.quotJsqrTlCheckState" :disabled="true">
+                  <el-option
+                    v-for="dict in dict.type.quot_jsxz_group_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -324,7 +338,14 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="低压操作状态" prop="quotJsqrDyOperateStatus">
-                <el-input v-model="form.quotJsqrDyOperateStatus" :disabled="true"/>
+                <el-select v-model="form.quotJsqrDyOperateStatus" :disabled="true">
+                  <el-option
+                    v-for="dict in dict.type.quot_jsxz_group_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -341,7 +362,14 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="低压审核状态" prop="quotJsqrDyCheckState">
-                <el-input v-model="form.quotJsqrDyCheckState" :disabled="true"/>
+                <el-select v-model="form.quotJsqrDyCheckState" :disabled="true">
+                  <el-option
+                    v-for="dict in dict.type.quot_jsxz_group_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -428,7 +456,14 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="中压操作状态" prop="quotJsqrZyOperateStatus">
-                <el-input v-model="form.quotJsqrZyOperateStatus" :disabled="true"/>
+                <el-select v-model="form.quotJsqrZyOperateStatus" :disabled="true">
+                  <el-option
+                    v-for="dict in dict.type.quot_jsxz_group_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -445,7 +480,14 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="中压审核状态" prop="quotJsqrZyCheckState">
-                <el-input v-model="form.quotJsqrZyCheckState" :disabled="true"/>
+                <el-select v-model="form.quotJsqrZyCheckState" :disabled="true">
+                  <el-option
+                    v-for="dict in dict.type.quot_jsxz_group_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -532,7 +574,14 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="其他操作状态" prop="quotJsqrQtOperateStatus">
-                <el-input v-model="form.quotJsqrQtOperateStatus" :disabled="true"/>
+                <el-select v-model="form.quotJsqrQtOperateStatus" :disabled="true">
+                  <el-option
+                    v-for="dict in dict.type.quot_jsxz_group_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -549,7 +598,14 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="其他审核状态" prop="quotJsqrQtCheckState">
-                <el-input v-model="form.quotJsqrQtCheckState" :disabled="true"/>
+                <el-select v-model="form.quotJsqrQtCheckState" :disabled="true">
+                  <el-option
+                    v-for="dict in dict.type.quot_jsxz_group_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -657,7 +713,7 @@ import { quotFileList,quotFileDelete } from "@/api/quot/quot";
 
 export default {
   name: "Jsqr",
-  dicts: ['quot_jsxz_approval_status','quot_jsxz_chapter','quot_jsxz_standard','quot_jsxz_group'],
+  dicts: ['quot_jsxz_approval_status','quot_jsxz_chapter','quot_jsxz_standard','quot_jsxz_group','quot_jsxz_group_status'],
   data() {
     return {
       // 遮罩层