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/travelexpenseapply/travelexpensedetail/index.vue | 1318 +++++++++++++++++++++------------------------------------- 1 files changed, 483 insertions(+), 835 deletions(-) diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue index 214cc38..26df205 100644 --- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue +++ b/src/views/project/travelexpenseapply/travelexpensedetail/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-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-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> @@ -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,53 +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> - </el-form-item> - </el-col> - <el-col :span="5"> - <el-form-item label="棰勫鐘舵��" prop="infoid"> - <el-select - v-model="form.checkstatus" - filterable - placeholder="璇烽�夋嫨棰勫鐘舵��" - > - <el-option - v-for="item in baselisttages" - :key="item.id" - :label="item.name" - :value="item.id" - > - </el-option> + <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> @@ -228,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> @@ -568,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> @@ -688,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> @@ -848,74 +443,48 @@ </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'" - > + <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"> + <el-radio label="1">寰呯敵璇锋潗鏂�</el-radio> + <el-radio label="2">瀹℃牳閫氳繃绛夊緟閭瘎绾歌川鏉愭枡</el-radio> + <el-radio label="3">宸叉敹鍒版姤閿�鏉愭枡</el-radio> + </el-radio-group> + </el-form-item> + </el-col> + </el-row> + + <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"> @@ -934,30 +503,15 @@ </el-row> </el-form> <div slot="footer" class="dialog-footer"> - <el-button - type="primary" - @click="submitForm" - v-if="operationType == 'edit'||beforehandType=='1'" - >淇� 瀛�</el-button - > - <el-button - type="primary" - @click="checksubmit" - v-if="operationType == 'check'&& beforehandType!='1'" - >鎻� 浜�</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> @@ -987,108 +541,108 @@ </el-table-column> </el-table> </div> - <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) => - uploadSccess(response, file, fileList) - " - :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 - > + <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) => + uploadSccess(response, file, fileList) + " :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> + </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="鍚嶇О"> + <template slot-scope="scope"> + <i style="color:#409EFF" class=" el-icon-s-order" />{{ + scope.row.name + }} + </template> + </el-table-column> + + <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> + </template> + </el-table-column> + </el-table> </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="鍚嶇О" - > - <template slot-scope="scope"> - <i style="color:#409EFF" class=" el-icon-s-order" />{{ - scope.row.name - }} - </template> - </el-table-column> + </div> - <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 - > - </template> - </el-table-column> - </el-table> - </div> - </div> - - <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" - > - <!-- <div slot="error" class="image-slot"> + <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"> + <!-- <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-image> + </div> + <div v-else class="pdfimgmins">{{ hintitle }}</div> + </div> + </el-tab-pane> + <el-tab-pane label="鍙戠エ鏂囦欢" :name="2"> + <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) => + uploadSccess(response, file, fileList) + " :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> + </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="鍚嶇О"> + <template slot-scope="scope"> + <i style="color:#409EFF" class=" el-icon-s-order" />{{ + scope.row.name + }} + </template> + </el-table-column> + + <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> + </template> + </el-table-column> + </el-table> + </div> + </div> + + <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"> + <!-- <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> + </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> @@ -1170,6 +724,7 @@ personsList: [], //涓嬫媺鍙互閫夋嫨浜哄憳鍒楄〃 personsSel: [], + activeName: 1, //鏂囦欢绫诲瀷 // 閮ㄩ棬鏍戦�夐」 deptOptions: undefined, @@ -1243,15 +798,14 @@ queryParamsPayee: { rbid: null }, + // 褰撳墠鐢ㄦ埛淇℃伅 + userprofile: {}, // 琛ㄥ崟鍙傛暟 form: {}, reimbursementList: [], // 琛ㄥ崟鏍¢獙 rules: { - createTime: [ - { required: true, message: "璇疯緭鍏ュ~鎶ユ棩鏈�", trigger: "blur" } - ], reason: [ { required: true, message: "璇疯緭鍏ュ嚭宸簨鐢�", trigger: "blur" } ], @@ -1273,16 +827,16 @@ baselisttages: [ { id: 1, - name: "寰呴瀹�" + name: "寰呯敵璇锋潗鏂�" }, { id: 2, - name: "棰勫閫氳繃绛夊緟鏉愭枡" + name: "瀹℃牳閫氳繃绛夊緟閭瘎绾歌川鏉愭枡" }, { id: 3, name: "宸叉敹鍒版姤閿�鏉愭枡" - }, + } ], baselist: [], donatorList: [], @@ -1297,11 +851,15 @@ //鏂囦欢鍒楄〃 fileList: [], fileListto: [], + invoicefileList: [], + invoicefileListto: [], + invoicepdfimg: "", + invoicepdfimgsrcList: [], + invoDatatop: [], //浜哄憳绫诲埆 persontype: null, //鍒拌揪鍦� arriveAddr: null, - beforehandType:null, headers: { Authorization: "Bearer " + getToken() }, @@ -1330,6 +888,7 @@ //鑾峰彇鐧诲綍鑰呬俊鎭� getUserProfile().then(response => { + this.userprofile = response.data; this.defaultperson = response.data; this.standardlevel = response.data.standardlevel; console.log("this.defaultperson", this.defaultperson); @@ -1363,7 +922,6 @@ let curId = this.$route.query.id; let pos = this.$route.query.pos; this.defaultperson = this.$route.query.routerparam; - this.beforehandType = this.$route.query.beforehandType; if (pos == 1) { this.handleAdd(curId); } else if (pos == 2) { @@ -1389,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 { @@ -1402,7 +960,7 @@ } }, - handleUploadError() {}, + handleUploadError() { }, // 鑾峰彇璇锋眰澶� Getnetworkheader() { console.log(window.location.href); @@ -1417,10 +975,23 @@ console.log(this.Networkheader); } }, + // 鍙戠エ鍒囨崲 + handleClick(tab, event) { + if (this.activeName == 1) { + this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�"; + } else { + this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤�"; + } + }, remove(file, fileList) { const rbDetails = [...this.rbDetails]; - this.fileListto.splice(this.fileListto.indexOf(file), 1); - rbDetails[this.atpresent].annexfilesList = this.fileListto; + if (this.activeName == 1) { + this.fileListto.splice(this.fileListto.indexOf(file), 1); + rbDetails[this.atpresent].annexfilesList = this.fileListto; + } else { + this.invoicefileListto.splice(this.invoicefileListto.indexOf(file), 1); + rbDetails[this.atpresent].invoicefilesList = this.invoicefileListto; + } }, handleExceed() { @@ -1431,31 +1002,56 @@ uploadSccess(response, file, fileList) { this.rbDetails; //鑾峰彇绁ㄦ嵁淇℃伅浣嶇疆 - if (response.code == 200) { - this.form.filename = file.raw.name; - this.previewpdf = true; - this.$modal.msgSuccess(response.msg); - this.fileListto.push({ - name: file.name, - url: response.fileName - }); - this.pdfimgsrcList.push( - this.Networkheader + "/prod-api" + response.fileName - ); - console.log(this.pdfimgsrcList); - this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�"; - this.pdfimg = this.Networkheader + "/prod-api" + response.fileName; - this.rbDetails[this.atpresent].annexfilesList = this.fileListto; + if (this.activeName == 1) { + if (response.code == 200) { + // this.form.filename = file.raw.name; + this.previewpdf = true; + this.$modal.msgSuccess(response.msg); + this.fileListto.push({ + name: file.name, + url: response.fileName + }); + this.pdfimgsrcList.push( + this.Networkheader + "/prod-api" + response.fileName + ); + console.log(this.pdfimgsrcList); + this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�"; + this.pdfimg = this.Networkheader + "/prod-api" + response.fileName; + this.rbDetails[this.atpresent].annexfilesList = this.fileListto; + } else { + console.log(response.msg); + } } else { - console.log(response.msg); + if (response.code == 200) { + // this.form.filename = file.raw.name; + this.previewpdf = true; + this.$modal.msgSuccess(response.msg); + this.invoicefileListto.push({ + name: file.name, + url: response.fileName + }); + this.invoicepdfimgsrcList.push( + this.Networkheader + "/prod-api" + response.fileName + ); + console.log(this.invoicepdfimgsrcList); + this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤�"; + this.pdfimg = this.Networkheader + "/prod-api" + response.fileName; + this.rbDetails[ + this.atpresent + ].invoicefilesList = this.invoicefileListto; + } else { + console.log(response.msg); + } } }, // 鐐瑰嚮绁ㄦ嵁 Filepopup(index, rows, row) { this.tableDatatop = []; this.pdfimgsrcList = []; + this.invoDatatop = []; + this.invoicepdfimgsrcList = []; + this.invoDatatop.push(row); this.tableDatatop.push(row); - // console.log(row); this.atpresent = index; this.pdfVisible = true; console.log(this.rbDetails[index]); @@ -1467,44 +1063,85 @@ this.fileListto.forEach(item => { this.pdfimgsrcList.push(this.Networkheader + "/prod-api" + item.url); }); - console.log(this.pdfimgsrcList); - console.log(this.pdfimg); - this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�"; } else { this.fileListto = []; this.pdfimg = ""; this.pdftitle = ""; } + // -鍙戠エ鏂囦欢 + if (this.rbDetails[index].invoicefilesList) { + this.previewpdf = true; + this.invoicefileListto = this.rbDetails[index].invoicefilesList; + console.log(this.invoicefileListto); + this.invoicepdfimg = + this.Networkheader + "/prod-api" + this.invoicefileListto[0].url; + this.invoicefileListto.forEach(item => { + this.invoicepdfimgsrcList.push( + this.Networkheader + "/prod-api" + item.url + ); + }); + console.log(this.invoicepdfimgsrcList); + console.log(this.invoicepdfimg); + } else { + this.invoicefileListto = []; + this.invoicepdfimg = ""; + this.pdftitle = ""; + } + + if (this.activeName == 1) { + this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�"; + } else { + this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤�"; + } }, // 鐐瑰嚮宸蹭笂浼犳枃浠� downFile(item) { - console.log(item, "鐐瑰嚮鏂囦欢鎷縤tem"); - this.pdftitle = - "鍏�" + this.pdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name; - let name = item.name.split("."); - if (name[1] == "pdf") { - this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮"); - this.previewpdf = false; - this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮"; - } else if (name[1] == "jpg" || "png") { - this.previewpdf = true; - if (item.url) { - this.pdfimg = this.Networkheader + "/prod-api" + item.url; - - // if (!this.pdfimgsrcList.includes(this.pdfimg)) { - // this.pdfimgsrcList.push(this.pdfimg); - // console.log("鍔犲叆"); - // } - console.log(this.pdfimg, "pdfimg"); - console.log(this.pdfimgsrcList, "imglist"); + if (this.activeName == 1) { + console.log(item, "鐐瑰嚮鏂囦欢鎷縤tem"); + this.pdftitle = + "鍏�" + this.pdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name; + let name = item.name.split("."); + if (name[1] == "pdf") { + this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮"); + this.previewpdf = false; + this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮"; + } else if (name[1] == "jpg" || "png") { + this.previewpdf = true; + if (item.url) { + this.pdfimg = this.Networkheader + "/prod-api" + item.url; + } else { + this.pdfimg = this.Networkheader + "/prod-api" + item.response.url; + } } else { - this.pdfimg = this.Networkheader + "/prod-api" + item.response.url; + this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮"; + this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮"); + this.previewpdf = false; } } else { - this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮"; - this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮"); - this.previewpdf = false; + console.log(item, "鐐瑰嚮鏂囦欢鎷縤tem"); + this.pdftitle = + "鍏�" + this.invoicepdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name; + let name = item.name.split("."); + if (name[1] == "pdf") { + this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮"); + this.previewpdf = false; + this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮"; + } else if (name[1] == "jpg" || "png") { + this.previewpdf = true; + if (item.url) { + this.invoicepdfimg = this.Networkheader + "/prod-api" + item.url; + console.log(this.invoicepdfimg, "pdfimg"); + console.log(this.invoicepdfimgsrcList, "imglist"); + } else { + this.invoicepdfimg = + this.Networkheader + "/prod-api" + item.response.url; + } + } else { + this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮"; + this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮"); + this.previewpdf = false; + } } }, getIndexInArray(arr, obj) { @@ -1512,24 +1149,35 @@ }, // 鐐瑰嚮鍒犻櫎 deletedowfile(row) { - console.log(this.fileListto); - console.log(row); - const indexlist = this.getIndexInArray( - this.pdfimgsrcList, - this.Networkheader + "/prod-api" + row.url - ); - console.log(indexlist); - this.pdfimgsrcList.splice(indexlist, 1); - const index = this.getIndexInArray(this.fileListto, row); - this.fileListto.splice(index, 1); - console.log(index); - console.log(this.pdfimgsrcList); + if (this.activeName == 1) { + const indexlist = this.getIndexInArray( + this.pdfimgsrcList, + this.Networkheader + "/prod-api" + row.url + ); + this.pdfimgsrcList.splice(indexlist, 1); + const index = this.getIndexInArray(this.fileListto, row); + this.fileListto.splice(index, 1); + } else { + const indexlist = this.getIndexInArray( + this.invoicepdfimgsrcList, + this.Networkheader + "/prod-api" + row.url + ); + this.invoicepdfimgsrcList.splice(indexlist, 1); + const index = this.getIndexInArray(this.invoicefileListto, row); + this.invoicefileListto.splice(index, 1); + } }, // 鐐瑰嚮涓婄Щ moveupdowfile(row) { - const index = this.getIndexInArray(this.fileListto, row); - const item = this.fileListto.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓� - this.fileListto.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣� + if (this.activeName == 1) { + const index = this.getIndexInArray(this.fileListto, row); + const item = this.fileListto.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓� + this.fileListto.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣� + } else { + const index = this.getIndexInArray(this.invoicefileListto, row); + const item = this.invoicefileListto.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓� + this.invoicefileListto.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣� + } }, /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */ @@ -1632,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 { @@ -1957,8 +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 })) : []; this.form.recordstatus = response.data.recordstatus + ""; sessionStorage.removeItem("apiform"); @@ -2009,20 +1662,22 @@ this.operationType = "detail"; this.title = "鎶ラ攢鐢宠璇︽儏"; this.jurisdiction = true; - this.reset(); this.open = true; const id = ids || this.ids; - 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.invoicefileListto = this.form.invoicefilesList + ? this.form.invoicefilesList + .split(",") + .map(item => ({ url: item, name: item })) + : []; //瀹℃牳鐘舵�� this.form.recordstatus = response.data.recordstatus + ""; let ids = response.data.id; @@ -2037,16 +1692,6 @@ //鎶ラ攢鏄庣粏 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++) { @@ -2083,8 +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 })) : []; //瀹℃牳鐘舵�� @@ -2103,16 +1753,6 @@ getReimbursementdetaillist(ids).then(res => { this.rbDetails = res.data; console.log(this.rbDetails); - /* - 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(); @@ -2136,6 +1776,14 @@ //鎻愪氦瀹℃牳鎰忚 checksubmit() { + if ( + this.form.checkstatus != 3 && + this.userprofile.nickName == "闄堟厱鍗�" && + this.checkObj.flowlevelone == 1 + ) { + this.$modal.msgError("璇烽�夌‘璁ゆ潗鏂欑姸鎬佸凡鏀跺埌锛�"); + return; + } let checkfundobj = { flowconclusion: this.checkObj.flowlevelone, flowcontent: this.checkObj.flowconclusion, @@ -2150,10 +1798,11 @@ this.$modal.msgError("璇烽�夋嫨瀹℃牳缁撹鍚庡啀鎻愪氦瀹℃壒缁撴灉!"); return; } - + if (this.userprofile.nickName == "闄堟厱鍗�") { + this.Savenow(); + console.log("淇濆瓨"); + } checkfund(checkfundobj).then(res => { - this.reset(); - this.open = false; this.$modal.msgSuccess("鎻愪氦瀹℃牳鎴愬姛!"); // 鍏抽棴绐楀彛 this.$store.dispatch("tagsView/delView", this.$route); @@ -2162,7 +1811,7 @@ }, /** 鎻愪氦淇濆瓨鎸夐挳 */ - submitForm: debounce(function(data) { + submitForm: debounce(function (data) { this.$refs["form"].validate(valid => { if (valid) { @@ -2171,8 +1820,6 @@ (amount, item) => amount + Number(item.amount), 0 ); - let list = this.fileListto; - console.log(list); //鏍¢獙璇锋閲戦鍚堣鏄惁绛変簬鎶ラ攢鍗曢噾棰� if (this.form.amountrequested != addnumber) { @@ -2187,7 +1834,7 @@ const rbDetails = [...this.rbDetails]; const rbPayees = [...this.rbPayees]; if (this.form.id != null) { - console.log(this.form); + console.log(this.form); updateReimbursement(this.form); // .then(res => { //淇濆瓨鏄庣粏 @@ -2211,21 +1858,31 @@ addReimbursementpayee(rbPayees[i]); } } - - this.$modal.msgSuccess("淇敼鎶ラ攢鍗曚繚瀛樻垚鍔�!"); + if (this.userprofile.nickName != "闄堟厱鍗�") { + this.$modal.msgSuccess("淇敼鎶ラ攢鍗曚繚瀛樻垚鍔燂紒"); + } this.open = false; // 鍏抽棴绐楀彛 this.$store.dispatch("tagsView/delView", this.$route); this.$router.go(-1); - - // this.getList(); - // }) - // .catch(err => { - // this.$modal.msgError("淇敼鎶ラ攢鍗曚繚瀛樺け璐ワ紒"); - // }); } 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 => { //淇濆瓨鏄庣粏 @@ -2255,7 +1912,7 @@ this.$router.go(-1); }) .catch(err => { - this.$modal.msgError("鏂板鎶ラ攢鍗曚繚瀛樺け璐ワ紒"); + this.$modal.msgError("鏂板鎶ラ攢鍗曚繚瀛樺け璐ワ紒" + res); }); } } @@ -2267,7 +1924,7 @@ const ids = row.id || this.ids; this.$modal .confirm("鏄惁纭鍒犻櫎璇ユ潯璁板綍锛�") - .then(function() { + .then(function () { // 鍒犻櫎details鍐呯殑鏁版嵁 return delReimbursement(ids); }) @@ -2276,7 +1933,7 @@ this.getList(); this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); }) - .catch(() => {}); + .catch(() => { }); }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ @@ -2292,7 +1949,7 @@ this.$download.name(response.msg); this.exportLoading = false; }) - .catch(() => {}); + .catch(() => { }); }, // 鍙栨秷鎻愰啋 unsave() { @@ -2312,9 +1969,6 @@ this.$refs["form"].validate(valid => { if (valid) { //绁ㄦ嵁鏂囦欢澶勭悊 - let list = this.fileListto; - console.log(list); - //鏍¢獙璇锋閲戦鍚堣鏄惁绛変簬鎶ラ攢鍗曢噾棰� if (this.form.amountrequested != addnumber) { this.$message({ @@ -2354,12 +2008,6 @@ } this.$modal.msgSuccess("淇敼鎶ラ攢鍗曚繚瀛樻垚鍔�!"); - - // this.getList(); - // }) - // .catch(err => { - // this.$modal.msgError("淇敼鎶ラ攢鍗曚繚瀛樺け璐ワ紒"); - // }); } else { this.form.recordstatus = -1; addReimbursement(this.form) @@ -2691,7 +2339,7 @@ this.form.amountrequested = allSum.toFixed(2); this.form.bigstrmoney = this.convertCurrency(this.form.amountrequested); - } catch {} + } catch { } }, //閲戦鏁板瓧杞崲鎴愬ぇ鍐� @@ -2808,8 +2456,7 @@ "departure", "destination", "traffictype", - "traffictype2", - "departure" + "traffictype2" ]; columns.forEach((column, index) => { if (index === 0) { @@ -2920,6 +2567,7 @@ line-height: 36px; text-align: center; } + ::v-deep .el-alert__title { font-size: 20px; line-height: 20px; -- Gitblit v1.9.3