前端

pages/reimbursement/request_funds.vue

@@ -41,6 +41,16 @@
 					</view>
 				</view>
 			</view>
+			<view class="c-row" v-if="detailData.purpose == '合同费用'">
+				<view class="title">类型</view>
+				<view class="con-list">
+					<view @click='show4=true'>{{detailData.type?detailData.type:"请选择类型"}}
+						<u-icon name="arrow-right" color=""></u-icon>
+					</view>
+				</view>
+			</view>
+			<u-picker :range="typeList2" range-key="value" @confirm='typeCheck2($event)' v-model="show4"
+				mode="selector"></u-picker>
 			<u-picker :range="typeList" range-key="value" @confirm='typeCheck($event)' v-model="show2" mode="selector">
 			</u-picker>
 			<view class="c-row" v-if="detailData.purpose == '合同费用'">
@@ -54,9 +64,14 @@
 			<view class="c-row">
 				<view class="title">费用名称</view>
 				<view class="con-list">
-					<input v-model='detailData.expenseName' placeholder="输入费用名称,1-15个字"></input>
+					<input v-if="detailData.purpose != '合同费用'||detailData.purpose == '合同费用'&&detailData.type!='非粮款'" v-model='detailData.expenseName' placeholder="输入费用名称,1-15个字"></input>
+					<view v-else @click='show5=true'>{{detailData.expenseName?detailData.expenseName:"请选择费用名称"}}
+						<u-icon name="arrow-right" color=""></u-icon>
+					</view>
 				</view>
 			</view>
+			<u-picker :range="expenseNameList" range-key="constValue" @confirm='expenseNameCheck($event)' v-model="show5" mode="selector">
+			</u-picker>
 			<view v-if="reType == 2 || expensesType == '2'" class="c-row">
 				<view class="title">付款方名头</view>
 				<view class="con-list">
@@ -157,7 +172,11 @@
 			return {
 				show: false,
 				show2: false,
+				show4: false,
+				show5: false,
 				showWare: false,
+				typeList2:[],
+				expenseNameList:[],
 				detailData: {
 					// flag: '否',
 					purpose: '库点费用',
@@ -206,6 +225,16 @@
 						value: "否"
 					},
 				],
+				typeList2:[{
+						value: "粮款"
+					},
+					{
+						value: "非粮款"
+					},
+					{
+						value: "保证金"
+					}
+				],
 				typeList: [{
 						value: "杂费"
 					},
@@ -345,6 +374,12 @@
 				this.detailData.warehouseName = this.warehouseInfo.warehouseName
 				this.$forceUpdate()
 			}
+			this.$api.doRequest('get', '/commonSysParameter/getInfo', {
+				constId: 'EX1'
+			}).then(res => {
+				console.log(res)
+				this.expenseNameList=res.data.data
+			})
 			this.contractNoInfo = uni.getStorageSync('reContractNo');
 			if (this.contractNoInfo && this.detailData.purpose == "合同费用") {
 				this.detailData.contractId = this.contractNoInfo.id
@@ -358,6 +393,7 @@
 					this.detailData.bankBranch = res.bankDepositBranch
 					this.$forceUpdate()
 				})
+				
 			}
 		},
 		watch: {
@@ -386,6 +422,12 @@
 			typeCheck1(e) {
 				this.detailData.flag = this.typeList1[e[0]].value
 			},
+			typeCheck2(e){
+				this.detailData.type = this.typeList2[e[0]].value
+			},
+			expenseNameCheck(e){
+				this.detailData.expenseName = this.expenseNameList[e[0]].constValue
+			},
 			afterRead(e) {
 				console.log(e)
 			},