From 69505a69fbfa11384a480487a937369e58de2de2 Mon Sep 17 00:00:00 2001 From: yxh <172933527@qq.com> Date: 星期二, 12 九月 2023 18:04:45 +0800 Subject: [PATCH] 修改了伦理审批列表 --- src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue | 515 +++++++++++---------------------------------------------- 1 files changed, 99 insertions(+), 416 deletions(-) diff --git a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue index c4c5187..68b57da 100644 --- a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue +++ b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue @@ -1,94 +1,44 @@ <template> <div class="app-container"> - <el-form - :model="queryParams" - ref="queryForm" - :inline="true" - v-show="showSearch" - label-width="120px" - > - <el-row align="left"> + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px"> + <el-row> <el-col :span="8"> <el-form-item label="鐢宠鏃ユ湡" prop="createTime"> - <el-date-picker - format="yyyy-MM-dd" - @change="selectapplication" - value-format="yyyy-MM-dd" - v-model="createTime" - type="daterange" - range-separator="鑷�" - start-placeholder="鐢宠寮�濮嬫棩鏈�" - end-placeholder="鐢宠缁撴潫鏃ユ湡" - @keyup.enter.native="handleQuery" - > + <el-date-picker format="yyyy-MM-dd" @change="selectapplication" value-format="yyyy-MM-dd" v-model="createTime" + type="daterange" range-separator="鑷�" start-placeholder="鐢宠寮�濮嬫棩鏈�" end-placeholder="鐢宠缁撴潫鏃ユ湡" + @keyup.enter.native="flowconclusion"> </el-date-picker> </el-form-item> </el-col> <el-col :span="5"> - <el-form-item label="鐢宠浜�" prop="APPLICANT" style="float: left"> - <el-input - v-model="queryParams.APPLICANT" - placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕" - clearable - size="small" - @keyup.enter.native="handleQuery" - /> + <el-form-item label="閲戦" prop="money" style="float: left"> + <el-input v-model="queryParams.money" placeholder="璇疯緭鍏ョ敵璇蜂汉閲戦" clearable size="small" + @keyup.enter.native="flowconclusion" /> </el-form-item> </el-col> <el-col :span="5"> - <el-form-item label="閲戦" prop="money" style="float: left"> - <el-input - v-model="queryParams.money" - placeholder="璇疯緭鍏ョ敵璇蜂汉閲戦" - clearable - size="small" - @keyup.enter.native="handleQuery" - /> + <el-form-item label="缁忓姙浜�" prop="APPLICANT" style="float: left"> + <el-input v-model="queryParams.APPLICANT" placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕" clearable size="small" + @keyup.enter.native="flowconclusion" /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="瀹℃壒鐘舵��" prop="CHECKFLAG" style="float: left"> - <el-select - v-model="queryParams.CHECKFLAG" - placeholder="璇烽�夋嫨" - style="width: 100%" - > - <el-option - v-for="item in checkFlagOptions" - :key="item.value" - :label="item.label" - :value="item.value" - > + <el-select v-model="queryParams.CHECKFLAG" placeholder="璇烽�夋嫨" style="width: 100%"> + <el-option v-for="item in checkFlagOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select> </el-form-item> </el-col> - </el-row> - <el-row> - <el-col :span="3"> - <div style="margin-bottom: 15px;"> - <el-button - type="primary" - icon="el-icon-search" - size="mini" - @click="handleQuery" - >鎼滅储</el-button - > - <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" - >閲嶇疆</el-button - > - </div> - </el-col> + <!-- <el-col :span="6"> + <el-button type="primary" icon="el-icon-search" size="mini" @click="flowconclusion">鎼滅储</el-button> + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button> + </el-col> --> </el-row> </el-form> <el-form ref="infoform" label-width="100px"> <el-row> - <el-table - v-loading="loading" - border - :data="donateconsolationfundList" - @selection-change="handleSelectionChange" - > + <el-table v-loading="loading" border :data="donateconsolationfundList" @selection-change="handleSelectionChange"> <!-- <el-table-column label="瀹℃壒鐘舵��" width="120" align="center" prop="checkFlag"> <template slot-scope="scope"> @@ -98,143 +48,60 @@ </template> </el-table-column> --> - <el-table-column - label="鐢宠鏃ユ湡" - width="120" - align="center" - prop="createTime" - > + <el-table-column label="鐢宠鏃ユ湡" width="120" align="center" prop="createTime"> <template slot-scope="scope"> <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span> </template> </el-table-column> - <el-table-column - label="缁忓姙浜�" - align="center" - prop="username" - width="150px" - /> - <el-table-column - label="鐢宠閲戦" - align="center" - prop="pretaxcost" - width="200px" - /> - <el-table-column - label="鎵�灞炵粍鍒�" - align="center" - prop="deptmentname" - width="200px" - /> - <el-table-column - label="缁勯暱" - align="center" - prop="managername" - width="150px" - /> + <el-table-column label="缁忓姙浜�" align="center" prop="username" width="150px" /> + <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="200px" /> + <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="200px" /> + <el-table-column label="缁勯暱" align="center" prop="managername" width="150px" /> <!-- <el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="230px" /> --> <!-- <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="160" /> --> <!-- <el-table-column label="绋庡悗閲戦" align="center" prop="taxedcost" width="120px" /> <el-table-column label="鐢宠閲戦" align="center" prop="amountrequested" width="120px" /> <el-table-column label="棰勬敮璐圭敤" align="center" prop="prepaidamount" width="120px" /> --> - <el-table-column - label="瀹℃牳鐘舵��" - align="center" - prop="recordstatus" - width="200" - > + <el-table-column label="瀹℃牳鐘舵��" align="center" prop="recordstatus" width="200"> <template slot-scope="scope"> - <dict-tag - :options="dict.type.sys_recordstatus" - :value="scope.row.recordstatus" - /> + <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" /> </template> </el-table-column> - <el-table-column - label="鎹愮尞鑰�" - align="center" - prop="donorname" - width="120px" - /> + <el-table-column label="鎹愮尞鑰�" align="center" prop="donorname" width="120px" /> <el-table-column label="澶囨敞" align="center" prop="remark" /> <!--<el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" /> <el-table-column label="璐㈠姟瀹℃牳" align="center" prop="financechecher" width="140" />--> - <el-table-column - label="鎿嶄綔" - fixed="right" - align="center" - class-name="small-padding fixed-width" - width="260px" - > + <el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width" width="160px"> <template slot-scope="scope"> - <el-button - v-if="scope.row.checkFlag == 1" - size="mini" - type="text" - icon="el-icon-edit" - @click="handleCheck(scope.row)" - >瀹℃牳</el-button - > - <el-button - size="mini" - type="text" - icon="el-icon-edit" - v-if="scope.row.checkFlag == 0" - @click="handleDetail(scope.row)" - >璇︽儏</el-button - > + <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 0" + @click="handleDetail(scope.row)">璇︽儏</el-button> + <el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit" + @click="handleCheck(scope.row)">瀹℃牳</el-button> <!-- v-hasPermi="['project:donateconsolationfund:edit']" --> - <el-button - size="mini" - type="text" - icon="el-icon-download" - @click="totaldayin(scope.row.id)" - v-hasPermi="['project:donateconsolationfund:download']" - >涓嬭浇</el-button - > + <el-button size="mini" type="text" icon="el-icon-download" @click="dayin(scope.row.id)">涓嬭浇</el-button> </template> </el-table-column> </el-table> - <pagination - v-show="total > 0" - :total="total" - :page.sync="queryParams.pageNum" - :limit.sync="queryParams.pageSize" - @pagination="getlistbypower" - /> + <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" + @pagination="getlistbypower" /> </el-row> </el-form> <!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇峰崟 --> - <el-dialog - :visible.sync="dialogOpen" - width="1600px" - :title="title" - style="text-align: center" - > + <el-dialog :visible.sync="dialogOpen" width="1600px" :title="title" style="text-align: center"> <el-form ref="form" :model="form" label-width="120px" :rules="rules"> <!-- <el-form ref="applyForm" :model="applicationForm" label-width="120px"> --> <el-row> <el-col :span="8"> <el-form-item label="鎹愮尞缂栧彿" prop="donorno"> - <el-input - disabled - v-model="form.donorno" - placeholder="璇疯緭鍏ユ崘鐚紪鍙�" - clearable - /> + <el-input disabled v-model="form.donorno" placeholder="璇疯緭鍏ユ崘鐚紪鍙�" clearable /> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="鎹愮尞鑰�" prop="name"> - <el-input - disabled - v-model="form.name" - placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" - clearable - /> + <el-input disabled v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable /> </el-form-item> </el-col> </el-row> @@ -246,41 +113,23 @@ placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕" clearable /> --> - <el-select - v-model="form.username" - placeholder="鐢宠浜哄鍚�" - clearable - filterable - allow-create - style="width: 100%" - > - <el-option - v-for="dict in userlist" - :key="dict.index" - :label="dict.nickname" - :value="dict.nickname" - ></el-option> + <el-select v-model="form.username" placeholder="鐢宠浜哄鍚�" clearable filterable allow-create + style="width: 100%"> + <el-option v-for="dict in userlist" :key="dict.index" :label="dict.nickname" + :value="dict.nickname"></el-option> </el-select> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="鑱旂郴鐢佃瘽" prop="phone"> - <el-input - v-model="form.phone" - placeholder="璇疯緭鍏ョ敵璇疯�呯殑鑱旂郴鏂瑰紡" - clearable - /> + <el-input v-model="form.phone" placeholder="璇疯緭鍏ョ敵璇疯�呯殑鑱旂郴鏂瑰紡" clearable /> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="宸ヤ綔鍗曚綅" prop="unitno"> - <org-selecter - ref="orgSelecter" - :org-type="'3'" - v-model="form.unitno" - /> + <org-selecter ref="orgSelecter" :org-type="'3'" v-model="form.unitno" /> </el-form-item> </el-col> </el-row> @@ -288,72 +137,31 @@ <el-row style="text-align: left"> <el-form-item label="鐢宠绫诲瀷"> <el-radio-group v-model="form.applytype" @change="LoadItemTypeArr"> - <el-radio v-model="form.applytype" label="2" - >浼︾悊瀹℃煡涓撳璐圭敵璇�</el-radio - > + <el-radio v-model="form.applytype" label="2">浼︾悊瀹℃煡涓撳璐圭敵璇�</el-radio> </el-radio-group> </el-form-item> </el-row> <el-row style="margin-top: 5px; margin-bottom: 5px"> - <el-table - :data="fundDetailArr" - :summary-method="getSummaries" - border - highlight-current-row - v-loading="loading" - > - <el-table-column - prop="orderno" - align="center" - label="鎺掑簭" - width="80" - > + <el-table :data="fundDetailArr" :summary-method="getSummaries" border highlight-current-row v-loading="loading"> + <el-table-column prop="orderno" align="center" label="鎺掑簭" width="80"> <template slot-scope="scope"> <el-input v-model="scope.row.orderno" placeholder="鎺掑簭" /> </template> </el-table-column> - <el-table-column - prop="applytype" - align="center" - label="璐圭敤绫诲瀷" - width="220" - > + <el-table-column prop="applytype" align="center" label="璐圭敤绫诲瀷" width="220"> <template slot-scope="scope"> - <el-select - v-model="scope.row.applytype" - placeholder="璐圭敤绫诲瀷" - @change="LoadItemTypeArr(scope.row)" - > - <el-option - v-for="dict in fundtypeArr" - :key="dict.index" - :label="dict.label" - :value="dict.value" - ></el-option> + <el-select v-model="scope.row.applytype" placeholder="璐圭敤绫诲瀷" @change="LoadItemTypeArr(scope.row)"> + <el-option v-for="dict in fundtypeArr" :key="dict.index" :label="dict.label" + :value="dict.value"></el-option> </el-select> </template> </el-table-column> - <el-table-column - prop="itemtype" - align="center" - label="鏈嶅姟椤圭洰" - width="200" - > + <el-table-column prop="itemtype" align="center" label="鏈嶅姟椤圭洰" width="200"> <template slot-scope="scope"> - <el-select - v-model="scope.row.itemid" - placeholder="鏈嶅姟椤圭洰" - clearable - filterable - allow-create - > - <el-option - v-for="dict in scope.row.itemArr" - :key="dict.index" - :label="dict.itemName" - :value="dict.id" - ></el-option> + <el-select v-model="scope.row.itemid" placeholder="鏈嶅姟椤圭洰" clearable filterable allow-create> + <el-option v-for="dict in scope.row.itemArr" :key="dict.index" :label="dict.itemName" + :value="dict.id"></el-option> <!-- <el-option v-for="dict in itemArr" :key="dict.index" @@ -364,48 +172,21 @@ </template> </el-table-column> - <el-table-column - prop="beneficiaryname" - align="center" - label="濮撳悕" - width="120" - > + <el-table-column prop="beneficiaryname" align="center" label="濮撳悕" width="120"> <template slot-scope="scope"> - <el-select - filterable - allow-create - ref="getReportname" - default-first-option - @change="selectpersonmsg(scope.row)" - v-model="scope.row.beneficiaryname" - placeholder="璇烽�夋嫨" - > - <el-option - v-for="item in arrr3" - :key="item.reportNo" - :label="item.reportName" - :value="item.reportName" - > + <el-select filterable allow-create ref="getReportname" default-first-option + @change="selectpersonmsg(scope.row)" v-model="scope.row.beneficiaryname" placeholder="璇烽�夋嫨"> + <el-option v-for="item in arrr3" :key="item.reportNo" :label="item.reportName" :value="item.reportName"> </el-option> </el-select> </template> </el-table-column> - <el-table-column - prop="amount" - align="center" - label="绋庡墠閲戦" - width="150" - > + <el-table-column prop="amount" align="center" label="绋庡墠閲戦" width="150"> <template slot-scope="scope"> - <el-input - v-model="scope.row.amount" - @blur=" - val => { - sumTotalFee(); - } - " - placeholder="绋庡墠閲戦" - /> + <el-input v-model="scope.row.amount" @blur="val => { + sumTotalFee(); + } + " placeholder="绋庡墠閲戦" /> </template> </el-table-column> <!-- <el-table-column @@ -418,111 +199,49 @@ <el-input v-model="scope.row.taxamount" placeholder="鎵g◣" /> </template> </el-table-column> --> - <el-table-column - prop="taxedamount" - align="center" - label="绋庡悗閲戦" - width="150" - > + <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="150"> <template slot-scope="scope"> - <el-input - v-model="scope.row.taxedamount" - placeholder="绋庡悗閲戦" - @blur=" - val => { - sumTotalFee(); - } - " - /> + <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" @blur="val => { + sumTotalFee(); + } + " /> </template> </el-table-column> - <el-table-column - prop="unitno" - align="center" - label="鍗曚綅" - width="180" - > + <el-table-column prop="unitno" align="center" label="鍗曚綅" width="180"> <template slot-scope="scope"> - <org-selecter - :ref="'unitSel' + scope.$index" - :org-type="'3'" - v-model="scope.row.unitno" - /> + <org-selecter :ref="'unitSel' + scope.$index" :org-type="'3'" v-model="scope.row.unitno" /> </template> </el-table-column> - <el-table-column - prop="title" - align="center" - label="鑱岀О" - width="180" - > + <el-table-column prop="title" align="center" label="鑱岀О" width="180"> <template slot-scope="scope"> <el-input v-model="scope.row.title" placeholder="鑱岀О" /> </template> </el-table-column> - <el-table-column - prop="idcardno" - align="center" - label="韬唤璇佸彿" - width="200" - > + <el-table-column prop="idcardno" align="center" label="韬唤璇佸彿" width="200"> <template slot-scope="scope"> <el-input v-model="scope.row.idcardno" placeholder="韬唤璇佸彿" /> </template> </el-table-column> - <el-table-column - prop="depositbank" - align="center" - label="寮�鎴烽摱琛�" - width="200" - > + <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�" width="200"> <template slot-scope="scope"> - <el-input - v-model="scope.row.depositbank" - placeholder="寮�鎴烽摱琛�" - /> + <el-input v-model="scope.row.depositbank" placeholder="寮�鎴烽摱琛�" /> </template> </el-table-column> - <el-table-column - prop="bankcardno" - align="center" - label="閾惰鍗″彿" - width="210" - > + <el-table-column prop="bankcardno" align="center" label="閾惰鍗″彿" width="210"> <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 - fixed="right" - align="center" - label="鎿嶄綔" - width="120" - > + <el-table-column fixed="right" align="center" label="鎿嶄綔" width="120"> <template slot-scope="scope"> - <el-button type="text" size="mini" @click="addRow" - >鏂板</el-button - > - <el-button - @click="saveRows(scope.row, scope.$index)" - type="text" - size="small" - v-if="show === 1" - > + <el-button type="text" size="mini" @click="addRow">鏂板</el-button> + <el-button @click="saveRows(scope.row, scope.$index)" type="text" size="small" v-if="show === 1"> 淇濆瓨 </el-button> - <el-button - @click.native.prevent=" - deleteRows(scope.row, scope.$index, fundDetailArr) - " - type="text" - size="small" - v-hasPermi="['project:ethicFeeCheck:delete']" - > + <el-button @click.native.prevent=" + deleteRows(scope.row, scope.$index, fundDetailArr) + " type="text" size="small" v-hasPermi="['project:ethicFeeCheck:delete']"> 鍒犻櫎 </el-button> </template> @@ -533,14 +252,8 @@ <el-col :span="7"> <el-form-item label="鐢宠鏃ユ湡" prop="createTime"> <!-- <el-input v-model="form.donorno" placeholder="璇疯緭鍏ョ敵璇锋棩鏈�" /> --> - <el-date-picker - clearable - style="width: 100%" - v-model="form.createTime" - type="date" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="鐢宠鏃ユ湡" - > + <el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡"> </el-date-picker> </el-form-item> </el-col> @@ -556,49 +269,24 @@ </el-col> <el-col :span="7"> <el-form-item label="璐㈠姟瀹℃牳" prop="financechecher"> - <el-input - v-model="form.financechecher" - placeholder="璇疯緭鍏ヨ储鍔″鏍�" - /> + <el-input v-model="form.financechecher" placeholder="璇疯緭鍏ヨ储鍔″鏍�" /> </el-form-item> </el-col> </el-row> <el-row style="margin-top: 5px; margin-bottom: 5px"> <el-table :data="fundflowList" border> - <el-table-column - label="瀹℃牳浜�" - align="center" - prop="checkusername" - /> - <el-table-column - label="瀹℃牳鏃ユ湡" - align="center" - prop="createTime" - /> - <el-table-column - label="瀹℃牳缁撴灉" - align="center" - 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" prop="checkusername" /> + <el-table-column label="瀹℃牳鏃ユ湡" align="center" prop="createTime" /> + <el-table-column label="瀹℃牳缁撴灉" align="center" 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 == 'edit'" - > + <el-row style="margin-top: 25px; margin-bottom: 5px" v-if="dialogType == 'edit'"> <el-col :span="7"> <el-form-item label="瀹℃牳" align="left"> <el-radio-group v-model="newobj.flowlevelone" align="left"> @@ -609,18 +297,13 @@ </el-col> <el-col :span="12"> <el-form-item label="瀹℃牳澶囨敞"> - <el-input - v-model="newobj.flowconclusion" - placeholder="鐢虫姤璐圭敤" - /> + <el-input v-model="newobj.flowconclusion" placeholder="鐢虫姤璐圭敤" /> </el-form-item> </el-col> </el-row> </el-form> <div slot="footer" class="dialog-footer"> - <el-button type="primary" @click="dundcheck" v-if="dialogType == 'edit'" - >瀹℃牳</el-button - > + <el-button type="primary" @click="dundcheck" v-if="dialogType == 'edit'">瀹℃牳</el-button> <el-button @click="cancel">鍙栨秷</el-button> </div> </el-dialog> @@ -951,7 +634,7 @@ }, getlistOrganization() { - listOrganization().then(res => {}); + listOrganization().then(res => { }); }, totaldayin(e) { @@ -986,7 +669,7 @@ username = res.data.username; this.$modal .confirm('鏄惁纭閫氳繃"' + username + '"鐨勮垂鐢ㄧ敵璇凤紵') - .then(function() { + .then(function () { getFund(e).then(res => { let data = res.data; let financechecher = "宸插鏍�"; @@ -1044,7 +727,7 @@ }); }, //鍔ㄦ�佽绠楃◣鍓嶉噾棰� - change(scope) {}, + change(scope) { }, autodonorno() { listDonatebaseinfo().then(res => { // console.log("鎵�鏈夋崘鐚�呭垪琛細",res); @@ -1236,7 +919,7 @@ infoid: infoid, count: this.idss }; - listFunddetails(aaa).then(res => {}); + listFunddetails(aaa).then(res => { }); }, //鍒濆鍖栬垂鐢ㄧ敵璇疯〃鍗曠晫闈� @@ -1444,7 +1127,7 @@ for (let i = 0; i < this.applicationDetailArr.length; i++) { // console.log('qqq',this.applicationDetailArr[i]); let tempData = this.applicationDetailArr[i]; - Object.keys(tempData).forEach(function(key) { + Object.keys(tempData).forEach(function (key) { // console.log('iii',key, tempData[key]); if ( tempData[key] == null || -- Gitblit v1.9.3