From 2bf3fda0cd085d5e6af9b55471701e44768d26a9 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 20 十二月 2023 15:47:07 +0800
Subject: [PATCH] yxh:修改了银行账户管理
---
src/views/project/travelexpensedeal/index.vue | 4
src/views/project/travelexpenseapply/edit.vue | 4
src/views/project/fund/medicalCostApply/index.vue | 8
src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue | 22
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 985 ++++++++----------------------------
src/views/project/fund/performanceApply/index.vue | 8
src/views/project/fundcheck/officeExpenseCheck/index.vue | 1
src/views/project/travelexpensecheck/index.vue | 16
src/views/project/fund/performancedetails/index.vue | 45 +
src/views/project/fund/applyDetail/index.vue | 346 ++++++-----
src/views/project/fund/expertFeeApply/index.vue | 12
src/views/project/fund/ethicalExpertFeeApply/index.vue | 12
src/api/project/externalperson.js | 9
src/views/project/externalperson/index.vue | 109 +++
src/views/project/fund/officeExpenseApply/index.vue | 14
src/views/project/fundcheck/performanceCheck/index.vue | 8
src/views/project/travelexpenseapply/index.vue | 10
17 files changed, 595 insertions(+), 1,018 deletions(-)
diff --git a/src/api/project/externalperson.js b/src/api/project/externalperson.js
index 351a9eb..5fd314f 100644
--- a/src/api/project/externalperson.js
+++ b/src/api/project/externalperson.js
@@ -62,4 +62,13 @@
method: 'get',
params: query
})
+}
+
+// 鍙栧嚭鏈�鏂扮紪鍙峰��
+export function getOnlyCode(query) {
+ return request({
+ url: '/project/baseonlyvalue/getOnlyCode',
+ method: 'get',
+ params: query
+ })
}
\ No newline at end of file
diff --git a/src/views/project/externalperson/index.vue b/src/views/project/externalperson/index.vue
index 5e6b2eb..80fadc1 100644
--- a/src/views/project/externalperson/index.vue
+++ b/src/views/project/externalperson/index.vue
@@ -81,7 +81,7 @@
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
- <!-- 娣诲姞鎴栦慨鏀瑰鍥村崟浣嶄汉鍛樺璇濇 -->
+ <!-- 娣诲姞鎴栦慨鏀逛汉鍛�/鍗曚綅璐﹀彿淇℃伅瀵硅瘽妗� -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
@@ -93,7 +93,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="璐﹀彿缂栧彿" prop="userno">
- <el-input v-model="form.userno" placeholder="璇疯緭鍏ヨ处鍙风紪鍙�" /> </el-form-item>
+ <el-input disabled=true v-model="form.userno" placeholder="璇疯緭鍏ヨ处鍙风紪鍙�" /> </el-form-item>
</el-col>
</el-row>
<el-row>
@@ -102,8 +102,8 @@
<el-input v-model="form.username" placeholder="璇疯緭鍏ヨ处鍙峰悕绉�" /> </el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍚敤鐘舵��" prop="userstatus">
- <el-radio-group v-model="form.userstatus" :disabled="ismanager==false">
+ <el-form-item label="鍚敤鐘舵��" prop="userstatus" :disabled="ismanager == false">
+ <el-radio-group v-model="form.userstatus">
<el-radio v-for="dict in dict.type.sys_0_1" :key="dict.value" :label="parseInt(dict.value)">{{ dict.label
}}</el-radio>
</el-radio-group>
@@ -133,7 +133,11 @@
<el-row v-if="form.usertype != 'org'">
<el-col :span="12">
<el-form-item label="鎵�鍦ㄥ崟浣�" prop="unitname">
- <el-input v-model="form.unitname" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�" /> </el-form-item>
+ <el-select v-model="form.unitname" 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>
+ </el-select>
+ </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鍗曚綅宸ュ彿" prop="personnelunitno">
@@ -186,7 +190,16 @@
addExternalperson,
updateExternalperson,
exportExternalperson,
+ getOnlyCode,
} from "@/api/project/externalperson";
+
+import {
+ listOrganization,
+ getOrganization,
+ listReportname,
+ listUser
+} from "@/api/project/organization";
+
import { getUserProfile } from "@/api/system/user";
export default {
@@ -195,7 +208,7 @@
data() {
return {
// 閬僵灞�
- loading: true,
+ loading: false,
// 瀵煎嚭閬僵灞�
exportLoading: false,
// 閫変腑鏁扮粍
@@ -210,6 +223,9 @@
total: 0,
// 澶栧洿鍗曚綅浜哄憳琛ㄦ牸鏁版嵁
externalpersonList: [],
+
+ //鍖荤枟鏈烘瀯鍒楄〃
+ unitList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -222,17 +238,41 @@
username: null,
usertype: null,
},
+
+ // 鏌ヨ鏈�鏂板簭鍙峰弬鏁�
+ seqnoParams: {
+ businessType: "externalperson",
+ datequery: false,
+ },
// 琛ㄥ崟鍙傛暟
form: {},
// 琛ㄥ崟鏍￠獙
- rules: {},
+ rules: {
+ usertype: [
+ { required: true, message: "璇疯緭鍏ヨ处鎴风被鍨�", trigger: "blur" }
+ ],
+ username: [
+ { required: true, message: "璇疯緭鍏ヨ处鎴峰悕绉�", trigger: "blur" }
+ ],
+ idcardno: [
+ { required: true, message: "璇疯緭鍏ヨ韩浠借瘉鍙风爜", trigger: "blur" }
+ ],
+ bankcardno: [
+ { required: true, message: "璇疯緭鍏ラ摱琛岃处鍙�", trigger: "blur" }
+ ],
+ depositbank: [
+ { required: true, message: "璇疯緭鍏ュ紑鎴烽摱琛�", trigger: "blur" }
+ ]
+ },
//鏄惁鏄笓瀹惰垂鐨凮PO瀹℃壒浜哄憳
ismanager: false,
};
},
created() {
this.getUserProfile();
- this.getList();
+ this.getUnitList();
+ // 榛樿涓嶆墦寮�
+ // this.getList();
},
methods: {
//鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
@@ -250,13 +290,18 @@
});
},
- /** 鏌ヨ澶栧洿鍗曚綅浜哄憳鍒楄〃 */
+ /** 鏌ヨ鍗曚綅銆佷汉鍛樿处鍙峰垪琛� */
getList() {
- this.loading = true;
+ if (this.queryParams.username === null || this.queryParams.username.replace(/\s/g, '') == "") {
+ this.$modal.msgWarning("鏌ユ壘璐︽埛鏃讹紝璐︽埛鍚嶇О涓嶈兘涓虹┖锛岃杈撳叆璐︽埛鍚嶇О锛�");
+ return;
+ }
+
+ // this.loading = true;
listExternalperson(this.queryParams).then((response) => {
this.externalpersonList = response.rows;
this.total = response.total;
- this.loading = false;
+ // this.loading = false;
});
},
// 鍙栨秷鎸夐挳
@@ -285,6 +330,12 @@
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
+ console.log("handleQuery", this.queryParams);
+ if (this.queryParams.username === null || this.queryParams.username.replace(/\s/g, '') == "") {
+ this.$modal.msgWarning("涓洪檺鍒舵壒閲忔煡鎵捐处鎴蜂俊鎭紝闄愬埗璐︽埛鍚嶇О涓哄繀杈撻」锛岃杈撳叆璐︽埛鍚嶇О鍚庡啀鎼滅储锛�");
+ return;
+ }
+
this.queryParams.pageNum = 1;
this.getList();
},
@@ -303,7 +354,7 @@
handleAdd() {
this.reset();
this.open = true;
- this.title = "娣诲姞澶栧洿鍗曚綅浜哄憳";
+ this.title = "娣诲姞浜哄憳/鍗曚綅璐﹀彿淇℃伅";
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
@@ -312,7 +363,7 @@
getExternalperson(id).then((response) => {
this.form = response.data;
this.open = true;
- this.title = "浜哄憳淇℃伅淇敼";
+ this.title = "浜哄憳/鍗曚綅璐﹀彿淇℃伅淇敼";
});
},
/** 鎻愪氦鎸夐挳 */
@@ -323,14 +374,19 @@
updateExternalperson(this.form).then((response) => {
this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
+ this.queryParams.username = this.form.username;
this.getList();
});
} else {
- addExternalperson(this.form).then((response) => {
- console.log("addExternalperson", response);
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
+ getOnlyCode(this.seqnoParams).then((res) => {
+ this.form.userno = res.data.currentvalue;
+
+ addExternalperson(this.form).then((response) => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+ this.queryParams.username = this.form.username;
+ this.getList();
+ });
});
}
}
@@ -340,7 +396,7 @@
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal
- .confirm('鏄惁纭鍒犻櫎澶栧洿鍗曚綅浜哄憳缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�')
+ .confirm('鏄惁纭鍒犻櫎浜哄憳/鍗曚綅璐﹀彿淇℃伅缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�')
.then(function () {
return delExternalperson(ids);
})
@@ -354,7 +410,7 @@
handleExport() {
const queryParams = this.queryParams;
this.$modal
- .confirm("鏄惁纭瀵煎嚭鎵�鏈夊鍥村崟浣嶄汉鍛樻暟鎹」锛�")
+ .confirm("鏄惁纭瀵煎嚭鎵�鏈変汉鍛�/鍗曚綅璐﹀彿淇℃伅鏁版嵁椤癸紵")
.then(() => {
this.exportLoading = true;
return exportExternalperson(queryParams);
@@ -365,6 +421,19 @@
})
.catch(() => { });
},
+
+ //鑾峰彇鍖荤枟鏈烘瀯鍒楄〃
+ getUnitList() {
+ listOrganization(3).then(response => {
+ for (let i = 0; i < response.rows.length; i++) {
+ this.unitList.push({
+ //organizationid: response.rows[i].organizationid,
+ organizationid: response.rows[i].id,
+ organizationname: response.rows[i].organizationname
+ });
+ }
+ });
+ },
},
};
</script>
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index f15f222..2771bcd 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -6,8 +6,8 @@
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="5">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <el-date-picker clearable :disabled="true" style="width: 100%" v-model="form.createTime" type="date"
+ <el-form-item label="鐢宠鏃ユ湡" prop="applyTime">
+ <el-date-picker clearable :disabled="true" style="width: 100%" v-model="form.applyTime" type="date"
value-format="yyyy-MM-dd HH:mm:ss" placeholder="鏃� 鏈�">
</el-date-picker>
</el-form-item>
@@ -90,21 +90,21 @@
</el-row>
<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;" v-if="businessType == 2">
- <el-button type="success" icon="el-icon-download" @click="Batchentry">鎵归噺褰曞叆</el-button>
+ <div style="margin-bottom: 15px;">
+ <el-button type="primary" icon="el-icon-download" size="small" @click.native.prevent="importFeeItems">
+ 鎵归噺瀵煎叆鏈嶅姟椤圭洰
+ </el-button>
</div>
</el-col>
-
- <el-col :span="3">
- <div style="margin-bottom: 15px;" v-if="userprofile.nickName == '闄堟厱鍗�' &&
- (businessType == '1' || businessType == '2')
- ">
- <el-button type="success" icon="el-icon-edit-outline" @click="Manualcalculationfn">璁＄畻涓◣</el-button>
+ <el-col :span="3" v-if="businessType == 2">
+ <div style="margin-bottom: 15px;">
+ <el-button type="primary" icon="el-icon-download" size="small" @click="Batchentry">鎵归噺褰曞叆涓撳</el-button>
+ </div>
+ </el-col>
+ <el-col :span="3" v-if="userprofile.nickName == '闄堟厱鍗�' && (businessType == '1' || businessType == '2')">
+ <div style="margin-bottom: 15px;">
+ <el-button type="success" icon="el-icon-edit-outline" size="small"
+ @click="Manualcalculationfn">璁＄畻涓◣</el-button>
</div>
</el-col>
</el-row>
@@ -229,7 +229,7 @@
<el-table-column prop="idcardno" align="center" label="韬唤璇佸彿" width="200"
v-if="businessType == '1' || businessType == '2'">
<template slot-scope="scope">
- <el-form-item :error="scope.row.error" label-width="0">
+ <el-form-item label-width="0">
<el-input :disabled="userprofile.nickName != '闄堟厱鍗�'
" v-model.number="scope.row.idcardno" @input="tableParValueChange1(scope.row)"
placeholder="韬唤璇佸彿" />
@@ -379,11 +379,11 @@
<el-form ref="accountselectform" :rules="dialogrules" :model="accountselectform" label-width="120px">
<el-row v-if="selectionType == 'workunit'">
<el-col :span="24">
- <el-form-item label="鍗曚綅鍚嶇О" prop="expertunitno" label-width="120px">
- <el-select v-model="accountselectform.expertunitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
+ <el-form-item label="鍗曚綅鍚嶇О" prop="expertunitname" label-width="120px">
+ <el-select v-model="accountselectform.expertunitname" 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>
+ :value="spec.organizationname"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -407,23 +407,24 @@
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="accountfrom == '2'">
+ <el-row v-if="selectionType == 'account' && accountfrom == '2'">
<el-col :span="16"><el-form-item label="鏂板绫诲瀷" prop="usertype">
- <el-radio-group v-model="accountselectform.usertype" style="margin-bottom: 0">
+ <el-radio-group v-model="accountselectform.usertype" style="margin-bottom: 0"
+ @change="userTypeChange(accountselectform.usertype)">
<el-radio label="expert">鏂板涓撳璐﹀彿</el-radio>
<el-radio label="org">鏂板鍗曚綅璐﹀彿</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="accountfrom == '2'">
+ <el-row v-if="selectionType == 'account' && accountfrom == '2'">
<el-col :span="24">
<el-form-item label="璐﹀彿鍚嶇О" prop="username">
<el-input v-model="accountselectform.username" placeholder="璇疯緭鍏ュ崟浣嶅悕绉版垨涓撳濮撳悕" />
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="accountfrom == '2' && accountselectform.usertype != 'org'">
+ <el-row v-if="selectionType == 'account' && accountfrom == '2' && accountselectform.usertype != 'org'">
<el-col :span="12">
<el-form-item label="韬唤璇佸彿" prop="idcardno">
<el-input v-model="accountselectform.idcardno" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" />
@@ -438,7 +439,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="accountfrom == '2' && accountselectform.usertype != 'org'">
+ <el-row v-if="selectionType == 'account' && accountfrom == '2' && accountselectform.usertype != 'org'">
<el-col>
<el-form-item label="鎵�鍦ㄥ崟浣�" prop="unitno">
<el-select v-model="accountselectform.unitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
@@ -454,7 +455,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="accountfrom == '2'">
+ <el-row v-if="selectionType == 'account' && accountfrom == '2'">
<el-col><el-form-item label="寮�鎴烽摱琛�" prop="depositbank">
<el-input v-model="accountselectform.depositbank" placeholder="璇疯緭鍏ュ紑鎴烽摱琛屽悕绉�" />
</el-form-item>
@@ -464,14 +465,14 @@
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="accountfrom == '2'">
+ <el-row v-if="selectionType == 'account' && accountfrom == '2'">
<el-col>
<el-form-item label="鑱旂郴鍦板潃" prop="address">
<el-input v-model="accountselectform.address" placeholder="璇疯緭鍏ヨ仈绯诲湴鍧�" />
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="accountfrom == '2'">
+ <el-row v-if="selectionType == 'account' && accountfrom == '2'">
<el-col>
<el-form-item label="鑱旂郴鐢佃瘽" prop="telephone">
<el-input v-model="accountselectform.telephone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
@@ -724,7 +725,8 @@
delExternalperson,
addExternalperson,
updateExternalperson,
- exportExternalperson
+ exportExternalperson,
+ getOnlyCode,
} from "@/api/project/externalperson";
import { listItemexpense } from "@/api/project/itemexpense";
@@ -870,27 +872,17 @@
// 琛ㄥ崟鏍￠獙
rules: {
- // createTime: [
- // { required: true, message: "璇疯緭鍏ュ～鎶ユ棩鏈�", trigger: "blur" }
- // ],
- reason: [
- { required: true, message: "璇疯緭鍏ュ嚭宸簨鐢�", trigger: "blur" }
- ],
- deptmentname: [
- { required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" }
- ]
+ reason: [{ required: true, message: "璇疯緭鍏ュ嚭宸簨鐢�", trigger: "blur" }],
+ deptmentname: [{ required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" }]
},
+
dialogrules: {
- // expertidcardno: [{ validator: validatePass, trigger: "blur" }],
- depositbank: [
- { required: true, message: "璇疯緭鍏ュ紑鎴烽摱琛�", trigger: "change" }
- ],
- bankcardno: [
- { required: true, message: "璇疯緭鍏ラ摱琛屽崱鍙�", trigger: "change" }
- ],
- unitno: [
- { required: true, message: "璇烽�夋嫨鍗曚綅鍚嶇О", trigger: "change" }
- ]
+ usertype: [{ required: true, message: "璇疯緭鍏ヨ处鎴风被鍨�", trigger: "blur" }],
+ username: [{ required: true, message: "璇疯緭鍏ヨ处鎴峰悕绉�", trigger: "blur" }],
+ idcardno: [{ required: true, message: "璇疯緭鍏ヨ韩浠借处鍙�", trigger: "blur" }],
+ //idcardno: [{ validator: validatePass, trigger: "blur" }],
+ depositbank: [{ required: true, message: "璇疯緭鍏ュ紑鎴烽摱琛�", trigger: "change" }],
+ bankcardno: [{ required: true, message: "璇疯緭鍏ラ摱琛屽崱鍙�", trigger: "change" }],
},
accountselectform: {
@@ -908,13 +900,15 @@
unitno: null,
personnelunitno: null,
address: null,
- telephone: null
+ telephone: null,
+ username: null,
+ userno: null
},
accountform: {
searchValue: null,
id: null,
- userstatus: 1,
+ userstatus: 0,
usertype: null,
pym: null,
@@ -979,6 +973,11 @@
userno: null,
username: null,
usertype: null
+ },
+ // 鏌ヨ鏈�鏂板簭鍙峰弬鏁�
+ seqnoParams: {
+ businessType: "externalperson",
+ datequery: false,
},
//璁＄畻涓◣鍙傛暟
@@ -1379,7 +1378,7 @@
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
this.form.recordstatus = 0;
var currenttime = new Date();
- this.form.createTime =
+ this.form.applyTime =
currenttime.getFullYear() +
"-" +
(currenttime.getMonth() + 1) +
@@ -1594,6 +1593,8 @@
// });
} else {
this.form.recordstatus = -1;
+ var currenttime = new Date();
+ this.form.applyTime = currenttime.getFullYear() + "-" + (currenttime.getMonth() + 1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
// addorupdateFund(this.form).then((response) => {
// if (response.code === 200) {
@@ -1716,8 +1717,7 @@
this.form.deptmentno = this.userprofile.dept.deptId;
this.form.managername = this.userprofile.dept.leader;
this.form.phone = this.userprofile.phonenumber;
- // this.form.applytype = this.businessType;
- // this.form.createTime = new Date();
+ // this.form.applytype = this.businessType;
if (this.businessType == "4") {
this.getUserAccount();
@@ -1737,6 +1737,24 @@
getAccountList() {
listExternalperson().then(res => {
this.accountlist = res.rows;
+ //鑾峰彇鍚敤鐨勮处鎴峰垪琛�
+ for (let j = 0; j < res.length; j++) {
+ //鍗曚綅璐﹀彿鍒楄〃
+ if (res.userstatus == "1") {
+ this.accountlist.push({
+ id: res.id,
+ userno: res.userno,
+ username: res.username,
+ idcardno: res.idcardno,
+ title: res.title,
+ depositbank: res.depositbank,
+ bankcardno: res.bankcardno,
+ unitno: res.unitno,
+ unitname: res.unitname
+ });
+ }
+ }
+
/**
for (let j = 0; j < this.accountlist.length; j++) {
//鍗曚綅璐﹀彿鍒楄〃
@@ -2724,6 +2742,7 @@
console.log(row);
window.location.href = this.Networkheader + "/prod-api" + row.url;
},
+
//涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
showSelectionDialog(scope, selectiontype) {
this.selectionScope = scope;
@@ -2733,15 +2752,15 @@
if (this.selectionType == "account") {
//榛樿浠庤处鎴峰簱閫夋嫨锛�1,璐︽埛搴擄紱2锛屾柊寤鸿处鎴�
this.accountfrom = "1";
-
- this.accountselectform.accountno = scope.row.beneficiaryno;
this.accountselectform.accountname = scope.row.beneficiaryname;
+ this.accountselectform.accountno = scope.row.beneficiaryno;
this.accountselectform.expertunitname = "";
this.accountselectform.expertunitno = "";
- this.accountselectform.unitno = "";
- this.accountselectform.unitname = "";
- this.accountselectform.telephone = "";
+
+ this.accountselectform.username = '';
+ this.accountselectform.userno = '';
this.accountselectform.idcardno = "";
+ this.accountselectform.telephone = "";
this.accountselectform.title = "";
this.accountselectform.unitno = "";
this.accountselectform.unitname = "";
@@ -2765,120 +2784,116 @@
if (this.selectionType == "account") {
if (this.accountfrom == "1") {
//璧嬪�间俊鎭�
- this.accountlist.map(res => {
- if (res.username == this.accountselectform.accountname) {
- console.log(res);
- this.rbDetails[tempIndex].beneficiaryno = res.userno;
- this.rbDetails[tempIndex].beneficiaryname = res.username;
- this.rbDetails[tempIndex].depositbank = res.depositbank;
- this.rbDetails[tempIndex].branchbankname = res.branchbankname;
- this.rbDetails[tempIndex].bankcardno = res.bankcardno;
- this.rbDetails[tempIndex].phone = res.telephone;
+ if (this.rbDetails[tempIndex].beneficiaryname != this.accountselectform.accountname) {
+ this.accountlist.map(res => {
+ if (res.username == this.accountselectform.accountname) {
+ this.rbDetails[tempIndex].beneficiaryno = res.userno;
+ this.rbDetails[tempIndex].beneficiaryname = res.username;
+ this.rbDetails[tempIndex].depositbank = res.depositbank;
+ this.rbDetails[tempIndex].branchbankname = res.branchbankname;
+ this.rbDetails[tempIndex].bankcardno = res.bankcardno;
+ this.rbDetails[tempIndex].phone = res.telephone;
- if (res.usertype == "org") {
- this.rbDetails[tempIndex].idcardno = "";
- this.rbDetails[tempIndex].title = "";
- this.rbDetails[tempIndex].unitno = "";
- this.rbDetails[tempIndex].unitname = "";
- } else {
- this.rbDetails[tempIndex].idcardno = res.idcardno;
- this.rbDetails[tempIndex].title = res.title;
- this.rbDetails[tempIndex].unitno = parseInt(res.unitno);
- this.rbDetails[tempIndex].unitname = res.unitname;
- }
- }
- });
- } else if (this.accountfrom == "2") {
- //淇濆瓨鏂板璐﹀彿
- this.accountform.id = null;
- this.accountform.userno =
- this.accountlist[this.accountlist.length - 1].id + 1;
- this.accountform.usertype = this.accountselectform.usertype;
- this.accountform.username = this.accountselectform.username;
- this.accountform.idcardno = this.accountselectform.idcardno;
- this.accountform.sex = null;
- this.accountform.title = this.accountselectform.title;
- this.accountform.telephone = this.accountselectform.telephone;
- this.accountform.address = this.accountselectform.address;
- this.accountform.wbm = null;
- this.accountform.pym = null;
-
- this.accountform.depositbank = this.accountselectform.depositbank;
- this.accountform.bankcardno = this.accountselectform.bankcardno;
- this.accountform.branchbankname = null;
- this.accountform.remark = null;
- this.accountform.del_flag = "0";
- this.accountform.personnelunitno = null;
-
- if (this.accountselectform.usertype != "org") {
- this.accountform.unitno = this.accountselectform.unitno;
- this.unitList.map(res => {
- if (res.organizationid == this.accountform.unitno) {
- this.accountform.unitname = res.organizationname;
+ if (res.usertype == "org") {
+ this.rbDetails[tempIndex].idcardno = "";
+ this.rbDetails[tempIndex].title = "";
+ this.rbDetails[tempIndex].unitno = "";
+ this.rbDetails[tempIndex].unitname = "";
+ } else {
+ this.rbDetails[tempIndex].idcardno = res.idcardno;
+ this.rbDetails[tempIndex].title = res.title;
+ this.rbDetails[tempIndex].unitno = parseInt(res.unitno);
+ this.rbDetails[tempIndex].unitname = res.unitname;
+ }
}
});
- // try {
- // let unitIndex = this.unitList.findIndex(
- // item => this.accountform.unitno == item.organizationid
- // );
- // if (unitIndex > -1) {
- // this.accountform.unitname = this.unitList[unitIndex].organizationname;
- // } else {
- // this.accountform.unitname = this.accountform.unitno;
- // }
- // } catch {
- // this.accountform.unitname = this.accountform.unitno;
- // }
}
- addExternalperson(this.accountform).then(response => {
- if (response.code == 200) {
- //this.$modal.msgSuccess("鏂扮殑涓撳鎴栧崟浣嶈处鎴蜂俊鎭凡娣诲姞鎴愬姛锛�");
- this.accountselectform.accountno = this.accountselectform.userno;
- this.accountselectform.accountname = this.accountselectform.username;
+ } else if (this.accountfrom == "2") {
+ //淇濆瓨鏂板璐﹀彿
+ //鑾峰彇鐢ㄦ埛缂栧彿
+ // this.accountform.userno = this.accountlist[this.accountlist.length - 1].id + 1;
+ getOnlyCode(this.seqnoParams).then((res) => {
+ this.accountform.userno = res.data.currentvalue;
+ this.accountform.id = null;
- //閲嶆柊鑾峰彇璐︽埛鍒楄〃
- listExternalperson().then(res => {
- this.accountlist = res.rows;
+ this.accountform.usertype = this.accountselectform.usertype;
+ this.accountform.username = this.accountselectform.username;
+ this.accountform.idcardno = this.accountselectform.idcardno;
+ this.accountform.sex = null;
+ this.accountform.title = this.accountselectform.title;
+ this.accountform.telephone = this.accountselectform.telephone;
+ this.accountform.address = this.accountselectform.address;
+ this.accountform.wbm = null;
+ this.accountform.pym = null;
- //璧嬪�间俊鎭�
- this.accountlist.map(res => {
- if (res.username == this.accountselectform.accountname) {
- this.rbDetails[tempIndex].beneficiaryno = res.userno;
- this.rbDetails[tempIndex].beneficiaryname = res.username;
- this.rbDetails[tempIndex].depositbank = res.depositbank;
- this.rbDetails[tempIndex].branchbankname =
- res.branchbankname;
- this.rbDetails[tempIndex].bankcardno = res.bankcardno;
- this.rbDetails[tempIndex].phone = res.telephone;
+ this.accountform.depositbank = this.accountselectform.depositbank;
+ this.accountform.bankcardno = this.accountselectform.bankcardno;
+ this.accountform.branchbankname = null;
+ this.accountform.remark = null;
+ this.accountform.del_flag = "0";
+ this.accountform.personnelunitno = null;
- if (res.usertype == "org") {
- this.rbDetails[tempIndex].idcardno = "";
- this.rbDetails[tempIndex].title = "";
- this.rbDetails[tempIndex].unitno = "";
- this.rbDetails[tempIndex].unitname = "";
- } else {
- this.rbDetails[tempIndex].idcardno = res.idcardno;
- this.rbDetails[tempIndex].title = res.title;
- this.rbDetails[tempIndex].unitno = parseInt(res.unitno);
- this.rbDetails[tempIndex].unitname = res.unitname;
- }
- }
- });
+ if (this.accountselectform.usertype != "org") {
+ this.accountform.unitno = this.accountselectform.unitno;
+ this.unitList.map(res => {
+ if (res.organizationid == this.accountform.unitno) {
+ this.accountform.unitname = res.organizationname;
+ }
});
+ }
+ addExternalperson(this.accountform).then(response => {
+ if (response.code == 200) {
+ this.$modal.msgSuccess("鏂拌处鎴蜂俊鎭凡娣诲姞鎴愬姛,闇�瑕佸湪璐﹀彿鐘舵�佸惎鐢ㄥ悗鎵嶈兘琚娇鐢紒");
+
+ /**
+ this.accountselectform.accountno = this.accountselectform.userno;
+ this.accountselectform.accountname = this.accountselectform.username;
+
+ //閲嶆柊鑾峰彇璐︽埛鍒楄〃
+ listExternalperson().then(res => {
+ this.accountlist = res.rows;
+
+ //璧嬪�间俊鎭�
+ this.accountlist.map(res => {
+ if (res.username == this.accountselectform.accountname) {
+ this.rbDetails[tempIndex].beneficiaryno = res.userno;
+ this.rbDetails[tempIndex].beneficiaryname = res.username;
+ this.rbDetails[tempIndex].depositbank = res.depositbank;
+ this.rbDetails[tempIndex].branchbankname =
+ res.branchbankname;
+ this.rbDetails[tempIndex].bankcardno = res.bankcardno;
+ this.rbDetails[tempIndex].phone = res.telephone;
+
+ if (res.usertype == "org") {
+ this.rbDetails[tempIndex].idcardno = "";
+ this.rbDetails[tempIndex].title = "";
+ this.rbDetails[tempIndex].unitno = "";
+ this.rbDetails[tempIndex].unitname = "";
+ } else {
+ this.rbDetails[tempIndex].idcardno = res.idcardno;
+ this.rbDetails[tempIndex].title = res.title;
+ this.rbDetails[tempIndex].unitno = parseInt(res.unitno);
+ this.rbDetails[tempIndex].unitname = res.unitname;
+ }
+ }
+ });
+ });
+ */
+ }
+ });
+ });
+
+
+ }
+ } else if (this.selectionType == "workunit") {
+ if (this.rbDetails[tempIndex].unitname != this.accountselectform.expertunitname) {
+ this.rbDetails[tempIndex].unitname = this.accountselectform.expertunitname;
+ this.unitList.map(res => {
+ if (res.organizationname == this.accountselectform.expertunitname) {
+ this.rbDetails[tempIndex].unitno = res.organizationid;
}
});
}
- } else if (this.selectionType == "workunit") {
- console.log(tempIndex);
-
- this.rbDetails[
- tempIndex
- ].unitno = this.accountselectform.expertunitno;
- this.unitList.map(res => {
- if (res.organizationid == this.accountform.unitno) {
- this.rbDetails[tempIndex].unitno.unitname = res.organizationname;
- }
- });
}
//鍏抽棴绐楀彛
@@ -2901,6 +2916,17 @@
} else {
row.error = "韬唤璇佸彿鐮佹牸寮忛敊璇�";
}
+ },
+
+ //璐︽埛绫诲瀷閫夋嫨鍙樺寲
+ userTypeChange(type) {
+ if (type == "org") {
+ this.accountselectform.idcardno = "";
+ this.accountselectform.unitno = "";
+ this.accountselectform.unitname = "";
+ this.accountselectform.personnelunitno = "";
+ };
+ // this.$modal.msgWarning(type);
}
},
diff --git a/src/views/project/fund/ethicalExpertFeeApply/index.vue b/src/views/project/fund/ethicalExpertFeeApply/index.vue
index 7b4dbdf..361859b 100644
--- a/src/views/project/fund/ethicalExpertFeeApply/index.vue
+++ b/src/views/project/fund/ethicalExpertFeeApply/index.vue
@@ -76,10 +76,10 @@
</el-row>
<el-row>
<el-table v-loading="loading" border :data="donateconsolationfundList">
- <el-table-column label="鐢宠鏃ユ湡" align="center" prop="createTime" width="150px">
+ <el-table-column label="鐢宠鏃ユ湡" align="center" prop="applyTime" width="150px">
<template slot-scope="scope">
<span>{{
- parseTime(scope.row.createTime, "{y}-{m}-{d}")
+ parseTime(scope.row.applyTime, "{y}-{m}-{d}")
}}</span>
</template>
</el-table-column>
@@ -133,8 +133,8 @@
<el-form ref="form" :model="form" label-width="120px" :rules="rules">
<el-row style="text-align: left">
<el-col :span="5">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date"
+ <el-form-item label="鐢宠鏃ユ湡" prop="applyTime">
+ <el-date-picker clearable style="width: 100%" v-model="form.applyTime" type="date"
value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡">
</el-date-picker>
</el-form-item>
@@ -569,7 +569,7 @@
username: [
{ required: true, message: "璇疯緭鍏ョ敵璇蜂汉", trigger: "blur" }
],
- createTime: [
+ applyTime: [
{ required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" }
],
deptmentname: [
@@ -825,7 +825,7 @@
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
row.recordstatus = "0";
var currenttime = new Date();
- row.createTime = currenttime.getFullYear() + "-" + (currenttime.getMonth()+1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
+ row.applyTime = currenttime.getFullYear() + "-" + (currenttime.getMonth()+1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
updateFund(row).then(response => {
if (response.code == 200) {
diff --git a/src/views/project/fund/expertFeeApply/index.vue b/src/views/project/fund/expertFeeApply/index.vue
index 26bc82b..5813975 100644
--- a/src/views/project/fund/expertFeeApply/index.vue
+++ b/src/views/project/fund/expertFeeApply/index.vue
@@ -137,12 +137,12 @@
<el-table-column
label="鐢宠鏃ユ湡"
align="center"
- prop="createTime"
+ prop="applyTime"
width="180px"
>
<template slot-scope="scope">
<span>{{
- parseTime(scope.row.createTime, "{y}-{m}-{d}")
+ parseTime(scope.row.applyTime, "{y}-{m}-{d}")
}}</span>
</template>
</el-table-column>
@@ -291,11 +291,11 @@
>
<el-row style="text-align: left">
<el-col :span="5">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
+ <el-form-item label="鐢宠鏃ユ湡" prop="applyTime">
<el-date-picker
clearable
style="width: 100%"
- v-model="form.createTime"
+ v-model="form.applyTime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="鐢宠鏃ユ湡"
@@ -1227,7 +1227,7 @@
username: [
{ required: true, message: "璇疯緭鍏ョ敵璇蜂汉", trigger: "blur" }
],
- createTime: [
+ applyTime: [
{ required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" }
],
deptmentname: [
@@ -1586,7 +1586,7 @@
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
row.recordstatus = 0;
var currenttime = new Date();
- row.createTime = currenttime.getFullYear() + "-" + (currenttime.getMonth()+1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
+ row.applyTime = currenttime.getFullYear() + "-" + (currenttime.getMonth()+1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
updateFund(row).then(response => {
if (response.code == 200) {
diff --git a/src/views/project/fund/medicalCostApply/index.vue b/src/views/project/fund/medicalCostApply/index.vue
index 8438b81..434c68d 100644
--- a/src/views/project/fund/medicalCostApply/index.vue
+++ b/src/views/project/fund/medicalCostApply/index.vue
@@ -128,12 +128,12 @@
<el-table-column
label="鐢宠鏃ユ湡"
align="center"
- prop="createTime"
+ prop="applyTime"
width="150px"
>
<template slot-scope="scope">
<span>{{
- parseTime(scope.row.createTime, "{y}-{m}-{d}")
+ parseTime(scope.row.applyTime, "{y}-{m}-{d}")
}}</span>
</template>
</el-table-column>
@@ -379,7 +379,7 @@
username: [
{ required: true, message: "璇疯緭鍏ョ敵璇蜂汉", trigger: "blur" }
],
- createTime: [
+ applyTime: [
{ required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" }
],
deptmentname: [
@@ -690,7 +690,7 @@
//鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
row.recordstatus = 0;var currenttime = new Date();
- row.createTime = currenttime.getFullYear() + "-" + (currenttime.getMonth()+1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
+ row.applyTime = currenttime.getFullYear() + "-" + (currenttime.getMonth()+1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
updateFund(row).then(response => {
if (response.code == 200) {
this.$message({
diff --git a/src/views/project/fund/officeExpenseApply/index.vue b/src/views/project/fund/officeExpenseApply/index.vue
index 46f486e..bca0af2 100644
--- a/src/views/project/fund/officeExpenseApply/index.vue
+++ b/src/views/project/fund/officeExpenseApply/index.vue
@@ -91,11 +91,11 @@
<el-table-column
label="鐢宠鏃ユ湡"
align="center"
- prop="createTime"
+ prop="applyTime"
width="180px"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+ <span>{{ parseTime(scope.row.applyTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column
@@ -217,11 +217,11 @@
<el-form ref="form" :model="form" label-width="120px" :rules="rules">
<el-row style="text-align: left">
<el-col :span="5">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
+ <el-form-item label="鐢宠鏃ユ湡" prop="applyTime">
<el-date-picker
clearable
style="width: 100%"
- v-model="form.createTime"
+ v-model="form.applyTime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="鐢宠鏃ユ湡"
@@ -1018,7 +1018,7 @@
username: [
{ required: true, message: "璇疯緭鍏ョ敵璇蜂汉", trigger: "blur" }
],
- createTime: [
+ applyTime: [
{ required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" }
],
deptmentname: [
@@ -1164,7 +1164,7 @@
//鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
row.recordstatus = 0;var currenttime = new Date();
- row.createTime = currenttime.getFullYear() + "-" + (currenttime.getMonth()+1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
+ row.applyTime = currenttime.getFullYear() + "-" + (currenttime.getMonth()+1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
updateFund(row).then(response => {
if (response.code == 200) {
this.$message({
@@ -1262,7 +1262,7 @@
this.form.deptmentno = this.defaultperson.dept.deptId;
this.form.managername = this.defaultperson.dept.leader;
- // this.form.createTime = nowdate;
+ // this.form.applyTime = nowdate;
//this.open = true;
//this.initFundApplyForm();
this.fundDetails = [];
diff --git a/src/views/project/fund/performanceApply/index.vue b/src/views/project/fund/performanceApply/index.vue
index 28974f8..898a800 100644
--- a/src/views/project/fund/performanceApply/index.vue
+++ b/src/views/project/fund/performanceApply/index.vue
@@ -16,7 +16,7 @@
</el-form-item>
</el-col>
<el-col :span="7">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
+ <el-form-item label="鐢宠鏃ユ湡" prop="applyTime">
<el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="value1" type="daterange" @blur="onpick"
range-separator="鑷�" start-placeholder="鎶ラ攢鐢宠寮�濮嬫棩鏈�" end-placeholder="鎶ラ攢鐢宠缁撴潫鏃ユ湡"
@keyup.enter.native="handleQuery">
@@ -58,9 +58,9 @@
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
</el-row>
<el-table v-loading="loading" border :data="donateconsolationfundList">
- <el-table-column label="鐢宠鏃ユ湡" align="center" prop="createTime" width="180px">
+ <el-table-column label="鐢宠鏃ユ湡" align="center" prop="applyTime" width="180px">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+ <span>{{ parseTime(scope.row.applyTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="鐢宠浜�" align="center" prop="username" width="150px" />
@@ -272,7 +272,7 @@
//鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
row.recordstatus = 0;var currenttime = new Date();
- row.createTime = currenttime.getFullYear() + "-" + (currenttime.getMonth()+1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
+ row.applyTime = currenttime.getFullYear() + "-" + (currenttime.getMonth()+1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
updateFund(row).then(response => {
if (response.code == 200) {
this.$message({
diff --git a/src/views/project/fund/performancedetails/index.vue b/src/views/project/fund/performancedetails/index.vue
index 8c15da9..3345a27 100644
--- a/src/views/project/fund/performancedetails/index.vue
+++ b/src/views/project/fund/performancedetails/index.vue
@@ -6,9 +6,9 @@
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="5">
- <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-form-item label="鐢宠鏃ユ湡" prop="applyTime">
+ <el-date-picker clearable style="width: 100%" v-model="form.applyTime" type="date"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡" disabled="true">
</el-date-picker>
</el-form-item>
</el-col>
@@ -67,14 +67,12 @@
<el-row>
<el-col :span="3">
<div style="margin-bottom: 15px;">
- <el-button type="success" icon="el-icon-download" @click="Batchentry">鎵归噺褰曞叆</el-button>
+ <el-button type="primary" icon="el-icon-download" size="small" @click="Batchentry">鎵归噺褰曞叆浜哄憳</el-button>
</div>
</el-col>
- </el-row>
- <el-row v-if="userprofile.nickName == '闄堟厱鍗�' && operationType == 'check'">
- <el-col :span="3">
+ <el-col :span="3" v-if="userprofile.nickName == '闄堟厱鍗�' && operationType == 'check'">
<div style="margin-bottom: 15px;">
- <el-button type="success" icon="el-icon-edit-outline" @click="Manualcalculationfn">璁＄畻涓◣</el-button>
+ <el-button type="success" icon="el-icon-edit-outline" size="small" @click="Manualcalculationfn">璁＄畻涓◣</el-button>
</div>
</el-col>
</el-row>
@@ -220,12 +218,13 @@
<el-form ref="funddetailForm" :model="funddetailForm">
<el-row>
<el-form-item label="璇疯緭鍏ラ�夋嫨锛�" prop="unitno" label-width="120px">
- <el-select v-model="funddetailForm.userName" filterable remote reserve-keyword allow-create default-first-option
- placeholder="璇疯緭鍏ュ鍚嶆垨鍗曚綅鍚嶇О" :remote-method="remoteMethod" :loading="loadingperformance" style="width: 100%">
- <el-option v-for="item in optionsperformance" :key="item.value" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
+ <el-select v-model="funddetailForm.userName" filterable remote reserve-keyword allow-create
+ default-first-option placeholder="璇疯緭鍏ュ鍚嶆垨鍗曚綅鍚嶇О" :remote-method="remoteMethod" :loading="loadingperformance"
+ style="width: 100%">
+ <el-option v-for="item in optionsperformance" :key="item.value" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -448,9 +447,6 @@
// 琛ㄥ崟鏍￠獙
rules: {
- createTime: [
- { required: true, message: "璇疯緭鍏ュ～鎶ユ棩鏈�", trigger: "blur" }
- ],
reason: [
{ required: true, message: "璇疯緭鍏ュ嚭宸簨鐢�", trigger: "blur" }
],
@@ -926,7 +922,7 @@
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
this.form.recordstatus = 0;
var currenttime = new Date();
- this.form.createTime = currenttime.getFullYear() + "-" + (currenttime.getMonth()+1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
+ this.form.applyTime = currenttime.getFullYear() + "-" + (currenttime.getMonth() + 1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
if (!this.form.id) {
this.form.id = this.$route.query.id;
@@ -1100,6 +1096,19 @@
if (this.form.id != null) {
} else {
this.form.recordstatus = -1;
+ var currenttime = new Date();
+ this.form.applyTime =
+ currenttime.getFullYear() +
+ "-" +
+ (currenttime.getMonth() + 1) +
+ "-" +
+ currenttime.getDate() +
+ " " +
+ currenttime.getHours() +
+ ":" +
+ currenttime.getMinutes() +
+ ":" +
+ currenttime.getSeconds();
}
sessionStorage.setItem(
diff --git a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
index a4732e1..eba6a42 100644
--- a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
@@ -9,12 +9,12 @@
>
<el-row>
<el-col :span="8">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
+ <el-form-item label="鐢宠鏃ユ湡" prop="applyTime">
<el-date-picker
format="yyyy-MM-dd"
@change="selectapplication"
value-format="yyyy-MM-dd"
- v-model="createTime"
+ v-model="applyTime"
type="daterange"
range-separator="鑷�"
start-placeholder="鐢宠寮�濮嬫棩鏈�"
@@ -159,10 +159,10 @@
label="鐢宠鏃ユ湡"
width="120"
align="center"
- prop="createTime"
+ prop="applyTime"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+ <span>{{ parseTime(scope.row.applyTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column
@@ -622,12 +622,12 @@
</el-row>
<el-row style="margin-top: 25px; margin-bottom: 5px">
<el-col :span="7">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
+ <el-form-item label="鐢宠鏃ユ湡" prop="applyTime">
<!-- <el-input v-model="form.donorno" placeholder="璇疯緭鍏ョ敵璇锋棩鏈�" /> -->
<el-date-picker
clearable
style="width: 100%"
- v-model="form.createTime"
+ v-model="form.applyTime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="鐢宠鏃ユ湡"
@@ -935,7 +935,7 @@
username: [
{ required: true, message: "璇疯緭鍏ョ敵璇蜂汉濮撳悕", trigger: "blur" }
],
- createTime: [
+ applyTime: [
{ required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" }
],
amountrequested: [
@@ -1018,9 +1018,9 @@
},
methods: {
selectapplication() {
- console.log("鏃堕棿", this.createTime);
- this.queryParams.APPLICATIONBEGTIME = this.createTime[0];
- this.queryParams.APPLICATIONENDTIME = this.createTime[1];
+ console.log("鏃堕棿", this.applyTime);
+ this.queryParams.APPLICATIONBEGTIME = this.applyTime[0];
+ this.queryParams.APPLICATIONENDTIME = this.applyTime[1];
// this.getlistbypower()
},
getlistbypower() {
@@ -1413,7 +1413,7 @@
this.form.donorno = this.curCase.donorno;
this.form.name = this.curCase.name;
this.form.infoid = this.curCase.id;
- // this.form.createTime = nowdate;
+ // this.form.applyTime = nowdate;
//this.open = true;
//this.initFundApplyForm();
this.fundDetailArr = [];
diff --git a/src/views/project/fundcheck/officeExpenseCheck/index.vue b/src/views/project/fundcheck/officeExpenseCheck/index.vue
index 200df76..5bd1ebd 100644
--- a/src/views/project/fundcheck/officeExpenseCheck/index.vue
+++ b/src/views/project/fundcheck/officeExpenseCheck/index.vue
@@ -1032,6 +1032,7 @@
APPLICATIONENDTIME: null,
CHECKFLAG: 1,
APPLYTYPE: 4,
+
money: null
},
// 琛ㄥ崟鍙傛暟
diff --git a/src/views/project/fundcheck/performanceCheck/index.vue b/src/views/project/fundcheck/performanceCheck/index.vue
index 6e6b569..de2ada5 100644
--- a/src/views/project/fundcheck/performanceCheck/index.vue
+++ b/src/views/project/fundcheck/performanceCheck/index.vue
@@ -475,8 +475,8 @@
},
mounted() {
- if (grtItem("officeExpenseCheck")) {
- this.queryParams = grtItem("officeExpenseCheck");
+ if (grtItem("performanceCheck")) {
+ this.queryParams = grtItem("performanceCheck");
this.queryParams.APPLICATIONBEGTIME = "";
this.queryParams.APPLICATIONENDTIME = "";
}
@@ -495,8 +495,8 @@
// this.queryParams.params = {};
console.log("this.queryParams", this.queryParams);
listbypower(this.queryParams).then(res => {
- removeItem("officeExpenseCheck");
- setItem("officeExpenseCheck", this.queryParams);
+ removeItem("performanceCheck");
+ setItem("performanceCheck", this.queryParams);
this.loading = false;
let list = res.rows;
this.total = res.total;
diff --git a/src/views/project/travelexpenseapply/edit.vue b/src/views/project/travelexpenseapply/edit.vue
index 21ab711..d888db5 100644
--- a/src/views/project/travelexpenseapply/edit.vue
+++ b/src/views/project/travelexpenseapply/edit.vue
@@ -62,8 +62,8 @@
</el-form-item>
</el-col>
<el-col :span="7">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <el-date-picker style="width: 100%" v-model="form.createTime" type="date"
+ <el-form-item label="鐢宠鏃ユ湡" prop="applyTime">
+ <el-date-picker style="width: 100%" v-model="form.applyTime" type="date"
value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡">
</el-date-picker>
</el-form-item>
diff --git a/src/views/project/travelexpenseapply/index.vue b/src/views/project/travelexpenseapply/index.vue
index de93c46..7dbd885 100644
--- a/src/views/project/travelexpenseapply/index.vue
+++ b/src/views/project/travelexpenseapply/index.vue
@@ -28,7 +28,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="鎶ラ攢鏃ユ湡" prop="createTime">
+ <el-form-item label="鎶ラ攢鏃ユ湡" prop="applyTime">
<el-date-picker
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
@@ -138,10 +138,10 @@
label="鐢宠鏃堕棿"
width="150"
align="center"
- prop="createTime"
+ prop="applyTime"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+ <span>{{ parseTime(scope.row.applyTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column
@@ -287,10 +287,10 @@
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row
><el-col :span="5">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
+ <el-form-item label="鐢宠鏃ユ湡" prop="applyTime">
<el-date-picker
style="width: 100%"
- v-model="form.createTime"
+ v-model="form.applyTime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="鐢宠鏃ユ湡"
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index 5dba5d3..26df205 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -3,37 +3,19 @@
<div class="boxdiv">
<div class="top-text">{{ title }}</div>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
- <el-row
- ><el-col :span="5">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <el-date-picker
- style="width: 100%"
- v-model="form.createTime"
- type="date"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="鐢宠鏃ユ湡"
- :disabled="true"
- >
+ <el-row><el-col :span="5">
+ <el-form-item label="鐢宠鏃ユ湡" prop="applyTime">
+ <el-date-picker style="width: 100%" v-model="form.applyTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="鐢宠鏃ユ湡" :disabled="true">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="缁忓姙浜�" prop="username">
- <el-select
- v-model="form.username"
- clearable
- filterable
- allow-create
- ref="getReportname"
- default-first-option
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in personsList"
- :key="item.reportNo"
- :label="item.reportName"
- :value="item.reportName"
- >
+ <el-select v-model="form.username" clearable filterable allow-create ref="getReportname"
+ default-first-option placeholder="璇烽�夋嫨">
+ <el-option v-for="item in personsList" :key="item.reportNo" :label="item.reportName"
+ :value="item.reportName">
</el-option>
</el-select>
</el-form-item>
@@ -58,18 +40,8 @@
</el-col>
<el-col :span="5">
<el-form-item label="鎹愮尞鑰�" prop="infoid">
- <el-select
- v-model="form.infoid"
- @change="selectbaseinfo"
- filterable
- placeholder="璇烽�夋嫨鎹愮尞鑰�"
- >
- <el-option
- v-for="item in baselist"
- :key="item.index"
- :label="item.name"
- :value="item.infoid"
- >
+ <el-select v-model="form.infoid" @change="selectbaseinfo" filterable placeholder="璇烽�夋嫨鎹愮尞鑰�">
+ <el-option v-for="item in baselist" :key="item.index" :label="item.name" :value="item.infoid">
</el-option>
</el-select>
</el-form-item>
@@ -78,36 +50,17 @@
<el-row style="margin-top: 10px">
<el-col :span="5">
<el-form-item label="鎶ラ攢閲戦" prop="amountrequested">
- <el-input
- :disabled="true"
- v-model="form.amountrequested"
- placeholder="鎶ラ攢鍚堣閲戦"
- />
+ <el-input :disabled="true" v-model="form.amountrequested" placeholder="鎶ラ攢鍚堣閲戦" />
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="澶у啓閲戦" prop="bigstrmoney">
- <el-input
- :disabled="true"
- v-model="form.bigstrmoney"
- placeholder="鎶ラ攢澶у啓閲戦"
- />
- </el-form-item> </el-col
- ><el-col :span="4">
+ <el-input :disabled="true" v-model="form.bigstrmoney" placeholder="鎶ラ攢澶у啓閲戦" />
+ </el-form-item> </el-col><el-col :span="4">
<el-form-item label="瀹℃牳鐘舵��" prop="flowlevel">
- <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"
- />
+ <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" />
</el-select>
</el-form-item>
</el-col>
@@ -212,325 +165,142 @@
<el-row v-if="jurisdiction">
<!-- <el-alert title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��" type="warning">
</el-alert> -->
- <el-alert
- title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��"
- type="warning"
- show-icon
- >
+ <el-alert title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��" type="warning" show-icon>
</el-alert>
</el-row>
<el-row style="margin-top: 25px; margin-bottom: 5px">
<el-col :span="20">鎶ラ攢鏄庣粏</el-col>
</el-row>
<el-row>
- <el-table
- :data="rbDetails"
- ref="table"
- border
- max-height="800"
- highlight-current-row
- :summary-method="getSummaries"
- show-summary
- >
- <el-table-column
- prop="orderno"
- slot=""
- label="搴忓彿"
- align="center"
- fixed
- width="88"
- >
+ <el-table :data="rbDetails" ref="table" border max-height="800" highlight-current-row
+ :summary-method="getSummaries" show-summary>
+ <el-table-column prop="orderno" slot="" label="搴忓彿" align="center" fixed width="88">
<template slot-scope="scope">
<el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
</template>
</el-table-column>
<!--涓婚敭銆佸涓嶅睍绀�-->
- <el-table-column
- prop="id"
- slot=""
- label="涓婚敭"
- align="center"
- fixed
- width="95"
- v-if="false"
- >
+ <el-table-column prop="id" slot="" label="涓婚敭" align="center" fixed width="95" v-if="false">
<template slot-scope="scope">
<el-input v-model="scope.row.id" placeholder="id" />
</template>
</el-table-column>
- <el-table-column
- prop="rbid"
- slot=""
- label="澶栭敭"
- align="center"
- fixed
- width="95"
- v-if="false"
- >
+ <el-table-column prop="rbid" slot="" label="澶栭敭" align="center" fixed width="95" v-if="false">
<template slot-scope="scope">
<el-input v-model="scope.row.rbid" placeholder="rbid" />
</template>
</el-table-column>
- <el-table-column
- prop="persontype"
- slot=""
- label="浜哄憳绫诲埆"
- align="center"
- fixed
- width="130"
- >
+ <el-table-column prop="persontype" slot="" label="浜哄憳绫诲埆" align="center" fixed width="130">
<template slot-scope="scope">
- <el-select
- v-model="scope.row.persontype"
- value-key="value"
- placeholder="浜哄憳绫诲埆"
- @change="getPersons(scope.row)"
- >
- <el-option
- v-for="dict in dict.type.sys_travelexpensebelong"
- :key="dict.value"
- :label="dict.label"
- :value="dict.label"
- ></el-option>
+ <el-select v-model="scope.row.persontype" value-key="value" placeholder="浜哄憳绫诲埆"
+ @change="getPersons(scope.row)">
+ <el-option v-for="dict in dict.type.sys_travelexpensebelong" :key="dict.value" :label="dict.label"
+ :value="dict.label"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="personname"
- slot=""
- label="璐圭敤浜哄憳"
- align="center"
- fixed
- width="110"
- >
+ <el-table-column prop="personname" slot="" label="璐圭敤浜哄憳" align="center" fixed width="110">
<template slot-scope="scope">
- <el-select
- v-model="scope.row.personname"
- clearable
- filterable
- allow-create
- default-first-option
- placeholder="璇烽�夋嫨"
- @focus1="getPersons(scope.row)"
- >
- <el-option
- v-for="item in personsSel"
- :key="item.reportNo"
- :label="item.reportName"
- :value="item.reportName"
- >
+ <el-select v-model="scope.row.personname" clearable filterable allow-create default-first-option
+ placeholder="璇烽�夋嫨" @focus1="getPersons(scope.row)">
+ <el-option v-for="item in personsSel" :key="item.reportNo" :label="item.reportName"
+ :value="item.reportName">
</el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="starttime"
- slot=""
- label="寮�濮嬫棩鏈�"
- fixed
- align="center"
- width="150"
- >
+ <el-table-column prop="starttime" slot="" label="寮�濮嬫棩鏈�" fixed align="center" width="150">
<template slot-scope="scope">
- <el-date-picker
- :picker-options="{
- disabledDate: time => {
- if (scope.row.endtime) {
- return (
- time.getTime() >
- new Date(scope.row.endtime.replace(/-/g, '/'))
- );
- }
+ <el-date-picker :picker-options="{
+ disabledDate: time => {
+ if (scope.row.endtime) {
+ return (
+ time.getTime() >
+ new Date(scope.row.endtime.replace(/-/g, '/'))
+ );
}
- }"
- clearable
- size="small"
- style="width: 100%"
- v-model="scope.row.starttime"
- type="date"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="寮�濮嬫棩鏈�"
- @blur="getdays(scope.row)"
- >
+ }
+ }" clearable size="small" style="width: 100%" v-model="scope.row.starttime" type="date"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="寮�濮嬫棩鏈�" @blur="getdays(scope.row)">
</el-date-picker>
</template>
</el-table-column>
- <el-table-column
- prop="endtime"
- slot=""
- label="缁撴潫鏃ユ湡"
- align="center"
- fixed
- width="150"
- >
+ <el-table-column prop="endtime" slot="" label="缁撴潫鏃ユ湡" align="center" fixed width="150">
<template slot-scope="scope">
- <el-date-picker
- :picker-options="{
- disabledDate: time => {
- if (scope.row.starttime) {
- return (
- time.getTime() <
- new Date(scope.row.starttime.replace(/-/g, '/'))
- );
- }
+ <el-date-picker :picker-options="{
+ disabledDate: time => {
+ if (scope.row.starttime) {
+ return (
+ time.getTime() <
+ new Date(scope.row.starttime.replace(/-/g, '/'))
+ );
}
- }"
- clearable
- size="small"
- style="width: 100%"
- v-model="scope.row.endtime"
- type="date"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="缁撴潫鏃ユ湡"
- @blur="getdays(scope.row)"
- >
+ }
+ }" clearable size="small" style="width: 100%" v-model="scope.row.endtime" type="date"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="缁撴潫鏃ユ湡" @blur="getdays(scope.row)">
</el-date-picker>
</template>
</el-table-column>
- <el-table-column
- prop="departure"
- slot=""
- label="鍑哄彂鍦�"
- align="center"
- width="100"
- >
+ <el-table-column prop="departure" slot="" label="鍑哄彂鍦�" align="center" width="100">
<template slot-scope="scope">
<el-input v-model="scope.row.departure" placeholder="鍑哄彂鍦�" />
</template>
</el-table-column>
- <el-table-column
- label="鍒拌揪鍦�"
- prop="destination"
- align="center"
- width="140"
- >
+ <el-table-column label="鍒拌揪鍦�" prop="destination" align="center" width="140">
<template slot-scope="scope">
<!-- <el-input v-model="scope.row.destination" placeholder="鍒拌揪鍦�" @blur="getallowance(scope.row)" /> -->
- <el-select
- filterable
- allow-create
- v-model="scope.row.destination"
- value-key="value"
- placeholder="鍒拌揪鍦�"
- @change="getallowance(scope.row)"
- >
- <el-option
- v-for="dict in dict.type.sys_area_name"
- :key="dict.value"
- :label="dict.label"
- :value="dict.label"
- ></el-option>
+ <el-select filterable allow-create v-model="scope.row.destination" value-key="value" placeholder="鍒拌揪鍦�"
+ @change="getallowance(scope.row)">
+ <el-option v-for="dict in dict.type.sys_area_name" :key="dict.value" :label="dict.label"
+ :value="dict.label"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="days"
- label="澶╂暟"
- width="100"
- align="center"
- >
+ <el-table-column prop="days" label="澶╂暟" width="100" align="center">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.days"
- @blur="getallowance(scope.row)"
- placeholder="澶╂暟"
- />
+ <el-input v-model="scope.row.days" @blur="getallowance(scope.row)" placeholder="澶╂暟" />
</template>
</el-table-column>
- <el-table-column
- prop="traffictype"
- label="鍑哄彂浜ら�氬伐鍏�"
- align="center"
- width="100"
- >
+ <el-table-column prop="traffictype" label="鍑哄彂浜ら�氬伐鍏�" align="center" width="100">
<template slot-scope="scope">
- <el-select
- v-model="scope.row.traffictype"
- placeholder="鍑哄彂浜ら�氬伐鍏�"
- >
- <el-option
- v-for="dict in dict.type.sys_traffictype"
- :key="dict.value"
- :label="dict.label"
- :value="dict.label"
- ></el-option>
+ <el-select v-model="scope.row.traffictype" placeholder="鍑哄彂浜ら�氬伐鍏�">
+ <el-option v-for="dict in dict.type.sys_traffictype" :key="dict.value" :label="dict.label"
+ :value="dict.label"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="traffictype2"
- label="杩斿洖浜ら�氬伐鍏�"
- align="center"
- width="100"
- >
+ <el-table-column prop="traffictype2" label="杩斿洖浜ら�氬伐鍏�" align="center" width="100">
<template slot-scope="scope">
- <el-select
- v-model="scope.row.traffictype2"
- placeholder="杩斿洖浜ら�氬伐鍏�"
- >
- <el-option
- v-for="dict in dict.type.sys_traffictype"
- :key="dict.value"
- :label="dict.label"
- :value="dict.label"
- ></el-option>
+ <el-select v-model="scope.row.traffictype2" placeholder="杩斿洖浜ら�氬伐鍏�">
+ <el-option v-for="dict in dict.type.sys_traffictype" :key="dict.value" :label="dict.label"
+ :value="dict.label"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="trafficexpense"
- label="浜ら�氳垂"
- align="center"
- width="120"
- >
+ <el-table-column prop="trafficexpense" label="浜ら�氳垂" align="center" width="120">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.trafficexpense"
- placeholder="浜ら�氳垂"
- @blur="
- val => {
- sumRowFee(scope.row);
- }
- "
- />
+ <el-input v-model="scope.row.trafficexpense" placeholder="浜ら�氳垂" @blur="val => {
+ sumRowFee(scope.row);
+ }
+ " />
</template>
</el-table-column>
- <el-table-column
- prop="cityfee"
- label="甯傚唴浜ら�氳垂"
- align="center"
- width="120"
- >
+ <el-table-column prop="cityfee" label="甯傚唴浜ら�氳垂" align="center" width="120">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.cityfee"
- placeholder="甯傚唴浜ら�氳垂"
- @blur="
- val => {
- sumRowFee(scope.row);
- }
- "
- >{{ Number(scope.row.cityfee).toFixed(2) }}
+ <el-input v-model="scope.row.cityfee" placeholder="甯傚唴浜ら�氳垂" @blur="val => {
+ sumRowFee(scope.row);
+ }
+ ">{{ Number(scope.row.cityfee).toFixed(2) }}
</el-input>
</template>
</el-table-column>
- <el-table-column
- prop="hotelexpense"
- label="浣忓璐�"
- align="center"
- width="120"
- >
+ <el-table-column prop="hotelexpense" label="浣忓璐�" align="center" width="120">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.hotelexpense"
- placeholder="浣忓璐�"
- @blur="
- val => {
- sumRowFee(scope.row);
- }
- "
- />
+ <el-input v-model="scope.row.hotelexpense" placeholder="浣忓璐�" @blur="val => {
+ sumRowFee(scope.row);
+ }
+ " />
</template>
</el-table-column>
@@ -552,118 +322,52 @@
/>
</template>
</el-table-column> -->
- <el-table-column
- prop="foodallowance"
- label="浼欓琛ュ姪"
- align="center"
- width="120"
- >
+ <el-table-column prop="foodallowance" label="浼欓琛ュ姪" align="center" width="120">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.foodallowance"
- placeholder="浼欓璐硅ˉ鍔�"
- @blur="
- val => {
- sumRowFee(scope.row);
- }
- "
- />
+ <el-input v-model="scope.row.foodallowance" placeholder="浼欓璐硅ˉ鍔�" @blur="val => {
+ sumRowFee(scope.row);
+ }
+ " />
</template>
</el-table-column>
- <el-table-column
- prop="otherexpense"
- label="鍏潅璐硅ˉ鍔�"
- align="center"
- width="120"
- >
+ <el-table-column prop="otherexpense" label="鍏潅璐硅ˉ鍔�" align="center" width="120">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.otherexpense"
- placeholder="鏉傝垂"
- @blur="
- val => {
- sumRowFee(scope.row);
- }
- "
- />
+ <el-input v-model="scope.row.otherexpense" placeholder="鏉傝垂" @blur="val => {
+ sumRowFee(scope.row);
+ }
+ " />
</template>
</el-table-column>
- <el-table-column
- prop="otherfeeamount"
- label="鍏朵粬璐圭敤"
- align="center"
- width="120"
- >
+ <el-table-column prop="otherfeeamount" label="鍏朵粬璐圭敤" align="center" width="120">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.otherfeeamount"
- placeholder="鍏朵粬璐圭敤"
- @blur="
- val => {
- sumRowFee(scope.row);
- }
- "
- />
+ <el-input v-model="scope.row.otherfeeamount" placeholder="鍏朵粬璐圭敤" @blur="val => {
+ sumRowFee(scope.row);
+ }
+ " />
</template>
</el-table-column>
- <el-table-column
- prop="departure"
- slot=""
- label="鍏朵粬璐圭敤璇存槑"
- align="center"
- width="120"
- >
+ <el-table-column prop="departure" slot="" label="鍏朵粬璐圭敤璇存槑" align="center" width="120">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.otherfeedesc"
- placeholder="鍏朵粬璐圭敤璇存槑"
- />
+ <el-input v-model="scope.row.otherfeedesc" placeholder="鍏朵粬璐圭敤璇存槑" />
</template>
</el-table-column>
- <el-table-column
- prop="total"
- label="鍚堣"
- align="center"
- width="110"
- fixed="right"
- >
+ <el-table-column prop="total" label="鍚堣" align="center" width="110" fixed="right">
<template slot-scope="scope">
<el-input v-model="scope.row.total" placeholder="鍚堣" />
</template>
</el-table-column>
- <el-table-column
- fixed="right"
- label="鎿嶄綔"
- align="center"
- width="120"
- >
+ <el-table-column fixed="right" label="鎿嶄綔" align="center" width="120">
<template slot-scope="scope">
- <el-button
- type="text"
- size="mini"
- @click="addDetailRow(scope.$index)"
- v-if="operationType == 'edit'"
- >鏂板</el-button
- >
- <el-button
- @click.native.prevent="
- deleteDetailRow(scope.$index, rbDetails, scope.row)
- "
- type="text"
- size="small"
- v-if="operationType == 'edit'"
- >鍒犻櫎</el-button
- >
- <el-button
- @click.native.prevent="
- Filepopup(scope.$index, rbDetails, scope.row)
- "
- type="text"
- size="small"
- >绁ㄦ嵁</el-button
- >
+ <el-button type="text" size="mini" @click="addDetailRow(scope.$index)"
+ v-if="operationType == 'edit'">鏂板</el-button>
+ <el-button @click.native.prevent="
+ deleteDetailRow(scope.$index, rbDetails, scope.row)
+ " type="text" size="small" v-if="operationType == 'edit'">鍒犻櫎</el-button>
+ <el-button @click.native.prevent="
+ Filepopup(scope.$index, rbDetails, scope.row)
+ " type="text" size="small">绁ㄦ嵁</el-button>
</template>
</el-table-column>
</el-table>
@@ -672,154 +376,61 @@
<el-col :span="20">鎵撴鏄庣粏</el-col>
</el-row>
<el-row style="margin-top: 5px">
- <el-table
- :data="rbPayees"
- border
- max-height="400"
- highlight-current-row
- :summary-method="getSummaries"
- show-summary
- >
- <el-table-column
- prop="orderno"
- slot=""
- label="搴忓彿"
- align="center"
- fixed
- width="65"
- >
+ <el-table :data="rbPayees" border max-height="400" highlight-current-row :summary-method="getSummaries"
+ show-summary>
+ <el-table-column prop="orderno" slot="" label="搴忓彿" align="center" fixed width="65">
<template slot-scope="scope">
<el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
</template>
</el-table-column>
<!--涓婚敭銆佸閿笉灞曠ず-->
- <el-table-column
- prop="id"
- slot=""
- label="涓婚敭"
- align="center"
- fixed
- width="95"
- v-if="false"
- >
+ <el-table-column prop="id" slot="" label="涓婚敭" align="center" fixed width="95" v-if="false">
<template slot-scope="scope">
<el-input v-model="scope.row.id" placeholder="id" />
</template>
</el-table-column>
- <el-table-column
- prop="rbid"
- slot=""
- label="澶栭敭"
- align="center"
- fixed
- width="95"
- v-if="false"
- >
+ <el-table-column prop="rbid" slot="" label="澶栭敭" align="center" fixed width="95" v-if="false">
<template slot-scope="scope">
<el-input v-model="scope.row.rbid" placeholder="rbid" />
</template>
</el-table-column>
- <el-table-column
- prop="persontype"
- slot=""
- label="浜哄憳绫诲埆"
- align="center"
- fixed
- width="130"
- >
+ <el-table-column prop="persontype" slot="" label="鏀舵浜虹被鍒�" align="center" fixed width="150">
<template slot-scope="scope">
- <el-select
- v-model="scope.row.persontype"
- value-key="value"
- placeholder="浜哄憳绫诲埆"
- @change="getPersons(scope.row)"
- >
- <el-option
- v-for="dict in dict.type.sys_travelexpensebelong"
- :key="dict.value"
- :label="dict.label"
- :value="dict.label"
- ></el-option>
+ <el-select v-model="scope.row.persontype" value-key="value" placeholder="鏀舵浜虹被鍒�"
+ @change="getPersons(scope.row)">
+ <el-option v-for="dict in dict.type.sys_travelexpensebelong" :key="dict.value" :label="dict.label"
+ :value="dict.label"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="personname"
- slot=""
- label="鏀舵浜�"
- align="center"
- fixed
- width="110"
- >
+ <el-table-column prop="personname" slot="" label="鏀舵浜�" align="center" fixed width="200">
<template slot-scope="scope">
- <el-select
- v-model="scope.row.personname"
- clearable
- filterable
- allow-create
- ref="getReportname"
- default-first-option
- placeholder="璇烽�夋嫨"
- @change="getAccountinfo2(scope.row, scope.row.persontype)"
- >
- <el-option
- v-for="item in personsSel"
- :key="item.reportNo"
- :label="item.reportName"
- :value="item.reportName"
- >
+ <el-select v-model="scope.row.personname" clearable filterable allow-create ref="getReportname"
+ default-first-option placeholder="璇烽�夋嫨" @change="getAccountinfo2(scope.row, scope.row.persontype)">
+ <el-option v-for="item in personsSel" :key="item.reportNo" :label="item.reportName"
+ :value="item.reportName">
</el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="bankname"
- slot=""
- label="閾惰鍚嶇О"
- align="center"
- fixed
- width="200"
- >
+ <el-table-column prop="bankname" slot="" label="鏀舵閾惰" align="center" fixed width="250">
<template slot-scope="scope">
- <el-input v-model="scope.row.bankname" placeholder="閾惰鍚嶇О" />
+ <el-input v-model="scope.row.bankname" placeholder="鏀舵閾惰" />
</template>
</el-table-column>
- <el-table-column
- prop="bankcardno"
- slot=""
- label="閾惰鍗″彿"
- align="center"
- fixed
- width="200"
- >
+ <el-table-column prop="bankcardno" slot="" label="閾惰璐﹀彿" align="center" fixed width="200">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.bankcardno"
- placeholder="閾惰鍗″彿"
- />
+ <el-input v-model="scope.row.bankcardno" placeholder="閾惰璐﹀彿" />
</template>
</el-table-column>
- <el-table-column
- prop="amount"
- slot=""
- label="鎵撴閲戦"
- align="center"
- fixed
- width="130"
- >
+ <el-table-column prop="amount" slot="" label="鎵撴閲戦" align="center" fixed width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.amount" placeholder="鎵撴閲戦" />
</template>
</el-table-column>
- <el-table-column
- prop="remark"
- slot=""
- label="璇锋璇存槑"
- align="center"
- fixed
- >
+ <el-table-column prop="remark" slot="" label="璇锋璇存槑" align="center" fixed>
<template slot-scope="scope">
<el-input v-model="scope.row.remark" placeholder="璇存槑" />
</template>
@@ -832,74 +443,36 @@
</el-date-picker>
</template>
</el-table-column>-->
- <el-table-column
- label="鎿嶄綔"
- align="center"
- width="100"
- v-if="operationType == 'edit'"
- >
+ <el-table-column label="鎿嶄綔" align="center" width="100" v-if="operationType == 'edit'">
<template slot-scope="scope">
- <el-button
- type="text"
- size="mini"
- @click="addPayeeRow(scope.$index)"
- >鏂板</el-button
- >
- <el-button
- @click.native.prevent="
- deletePayeeRow(scope.$index, rbPayees, scope.row)
- "
- type="text"
- size="small"
- >
+ <el-button type="text" size="mini" @click="addPayeeRow(scope.$index)">鏂板</el-button>
+ <el-button @click.native.prevent="
+ deletePayeeRow(scope.$index, rbPayees, scope.row)
+ " type="text" size="small">
鍒犻櫎
</el-button>
</template>
</el-table-column>
</el-table>
</el-row>
- <el-row
- style="margin-top: 25px; margin-bottom: 5px"
- v-if="operationType != 'edit'"
- >
+ <el-row style="margin-top: 25px; margin-bottom: 5px" v-if="operationType != 'edit'">
<el-col :span="20">瀹℃牳璁板綍</el-col>
</el-row>
<el-row v-if="operationType != 'add'">
<el-table :data="fundflowList" border>
- <el-table-column
- label="瀹℃牳鏃ユ湡"
- align="center"
- width="200"
- prop="createTime"
- />
- <el-table-column
- label="瀹℃牳浜�"
- align="center"
- width="150"
- prop="checkusername"
- />
- <el-table-column
- label="瀹℃牳缁撴灉"
- align="center"
- width="200"
- prop="flowconclusion"
- >
+ <el-table-column label="瀹℃牳鏃ユ湡" align="center" width="200" prop="createTime" />
+ <el-table-column label="瀹℃牳浜�" align="center" width="150" prop="checkusername" />
+ <el-table-column label="瀹℃牳缁撴灉" align="center" width="200" prop="flowconclusion">
<template slot-scope="scope">
<span v-if="scope.row.flowconclusion == 1">閫氳繃</span>
<span v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span>
</template>
</el-table-column>
- <el-table-column
- label="瀹℃牳澶囨敞"
- align="center"
- prop="flowcontent"
- />
+ <el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" />
</el-table>
</el-row>
- <el-row
- style="margin-top: 25px; margin-bottom: 5px"
- v-if="operationType == 'check' && userprofile.nickName == '闄堟厱鍗�'"
- >
+ <el-row style="margin-top: 25px; margin-bottom: 5px"
+ v-if="operationType == 'check' && userprofile.nickName == '闄堟厱鍗�'">
<el-col :span="12">
<el-form-item label="鐢宠鏉愭枡鐘舵��" prop="infoid">
<el-radio-group v-model="form.checkstatus" align="left">
@@ -911,10 +484,7 @@
</el-col>
</el-row>
- <el-row
- style="margin-top: 25px; margin-bottom: 5px"
- v-if="operationType == 'check'"
- >
+ <el-row style="margin-top: 25px; margin-bottom: 5px" v-if="operationType == 'check'">
<el-col :span="7">
<el-form-item label="瀹℃牳缁撴灉" align="left">
<el-radio-group v-model="checkObj.flowlevelone" align="left">
@@ -933,30 +503,15 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button
- type="primary"
- @click="submitForm"
- v-if="operationType == 'edit' || userprofile.nickName == '闄堟厱鍗�'"
- >淇� 瀛�</el-button
- >
- <el-button
- type="primary"
- @click="checksubmit"
- v-if="operationType == 'check'"
- >鎻愪氦瀹℃牳</el-button
- >
+ <el-button type="primary" @click="submitForm" v-if="operationType == 'edit' || userprofile.nickName == '闄堟厱鍗�'">淇�
+ 瀛�</el-button>
+ <el-button type="primary" @click="checksubmit" v-if="operationType == 'check'">鎻愪氦瀹℃牳</el-button>
<!--<el-button @click="cancel">閫� 鍑�</el-button>-->
</div>
</div>
- <el-dialog
- v-dialogDrags
- :modal="false"
- :close-on-click-modal="false"
- :title="pdftitle"
- :visible.sync="pdfVisible"
- width="60%"
- >
+ <el-dialog v-dialogDrags :modal="false" :close-on-click-modal="false" :title="pdftitle" :visible.sync="pdfVisible"
+ width="60%">
<div>
<el-table :data="tableDatatop" style="width: 100%">
<el-table-column prop="orderno" label="搴忓彿"> </el-table-column>
@@ -986,59 +541,24 @@
</el-table-column>
</el-table>
</div>
- <el-tabs
- style="margin-top: 20px;"
- v-model="activeName"
- type="border-card"
- @tab-click="handleClick"
- >
+ <el-tabs style="margin-top: 20px;" v-model="activeName" type="border-card" @tab-click="handleClick">
<el-tab-pane label="鏅�氶檮浠�" :name="1">
<div class="pdfimg">
<div class="box-pdf">
<div>
- <el-upload
- size="mini"
- class="upload-demo"
- :action="uploadFileUrl"
- :file-list="fileListto"
- :show-file-list="false"
- multiple
- drag
- :headers="headers"
- :on-success="
- (response, file, fileList) =>
+ <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileListto"
+ :show-file-list="false" multiple drag :headers="headers" :on-success="(response, file, fileList) =>
uploadSccess(response, file, fileList)
- "
- :on-preview="downFile"
- :disabled="operationType == 'detail'"
- :on-error="handleUploadError"
- :on-remove="remove"
- accept="image/*,.pdf"
- >
+ " :on-preview="downFile" :disabled="operationType == 'detail'" :on-error="handleUploadError"
+ :on-remove="remove" accept="image/*,.pdf">
<i class="el-icon-upload"></i>
<div class="el-upload__text">
灏嗙エ鎹嫋鍒版澶勶紝鎴�
- <em
- ><el-button
- :disabled="operationType == 'detail'"
- size="small"
- type="primary"
- >鐐瑰嚮涓婁紶</el-button
- ></em
- >
+ <em><el-button :disabled="operationType == 'detail'" size="small" type="primary">鐐瑰嚮涓婁紶</el-button></em>
</div>
</el-upload>
- <el-table
- :data="fileListto"
- @row-click="downFile"
- style="width: 100%"
- height="400"
- >
- <el-table-column
- prop="name"
- :show-overflow-tooltip="true"
- label="鍚嶇О"
- >
+ <el-table :data="fileListto" @row-click="downFile" style="width: 100%" height="400">
+ <el-table-column prop="name" :show-overflow-tooltip="true" label="鍚嶇О">
<template slot-scope="scope">
<i style="color:#409EFF" class=" el-icon-s-order" />{{
scope.row.name
@@ -1046,41 +566,21 @@
</template>
</el-table-column>
- <el-table-column
- prop="name"
- width="180"
- :show-overflow-tooltip="true"
- label="鍔熻兘"
- >
+ <el-table-column prop="name" width="180" :show-overflow-tooltip="true" label="鍔熻兘">
<template slot-scope="scope">
- <el-button
- type="primary"
- size="mini"
- @click.native.prevent.stop="deletedowfile(scope.row)"
- >鍒犻櫎</el-button
- >
- <el-button
- type="primary"
- size="mini"
- @click.native.prevent.stop="moveupdowfile(scope.row)"
- >涓婄Щ</el-button
- >
+ <el-button type="primary" size="mini"
+ @click.native.prevent.stop="deletedowfile(scope.row)">鍒犻櫎</el-button>
+ <el-button type="primary" size="mini"
+ @click.native.prevent.stop="moveupdowfile(scope.row)">涓婄Щ</el-button>
</template>
</el-table-column>
</el-table>
</div>
</div>
- <div
- v-if="this.previewpdf && pdfimgsrcList.length"
- class="pdfimgmin"
- >
+ <div v-if="this.previewpdf && pdfimgsrcList.length" class="pdfimgmin">
<!-- <img :src="pdfimg" /> -->
- <el-image
- style="width: 95%; height: 90%"
- :src="pdfimg"
- :preview-src-list="pdfimgsrcList"
- >
+ <el-image style="width: 95%; height: 90%" :src="pdfimg" :preview-src-list="pdfimgsrcList">
<!-- <div slot="error" class="image-slot">
<i class="el-icon-picture-outline"></i>
</div> -->
@@ -1093,49 +593,19 @@
<div class="pdfimg">
<div class="box-pdf">
<div>
- <el-upload
- size="mini"
- class="upload-demo"
- :action="uploadFileUrl"
- :file-list="invoicefileList"
- :show-file-list="false"
- multiple
- drag
- :headers="headers"
- :on-success="
- (response, file, fileList) =>
+ <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="invoicefileList"
+ :show-file-list="false" multiple drag :headers="headers" :on-success="(response, file, fileList) =>
uploadSccess(response, file, fileList)
- "
- :on-preview="downFile"
- :disabled="operationType == 'detail'"
- :on-error="handleUploadError"
- :on-remove="remove"
- accept="image/*,.pdf"
- >
+ " :on-preview="downFile" :disabled="operationType == 'detail'" :on-error="handleUploadError"
+ :on-remove="remove" accept="image/*,.pdf">
<i class="el-icon-upload"></i>
<div class="el-upload__text">
灏嗗彂绁ㄦ枃浠舵嫋鍒版澶勶紝鎴�
- <em
- ><el-button
- :disabled="operationType == 'detail'"
- size="small"
- type="primary"
- >鐐瑰嚮涓婁紶</el-button
- ></em
- >
+ <em><el-button :disabled="operationType == 'detail'" size="small" type="primary">鐐瑰嚮涓婁紶</el-button></em>
</div>
</el-upload>
- <el-table
- :data="invoicefileListto"
- @row-click="downFile"
- style="width: 100%"
- height="400"
- >
- <el-table-column
- prop="name"
- :show-overflow-tooltip="true"
- label="鍚嶇О"
- >
+ <el-table :data="invoicefileListto" @row-click="downFile" style="width: 100%" height="400">
+ <el-table-column prop="name" :show-overflow-tooltip="true" label="鍚嶇О">
<template slot-scope="scope">
<i style="color:#409EFF" class=" el-icon-s-order" />{{
scope.row.name
@@ -1143,60 +613,36 @@
</template>
</el-table-column>
- <el-table-column
- prop="name"
- width="180"
- :show-overflow-tooltip="true"
- label="鍔熻兘"
- >
+ <el-table-column prop="name" width="180" :show-overflow-tooltip="true" label="鍔熻兘">
<template slot-scope="scope">
- <el-button
- type="primary"
- size="mini"
- @click.native.prevent.stop="deletedowfile(scope.row)"
- >鍒犻櫎</el-button
- >
- <el-button
- type="primary"
- size="mini"
- @click.native.prevent.stop="moveupdowfile(scope.row)"
- >涓婄Щ</el-button
- >
+ <el-button type="primary" size="mini"
+ @click.native.prevent.stop="deletedowfile(scope.row)">鍒犻櫎</el-button>
+ <el-button type="primary" size="mini"
+ @click.native.prevent.stop="moveupdowfile(scope.row)">涓婄Щ</el-button>
</template>
</el-table-column>
</el-table>
</div>
</div>
- <div
- v-if="this.previewpdf && invoicepdfimgsrcList.length"
- class="pdfimgmin"
- >
+ <div v-if="this.previewpdf && invoicepdfimgsrcList.length" class="pdfimgmin">
<!-- <img :src="pdfimg" /> -->
- <el-image
- style="width: 95%; height: 90%"
- :src="invoicepdfimg"
- :preview-src-list="invoicepdfimgsrcList"
- >
+ <el-image style="width: 95%; height: 90%" :src="invoicepdfimg" :preview-src-list="invoicepdfimgsrcList">
<!-- <div slot="error" class="image-slot">
<i class="el-icon-picture-outline"></i>
</div> -->
</el-image>
</div>
<div v-else class="pdfimgmins">{{ hintitle }}</div>
- </div></el-tab-pane
- >
+ </div>
+ </el-tab-pane>
</el-tabs>
</el-dialog>
<el-dialog title="鎻愮ず" :visible.sync="Savereminder" width="30%">
- <el-alert
- :title="
- '鎮ㄥ凡娣诲姞' +
- totalquantity +
- '鏉℃暟鎹紝涓洪槻姝㈡暟鎹涪澶辨槸鍚︽彁浜や繚瀛樺啀缁х画娣诲姞銆�'
- "
- type="warning"
- >
+ <el-alert :title="'鎮ㄥ凡娣诲姞' +
+ totalquantity +
+ '鏉℃暟鎹紝涓洪槻姝㈡暟鎹涪澶辨槸鍚︽彁浜や繚瀛樺啀缁х画娣诲姞銆�'
+ " type="warning">
</el-alert>
<span slot="footer" class="dialog-footer">
<el-button @click="unsave">鍙� 娑�</el-button>
@@ -1359,7 +805,7 @@
reimbursementList: [],
// 琛ㄥ崟鏍￠獙
- rules: {
+ rules: {
reason: [
{ required: true, message: "璇疯緭鍏ュ嚭宸簨鐢�", trigger: "blur" }
],
@@ -1501,7 +947,7 @@
if (
(JSON.stringify(this.form) == sessionStorage.getItem("apiform") &&
JSON.stringify(this.rbDetails) ==
- sessionStorage.getItem("apifunddetail")) ||
+ sessionStorage.getItem("apifunddetail")) ||
!sessionStorage.getItem("apifunddetail")
) {
} else {
@@ -1514,7 +960,7 @@
}
},
- handleUploadError() {},
+ handleUploadError() { },
// 鑾峰彇璇锋眰澶�
Getnetworkheader() {
console.log(window.location.href);
@@ -1834,7 +1280,7 @@
row.days = (
Math.floor(
Math.abs(Date.parse(row.starttime) - Date.parse(row.endtime)) /
- (1000 * 3600 * 24)
+ (1000 * 3600 * 24)
) + 1
).toString();
} else {
@@ -2159,13 +1605,13 @@
this.fileListto = this.form.annexfiles
? this.form.annexfiles
- .split(",")
- .map(item => ({ url: item, name: item }))
+ .split(",")
+ .map(item => ({ url: item, name: item }))
: [];
this.invoicefileListto = this.form.invoicefilesList
? this.form.invoicefilesList
- .split(",")
- .map(item => ({ url: item, name: item }))
+ .split(",")
+ .map(item => ({ url: item, name: item }))
: [];
this.form.recordstatus = response.data.recordstatus + "";
sessionStorage.removeItem("apiform");
@@ -2224,13 +1670,13 @@
//绁ㄦ嵁
this.fileListto = this.form.annexfiles
? this.form.annexfiles
- .split(",")
- .map(item => ({ url: item, name: item }))
+ .split(",")
+ .map(item => ({ url: item, name: item }))
: [];
this.invoicefileListto = this.form.invoicefilesList
? this.form.invoicefilesList
- .split(",")
- .map(item => ({ url: item, name: item }))
+ .split(",")
+ .map(item => ({ url: item, name: item }))
: [];
//瀹℃牳鐘舵��
this.form.recordstatus = response.data.recordstatus + "";
@@ -2282,13 +1728,13 @@
//绁ㄦ嵁
this.fileListto = this.form.annexfiles
? this.form.annexfiles
- .split(",")
- .map(item => ({ url: item, name: item }))
+ .split(",")
+ .map(item => ({ url: item, name: item }))
: [];
this.invoicefileListto = this.form.invoicefilesList
? this.form.invoicefilesList
- .split(",")
- .map(item => ({ url: item, name: item }))
+ .split(",")
+ .map(item => ({ url: item, name: item }))
: [];
//瀹℃牳鐘舵��
@@ -2365,9 +1811,10 @@
},
/** 鎻愪氦淇濆瓨鎸夐挳 */
- submitForm: debounce(function(data) {
+ submitForm: debounce(function (data) {
this.$refs["form"].validate(valid => {
if (valid) {
+
//绁ㄦ嵁鏂囦欢澶勭悊
const addnumber = this.rbPayees.reduce(
(amount, item) => amount + Number(item.amount),
@@ -2421,6 +1868,21 @@
this.$router.go(-1);
} else {
this.form.recordstatus = -1;
+ // 鐢宠鏃堕棿
+ var currenttime = new Date();
+ this.form.applyTime =
+ currenttime.getFullYear() +
+ "-" +
+ (currenttime.getMonth() + 1) +
+ "-" +
+ currenttime.getDate() +
+ " " +
+ currenttime.getHours() +
+ ":" +
+ currenttime.getMinutes() +
+ ":" +
+ currenttime.getSeconds();
+
addReimbursement(this.form)
.then(response => {
//淇濆瓨鏄庣粏
@@ -2462,7 +1924,7 @@
const ids = row.id || this.ids;
this.$modal
.confirm("鏄惁纭鍒犻櫎璇ユ潯璁板綍锛�")
- .then(function() {
+ .then(function () {
// 鍒犻櫎details鍐呯殑鏁版嵁
return delReimbursement(ids);
})
@@ -2471,7 +1933,7 @@
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => {});
+ .catch(() => { });
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
@@ -2487,7 +1949,7 @@
this.$download.name(response.msg);
this.exportLoading = false;
})
- .catch(() => {});
+ .catch(() => { });
},
// 鍙栨秷鎻愰啋
unsave() {
@@ -2877,7 +2339,7 @@
this.form.amountrequested = allSum.toFixed(2);
this.form.bigstrmoney = this.convertCurrency(this.form.amountrequested);
- } catch {}
+ } catch { }
},
//閲戦鏁板瓧杞崲鎴愬ぇ鍐�
@@ -3105,6 +2567,7 @@
line-height: 36px;
text-align: center;
}
+
::v-deep .el-alert__title {
font-size: 20px;
line-height: 20px;
diff --git a/src/views/project/travelexpensecheck/index.vue b/src/views/project/travelexpensecheck/index.vue
index a88d203..9fce196 100644
--- a/src/views/project/travelexpensecheck/index.vue
+++ b/src/views/project/travelexpensecheck/index.vue
@@ -15,7 +15,7 @@
</el-form-item>
</el-col>-->
<el-col :span="8">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
+ <el-form-item label="鐢宠鏃ユ湡" prop="applyTime">
<el-date-picker
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
@@ -157,10 +157,10 @@
label="鐢宠鏃ユ湡"
width="120"
align="center"
- prop="createTime"
+ prop="applyTime"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+ <span>{{ parseTime(scope.row.applyTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
@@ -306,10 +306,10 @@
<el-form ref="form" :model="form" label-width="120px">
<el-row>
<el-col :span="5">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
+ <el-form-item label="鐢宠鏃ユ湡" prop="applyTime">
<el-date-picker
style="width: 100%"
- v-model="form.createTime"
+ v-model="form.applyTime"
:disabled="true"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
@@ -1369,7 +1369,7 @@
},
standardlevel: 0,
- createTime: [],
+ applyTime: [],
//寮圭獥璇︽儏--show锛沞dit
dialogType: "show"
};
@@ -1384,8 +1384,8 @@
},
methods: {
selectapplication() {
- this.queryParams.APPLICATIONBEGTIME = this.createTime[0];
- this.queryParams.APPLICATIONENDTIME = this.createTime[1];
+ this.queryParams.APPLICATIONBEGTIME = this.applyTime[0];
+ this.queryParams.APPLICATIONENDTIME = this.applyTime[1];
},
getList() {
this.loading = true;
diff --git a/src/views/project/travelexpensedeal/index.vue b/src/views/project/travelexpensedeal/index.vue
index 034c3bc..13bbf91 100644
--- a/src/views/project/travelexpensedeal/index.vue
+++ b/src/views/project/travelexpensedeal/index.vue
@@ -30,11 +30,11 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
+ <el-form-item label="鐢宠鏃ユ湡" prop="applyTime">
<el-date-picker
clearable
size="small"
- v-model="queryParams.createTime"
+ v-model="queryParams.applyTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="閫夋嫨鐢宠鏃ユ湡"
--
Gitblit v1.9.3