Sfoglia il codice sorgente

关闭现场开支可以新增开支项的功能

余思翰 1 giorno fa
parent
commit
64e3062df4

+ 1
- 1
oa-ui-app/pages/form/borrow/borrow.vue Vedi File

@@ -49,7 +49,7 @@
49 49
 
50 50
       <!-- 借款明细 -->
51 51
       <uni-forms-item label="借款明细" required class="form-item">
52
-        <BorrowDetail :borrowId="form.borrowId" :taskName="taskName" @getApplyAmount="setApplyAmount"
52
+        <BorrowDetail :borrowId="form.borrowId" :taskName="taskName" :borrowUsage="form.borrowUsage" @getApplyAmount="setApplyAmount"
53 53
           @getManagerAmount="setManagerAmount"></BorrowDetail>
54 54
       </uni-forms-item>
55 55
 

+ 8
- 7
oa-ui-app/pages/form/borrow/borrowDetail.vue Vedi File

@@ -2,7 +2,7 @@
2 2
  * @Author: ysh
3 3
  * @Date: 2025-02-27 10:43:04
4 4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2025-05-28 11:05:53
5
+ * @LastEditTime: 2025-06-25 09:53:56
6 6
 -->
7 7
 <template>
8 8
   <view class="container">
@@ -52,7 +52,8 @@
52 52
         <uni-forms ref="form" :modelValue="newItem" :rules="rules" label-position="top" label-width="150">
53 53
           <uni-forms-item label="开支项目" name="borrowItem" required class="form-item">
54 54
             <uni-data-select v-model="newItem.borrowItem" :localdata="dictsList" placeholder="请选择开支项目"
55
-              @change="handleExpenseChange" />
55
+              @change="handleExpenseChange" v-if="borrowUsage == '0'" />
56
+            <uni-easyinput v-model="newItem.borrowItem" placeholder="请输入开支项目" v-else />
56 57
           </uni-forms-item>
57 58
           <uni-forms-item label="单位" name="unit" required class="form-item">
58 59
             <uni-easyinput v-model="newItem.unit" placeholder="请输入单位" />
@@ -97,6 +98,7 @@ export default {
97 98
   props: {
98 99
     borrowId: String,
99 100
     taskName: String,
101
+    borrowUsage: String,
100 102
   },
101 103
   data() {
102 104
     return {
@@ -174,14 +176,13 @@ export default {
174 176
           value: item.dictValue,
175 177
           text: item.dictLabel
176 178
         }))
177
-        this.dictsList.push({
178
-          value: 'newExpense',
179
-          text: '+新增更多开支项...'
180
-        })
179
+        // this.dictsList.push({
180
+        //   value: 'newExpense',
181
+        //   text: '+新增更多开支项...'
182
+        // })
181 183
       })
182 184
     },
183 185
     handleExpenseChange(value) {
184
-      console.log(value);
185 186
       if (value == 'newExpense') {
186 187
         this.openNewExpense = true;
187 188
       }

+ 1
- 1
oa-ui/src/views/flowable/form/budget/siteExpenses.vue Vedi File

@@ -21,7 +21,7 @@
21 21
                 style="width: 100%;">
22 22
                 <el-option v-for="dict in dict.type.cmc_borrow_expense" clearable :key="dict.value" :label="dict.label"
23 23
                   :value="dict.value" />
24
-                <el-option label="+新增更多开支项..." value="new_expense" />
24
+                <!-- <el-option label="+新增更多开支项..." value="new_expense" /> -->
25 25
               </el-select>
26 26
             </td>
27 27
             <td>

+ 1
- 1
oa-ui/src/views/flowable/form/finance/borrowForm.vue Vedi File

@@ -84,7 +84,7 @@
84 84
                   style="width: 100%;" :disabled="taskName != '借款申请'" v-if="form.borrowUsage == 0">
85 85
                   <el-option v-for="dict in dict.type.cmc_borrow_expense" clearable :key="dict.value"
86 86
                     :label="dict.label" :value="dict.value" />
87
-                  <el-option label="+新增更多开支项..." value="new_expense" />
87
+                  <!-- <el-option label="+新增更多开支项..." value="new_expense" /> -->
88 88
                 </el-select>
89 89
                 <el-autocomplete v-model="detail.borrowItem" :fetch-suggestions="querySearchAsync" placeholder="请输入内容"
90 90
                   :disabled="taskName != '借款申请'" v-else></el-autocomplete>

Loading…
Annulla
Salva