From ad93fb05eb49e90b9e2df30a5dd6af3bc59cac62 Mon Sep 17 00:00:00 2001
From: FrancisHu <2756004617@qq.com>
Date: Fri, 20 Sep 2024 10:37:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=90=8E=E5=8F=B0-=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=A8=A1=E5=9D=97=E5=BE=AE=E8=B0=83-d7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/proj.js                                |  7 +++++++
 .../base/edgeInsert/components/form-insert-all.vue  | 13 +++++++------
 src/views/base/proj/components/form-project.vue     | 11 +++++++++++
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/api/base/proj.js b/src/api/base/proj.js
index 63b22b0..39c0e09 100644
--- a/src/api/base/proj.js
+++ b/src/api/base/proj.js
@@ -10,6 +10,13 @@ export const queryProjListApi = (data) => {
   })
 }
 
+/** 工程类型查询 */
+export const queryProjTypeApi = (data) => {
+  return request.get('/base/tbProDepart/getDataList', {
+    params: data
+  })
+}
+
 /** 工程名称查询 */
 export const queryProjNameApi = (data) => {
   return request.get('/base/tbProject/getList', {
diff --git a/src/views/base/edgeInsert/components/form-insert-all.vue b/src/views/base/edgeInsert/components/form-insert-all.vue
index 004acf1..df6da58 100644
--- a/src/views/base/edgeInsert/components/form-insert-all.vue
+++ b/src/views/base/edgeInsert/components/form-insert-all.vue
@@ -60,8 +60,8 @@
               </el-form-item>
             </el-col>
           </el-row>
-          
-        
+
+
 
         <TableModelTwo
           :columnsList="columnsListInsert"
@@ -75,8 +75,8 @@
         >
         </TableModelTwo>
         <el-form-item label="审核意见" prop="remarks">
-          <textarea id="remarks" v-model="projectParams.remarks" class="el-textarea" placeholder="请输入审核意见" disabled></textarea>
-                <!-- <el-input v-model="projectParams.relUser" placeholder="请输入" disabled/> -->
+<!--          <textarea id="remarks" v-model="projectParams.remarks" class="el-textarea" placeholder="请输入审核意见" disabled></textarea>-->
+                 <el-input :rows="4" type="textarea" v-model="projectParams.remarks" placeholder="请输入" disabled/>
         </el-form-item>
         <el-row type="flex" justify="space-between" :gutter="24">
             <el-col :span="12">
@@ -145,6 +145,7 @@ export default {
             // this.projectParams.remarks = ''
             // 查询所属设备
             queryEdgeDeviceByIdApi(this.editParams.id).then(res => {
+              this.projectParams.auditUserName = res.data.auditUserName
               res.data.recordList.forEach(item => {
                 this.$refs.tableRef.tableList.unshift(item)
               })
@@ -320,7 +321,7 @@ export default {
                       this.$modal.msgSuccess('操作成功')
                       this.$emit('closeDialogApprove', true)
                     }
-                  
+
                 }
             })
         },
@@ -337,7 +338,7 @@ export default {
             }
           })
         },
-        
+
     },
 }
 </script>
diff --git a/src/views/base/proj/components/form-project.vue b/src/views/base/proj/components/form-project.vue
index 20f0eab..aac9da5 100644
--- a/src/views/base/proj/components/form-project.vue
+++ b/src/views/base/proj/components/form-project.vue
@@ -151,6 +151,7 @@ import {
   addProjApi,
   editProjApi,
   queryProjNameApi,
+  queryProjTypeApi,
   queryDeptApi,
   queryVolLevelApi
 } from '@/api/base/proj'
@@ -286,6 +287,16 @@ export default {
               lat: item.lat
             }
           })
+          // 获取工程类型下拉选
+          let typeRes = await queryProjTypeApi({
+            dictType: 'pro_type'
+          })
+          /* this.provinceRange = provinceRes.data.map(item => {
+            return {
+              label: item.areaName,
+              value: item.areaId
+            }
+          }) */
           // 获取省份下拉选
           let provinceRes = await queryProvincesApi()
           this.provinceRange = provinceRes.data.map(item => {