From 681bd876235ddb2a73fc218c64d0cf174b38d666 Mon Sep 17 00:00:00 2001 From: yxh <172933527@qq.com> Date: 星期一, 31 七月 2023 13:24:45 +0800 Subject: [PATCH] yxh --- src/views/project/travelexpenseslist/Modifydetails/index.vue | 1100 ++++++++++++++++++++++----------------------------------- 1 files changed, 426 insertions(+), 674 deletions(-) diff --git a/src/views/project/travelexpenseslist/Modifydetails/index.vue b/src/views/project/travelexpenseslist/Modifydetails/index.vue index 10d6c0a..6555bac 100644 --- a/src/views/project/travelexpenseslist/Modifydetails/index.vue +++ b/src/views/project/travelexpenseslist/Modifydetails/index.vue @@ -3,36 +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-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="鐢宠鏃ユ湡" - > + <el-date-picker style="width: 100%" v-model="form.createTime" type="date" value-format="yyyy-MM-dd HH:mm:ss" + placeholder="鐢宠鏃ユ湡"> </el-date-picker> </el-form-item> </el-col> <el-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> @@ -57,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> @@ -77,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="10"> <el-form-item label="澶у啓閲戦" prop="bigstrmoney"> - <el-input - :disabled="true" - v-model="form.bigstrmoney" - placeholder="鎶ラ攢澶у啓閲戦" - /> - </el-form-item> </el-col - ><el-col :span="5"> + <el-input :disabled="true" v-model="form.bigstrmoney" placeholder="鎶ラ攢澶у啓閲戦" /> + </el-form-item> </el-col><el-col :span="5"> <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,264 +166,117 @@ <el-col :span="20">鎶ラ攢鏄庣粏褰曞叆锛�</el-col> </el-row> <el-row> - <el-table :data="rbDetails" border highlight-current-row show-summary> - <el-table-column - prop="orderno" - slot="" - label="搴忓彿" - align="center" - fixed - width="65" - > + <el-table :data="rbDetails" border 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="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="65" 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="80" - > + <el-table-column prop="trafficexpense" label="浜ら�氳垂" align="center" width="80"> <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> <!-- @@ -484,156 +291,67 @@ </template> </el-table-column> --> - <el-table-column - prop="hotelexpense" - label="浣忓璐�" - align="center" - width="80" - > + <el-table-column prop="hotelexpense" label="浣忓璐�" align="center" width="80"> <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> - <el-table-column - prop="foodexpenses" - label="椁愯垂鎶ラ攢" - align="center" - width="80" - > + <el-table-column prop="foodexpenses" label="椁愯垂鎶ラ攢" align="center" width="80"> <template slot-scope="scope"> - <el-input - v-model="scope.row.foodexpenses" - placeholder="浼欓璐规姤閿�" - @blur=" - val => { - sumRowFee(scope.row); - } - " - /> + <el-input v-model="scope.row.foodexpenses" placeholder="浼欓璐规姤閿�" @blur="val => { + sumRowFee(scope.row); + } + " /> </template> </el-table-column> - <el-table-column - prop="foodallowance" - label="浼欓琛ュ姪" - align="center" - width="80" - > + <el-table-column prop="foodallowance" label="浼欓琛ュ姪" align="center" width="80"> <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="80" - > + <el-table-column prop="otherexpense" label="鍏潅璐硅ˉ鍔�" align="center" width="80"> <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="90" - > + <el-table-column prop="otherfeeamount" label="鍏朵粬璐圭敤" align="center" width="90"> <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" - v-if="dialogType == 'edit'" - > + <el-table-column fixed="right" label="鎿嶄綔" align="center" width="120"> <template slot-scope="scope"> - <el-button - type="text" - size="mini" - @click="addDetailRow(scope.$index)" - >鏂板</el-button - > - <el-button - @click.native.prevent=" - deleteDetailRow(scope.$index, rbDetails, scope.row) - " - type="text" - size="small" - > - 鍒犻櫎 - </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="dialogType == 'edit'">鏂板</el-button> + <el-button @click.native.prevent="deleteDetailRow(scope.$index, rbDetails, scope.row)" type="text" + size="small" v-if="dialogType == '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> @@ -642,193 +360,78 @@ <el-col :span="20">鎶ラ攢璇锋鏄庣粏锛�</el-col> </el-row> <el-row style="margin-top: 30px"> - <el-table :data="rbPayees" border highlight-current-row show-summary> - <el-table-column - prop="orderno" - slot="" - label="搴忓彿" - align="center" - fixed - width="65" - > + <el-table :data="rbPayees" border 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="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 - 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="200"> <template slot-scope="scope"> <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 - width="280" - > + <el-table-column prop="remark" slot="" label="璇锋璇存槑" align="center" fixed> <template slot-scope="scope"> <el-input v-model="scope.row.remark" placeholder="璇存槑" /> - </template> </el-table-column - ><el-table-column - prop="paiddate" - slot="" - label="鎵撴鏃ユ湡" - fixed - align="center" - width="150" - > - <template slot-scope="scope"> - <el-date-picker - clearable - size="small" - style="width: 100%" - v-model="scope.row.paiddate" - type="date" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="鎵撴鏃ユ湡" - :disabled="true" - > - </el-date-picker> </template> </el-table-column> - <el-table-column - label="鎿嶄綔" - align="center" - width="100" - v-if="dialogType == 'edit'" - > + <!-- + <el-table-column prop="paiddate" slot="" label="鎵撴鏃ユ湡" fixed align="center" width="150"> <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-date-picker clearable size="small" style="width: 100%" v-model="scope.row.paiddate" type="date" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="鎵撴鏃ユ湡" :disabled="true"> + </el-date-picker> + </template> + </el-table-column>--> + <el-table-column label="鎿嶄綔" align="center" width="100" v-if="dialogType == '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> </template> @@ -836,48 +439,39 @@ </el-table> </el-row> - <el-row v-if="dialogType == 'detail'"> + <el-row v-if="dialogType == 'detail' || dialogType == 'check'"> <el-table :data="fundflowList" border> - <el-table-column - label="瀹℃牳浜�" - align="center" - width="120" - prop="checkusername" - /> - <el-table-column - label="瀹℃牳鏃ユ湡" - align="center" - width="160" - prop="createTime" - /> - <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 label="瀹℃牳浜�" align="center" width="120" prop="checkusername" /> + <el-table-column label="瀹℃牳鏃ユ湡" align="center" width="160" prop="createTime" /> + <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="dialogType == 'check'"> + <el-col :span="7"> + <el-form-item label="瀹℃牳缁撴灉" align="left"> + <el-radio-group v-model="checkObj.flowlevelone" align="left"> + <el-radio label="1">閫氳繃</el-radio> + <el-radio label="2">涓嶉�氳繃</el-radio> + </el-radio-group> + </el-form-item> + </el-col> + </el-row> + <el-row v-if="dialogType == 'check'"> + <el-col :span="17"> + <el-form-item label="瀹℃牳澶囨敞" align="left"> + <el-input v-model="checkObj.flowconclusion" placeholder="澶囨敞" /> + </el-form-item> + </el-col> </el-row> </el-form> <div slot="footer" class="dialog-footer"> - <el-button - type="primary" - @click="submitForm" - v-if="dialogType == 'edit'" - >淇� 瀛�</el-button - > - <el-button @click="cancel">鍙� 娑�</el-button> + <el-button type="primary" @click="submitForm" v-if="dialogType == 'edit'">淇� 瀛�</el-button> + <el-button type="primary" @click="checksubmit" v-if="dialogType == 'check'">鎻� 浜�</el-button> + <!--<el-button @click="cancel">閫� 鍑�</el-button>--> </div> </div> @@ -885,31 +479,12 @@ <div class="pdfimg"> <div class="box-pdf"> <div> - <el-upload - size="mini" - class="upload-demo" - :action="uploadFileUrl" - :file-list="fileListto" - multiple - :limit="20" - :headers="headers" - :on-success=" - (response, file, fileList) => - uploadSccess(response, file, fileList) - " - :on-preview="downFile" - :disabled="dialogType == 'detail'" - :on-error="handleUploadError" - :on-exceed="handleExceed" - :on-remove="remove" - accept="image/*,.pdf" - > - <el-button - :disabled="dialogType == 'detail'" - size="small" - type="primary" - >涓婁紶</el-button - > + <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileListto" multiple + :limit="20" :headers="headers" :on-success="(response, file, fileList) => + uploadSccess(response, file, fileList) + " :on-preview="downFile" :disabled="dialogType == 'detail'" :on-error="handleUploadError" + :on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf"> + <el-button :disabled="dialogType == 'detail'" size="small" type="primary">涓婁紶</el-button> </el-upload> </div> <!-- <div @@ -954,6 +529,7 @@ updateReimbursement, exportReimbursement, getdownload, + checkfund, fundSubmit } from "@/api/project/reimbursement"; import { @@ -1006,7 +582,9 @@ //涓嬫媺鍙互閫夋嫨浜哄憳鍒楄〃 personsSel: [], // 閮ㄩ棬鏍戦�夐」 + deptOptions: undefined, + //绁ㄦ嵁鏂囦欢 pdftitle: "", pdfimg: "", pdfVisible: false, @@ -1014,6 +592,7 @@ value: 0, label: "" }, + hintitle: "閫変腑宸︿晶宸蹭笂浼犳枃浠堕瑙堟煡鐪�", atpresent: "", iframeurl: "", @@ -1106,19 +685,36 @@ headers: { Authorization: "Bearer " + getToken() - } + }, + + //瀹℃壒淇℃伅 + checkObj: { + flowlevelone: null, + flowconclusion: null, + fundid: null, + }, + + //淇濆瓨鎸夐挳鎺у埗 + idisabled: false, + }; }, created() { //鑾峰彇璁板綍鍒楄〃 - this.getList(); - this.gainee(); + // this.getList(); + //鑾峰彇鎶ラ攢涓殑浜哄憳淇℃伅 this.getPersonList(); - }, - mounted() { + //鑾峰彇鐧诲綍鑰呬俊鎭� + getUserProfile().then(response => { + this.defaultperson = response.data; + this.standardlevel = response.data.standardlevel; + console.log("this.defaultperson", this.defaultperson); + + }); + //鑾峰彇鎹愮尞鑰呭鍚� listDonatebaseinfo().then(res => { let list = res.rows; @@ -1136,14 +732,31 @@ } }); - //鑾峰彇鐧诲綍鑰呬俊鎭� - this.getUsermsg(); //鑾峰彇閮ㄩ棬淇℃伅 //this.getTreeselect(); + + }, + + mounted() { + //閫夋嫨涓氬姟绫诲瀷:1銆佹柊澧烇紱2銆佷慨鏀癸紱3銆佹煡鐪� + let ids = this.$route.query.id; + let pos = this.$route.query.pos; + this.defaultperson = this.$route.query.routerparam; + if (pos == 1) { + this.handleAdd(ids); + } else if (pos == 2) { + this.handleUpdate(ids); + } + else if (pos == 3) { + this.handleDetail(ids); + } + else if (pos == 4) { + this.handleCheck(ids); + } }, methods: { - handleUploadError() {}, + handleUploadError() { }, remove(file, fileList) { const rbDetails = [...this.rbDetails]; @@ -1164,7 +777,7 @@ console.log(fileList); this.rbDetails; - //鑾峰彇闄勪欢淇℃伅浣嶇疆 + //鑾峰彇绁ㄦ嵁淇℃伅浣嶇疆 if (response.code == 200) { this.form.filename = file.raw.name; console.log(this.fileList); @@ -1177,7 +790,7 @@ this.$modal.msgError(response.msg); } }, - // 鐐瑰嚮鏂囦欢 + // 鐐瑰嚮绁ㄦ嵁 Filepopup(index, rows, row) { console.log(index, rows, row); this.atpresent = index; @@ -1213,14 +826,6 @@ this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮"); this.previewpdf = false; } - }, - - //鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅 - getUsermsg() { - getUserProfile().then(response => { - this.defaultperson = response.data; - this.standardlevel = response.data.standardlevel; - }); }, /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */ @@ -1320,7 +925,7 @@ row.days = ( Math.floor( Math.abs(Date.parse(row.starttime) - Date.parse(row.endtime)) / - (1000 * 3600 * 24) + (1000 * 3600 * 24) ) + 1 ).toString(); } else { @@ -1329,34 +934,36 @@ //璁$畻琛ュ姪 this.getallowance(row); + }, //璁$畻琛ュ姪 getallowance(row) { - console.log("ro", row); - //鍏潅璐硅ˉ鍔╋細鏉窞妗愬簮锛屽缓寰凤紝娣冲畨60锛屾澀宸炲叾浠栧湴鍖�0锛岄潪鏉窞鍦板尯80 - if (row.destination != "") { - var tempStr = row.destination; + if (row.persontype == "涓撹亴浜哄憳" || row.persontype == "鍗忚皟鍛�" || row.persontype == "绠$悊浜哄憳") { + //鍏潅璐硅ˉ鍔╋細鏉窞妗愬簮锛屽缓寰凤紝娣冲畨60锛屾澀宸炲叾浠栧湴鍖�0锛岄潪鏉窞鍦板尯80 + if (row.destination != "") { + var tempStr = row.destination; - //楠岃瘉鍩庡競 - if (tempStr == "鏉窞") { - row.otherexpense = ""; - } else if ( - tempStr == "鏉窞-妗愬簮" || - tempStr == "鏉窞-寤哄痉" || - tempStr == "鏉窞-娣冲畨" - ) { - row.otherexpense = (parseInt(row.days) * 60).toString(); - } else { - row.otherexpense = (parseInt(row.days) * 80).toString(); + //楠岃瘉鍩庡競 + if (tempStr == "鏉窞") { + row.otherexpense = ""; + } else if ( + tempStr == "鏉窞-妗愬簮" || + tempStr == "鏉窞-寤哄痉" || + tempStr == "鏉窞-娣冲畨" + ) { + row.otherexpense = (parseInt(row.days) * 60).toString(); + } else { + row.otherexpense = (parseInt(row.days) * 80).toString(); + } } + + //浼欓璐硅ˉ鍔╋細鍩庡競锛堣タ钘忥紝鏂扮枂锛岄潚娴�.120锛夛紙鍏朵粬100锛� + row.foodallowance = (parseInt(row.days) * 100).toString(); + + //璁$畻鍚堣 + this.sumRowFee(row); } - - //浼欓璐硅ˉ鍔╋細鍩庡競锛堣タ钘忥紝鏂扮枂锛岄潚娴�.120锛夛紙鍏朵粬100锛� - row.foodallowance = (parseInt(row.days) * 100).toString(); - - //璁$畻鍚堣 - this.sumRowFee(row); }, getStandard(row) { @@ -1501,10 +1108,12 @@ this.loading = false; }); }, + // 鍙栨秷鎸夐挳 cancel() { - this.open = false; + window.close(); }, + // 琛ㄥ崟閲嶇疆 reset() { this.fileListto = []; @@ -1556,6 +1165,7 @@ this.rbPayees = []; this.resetForm("form"); }, + // handup(e) { console.log("涓婃姤", e); @@ -1573,7 +1183,7 @@ // this.queryParams.paprovincecode= this.$refs["residenceSelect" ].getSheng(); // this.queryParams.patowncode= this.$refs["residenceSelect" ].getQu(); this.queryParams.pageNum = 1; - this.getList(); + // this.getList(); }, /** 閲嶇疆鎸夐挳鎿嶄綔 */ @@ -1591,11 +1201,12 @@ /** 鏂板鎸夐挳鎿嶄綔 */ handleAdd() { this.reset(); - - this.open = true; - this.title = "鏂板鎶ラ攢鐢宠"; + // this.open = true; + this.title = "鏂板宸梾鐢宠鍗�"; this.dialogType = "edit"; this.fundflowList = []; + + console.log(this.title, this.defaultperson); this.form.userno = this.defaultperson.userName; this.form.username = this.defaultperson.nickName; @@ -1606,23 +1217,14 @@ this.addDetailRow(0); this.addPayeeRow(0); }, - gainee() { - let ids = this.$route.query.id; - let pos = this.$route.query.pos; - console.log(ids, pos); - if (pos == 2) { - this.handleDetail(ids); - } else if (pos == 1) { - this.handleUpdate(ids); - } - }, /** 淇敼鎸夐挳鎿嶄綔 */ handleUpdate(ids) { - this.$router.push({ - path: "/finance/travelexpenseslist/Modifydetails/", - query: { id: ids } - }); + // this.$router.push({ + // path: "/finance/travelexpenseslist/Modifydetails/", + // query: { id: ids } + // }); + this.dialogType = "edit"; this.reset(); // this.open = true; @@ -1634,8 +1236,8 @@ this.form = response.data; this.fileListto = this.form.annexfiles ? this.form.annexfiles - .split(",") - .map(item => ({ url: item, name: item })) + .split(",") + .map(item => ({ url: item, name: item })) : []; this.form.recordstatus = response.data.recordstatus + ""; @@ -1643,11 +1245,12 @@ //鑾峰彇鎶ラ攢鏄庣粏淇℃伅 getReimbursementdetaillist(ids).then(res => { this.rbDetails = res.data; - console.log(this.rbDetails); if (this.rbDetails.length == 0) { this.addDetailRow(0); } + //瀹炴椂鍚堣閲戦 + //this.sumTotalFee(); for (let i = 0; i < this.rbDetails.length; i++) { this.sumRowFee(this.rbDetails[i]); //瑙f瀽鍑哄樊鍦板潃 @@ -1659,9 +1262,6 @@ qu: this.rbDetails[i].traveltownname, }; */ } - - //瀹炴椂鍚堣閲戦 - //this.sumTotalFee(); }); //鑾峰彇鎶ラ攢鎵撴淇℃伅 @@ -1686,11 +1286,72 @@ getReimbursement(id).then(response => { this.form = response.data; - //闄勪欢 + //绁ㄦ嵁 this.fileListto = this.form.annexfiles ? this.form.annexfiles - .split(",") - .map(item => ({ url: item, name: item })) + .split(",") + .map(item => ({ url: item, name: item })) + : []; + + //瀹℃牳鐘舵�� + this.form.recordstatus = response.data.recordstatus + ""; + let ids = response.data.id; + let listFundflowparams = { + fundid: ids, + fundtype: 1 + }; + listFundflow(listFundflowparams).then(res => { + this.fundflowList = res.rows; + }); + + //鎶ラ攢鏄庣粏 + getReimbursementdetaillist(ids).then(res => { + this.rbDetails = res.data; + /* + for (let i = 0; i < this.rbDetails.length; i++) { + this.rbDetails[i].index = i; + this.rbDetails[i].searchAddress = { + sheng: this.rbDetails[i].travelprovincename, + shi: this.rbDetails[i].travelcityname, + qu: this.rbDetails[i].traveltownname, + }; + } + */ + //鍚堣璐圭敤 + // if (this.rbDetails.length > 0) this.sumTotalFee(); + for (let i = 0; i < this.rbDetails.length; i++) { + this.sumRowFee(this.rbDetails[i]); + } + }); + + //浠樻淇℃伅 + this.queryParamsPayee.rbid = ids; + listReimbursementpayee(this.queryParamsPayee).then(res => { + this.rbPayees = res.rows; + if (this.rbPayees.length == 0) { + this.addPayeeRow(0); + } + }); + }); + }, + + /** 瀹℃牳鎸夐挳鎿嶄綔 */ + handleCheck(ids) { + this.dialogType = "check"; + this.title = "鎶ラ攢鐢宠璇︽儏"; + + this.reset(); + this.open = true; + const id = ids || this.ids; + this.checkObj.fundid = id; + + getReimbursement(id).then(response => { + this.form = response.data; + //绁ㄦ嵁 + this.fileListto = this.form.annexfiles + ? this.form.annexfiles + .split(",") + .map(item => ({ url: item, name: item })) : []; //瀹℃牳鐘舵�� @@ -1718,9 +1379,13 @@ }; } */ - }); - if (this.rbDetails.length > 0) this.sumTotalFee(); + //鍚堣璐圭敤 + // if (this.rbDetails.length > 0) this.sumTotalFee(); + for (let i = 0; i < this.rbDetails.length; i++) { + this.sumRowFee(this.rbDetails[i]); + } + }); //浠樻淇℃伅 this.queryParamsPayee.rbid = ids; @@ -1733,10 +1398,36 @@ }); }, + //鎻愪氦瀹℃牳鎰忚 + checksubmit() { + let checkfundobj = { + flowconclusion: this.checkObj.flowlevelone, + flowcontent: this.checkObj.flowconclusion, + fundid: this.checkObj.fundid, + }; + + if ( + checkfundobj.flowconclusion == null || + checkfundobj.flowconclusion == undefined || + checkfundobj.flowconclusion == "" + ) { + this.$modal.msgError("璇烽�夋嫨瀹℃牳缁撹鍚庡啀鎻愪氦瀹℃壒缁撴灉!"); + return; + } + + checkfund(checkfundobj).then((res) => { + this.reset(); + this.open = false; + this.getList(); + this.$modal.msgSuccess("鎻愪氦瀹℃牳鎴愬姛!"); + }); + }, + /** 鎻愪氦淇濆瓨鎸夐挳 */ submitForm() { this.$refs["form"].validate(valid => { if (valid) { + // idisabled=true; /** let indexErrTime = this.rbDetails.findIndex((item) => { if (item.endtime && item.starttime) { @@ -1793,7 +1484,7 @@ } */ - //闄勪欢鏂囦欢澶勭悊 + //绁ㄦ嵁鏂囦欢澶勭悊 let list = this.fileListto; console.log(list); @@ -1845,7 +1536,10 @@ this.$modal.msgSuccess("淇敼鎶ラ攢鍗曚繚瀛樻垚鍔�!"); this.open = false; - this.getList(); + + // 鍏抽棴绐楀彛 + this.$router.go(-1); + // this.getList(); // }) // .catch(err => { // this.$modal.msgError("淇敼鎶ラ攢鍗曚繚瀛樺け璐ワ紒"); @@ -1870,12 +1564,17 @@ this.$modal.msgSuccess("鏂板鎶ラ攢鍗曚繚瀛樻垚鍔�!"); this.open = false; - this.getList(); + // this.getList(); + // 鍏抽棴绐楀彛 + this.$router.go(-1); + }) .catch(err => { this.$modal.msgError("鏂板鎶ラ攢鍗曚繚瀛樺け璐ワ紒"); }); } + + } }); }, @@ -1885,7 +1584,7 @@ const ids = row.id || this.ids; this.$modal .confirm("鏄惁纭鍒犻櫎璇ユ潯璁板綍锛�") - .then(function() { + .then(function () { // 鍒犻櫎details鍐呯殑鏁版嵁 return delReimbursement(ids); }) @@ -1894,7 +1593,7 @@ this.getList(); this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); }) - .catch(() => {}); + .catch(() => { }); }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ @@ -1910,7 +1609,7 @@ this.$download.name(response.msg); this.exportLoading = false; }) - .catch(() => {}); + .catch(() => { }); }, //鏂板涓�琛� @@ -2193,7 +1892,7 @@ this.form.amountrequested = allSum.toFixed(2); this.form.bigstrmoney = this.convertCurrency(this.form.amountrequested); - } catch {} + } catch { } }, //閲戦鏁板瓧杞崲鎴愬ぇ鍐� @@ -2294,18 +1993,53 @@ chineseStr += cnInteger; } return chineseStr; - } + }, + + //琛ㄦ牸鍚堣 + getSummaries(param) { + const { columns, data } = param; + const sums = []; + var columnnames = ["bankname", "bankcardno", "remark", "personname", "starttime", "endtime", "departure", "destination", "traffictype", "traffictype2", "departure"]; + columns.forEach((column, index) => { + if (index === 0) { + sums[index] = '鍚堣'; + return; + } + //鍘婚櫎閮ㄥ垎瀛楁璁$畻 + if (columnnames.indexOf(column.property) > -1) { return; } + + const values = data.map(item => Number(item[column.property])); + if (!values.every(value => isNaN(value))) { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr); + if (!isNaN(value)) { + return prev + curr; + } else { + return prev; + } + }, 0); + sums[index] += ''; + } else { + sums[index] = ''; + } + }); + return sums; + }, + } }; + </script> <style lang="scss" scoped> .Modifydetailscla { padding: 10px; + .boxdiv { font-size: 18px; padding: 0 30px; padding-bottom: 60px; + .top-text { text-align: center; @@ -2314,19 +2048,23 @@ margin: 20px 0; margin-bottom: 50px; } + .dialog-footer { text-align: left; margin-top: 10px; } } } + .upload-demo { text-align: center; } + .pdfimg { display: flex; // text-align: center; width: 100%; height: 600px; + .box-pdf { width: 200px; padding-top: 20px; @@ -2334,25 +2072,39 @@ border: 1px solid #dcdfe6; -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12), 0 0 6px 0 rgba(0, 0, 0, 0.04); + box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.1); // <- Add this to fix. } + .pdftit { width: 200px; padding: 20px; font-size: 18px; } + .pdftit:hover { background: #c0cef7; } + .pdfimgmin { width: 60%; + img { width: 100%; } } + .pdfimgmins { font-size: 28px; width: 60%; text-align: center; } + + +} + +::v-deep .el-input--medium .el-input__inner { + height: 36px; + line-height: 36px; + text-align: center; } </style> -- Gitblit v1.9.3