From 47424ced7f1ce997a5805821922c413dc8971ea6 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 08 五月 2023 15:09:39 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/fund/expertFeeFundApply/index.vue | 144 ++++++++++++++++++++++++-----------------------
1 files changed, 74 insertions(+), 70 deletions(-)
diff --git a/src/views/project/fund/expertFeeFundApply/index.vue b/src/views/project/fund/expertFeeFundApply/index.vue
index 70104a6..e130ae0 100644
--- a/src/views/project/fund/expertFeeFundApply/index.vue
+++ b/src/views/project/fund/expertFeeFundApply/index.vue
@@ -18,14 +18,12 @@
</el-select>
</el-form-item>
</el-col>
-
<el-col :span="6">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-col>
</el-row>
</el-form>
-
<el-row>
<el-col :span="8">
<el-card shadow="never">
@@ -36,7 +34,6 @@
</el-row>
</el-col>
</el-row>
-
<el-table v-loading="loading" border highlight-current-row :data="donatebaseinfoList"
@row-click="selectDonotor">
<!-- <el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" /> -->
@@ -52,7 +49,6 @@
:limit.sync="queryParams.pageSize" @pagination="getBaseInfoList" />
</el-card>
</el-col>
-
<el-col :span="16">
<el-card shadow="naver">
<el-form ref="infoform" label-width="100px">
@@ -95,11 +91,9 @@
align="center"
prop="amountrequested"
width="120px"
- /> -->
+ /> -->
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="150px" />
-
<el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="220px" />
-
<el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width"
width="280px">
<template slot-scope="scope">
@@ -124,7 +118,7 @@
icon="el-icon-download"
@click="mixExport(scope)"
>涓嬭浇</el-button
- > -->
+ > -->
<!-- v-hasPermi="['project:expretfund:download']" -->
</template>
</el-table-column>
@@ -136,28 +130,24 @@
</el-row>
<!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇峰崟 -->
- <el-dialog :visible.sync="dialogOpen" :close-on-click-modal="false" width="1600px" :title="title"
+ <el-dialog :visible.sync="dialogOpen" :close-on-click-modal="false" width="1400px" :title="title"
style="text-align: center" v-loading="loading">
<el-form style="height: 550px; overflow-y: auto; overflow-x: hidden" ref="form" :model="form" label-width="120px"
:rules="rules">
- <el-row>
+ <el-row style="text-align: left">
<el-col :span="7">
- <el-form-item label="鎹愮尞缂栧彿" prop="donorno">
- <el-input disabled v-model="form.donorno" placeholder="璇疯緭鍏ユ崘鐚紪鍙�" clearable />
+ <el-form-item label="璐圭敤绫诲瀷">
+ <el-radio v-model="form.applytype" label="1">涓撳璐圭敤鐢宠</el-radio>
</el-form-item>
</el-col>
-
- <el-col :span="8">
+ <el-col :span="7">
<el-form-item label="鎹愮尞鑰�" prop="name">
<el-input disabled v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable />
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="瀹℃牳鐘舵��" prop="recordstatus">
- <!-- <el-input
- v-model="form.recordstatus"
- placeholder="瀹℃牳鎰忚"
- /> -->
+ <!-- <el-input v-model="form.recordstatus" placeholder="瀹℃牳鎰忚"/> -->
<el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable :disabled="true" size="small">
<el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
:value="dict.value" />
@@ -165,7 +155,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row>
+ <el-row style="text-align: left">
<el-col :span="7">
<el-form-item label="鐢宠浜�" prop="username">
<el-select v-model="form.username" placeholder="鐢宠浜�" clearable filterable allow-create style="width: 100%">
@@ -174,13 +164,11 @@
</el-select>
</el-form-item>
</el-col>
-
- <el-col :span="8">
+ <el-col :span="7">
<el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
<el-input v-model="form.phone" placeholder="璇疯緭鍏ョ敵璇疯�呯殑鑱旂郴鏂瑰紡" clearable />
</el-form-item>
</el-col>
-
<el-col :span="7">
<el-form-item label="宸ヤ綔鍗曚綅" prop="unitno">
<org-selecter ref="orgSelecter" :org-type="'3'" v-model="form.unitno" />
@@ -188,25 +176,34 @@
</el-col>
</el-row>
<el-row style="text-align: left">
- <el-form-item label="璐圭敤鐢宠">
- <el-radio v-model="form.applytype" label="1">涓撳璐圭敤鐢宠</el-radio>
- </el-form-item>
+ <el-col :span="14">
+ <el-form-item label="鐢宠璇存槑" prop="remark">
+ <el-input v-model="form.remark" placeholder="鐢宠璇存槑" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
+ <el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row style="margin-top: 5px; margin-bottom: 5px">
<el-row style="margin-bottom: 10px">
<el-col :span="4">
<el-button @click.native.prevent="addAlls" type="primary" size="small">
- 鏈嶅姟椤圭洰瀵煎叆
+ 瀵煎叆鏈嶅姟椤圭洰
</el-button>
</el-col>
</el-row>
<el-table :data="fundDetailArr" v-loading="loading" border highlight-current-row>
- <el-table-column prop="orderno" align="center" label="搴忓彿" width="80">
+ <el-table-column prop="orderno" align="center" label="搴忓彿" width="65">
<template slot-scope="scope">
<el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
</template>
</el-table-column>
- <el-table-column prop="applytype" align="center" label="璐圭敤绫诲瀷" width="220">
+ <el-table-column prop="applytype" align="center" label="璐圭敤绫诲瀷" width="200">
<template slot-scope="scope">
<el-select v-model="scope.row.applytype" placeholder="璐圭敤绫诲瀷" @change="LoadItemTypeArr(scope.row)">
<el-option v-for="dict in fundtypeArr" :key="dict.index" :label="dict.label"
@@ -223,7 +220,7 @@
</el-select>
</template>
</el-table-column>
- <el-table-column prop="itemcode" align="center" label="璐圭敤缂栧彿" show-overflow-tooltip="">
+ <el-table-column prop="itemcode" align="center" label="椤圭洰缂栧彿" show-overflow-tooltip="" v-if="false" >
</el-table-column>
<el-table-column prop="servicesscopename" align="center" label="璐圭敤璇存槑" width="180">
<template slot-scope="scope">
@@ -234,7 +231,22 @@
</el-select>
</template>
</el-table-column>
- <el-table-column prop="beneficiaryname" align="center" label="濮撳悕" width="120" v-if="form.applytype != 3">
+ <el-table-column v-if="this.ismanager == true" prop="amount" align="center" label="绋庡墠閲戦" width="100">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.amount" placeholder="绋庡墠閲戦" clearable filterable allow-create
+ @change="selectamount(scope.row)">
+ <el-option v-for="dict in scope.row.fundblock" :key="dict.expensedescribe" :label="dict.expense"
+ :value="dict.expense"></el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="100" v-if="this.ismanager == true">
+ <!-- v-if="form.applytype != '3'"涓婂悓 -->
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" />
+ </template>
+ </el-table-column>
+ <el-table-column prop="beneficiaryname" align="center" label="濮撳悕" width="100" v-if="form.applytype != 3">
<template slot-scope="scope">
<el-button type="primary" plain @click="ShowDetailDialog(scope, 'name')">{{ scope.row.beneficiaryname
}}</el-button>
@@ -254,26 +266,10 @@
:value="item.reportName"
>
</el-option>
- </el-select> -->
+ </el-select> -->
</template>
</el-table-column>
- <el-table-column v-if="this.ismanager == true" prop="amount" align="center" label="绋庡墠閲戦" width="120">
- <template slot-scope="scope">
- <el-select v-model="scope.row.amount" placeholder="绋庡墠閲戦" clearable filterable allow-create
- @change="selectamount(scope.row)">
- <el-option v-for="dict in scope.row.fundblock" :key="dict.expensedescribe" :label="dict.expense"
- :value="dict.expense"></el-option>
- </el-select>
- </template>
- </el-table-column>
-
- <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="this.ismanager == true">
- <!-- v-if="form.applytype != '3'"涓婂悓 -->
- <template slot-scope="scope">
- <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" />
- </template>
- </el-table-column>
- <el-table-column prop="unitno" align="center" label="鍗曚綅" width="220">
+ <el-table-column prop="unitno" align="center" label="鍗曚綅鍚嶇О" width="220">
<template slot-scope="scope">
<el-button type="primary" plain @click="ShowDetailDialog(scope, 'unit')">{{ scope.row.unitname
}}</el-button>
@@ -290,10 +286,9 @@
:label="spec.organizationname"
:value="spec.organizationid"
></el-option>
- </el-select> -->
+ </el-select> -->
</template>
</el-table-column>
-
<el-table-column prop="quantity" align="center" label="鏁伴噺" width="120" v-if="form.applytype == '3'">
<template slot-scope="scope">
<el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="
@@ -303,7 +298,6 @@
" />
</template>
</el-table-column>
-
<el-table-column prop="price" align="center" label="浠锋牸" width="120" v-if="form.applytype == '3'">
<template slot-scope="scope">
<el-input v-model="scope.row.price" placeholder="浠锋牸" @blur="
@@ -313,7 +307,6 @@
" />
</template>
</el-table-column>
-
<el-table-column prop="remark" align="center" label="澶囨敞" width="210" v-if="form.applytype == '3'">
<template slot-scope="scope">
<el-input v-model="scope.row.remark" placeholder="澶囨敞" />
@@ -353,22 +346,32 @@
</template>
</el-table-column>
</el-table>
- </el-row>
- <el-row>
- <el-col :span="22">
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" placeholder="澶囨敞" />
- </el-form-item>
- </el-col>
</el-row>
<el-row>
<el-col :span="7">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date"
- value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡">
- </el-date-picker>
+ <el-form-item label="鐢宠閲戦" prop="amountrequested">
+ <el-input v-model="form.amountrequested" placeholder="鐢宠閲戦" />
+ </el-form-item>
+ </el-col> <el-col :span="7">
+ <el-form-item label="绋庡墠鍚堣" prop="pretaxcost">
+ <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" />
</el-form-item>
</el-col>
+ <el-col :span="7">
+ <el-form-item label="绋庡悗鍚堣" prop="pretaxcost">
+ <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" />
+ </el-form-item>
+ </el-col>
+ <!--
+ <el-col :span="7">
+ <el-form-item label="棰勬敮閲戦" prop="prepaidamount">
+ <el-input v-model="form.prepaidamount" placeholder="鐢宠閲戦" />
+ </el-form-item>
+ </el-col>
+ -->
+ </el-row>
+ <!--
+ <el-row>
<el-col :span="7">
<el-form-item label="OPO涓績绛惧瓧" prop="opochecker">
<el-input v-model="form.opochecker" placeholder="opo涓績绛惧瓧" />
@@ -400,9 +403,10 @@
</el-form-item>
</el-col>
</el-row>
+ -->
<el-row>
- <el-col :span="24">
- <el-form-item label="鏂囦欢涓婁紶" align="left" prop="annexbankcard">
+ <el-col :span="12">
+ <el-form-item label="璐圭敤鐢宠闄勪欢" align="left" prop="annexbankcard">
<el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="5"
:headers="headers" :on-success="
(response, file, fileList) =>
@@ -438,7 +442,7 @@
<el-form ref="funddetailForm" :model="funddetailForm">
<el-row>
<el-col :span="24" v-if="detailInfoDialogShowType == 'name'">
- <el-form-item label="濮撳悕" prop="beneficiaryname" label-width="80px">
+ <el-form-item label="涓撳濮撳悕" prop="beneficiaryname" label-width="80px">
<el-select filterable allow-create ref="beneficiaryname" default-first-option
v-model="funddetailForm.beneficiaryname" placeholder="璇烽�夋嫨" style="width: 100%">
<el-option v-for="item in arrr3" :key="item.reportNo" :label="item.reportName" :value="item.reportName">
@@ -448,8 +452,8 @@
</el-col>
<el-col :span="24" v-if="detailInfoDialogShowType == 'unit'">
- <el-form-item label="鍗曚綅" prop="unitno" label-width="80px">
- <el-select v-model="funddetailForm.unitno" placeholder="鍗曚綅" clearable filterable allow-create
+ <el-form-item label="鍗曚綅鍚嶇О" prop="unitno" label-width="80px">
+ <el-select v-model="funddetailForm.unitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
style="width: 100%">
<el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname"
:value="spec.organizationid"></el-option>
@@ -1235,7 +1239,7 @@
},
getlistExternalperson() {
listExternalperson().then((res) => {
- console.log("浜哄憳琛細", res.rows);
+ console.log("浜哄憳琛細", res);
this.personlist = res.rows;
});
},
@@ -1301,7 +1305,7 @@
this.form.name = this.curCase.name;
//闄勪欢澶勭悊
this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
-
+
getownFundDetail(id).then((res) => {
console.log("鏌ヨ鏄庣粏璁板綍锛�", res);
this.fundDetailArr = res.data;
--
Gitblit v1.9.3