From f3004e4dc475e6a81ac884d166fc472b052a3ab4 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 11 十月 2023 17:16:08 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/donationdetails/index.vue | 246 ++++++++++++++++++++++++++++++++++
src/views/project/fund/performancedetails/index.vue | 67 ++++++---
src/views/project/fund/applyDetail/index.vue | 50 +++---
src/views/project/fund/expertFeeApply/index.vue | 14 -
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 1
src/views/project/fund/performanceApply/index.vue | 15 ++
6 files changed, 327 insertions(+), 66 deletions(-)
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 11081c4..e405756 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -629,11 +629,14 @@
<el-button
v-show="showTerminationBtn"
type="primary"
- @click="submitForm"
+ @click="Terminationcase"
>缁堟妗堜緥</el-button
>
- <el-button v-show="ReviewBtn" type="primary" @click="ReviewFn"
+ <el-button v-show="Reportforreview" type="primary" @click="ReviewFn"
>涓婃姤瀹℃牳</el-button
+ >
+ <el-button v-show="makeastepforward" type="primary" @click="ReviewFn"
+ >涓嬩竴姝�</el-button
>
<el-button @click="cancel">鍙� 娑�</el-button>
<!-- <el-button @click="handleapproval">鎻愪氦瀹℃牳</el-button> -->
@@ -842,9 +845,232 @@
</el-col>
</el-row>
</el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button v-show="showSaveBtn" type="primary" @click="submitForm"
+ >淇濆瓨璇勪及淇℃伅</el-button
+ >
+ <el-button
+ v-show="showTerminationBtn"
+ type="primary"
+ @click="Terminationcase"
+ >缁堟妗堜緥</el-button
+ >
+ <el-button v-show="makeastepforward" type="primary" @click="ReviewFn"
+ >涓嬩竴姝�</el-button
+ >
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </div>
</div>
<!-- 鎹愮尞纭 -->
- <div class="boxdiv" v-show="actives == 2"></div>
+ <div class="boxdiv" v-show="actives == 2">
+ <el-form
+ ref="affirmform"
+ :model="affirmform"
+ :rules="affirmrules"
+ label-width="100px"
+ label-position="right"
+ >
+ <el-row>
+ <el-col :span="12">
+ <el-form-item
+ label="浜插睘鍏崇郴"
+ prop="kinship"
+ class="relation"
+ align="left"
+ >
+ <el-checkbox-group v-model="form.kinship">
+ <el-checkbox
+ v-for="dict in dict.type.sys_Kinship"
+ :key="dict.value"
+ :label="dict.value"
+ >
+ {{ dict.label }}
+ </el-checkbox>
+ </el-checkbox-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瀛愬コ鏁伴噺" prop="kinshipChildrennum">
+ <el-input
+ v-model="form.kinshipChildrennum"
+ placeholder="璇疯緭鍏ユ暟閲�"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="浜插睘濮撳悕" prop="name">
+ <el-input v-model="form.name" placeholder="璇疯緭鍏ュ鍚�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item
+ align="left"
+ label="涓庢崘璧犺�呭叧绯�"
+ prop="familyrelations"
+ >
+ <el-select
+ v-model="form.familyrelations"
+ placeholder="璇烽�夋嫨涓庢崘璧犺�呭叧绯�"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_FamilyRelation"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="12">
+ <el-form-item label="韬唤璇佸彿" prop="idcardno">
+ <el-input
+ ref="updateBSvalue"
+ class="sfzcode"
+ v-model="form.idcardno"
+ placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="浜插睘绫嶈疮" prop="residenceaddresss">
+ <div>
+ <li_area_select
+ v-model="defultAddresss"
+ ref="residenceaddresss"
+ ></li_area_select>
+ <!-- <div>{{defultAddress}}</div> -->
+ </div>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐜颁綇鍦板潃" prop="residenceaddress">
+ <el-input
+ v-model="form.residenceaddress"
+ placeholder="璇疯緭鍏ュ唴瀹�"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row> </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
+ <el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="18">
+ <el-form-item align="left" label="鎹愮尞鍐冲畾">
+ <el-checkbox-group v-model="form.organdecision">
+ <el-checkbox
+ v-for="dict in dict.type.sys_OrganDecision"
+ :key="dict.label"
+ :label="dict.label"
+ >
+ {{ dict.label }}
+ </el-checkbox>
+ </el-checkbox-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍏朵粬" prop="organdecisionOther">
+ <el-input
+ v-model="form.organdecisionOther"
+ placeholder="璇疯緭鍏ュ叾浠�"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="璐熻矗浜�" prop="responsibleuserid">
+ <el-select
+ v-model="form.responsibleuserid"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in leaderlist"
+ :key="item.reportNo"
+ :label="item.reportName"
+ :value="item.reportNo"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍗忚皟鍛�1" prop="coordinateduserido">
+ <el-select
+ v-model="form.coordinateduserido"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in coordinatorlist1"
+ :key="item.reportNo"
+ :label="item.reportName"
+ :value="item.reportNo"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍗忚皟鍛�2" prop="coordinateduseridt">
+ <el-select
+ v-model="form.coordinateduseridt"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in coordinatorlist1"
+ :key="item.reportNo"
+ :label="item.reportName"
+ :value="item.reportNo"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item> </el-col
+ ><el-col :span="6">
+ <el-form-item
+ align="left"
+ label="绛惧瓧鏃ユ湡"
+ prop="signdate"
+ style="over-flow: hidden"
+ >
+ <el-date-picker
+ clearable
+ size="small"
+ v-model="form.signdate"
+ type="date"
+ value-format="yyyy-MM-dd hh:mm:ss"
+ placeholder="閫夋嫨绛惧瓧鏃ユ湡"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button v-show="showSaveBtn" type="primary" @click="submitForm"
+ >淇濆瓨璇勪及淇℃伅</el-button
+ >
+ <el-button
+ v-show="showTerminationBtn"
+ type="primary"
+ @click="Terminationcase"
+ >缁堟妗堜緥</el-button
+ >
+ <el-button v-show="makeastepforward" type="primary" @click="ReviewFn"
+ >涓嬩竴姝�</el-button
+ >
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </div>
+ </div>
<div class="boxdiv" v-show="actives == 3">浼︾悊瀹℃煡</div>
<div class="boxdiv" v-show="actives == 4">鍣ㄥ畼鍒嗛厤</div>
<div class="boxdiv" v-show="actives == 5">鑾峰彇瑙佽瘉</div>
@@ -938,7 +1164,7 @@
shi: "",
qu: ""
},
- // 琛ㄥ崟鏍￠獙
+ // 椤堕儴鏁版嵁鏍￠獙
rules: {
name: [
{ required: true, message: "璇疯緭鍏ユ崘鐚�呭鍚�", trigger: "blur" }
@@ -969,6 +1195,7 @@
]
// treatmenthospitalno: [{ required: true, message: "璇烽�夋嫨鍖荤枟鏈烘瀯", trigger: "change" }],
},
+ // 娼滃湪鎹愮尞鏁堥獙
latentrules: {
bloodtype: [
{ required: true, message: "璇烽�夋嫨ABO琛�鍨�", trigger: "blur" }
@@ -1052,13 +1279,22 @@
this.latentform = this.form;
});
},
+ // 鍒囨崲tab
on_click(e) {
console.log(e);
if (e != "" || e != null) {
this.actives = e;
}
+ },
+ // 鍓嶈繘姝ラ
+ makeastepforward(){},
+ // 涓婃姤瀹℃牳
+ Reportforreview(){},
+ // 缁堟妗堜緥
+ Terminationcase(){},
+ // 杩斿洖涓婁竴椤�
+ cancel(){},
}
- }
};
</script>
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index f1bebe6..69bd09a 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -115,17 +115,6 @@
</el-col>-->
</el-row>
<el-row style="margin-top: 5px; margin-bottom: 5px" />
- <el-row style="margin-bottom: 10px" v-if="businessType == '1'">
- <el-col :span="4">
- <el-button
- @click.native.prevent="importFeeItems"
- type="primary"
- size="small"
- >
- 瀵煎叆鏈嶅姟椤圭洰
- </el-button>
- </el-col>
- </el-row>
<el-row v-if="jurisdiction">
<!-- <el-alert title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��" type="warning">
</el-alert> -->
@@ -136,29 +125,42 @@
>
</el-alert>
</el-row>
- <el-row v-if="businessType == 2">
+ <el-row>
+ <el-col :span="3" v-if="businessType == '1'">
+ <el-button
+ @click.native.prevent="importFeeItems"
+ type="primary"
+ size="small"
+ >
+ 瀵煎叆鏈嶅姟椤圭洰
+ </el-button>
+ </el-col>
<el-col :span="3"
- ><div style="margin-bottom: 15px;">
+ ><div style="margin-bottom: 15px;" v-if="businessType == 2">
<el-button
type="success"
icon="el-icon-download"
@click="Batchentry"
>鎵归噺褰曞叆</el-button
>
- </div></el-col
- >
- </el-row>
- <el-row v-if="businessType == 1 && operationType == 'check'">
- <el-col :span="3"
- ><div style="margin-bottom: 15px;">
+ </div>
+ </el-col>
+
+ <el-col :span="3">
+ <div style="margin-bottom: 15px;"
+ v-if="
+ (businessType == 1 || businessType == 2 || businessType == 5) &&
+ operationType != 'detail'
+ "
+ >
<el-button
type="success"
icon="el-icon-edit-outline"
@click="Manualcalculationfn"
>璁＄畻鏄庣粏</el-button
>
- </div></el-col
- >
+ </div>
+ </el-col>
</el-row>
<el-row>
<el-table
@@ -2248,8 +2250,8 @@
//瀹℃壒鎻愪氦
checksubmit() {
- if (this.form.checkstatus != 3 && this.userprofile.nickName == "闄堟厱鍗�") {
- this.$modal.msgError("璇风‘璁ゆ敹鍒版潗鏂欏悗鍐嶆彁浜ゅ鏍革紒");
+ if (!this.form.checkstatus && this.userprofile.nickName == "闄堟厱鍗�") {
+ this.$modal.msgError("璇风‘璁ら瀹＄姸鎬佸悗鍐嶆彁浜ゅ鏍革紒");
return;
}
let checkFundObj = {
@@ -3035,7 +3037,7 @@
beneficiaryname: null,
beneficiaryno: null,
unitname: null,
- itemdescribe:null,
+ itemdescribe: null,
unitno: null,
uintuserno: null,
title: null,
diff --git a/src/views/project/fund/expertFeeApply/index.vue b/src/views/project/fund/expertFeeApply/index.vue
index 4eeba97..373d32a 100644
--- a/src/views/project/fund/expertFeeApply/index.vue
+++ b/src/views/project/fund/expertFeeApply/index.vue
@@ -11,7 +11,7 @@
<el-col :span="6">
<el-form-item label="濮撳悕" prop="name">
<el-input
- v-model="queryParams.name"
+ v-model="queryParams.donorname"
placeholder="璇疯緭鍏ュ鍚�"
clearable
size="small"
@@ -36,17 +36,7 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="鎹愮尞鑰�" prop="name">
- <el-input
- v-model="queryParams.donorname"
- placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- </el-col>
+
<el-col :span="6">
<el-button
type="primary"
diff --git a/src/views/project/fund/performanceApply/index.vue b/src/views/project/fund/performanceApply/index.vue
index 5a932c4..8503f4f 100644
--- a/src/views/project/fund/performanceApply/index.vue
+++ b/src/views/project/fund/performanceApply/index.vue
@@ -209,6 +209,14 @@
>淇敼</el-button
>
<el-button
+
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="duplicationfn(scope.row)"
+ >澶嶅埗</el-button
+ >
+ <el-button
size="mini"
type="text"
icon="el-icon-view"
@@ -458,6 +466,13 @@
query: { id: row.id, businessType: "5", operationType: "update" }
});
},
+ /** 澶嶅埗鎸夐挳鎿嶄綔 */
+ duplicationfn(row) {
+ this.$router.push({
+ path: "/finance/performancedetails/",
+ query: { id: row.id, businessType: "5", Copy: "1", operationType: "update" }
+ });
+ },
/** 鏌ョ湅鎸夐挳鎿嶄綔 */
handleDetail(row) {
diff --git a/src/views/project/fund/performancedetails/index.vue b/src/views/project/fund/performancedetails/index.vue
index a1c7577..dc0918b 100644
--- a/src/views/project/fund/performancedetails/index.vue
+++ b/src/views/project/fund/performancedetails/index.vue
@@ -58,23 +58,7 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="5">
- <el-form-item label="鐢宠鍗曠被鍨�">
- <el-select
- v-model="form.performancetype"
- filterable
- placeholder="璇烽�夋嫨鐢宠鍗曠姸鎬�"
- >
- <el-option
- v-for="item in PerformanceType"
- :key="item.id"
- :label="item.name"
- :value="item.id"
- >
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
+
<el-col :span="5">
<el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
<el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
@@ -89,8 +73,6 @@
/>
</el-form-item>
</el-col>
- </el-row>
- <el-row style="text-align: left">
<el-col :span="5">
<el-form-item label="棰勫鐘舵��" prop="infoid">
<el-select
@@ -108,6 +90,9 @@
</el-select>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row style="text-align: left">
+
<el-col :span="8">
<el-form-item label="鐢宠璇存槑" prop="remark">
<el-input v-model="form.remark" placeholder="鐢宠璇存槑" />
@@ -445,6 +430,8 @@
filterable
remote
reserve-keyword
+ allow-create
+ default-first-option
placeholder="璇疯緭鍏ュ叧閿瘝"
:remote-method="remoteMethod"
:loading="loadingperformance"
@@ -488,6 +475,13 @@
:visible.sync="batchdialogVisible"
width="40%"
>
+ <div style="margin-bottom: 15px; margin-left: 10px;">
+ <el-radio-group v-model="Performanceclass">
+ <el-radio-button :label="68">鏈堝害缁╂晥</el-radio-button>
+ <el-radio-button :label="69">瀛ｅ害缁╂晥</el-radio-button>
+ <el-radio-button :label="70">骞村害缁╂晥</el-radio-button>
+ </el-radio-group>
+ </div>
<div style="max-height: 330px; overflow-y: auto">
<el-checkbox
:indeterminate="isIndeterminate"
@@ -593,6 +587,7 @@
spocewl: "",
//璐圭敤鐢宠琛ㄥ崟title
title: "",
+ Copy: "",
//鐢宠鍗曠被鍨�
businessType: "0",
businessName: "",
@@ -623,6 +618,7 @@
Personnelforname: null,
unitforname: null,
isIndeterminate: true,
+ Performanceclass: 68,
//鏄惁鏄笓瀹惰垂鐨凮PO瀹℃壒浜哄憳
ismanager: false,
@@ -898,6 +894,7 @@
console.log(11);
//閫夋嫨涓氬姟绫诲瀷:1銆佹柊澧烇紱2銆佷慨鏀癸紱3銆佹煡鐪�
this.curId = this.$route.query.id;
+ this.Copy = this.$route.query.Copy;
this.businessType = this.$route.query.businessType;
this.operationType = this.$route.query.operationType;
this.beforehandType = this.$route.query.beforehandType;
@@ -913,6 +910,9 @@
this.handleAdd();
} else if (this.operationType == "update") {
this.title = this.businessName + "淇敼";
+ if (this.Copy) {
+ this.title = this.businessName + "澶嶅埗";
+ }
console.log(this.title);
this.handleUpdate();
} else if (this.operationType == "detail") {
@@ -945,6 +945,7 @@
getFund(this.curId).then(response => {
this.form = response.data;
+
sessionStorage.removeItem("apiform");
sessionStorage.setItem("apiform", JSON.stringify(this.form));
@@ -952,6 +953,14 @@
//鏄庣粏澶勭悊
getownFundDetail(this.curId).then(res => {
this.rbDetails = res.data;
+ if (this.Copy) {
+ this.form.createTime = null;
+ this.rbDetails.map(item => {
+ item.amount = 0;
+ item.taxedamount = 0;
+ });
+ console.log(this.rbDetails);
+ }
if (this.rbDetails.length > 0) {
for (let m = 0; m < this.rbDetails.length; m++) {
@@ -1267,6 +1276,12 @@
if (this.form.id != null) {
} else {
this.form.recordstatus = -1;
+ }
+ if (this.Copy) {
+ this.form.id = null;
+ this.rbDetails.map(item => {
+ return (item.id = null);
+ });
}
sessionStorage.setItem(
@@ -1761,7 +1776,6 @@
this.listperformancea = this.cityOptions.map(item => {
return { value: item.userName, label: item.userName };
});
- console.log(this.cityOptions, "缁╂晥鎵归噺");
});
},
// 纭褰曞叆
@@ -1788,7 +1802,7 @@
annexregistform: null,
applytype: "9",
applytypename: "绠＄悊鎴愭湰",
- itemid: 68,
+ itemid: this.Performanceclass,
itemcode: "68",
itemname: "缁╂晥宸ヨ祫",
itemtype: null,
@@ -1807,7 +1821,11 @@
updateTime: null,
uploadflag: null,
uploadtime: null,
- itemlist: [{ id: 68, itemName: "缁╂晥宸ヨ祫" }],
+ itemlist: [
+ { id: 68, itemName: "鏈堝害缁╂晥" },
+ { id: 69, itemName: "瀛ｅ害缁╂晥" },
+ { id: 70, itemName: "骞村害缁╂晥" }
+ ],
servicesscope: null,
rowfeeblocks: [],
annexfiles: null
@@ -1815,11 +1833,12 @@
this.rbDetails.push(rowData);
});
- for (let i = 0; i < this.checkedCities.length + 1; i++) {
+ for (let i = 0; i < this.rbDetails.length; i++) {
this.rbDetails[i].orderno = i + 1;
}
this.calculateTax();
this.batchdialogVisible = false;
+ this.checkedCities = [];
console.log(this.rowfeeItemTypes);
},
//鏂板涓�琛�
@@ -1961,7 +1980,6 @@
this.cityOptions.map(res => {
if (tempExpertName == res.userName) {
singleDetail.beneficiaryno = res.userno;
- singleDetail.beneficiaryname = res.userName;
singleDetail.bankcardno = res.bankCardNo;
singleDetail.branchbankname = res.branchbankname;
singleDetail.depositbank = res.depositBank;
@@ -1972,6 +1990,7 @@
singleDetail.unitno = parseInt(res.unitno);
}
});
+ singleDetail.beneficiaryname = tempExpertName;
this.rbDetails[tempIndex] = singleDetail;
this.showSelectionDialog = false;
},
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index 4373323..b714ab3 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -2834,7 +2834,6 @@
"destination",
"traffictype",
"traffictype2",
- "departure"
];
columns.forEach((column, index) => {
if (index === 0) {
--
Gitblit v1.9.3