Просмотр исходного кода

网页端:修改预算和核算无法查询到勘察项目的问题

余思翰 19 часов назад
Родитель
Сommit
00f86ddd77

+ 8
- 14
oa-ui-app/pages/work/index.vue Просмотреть файл

@@ -2,13 +2,7 @@
2 2
  * @Author: ysh
3 3
  * @Date: 2025-01-16 11:17:08
4 4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2025-06-17 15:18:44
6
--->
7
-<!--
8
- * @Author: ysh
9
- * @Date: 2025-01-16 11:17:08
10
- * @LastEditors: Please set LastEditors
11
- * @LastEditTime: 2025-06-17 14:54:35
5
+ * @LastEditTime: 2025-06-23 09:55:12
12 6
 -->
13 7
 <template>
14 8
   <view class="work-container">
@@ -27,8 +21,14 @@
27 21
     <uni-section title="常用操作" type="line"></uni-section>
28 22
     <view class="grid-body">
29 23
       <uni-grid :column="4" :showBorder="false">
24
+        <uni-grid-item>
25
+          <view class="grid-item-box" @click="$refs.popup.open()">
26
+            <u-image :fade="false" src="@/static/images/work/sendFlow.png" width="40px" height="40px"></u-image>
27
+            <text class="text">发起流程</text>
28
+          </view>
29
+        </uni-grid-item>
30 30
         <uni-grid-item v-for="item in gridList" :key="item.url" v-if="item.hasPermi">
31
-          <view class="grid-item-box" @click="toUrlFn(item.url)">
31
+          <view class="grid-item-box" @click="toUrlFn(item.url)" v-if="item.name != '发起流程'">
32 32
             <u-image :fade="false" :src="item.icon" width="40px" height="40px"></u-image>
33 33
             <text class="text">{{ item.name }}</text>
34 34
           </view>
@@ -67,12 +67,6 @@ export default {
67 67
         image: '/static/images/banner/banner03.jpg'
68 68
       }],
69 69
       gridList: [
70
-        {
71
-          name: '发起流程',
72
-          icon: '/static/images/work/sendFlow.png',
73
-          url: 'sendFlow',
74
-          hasPermi: true
75
-        },
76 70
         {
77 71
           name: '借款管理',
78 72
           icon: '/static/images/work/borrow.png',

+ 29
- 4
oa-ui/src/views/flowable/form/budget/adjust/adjustIndex.vue Просмотреть файл

@@ -2,7 +2,7 @@
2 2
  * @Author: ysh
3 3
  * @Date: 2025-05-14 16:09:56
4 4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2025-05-20 17:13:53
5
+ * @LastEditTime: 2025-06-23 11:00:49
6 6
 -->
7 7
 <template>
8 8
   <div class="app-container">
@@ -12,6 +12,12 @@
12 12
           <h3 style="font-weight: bold; color: #FF5733;">选择核算项目</h3>
13 13
         </div>
14 14
         <el-form :model="queryParams" ref="queryForm" :inline="true" class="search-form">
15
+          <el-form-item prop="projectId" label="是否勘察项目">
16
+            <el-radio-group v-model="isSurvey" @change="handleIsSurveyChange">
17
+              <el-radio :label="0">否</el-radio>
18
+              <el-radio :label="1">是</el-radio>
19
+            </el-radio-group>
20
+          </el-form-item>
15 21
           <el-form-item prop="projectId">
16 22
             <el-select v-model="queryType" style="width: 120px;">
17 23
               <el-option label="项目编号" value="1"></el-option>
@@ -24,6 +30,12 @@
24 30
               </el-option>
25 31
             </el-select>
26 32
           </el-form-item>
33
+          <el-form-item label="编制人" prop="compiler">
34
+            <el-select v-model="queryParams.compiler" filterable clearable>
35
+              <el-option :key="item.userId" v-for="item of $store.state.user.userList" :label="item.nickName"
36
+                :value="item.userId"></el-option>
37
+            </el-select>
38
+          </el-form-item>
27 39
           <el-form-item>
28 40
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
29 41
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -105,7 +117,8 @@ export default {
105 117
       },
106 118
       queryType: '1',
107 119
       projectList: [],
108
-      hideReturn: true
120
+      hideReturn: true,
121
+      isSurvey: 0
109 122
     }
110 123
   },
111 124
   created() {
@@ -179,12 +192,21 @@ export default {
179 192
       let params1 = {
180 193
         pageNum: 1,
181 194
         pageSize: 20,
182
-        projectNumber: val
195
+        projectNumber: val,
196
+        undertakingDept: ''
183 197
       }
184 198
       let params2 = {
185 199
         pageNum: 1,
186 200
         pageSize: 20,
187
-        projectName: val
201
+        projectName: val,
202
+        undertakingDept: ''
203
+      }
204
+      if (this.isSurvey == 1) {
205
+        params1.undertakingDept = '113'
206
+        params2.undertakingDept = '113'
207
+      } else {
208
+        params1.undertakingDept = ''
209
+        params2.undertakingDept = ''
188 210
       }
189 211
       let params = {};
190 212
       if (this.queryType == '1') {
@@ -198,6 +220,9 @@ export default {
198 220
     },
199 221
     preserve() {
200 222
       this.hideReturn = false;
223
+    },
224
+    handleIsSurveyChange(val) {
225
+      this.isSurvey = val;
201 226
     }
202 227
   }
203 228
 }

+ 21
- 2
oa-ui/src/views/oa/budget/index.vue Просмотреть файл

@@ -1,6 +1,12 @@
1 1
 <template>
2 2
   <div class="app-container">
3 3
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
4
+      <el-form-item prop="projectId" label="是否勘察项目" label-width="100px">
5
+        <el-radio-group v-model="isSurvey" @change="handleIsSurveyChange">
6
+          <el-radio :label="0">否</el-radio>
7
+          <el-radio :label="1">是</el-radio>
8
+        </el-radio-group>
9
+      </el-form-item>
4 10
       <el-form-item prop="projectId">
5 11
         <el-select v-model="queryType" style="width: 100px;">
6 12
           <el-option label="项目编号" value="1"></el-option>
@@ -160,6 +166,7 @@ export default {
160 166
       isAdjust: false,
161 167
       adjustOpen: false,
162 168
       newInfoOpen: false,
169
+      isSurvey: 0
163 170
     };
164 171
   },
165 172
   created() {
@@ -187,12 +194,21 @@ export default {
187 194
       let params1 = {
188 195
         pageNum: 1,
189 196
         pageSize: 20,
190
-        projectNumber: val
197
+        projectNumber: val,
198
+        undertakingDept: ''
191 199
       }
192 200
       let params2 = {
193 201
         pageNum: 1,
194 202
         pageSize: 20,
195
-        projectName: val
203
+        projectName: val,
204
+        undertakingDept: ''
205
+      }
206
+      if (this.isSurvey == 1) {
207
+        params1.undertakingDept = '113'
208
+        params2.undertakingDept = '113'
209
+      } else {
210
+        params1.undertakingDept = ''
211
+        params2.undertakingDept = ''
196 212
       }
197 213
       let params = {};
198 214
       if (this.queryType == '1') {
@@ -204,6 +220,9 @@ export default {
204 220
         this.projectList = res.rows;
205 221
       })
206 222
     },
223
+    handleIsSurveyChange(val) {
224
+      this.isSurvey = val;
225
+    },
207 226
     // 取消按钮
208 227
     cancel() {
209 228
       this.open = false;

Загрузка…
Отмена
Сохранить