From c0b29ee03f4f6c984f35618bfa669ba3f2ab6517 Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期二, 20 二月 2024 10:09:05 +0800 Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web --- src/api/project/reimbursementpayeeshared.js | 2 src/api/project/relativesconfirmation.js | 2 src/api/project/funddetailshared.js | 2 src/api/project/fundflowrule.js | 2 src/api/project/travelcity.js | 9 src/api/project/DonationEvaluation.js | 2 src/api/project/reimbursementdetailshared.js | 2 src/api/project/distributedetail.js | 2 src/api/project/donatecompletioninfo.js | 2 src/api/project/medicalevaluation.js | 2 src/api/project/donatebaseinfo.js | 2 src/api/project/externalperson.js | 2 src/api/project/reimbursement.js | 2 src/api/project/expertfeetype.js | 2 src/api/project/donatefollowup.js | 2 src/api/project/reimbursementdetail.js | 2 src/api/project/donationwitness.js | 2 src/api/project/donateannexrequirement.js | 2 src/views/project/donationdetails/index.vue | 1711 ++++++-------------------------- src/api/project/funddetail.js | 2 src/api/project/distributesummary.js | 2 src/api/project/documentfiles.js | 2 src/api/project/organallocation.js | 11 src/api/project/itemexpense.js | 2 src/api/project/donateorgan.js | 2 src/api/project/donateconsolationfund.js | 2 src/views/project/fund/applyDetail/index.vue | 1306 ++++++------------------ src/api/project/financesubject.js | 2 src/api/project/reimbursementpayee.js | 2 src/api/project/fund.js | 2 src/api/project/fundflow.js | 2 src/api/system/travelexpensestandard.js | 2 32 files changed, 753 insertions(+), 2,340 deletions(-) diff --git a/src/api/project/DonationEvaluation.js b/src/api/project/DonationEvaluation.js index 5edeb06..4d79994 100644 --- a/src/api/project/DonationEvaluation.js +++ b/src/api/project/DonationEvaluation.js @@ -3,7 +3,7 @@ // 鏂板鎹愮尞娴佺▼ export function addDonateflowchart(data) { return request({ - url: '/project/donateflowchart', + url: '/project/donateflowchart/add', method: 'post', data: data }) diff --git a/src/api/project/distributedetail.js b/src/api/project/distributedetail.js index 344c620..3c3cb69 100644 --- a/src/api/project/distributedetail.js +++ b/src/api/project/distributedetail.js @@ -20,7 +20,7 @@ // 鏂板涓撳璐圭敤鍒嗗彂姹囨�绘槑缁� export function addDistributedetail(data) { return request({ - url: '/project/distributedetail', + url: '/project/distributedetail/add', method: 'post', data: data }) diff --git a/src/api/project/distributesummary.js b/src/api/project/distributesummary.js index 7601a44..f1355c1 100644 --- a/src/api/project/distributesummary.js +++ b/src/api/project/distributesummary.js @@ -28,7 +28,7 @@ // 鏂板涓撳璐圭敤鍒嗗彂姹囨�讳富 export function addDistributesummary(data) { return request({ - url: '/project/distributesummary', + url: '/project/distributesummary/add', method: 'post', data: data }) diff --git a/src/api/project/documentfiles.js b/src/api/project/documentfiles.js index 246e97e..3319254 100644 --- a/src/api/project/documentfiles.js +++ b/src/api/project/documentfiles.js @@ -20,7 +20,7 @@ // 鏂板鎹愮尞闄勪欢 export function addDocumentfiles(data) { return request({ - url: '/project/documentfiles', + url: '/project/documentfiles/add', method: 'post', data: data }) diff --git a/src/api/project/donateannexrequirement.js b/src/api/project/donateannexrequirement.js index 5b35e20..aa28917 100644 --- a/src/api/project/donateannexrequirement.js +++ b/src/api/project/donateannexrequirement.js @@ -20,7 +20,7 @@ // 鏂板鎹愮尞闄勪欢瑕佹眰 export function addDonateannexrequirement(data) { return request({ - url: '/project/donateannexrequirement', + url: '/project/donateannexrequirement/add', method: 'post', data: data }) diff --git a/src/api/project/donatebaseinfo.js b/src/api/project/donatebaseinfo.js index e811706..54d69a3 100644 --- a/src/api/project/donatebaseinfo.js +++ b/src/api/project/donatebaseinfo.js @@ -27,7 +27,7 @@ // 鏂板鎹愮尞鍩虹 export function addDonatebaseinfo(data) { return request({ - url: '/project/donatebaseinfo', + url: '/project/donatebaseinfo/add', method: 'post', data: data }) diff --git a/src/api/project/donatecompletioninfo.js b/src/api/project/donatecompletioninfo.js index 4ce6f06..e93a327 100644 --- a/src/api/project/donatecompletioninfo.js +++ b/src/api/project/donatecompletioninfo.js @@ -29,7 +29,7 @@ // 鏂板鎹愮尞瀹屾垚 export function addDonatecompletioninfo(data) { return request({ - url: '/project/donatecompletioninfo', + url: '/project/donatecompletioninfo/add', method: 'post', data: data }) diff --git a/src/api/project/donateconsolationfund.js b/src/api/project/donateconsolationfund.js index 1a44af2..f30bd40 100644 --- a/src/api/project/donateconsolationfund.js +++ b/src/api/project/donateconsolationfund.js @@ -20,7 +20,7 @@ // 鏂板鎹愮尞浜洪亾鎱伴棶閲� export function addDonateconsolationfund(data) { return request({ - url: '/project/donateconsolationfund', + url: '/project/donateconsolationfund/add', method: 'post', data: data }) diff --git a/src/api/project/donatefollowup.js b/src/api/project/donatefollowup.js index 3549308..6340a5c 100644 --- a/src/api/project/donatefollowup.js +++ b/src/api/project/donatefollowup.js @@ -31,7 +31,7 @@ // 鏂板鎹愮尞闅忚 export function addDonatefollowup(data) { return request({ - url: '/project/donatefollowup', + url: '/project/donatefollowup/add', method: 'post', data: data }) diff --git a/src/api/project/donateorgan.js b/src/api/project/donateorgan.js index 68a4c5c..0d1123f 100644 --- a/src/api/project/donateorgan.js +++ b/src/api/project/donateorgan.js @@ -59,7 +59,7 @@ // 鏂板鎹愮尞鍣ㄥ畼绠$悊 export function addDonateorgan(data) { return request({ - url: '/project/donateorgan', + url: '/project/donateorgan/add', method: 'post', data: data }) diff --git a/src/api/project/donationwitness.js b/src/api/project/donationwitness.js index c4e81d4..04323fb 100644 --- a/src/api/project/donationwitness.js +++ b/src/api/project/donationwitness.js @@ -44,7 +44,7 @@ // 鏂板鎹愮尞瑙佽瘉 export function addDonationwitness(data) { return request({ - url: '/project/donationwitness', + url: '/project/donationwitness/add', method: 'post', data: data }) diff --git a/src/api/project/expertfeetype.js b/src/api/project/expertfeetype.js index 423b806..bc26462 100644 --- a/src/api/project/expertfeetype.js +++ b/src/api/project/expertfeetype.js @@ -20,7 +20,7 @@ // 鏂板涓撳璐圭敤 export function addExpertfeetype(data) { return request({ - url: '/project/expertfeetype', + url: '/project/expertfeetype/add', method: 'post', data: data }) diff --git a/src/api/project/externalperson.js b/src/api/project/externalperson.js index 5fd314f..c589e95 100644 --- a/src/api/project/externalperson.js +++ b/src/api/project/externalperson.js @@ -30,7 +30,7 @@ // 鏂板澶栧洿鍗曚綅浜哄憳 export function addExternalperson(data) { return request({ - url: '/project/externalperson', + url: '/project/externalperson/add', method: 'post', data: data }) diff --git a/src/api/project/financesubject.js b/src/api/project/financesubject.js index 2e5439d..a10b1d4 100644 --- a/src/api/project/financesubject.js +++ b/src/api/project/financesubject.js @@ -20,7 +20,7 @@ // 鏂板鏀跺叆璐圭敤绉戠洰 export function addFinancesubject(data) { return request({ - url: '/project/financesubject', + url: '/project/financesubject/add', method: 'post', data: data }) diff --git a/src/api/project/fund.js b/src/api/project/fund.js index 5c20776..92f64cc 100644 --- a/src/api/project/fund.js +++ b/src/api/project/fund.js @@ -42,7 +42,7 @@ // 鏂板璐圭敤鐢宠涓� export function addFund(data) { return request({ - url: '/project/fund', + url: '/project/fund/add', method: 'post', data: data }) diff --git a/src/api/project/funddetail.js b/src/api/project/funddetail.js index c3e4eec..7c87473 100644 --- a/src/api/project/funddetail.js +++ b/src/api/project/funddetail.js @@ -56,7 +56,7 @@ // 鏂板璐圭敤鐢宠鏄庣粏 export function addFunddetail(data) { return request({ - url: '/project/funddetail', + url: '/project/funddetail/add', method: 'post', data: data }) diff --git a/src/api/project/funddetailshared.js b/src/api/project/funddetailshared.js index f5e8d60..0aa5601 100644 --- a/src/api/project/funddetailshared.js +++ b/src/api/project/funddetailshared.js @@ -20,7 +20,7 @@ // 鏂板璐圭敤鐢宠鏄庣粏 export function addFunddetailshared(data) { return request({ - url: '/project/funddetailshared', + url: '/project/funddetailshared/add', method: 'post', data: data }) diff --git a/src/api/project/fundflow.js b/src/api/project/fundflow.js index a54d2a6..09717ec 100644 --- a/src/api/project/fundflow.js +++ b/src/api/project/fundflow.js @@ -20,7 +20,7 @@ // 鏂板璐圭敤瀹℃壒娴佺▼ export function addFundflow(data) { return request({ - url: '/project/fundflow', + url: '/project/fundflow/add', method: 'post', data: data }) diff --git a/src/api/project/fundflowrule.js b/src/api/project/fundflowrule.js index 3f3ee3d..1b6a2d3 100644 --- a/src/api/project/fundflowrule.js +++ b/src/api/project/fundflowrule.js @@ -20,7 +20,7 @@ // 鏂板璐圭敤瀹℃壒瑙勫垯 export function addFundflowrule(data) { return request({ - url: '/project/fundflowrule', + url: '/project/fundflowrule/add', method: 'post', data: data }) diff --git a/src/api/project/itemexpense.js b/src/api/project/itemexpense.js index cced4ff..2be01f2 100644 --- a/src/api/project/itemexpense.js +++ b/src/api/project/itemexpense.js @@ -20,7 +20,7 @@ // 鏂板鏀跺叆璐圭敤绉戠洰 export function addItemexpense(data) { return request({ - url: '/project/itemexpense', + url: '/project/itemexpense/add', method: 'post', data: data }) diff --git a/src/api/project/medicalevaluation.js b/src/api/project/medicalevaluation.js index f66adbe..6b1fb45 100644 --- a/src/api/project/medicalevaluation.js +++ b/src/api/project/medicalevaluation.js @@ -28,7 +28,7 @@ // 鏂板鍖诲璇勪及 export function addMedicalevaluation(data) { return request({ - url: '/project/medicalevaluation', + url: '/project/medicalevaluation/add', method: 'post', data: data }) diff --git a/src/api/project/organallocation.js b/src/api/project/organallocation.js index 8c1051d..e352ed6 100644 --- a/src/api/project/organallocation.js +++ b/src/api/project/organallocation.js @@ -17,10 +17,19 @@ }) } +// 鏂板鍣ㄥ畼鍒嗛厤(鍙兘閿欎簡) +// export function addOrganallocation(data) { +// return request({ +// url: '/project/donateorgan/addData', +// method: 'post', +// data: data +// }) +// } + // 鏂板鍣ㄥ畼鍒嗛厤 export function addOrganallocation(data) { return request({ - url: '/project/donateorgan/addData', + url: '/project/organallocation/add', method: 'post', data: data }) diff --git a/src/api/project/reimbursement.js b/src/api/project/reimbursement.js index 14cec00..fc4832c 100644 --- a/src/api/project/reimbursement.js +++ b/src/api/project/reimbursement.js @@ -28,7 +28,7 @@ // 鏂板鎶ラ攢鐢宠 export function addReimbursement(data) { return request({ - url: '/project/reimbursement', + url: '/project/reimbursement/add', method: 'post', data: data }) diff --git a/src/api/project/reimbursementdetail.js b/src/api/project/reimbursementdetail.js index c405256..cdd5b70 100644 --- a/src/api/project/reimbursementdetail.js +++ b/src/api/project/reimbursementdetail.js @@ -52,7 +52,7 @@ export function addReimbursementdetail(data) { return request({ - url: '/project/reimbursementdetail', + url: '/project/reimbursementdetail/add', method: 'post', data: data }) diff --git a/src/api/project/reimbursementdetailshared.js b/src/api/project/reimbursementdetailshared.js index ad99696..e1c29a7 100644 --- a/src/api/project/reimbursementdetailshared.js +++ b/src/api/project/reimbursementdetailshared.js @@ -20,7 +20,7 @@ // 鏂板鎶ラ攢鐢宠鏄庣粏 export function addReimbursementdetailshared(data) { return request({ - url: '/project/reimbursementdetailshared', + url: '/project/reimbursementdetailshared/add', method: 'post', data: data }) diff --git a/src/api/project/reimbursementpayee.js b/src/api/project/reimbursementpayee.js index f9cc7d4..67973a8 100644 --- a/src/api/project/reimbursementpayee.js +++ b/src/api/project/reimbursementpayee.js @@ -20,7 +20,7 @@ // 鏂板宸梾鎶ラ攢浠樻淇℃伅 export function addReimbursementpayee(data) { return request({ - url: '/project/reimbursementpayee', + url: '/project/reimbursementpayee/add', method: 'post', data: data }) diff --git a/src/api/project/reimbursementpayeeshared.js b/src/api/project/reimbursementpayeeshared.js index bd3565c..d7a205f 100644 --- a/src/api/project/reimbursementpayeeshared.js +++ b/src/api/project/reimbursementpayeeshared.js @@ -20,7 +20,7 @@ // 鏂板宸梾鎶ラ攢浠樻淇℃伅 export function addReimbursementpayeeshared(data) { return request({ - url: '/project/reimbursementpayeeshared', + url: '/project/reimbursementpayeeshared/add', method: 'post', data: data }) diff --git a/src/api/project/relativesconfirmation.js b/src/api/project/relativesconfirmation.js index 06a372a..5abb18d 100644 --- a/src/api/project/relativesconfirmation.js +++ b/src/api/project/relativesconfirmation.js @@ -29,7 +29,7 @@ // 鏂板鎹愮尞浜插睘纭 export function addRelativesconfirmation(data) { return request({ - url: '/project/relativesconfirmation', + url: '/project/relativesconfirmation/add', method: 'post', data: data }) diff --git a/src/api/project/travelcity.js b/src/api/project/travelcity.js index 871f0ef..c194dd3 100644 --- a/src/api/project/travelcity.js +++ b/src/api/project/travelcity.js @@ -8,4 +8,13 @@ url: '/project/travelcity/getSubsidy/' + cityCode, method: 'get' }) +} + +// 鏂板鍑哄樊鍩庡競 +export function addtravelcity(data) { + return request({ + url: '/project/travelcity/add', + method: 'post', + data: data + }) } \ No newline at end of file diff --git a/src/api/system/travelexpensestandard.js b/src/api/system/travelexpensestandard.js index 2c7a45a..1355351 100644 --- a/src/api/system/travelexpensestandard.js +++ b/src/api/system/travelexpensestandard.js @@ -20,7 +20,7 @@ // 鏂板浣忓璐归檺棰濇爣鍑� export function addTravelexpensestandard(data) { return request({ - url: '/system/travelexpensestandard', + url: '/system/travelexpensestandard/add', method: 'post', data: data }) diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue index f3e113f..da2ff09 100644 --- a/src/views/project/donationdetails/index.vue +++ b/src/views/project/donationdetails/index.vue @@ -6,10 +6,7 @@ <div> <el-steps direction="vertical" :active="workflow"> <el-step title="娼滃湪鎹愮尞" icon="el-icon-user"> - <template - slot="description" - v-if="Processdata.donatebaseinfo.createtime" - > + <template slot="description" v-if="Processdata.donatebaseinfo.createtime"> <p> 鎻愪氦鏃堕棿锛�<span>{{ parseTime(Processdata.donatebaseinfo.createtime) @@ -22,15 +19,8 @@ </p> </template> </el-step> - <el-step - title="鍖诲璇勪及" - icon="el-icon-edit-outline" - description="璇峰厛瀹屾垚鍓嶉儴姝ラ" - > - <template - slot="description" - v-if="Processdata.medicalevaluation.createtime" - > + <el-step title="鍖诲璇勪及" icon="el-icon-edit-outline" description="璇峰厛瀹屾垚鍓嶉儴姝ラ"> + <template slot="description" v-if="Processdata.medicalevaluation.createtime"> <p> 鎻愪氦鏃堕棿锛�<span>{{ parseTime(Processdata.medicalevaluation.createtime) @@ -43,15 +33,8 @@ </p> </template> </el-step> - <el-step - title="鎹愮尞纭" - description="璇峰厛瀹屾垚鍓嶉儴姝ラ" - icon="el-icon-folder-checked" - > - <template - slot="description" - v-if="Processdata.relativesconfirmation.createtime" - > + <el-step title="鎹愮尞纭" description="璇峰厛瀹屾垚鍓嶉儴姝ラ" icon="el-icon-folder-checked"> + <template slot="description" v-if="Processdata.relativesconfirmation.createtime"> <p> 鎻愪氦鏃堕棿锛�<span>{{ parseTime(Processdata.relativesconfirmation.createtime) @@ -64,15 +47,8 @@ </p> </template> </el-step> - <el-step - title="浼︾悊瀹℃煡" - description="璇峰厛瀹屾垚鍓嶉儴姝ラ" - icon="el-icon-s-order" - > - <template - slot="description" - v-if="Processdata.donateflowcharts.createtime" - > + <el-step title="浼︾悊瀹℃煡" description="璇峰厛瀹屾垚鍓嶉儴姝ラ" icon="el-icon-s-order"> + <template slot="description" v-if="Processdata.donateflowcharts.createtime"> <p> 鎻愪氦鏃堕棿锛�<span>{{ parseTime(Processdata.donateflowcharts.createtime) @@ -85,15 +61,8 @@ </p> </template> </el-step> - <el-step - title="鍣ㄥ畼鍒嗛厤" - description="璇峰厛瀹屾垚鍓嶉儴姝ラ" - icon="el-icon-s-operation" - > - <template - slot="description" - v-if="Processdata.donateorgansService.createtime" - > + <el-step title="鍣ㄥ畼鍒嗛厤" description="璇峰厛瀹屾垚鍓嶉儴姝ラ" icon="el-icon-s-operation"> + <template slot="description" v-if="Processdata.donateorgansService.createtime"> <p> 鎻愪氦鏃堕棿锛�<span>{{ parseTime(Processdata.donateorgansService.createtime) @@ -106,15 +75,8 @@ </p> </template> </el-step> - <el-step - title="鑾峰彇瑙佽瘉" - description="璇峰厛瀹屾垚鍓嶉儴姝ラ" - icon="el-icon-s-management" - > - <template - slot="description" - v-if="Processdata.donationwitness.createtime" - > + <el-step title="鑾峰彇瑙佽瘉" description="璇峰厛瀹屾垚鍓嶉儴姝ラ" icon="el-icon-s-management"> + <template slot="description" v-if="Processdata.donationwitness.createtime"> <p> 鎻愪氦鏃堕棿锛�<span>{{ parseTime(Processdata.donationwitness.createtime) @@ -127,15 +89,8 @@ </p> </template> </el-step> - <el-step - title="瀹屾垚鐧昏" - description="璇峰厛瀹屾垚鍓嶉儴姝ラ" - icon="el-icon-circle-check" - > - <template - slot="description" - v-if="Processdata.donatecompletioninfo.createtime" - > + <el-step title="瀹屾垚鐧昏" description="璇峰厛瀹屾垚鍓嶉儴姝ラ" icon="el-icon-circle-check"> + <template slot="description" v-if="Processdata.donatecompletioninfo.createtime"> <p> 鎻愪氦鏃堕棿锛�<span>{{ parseTime(Processdata.donatecompletioninfo.createtime) @@ -157,19 +112,11 @@ <!-- 椤堕儴鏁版嵁 --> <div class="boxdiv"> <div class="top-text">鎹愮尞妗堜緥淇℃伅</div> - <el-form - ref="form" - :model="form" - :rules="rules" - label-width="130px" - label-position="right" - > - <div - style=" + <el-form ref="form" :model="form" :rules="rules" label-width="130px" label-position="right"> + <div style=" border-top: 1px solid #ddd; padding-right: 60px; - " - > + "> <el-row style="margin-top: 10px"> <el-col :span="6"> <el-form-item label="鎹愮尞缂栧彿" prop="donorno"> @@ -178,39 +125,22 @@ </el-col> <el-col :span="6"> <el-form-item label="鎶ュ憡浜�" prop="reporterno"> - <el-select - ref="getReportname" - v-model="form.reporterno" - placeholder="璇烽�夋嫨" - > - <el-option - v-for="item in reporters" - :key="item.reportNo" - :label="item.reportName" - :value="item.reportNo" - > + <el-select ref="getReportname" v-model="form.reporterno" placeholder="璇烽�夋嫨"> + <el-option v-for="item in reporters" :key="item.reportNo" :label="item.reportName" + :value="item.reportNo"> </el-option> </el-select> </el-form-item> </el-col> <el-col :span="6"> <el-form-item label="鑱旂郴鐢佃瘽" prop="reporterphone"> - <el-input - v-model="form.reporterphone" - placeholder="璇疯緭鍏ヨ仈绯荤數璇�" - /> + <el-input v-model="form.reporterphone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" /> </el-form-item> </el-col> <el-col :span="6"> <el-form-item label="鎶ュ憡鏃堕棿" align="left" prop="reporttime"> - <el-date-picker - clearable - size="small" - v-model="form.reporttime" - type="datetime" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="閫夋嫨鎶ュ憡鏃堕棿" - > + <el-date-picker clearable size="small" v-model="form.reporttime" type="datetime" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鎶ュ憡鏃堕棿"> </el-date-picker> </el-form-item> </el-col> @@ -223,40 +153,22 @@ </el-col> <el-col :span="6"> <el-form-item label="璇佷欢绫诲瀷" prop="idcardtype"> - <el-select - v-model="form.idcardtype" - placeholder="璇烽�夋嫨璇佷欢绫诲瀷" - > - <el-option - v-for="dict in dict.type.sys_IDType" - :key="dict.value" - :label="dict.label" - :value="parseInt(dict.value)" - ></el-option> + <el-select v-model="form.idcardtype" placeholder="璇烽�夋嫨璇佷欢绫诲瀷"> + <el-option v-for="dict in dict.type.sys_IDType" :key="dict.value" :label="dict.label" + :value="parseInt(dict.value)"></el-option> </el-select> </el-form-item> </el-col> <el-col :span="6"> <el-form-item label="璇佷欢鍙风爜" prop="idcardno"> - <el-input - ref="updateBSvalue" - class="sfzcode" - v-model="form.idcardno" - placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�" - @blur="updateMessage" - /> + <el-input ref="updateBSvalue" class="sfzcode" v-model="form.idcardno" placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�" + @blur="updateMessage" /> </el-form-item> </el-col> <el-col :span="6"> <el-form-item label="鍑虹敓鏃ユ湡" prop="birthday"> - <el-date-picker - clearable - size="small" - v-model="form.birthday" - type="date" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="閫夋嫨鍑虹敓鏃ユ湡" - > + <el-date-picker clearable size="small" v-model="form.birthday" type="date" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鍑虹敓鏃ユ湡"> </el-date-picker> </el-form-item> </el-col> @@ -265,12 +177,8 @@ <el-col :span="6"> <el-form-item label="鎬у埆" prop="sex"> <el-select v-model="form.sex" placeholder="璇疯緭鍏ユ�у埆"> - <el-option - v-for="dict in dict.type.sys_user_sex" - :key="dict.label" - :label="dict.label" - :value="parseInt(dict.value)" - ></el-option> + <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.label" :label="dict.label" + :value="parseInt(dict.value)"></el-option> </el-select> </el-form-item> </el-col> @@ -280,24 +188,13 @@ </el-form-item> </el-col> <el-col :span="6"> - <el-form-item - align="left" - label="鍖荤枟鏈烘瀯" - prop="treatmenthospitalno" - > - <org-selecter - ref="addOrgSelect" - :org-type="'3'" - v-model="form.treatmenthospitalno" - /> + <el-form-item align="left" label="鍖荤枟鏈烘瀯" prop="treatmenthospitalno"> + <org-selecter ref="addOrgSelect" :org-type="'3'" v-model="form.treatmenthospitalno" /> </el-form-item> </el-col> <el-col :span="6"> <el-form-item label="绉戝" prop="treatmentdeptno"> - <el-input - v-model="form.treatmentdeptname" - placeholder="璇疯緭鍏ョ瀹�" - /> + <el-input v-model="form.treatmentdeptname" placeholder="璇疯緭鍏ョ瀹�" /> </el-form-item> </el-col> </el-row> @@ -307,58 +204,22 @@ <!-- 娴佺▼tab --> <div style="margin: 0 10px; cursor:pointer;"> <el-steps :active="actives" simple> - <el-step - @click.native="on_click(0)" - title="娼滃湪鎹愮尞" - icon="el-icon-user" - ></el-step> - <el-step - @click.native="on_click(1)" - title="鍖诲璇勪及" - icon="el-icon-edit-outline" - ></el-step> - <el-step - @click.native="on_click(2)" - title="鎹愮尞纭" - icon="el-icon-folder-checked" - ></el-step> - <el-step - @click.native="on_click(3)" - title="浼︾悊瀹℃煡" - icon="el-icon-s-order" - ></el-step> - <el-step - @click.native="on_click(4)" - title="鍣ㄥ畼鍒嗛厤" - icon="el-icon-s-operation" - ></el-step> - <el-step - @click.native="on_click(5)" - title="鑾峰彇瑙佽瘉" - icon="el-icon-s-management" - ></el-step> - <el-step - @click.native="on_click(6)" - title="瀹屾垚鐧昏" - icon="el-icon-circle-check" - ></el-step> + <el-step @click.native="on_click(0)" title="娼滃湪鎹愮尞" icon="el-icon-user"></el-step> + <el-step @click.native="on_click(1)" title="鍖诲璇勪及" icon="el-icon-edit-outline"></el-step> + <el-step @click.native="on_click(2)" title="鎹愮尞纭" icon="el-icon-folder-checked"></el-step> + <el-step @click.native="on_click(3)" title="浼︾悊瀹℃煡" icon="el-icon-s-order"></el-step> + <el-step @click.native="on_click(4)" title="鍣ㄥ畼鍒嗛厤" icon="el-icon-s-operation"></el-step> + <el-step @click.native="on_click(5)" title="鑾峰彇瑙佽瘉" icon="el-icon-s-management"></el-step> + <el-step @click.native="on_click(6)" title="瀹屾垚鐧昏" icon="el-icon-circle-check"></el-step> </el-steps> </div> <!-- 鍑瘉鏂囦欢 --> <div class="Ticket-button" v-show="actives != 5 && actives != 4"> - <el-button @click.native.prevent="Filepopup" type="success" - >鍑瘉鏂囦欢</el-button - > + <el-button @click.native.prevent="Filepopup" type="success">鍑瘉鏂囦欢</el-button> </div> <!-- 娼滃湪鎹愮尞 --> <div class="boxdiv" style="margin: 30px 0 66px 0;" v-show="actives == 0"> - <el-form - ref="form" - :model="form" - :rules="rules" - label-width="100px" - label-position="right" - > + <el-form ref="form" :model="form" :rules="rules" label-width="100px" label-position="right"> <el-row> <el-col :span="8"> <el-form-item label="浣忛櫌鍙�" prop="inpatientno"> @@ -367,10 +228,7 @@ </el-col> <el-col :span="16"> <el-form-item label="鐤剧梾璇婃柇" prop="diagnosisname"> - <el-input - v-model="form.diagnosisname" - placeholder="璇疯緭鍏ョ柧鐥呰瘖鏂悕绉�" - /> + <el-input v-model="form.diagnosisname" placeholder="璇疯緭鍏ョ柧鐥呰瘖鏂悕绉�" /> </el-form-item> </el-col> </el-row> @@ -378,12 +236,8 @@ <el-col :span="6"> <el-form-item label="姘戞棌" prop="nation"> <el-select v-model="form.nation" placeholder="璇烽�夋嫨姘戞棌"> - <el-option - v-for="dict in dict.type.sys_nation" - :key="dict.value" - :label="dict.label" - :value="dict.value" - ></el-option> + <el-option v-for="dict in dict.type.sys_nation" :key="dict.value" :label="dict.label" + :value="dict.value"></el-option> </el-select> </el-form-item> </el-col> @@ -402,24 +256,16 @@ <el-col :span="6"> <el-form-item label="鑱屼笟" prop="occupation"> <el-select v-model="form.occupation" placeholder="璇烽�夋嫨鑱屼笟"> - <el-option - v-for="dict in dict.type.sys_occupation" - :key="dict.value" - :label="dict.label" - :value="dict.value" - ></el-option> + <el-option v-for="dict in dict.type.sys_occupation" :key="dict.value" :label="dict.label" + :value="dict.value"></el-option> </el-select> </el-form-item> </el-col> <el-col :span="6"> <el-form-item label="瀛﹀巻" prop="education"> <el-select v-model="form.education" placeholder="璇烽�夋嫨瀛﹀巻"> - <el-option - v-for="dict in dict.type.sys_education" - :key="dict.value" - :label="dict.label" - :value="dict.value" - ></el-option> + <el-option v-for="dict in dict.type.sys_education" :key="dict.value" :label="dict.label" + :value="dict.value"></el-option> </el-select> </el-form-item> </el-col> @@ -428,19 +274,13 @@ <el-col :span="12"> <el-form-item label="浣忓潃" prop="residenceaddress"> <div> - <li_area_select - ref="residenceSelect" - v-model="residenceAddresss" - ></li_area_select> + <li_area_select ref="residenceSelect" v-model="residenceAddresss"></li_area_select> <!-- <div>{{defultAddress}}</div> --> </div> </el-form-item> </el-col> <el-col :span="11" :push="1"> - <el-input - v-model="form.residenceaddress" - placeholder="璇疯緭鍏ュ唴瀹�" - /> + <el-input v-model="form.residenceaddress" placeholder="璇疯緭鍏ュ唴瀹�" /> </el-col> </el-row> @@ -448,43 +288,29 @@ <el-col :span="12"> <el-form-item label="鐜版墍鍦ㄥ湴" prop="registeraddress"> <div> - <li_area_select - ref="registerSelect" - v-model="registerAddresss" - ></li_area_select> + <li_area_select ref="registerSelect" v-model="registerAddresss"></li_area_select> <!-- <div>{{defultAddress}}</div> --> </div> </el-form-item> </el-col> <el-col :span="11" :push="1"> - <el-input - v-model="form.registeraddress" - placeholder="璇疯緭鍏ュ唴瀹�" - /> + <el-input v-model="form.registeraddress" placeholder="璇疯緭鍏ュ唴瀹�" /> </el-col> </el-row> <el-row> <el-col :span="12"> <el-form-item align="left" label="琛�鍨�" prop="bloodtype"> <el-radio-group v-model="form.bloodtype"> - <el-radio - v-for="dict in dict.type.sys_BloodType" - :key="dict.value" - :label="dict.value" - >{{ dict.label }}</el-radio - > + <el-radio v-for="dict in dict.type.sys_BloodType" :key="dict.value" :label="dict.value">{{ dict.label + }}</el-radio> </el-radio-group> </el-form-item> </el-col> <el-col :span="12" :pull="1"> <el-form-item label="Rh(D)" align="left" prop="rhyin"> <el-radio-group v-model="form.rhyin"> - <el-radio - v-for="dict in dict.type.sys_bloodtype_rhd" - :key="dict.value" - :label="dict.value" - >{{ dict.label }}</el-radio - > + <el-radio v-for="dict in dict.type.sys_bloodtype_rhd" :key="dict.value" :label="dict.value">{{ + dict.label }}</el-radio> </el-radio-group> </el-form-item> </el-col> @@ -492,31 +318,20 @@ <el-row> <el-form-item label="鐤剧梾绫诲瀷" align="left"> <el-checkbox-group v-model="form.diseasetype"> - <el-checkbox - v-for="dict in dict.type.sys_DiseaseType" - :key="dict.value" - :label="dict.value" - > + <el-checkbox v-for="dict in dict.type.sys_DiseaseType" :key="dict.value" :label="dict.value"> {{ dict.label }} </el-checkbox> </el-checkbox-group> </el-form-item> <el-form-item label="鍏朵粬" prop="diseasetypeOther"> - <el-input - v-model="form.diseasetypeOther" - placeholder="璇疯緭鍏ュ叾浠�" - /> + <el-input v-model="form.diseasetypeOther" placeholder="璇疯緭鍏ュ叾浠�" /> </el-form-item> </el-row> <el-row> <el-col :span="12"> <el-form-item align="left" label="浼犳煋鐥�"> <el-checkbox-group v-model="form.infectious"> - <el-checkbox - v-for="dict in dict.type.sys_Infectious" - :key="dict.value" - :label="dict.value" - > + <el-checkbox v-for="dict in dict.type.sys_Infectious" :key="dict.value" :label="dict.value"> {{ dict.label }} </el-checkbox> </el-checkbox-group> @@ -524,10 +339,7 @@ </el-col> <el-col :span="12"> <el-form-item align="left" label="鍏朵粬" prop="infectiousOther"> - <el-input - v-model="form.infectiousOther" - placeholder="璇疯緭鍏ュ叾浠�" - /> + <el-input v-model="form.infectiousOther" placeholder="璇疯緭鍏ュ叾浠�" /> </el-form-item> </el-col> </el-row> @@ -535,11 +347,7 @@ <el-col :span="9"> <el-form-item align="left" label="鐥呬汉鐘跺喌"> <el-checkbox-group v-model="form.patientstate"> - <el-checkbox - v-for="dict in dict.type.sys_patientstate" - :key="dict.value" - :label="dict.value" - > + <el-checkbox v-for="dict in dict.type.sys_patientstate" :key="dict.value" :label="dict.value"> {{ dict.label }} </el-checkbox> </el-checkbox-group> @@ -548,11 +356,7 @@ <el-col :span="15" align="left"> <el-form-item label="鍏朵粬鎯呭喌"> <el-checkbox-group v-model="form.othercases"> - <el-checkbox - v-for="dict in dict.type.sys_OtherCases" - :key="dict.value" - :label="dict.value" - > + <el-checkbox v-for="dict in dict.type.sys_OtherCases" :key="dict.value" :label="dict.value"> {{ dict.label }} </el-checkbox> </el-checkbox-group> @@ -563,18 +367,9 @@ <div display="flex"> <el-row> <el-col :span="12"> - <el-form-item - label="浜插睘鐘跺喌" - prop="kinship" - class="relation" - align="left" - > + <el-form-item label="浜插睘鐘跺喌" prop="kinship" class="relation" align="left"> <el-checkbox-group v-model="form.kinship"> - <el-checkbox - v-for="dict in dict.type.sys_Kinship" - :key="dict.value" - :label="dict.value" - > + <el-checkbox v-for="dict in dict.type.sys_Kinship" :key="dict.value" :label="dict.value"> {{ dict.label }} </el-checkbox> </el-checkbox-group> @@ -582,10 +377,7 @@ </el-col> <el-col :span="12"> <el-form-item label="鍏朵粬" prop="kinshipOther"> - <el-input - v-model="form.kinshipOther" - placeholder="璇疯緭鍏ュ叾浠�" - /> + <el-input v-model="form.kinshipOther" placeholder="璇疯緭鍏ュ叾浠�" /> </el-form-item> </el-col> </el-row> @@ -595,11 +387,7 @@ <el-col :span="24"> <el-form-item align="left" label="鏈汉鎰忔効 "> <el-checkbox-group v-model="form.selfwill"> - <el-checkbox - v-for="dict in dict.type.sys_SelfWill" - :key="dict.value" - :label="dict.value" - > + <el-checkbox v-for="dict in dict.type.sys_SelfWill" :key="dict.value" :label="dict.value"> {{ dict.label }} </el-checkbox> </el-checkbox-group> @@ -609,24 +397,14 @@ <el-row> <el-col :span="12"> <el-form-item label="涓昏浜插睘" prop="majorrelatives"> - <el-input - v-model="form.majorrelatives" - placeholder="璇疯緭鍏ヤ富瑕佷翰灞�" - /> + <el-input v-model="form.majorrelatives" placeholder="璇疯緭鍏ヤ富瑕佷翰灞�" /> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="涓庢崘璧犺�呭叧绯�" prop="familyrelations"> - <el-select - v-model="form.familyrelations" - placeholder="璇烽�夋嫨涓庢崘璧犺�呭叧绯�" - > - <el-option - v-for="dict in dict.type.sys_FamilyRelation" - :key="dict.value" - :label="dict.label" - :value="dict.value" - ></el-option> + <el-select v-model="form.familyrelations" placeholder="璇烽�夋嫨涓庢崘璧犺�呭叧绯�"> + <el-option v-for="dict in dict.type.sys_FamilyRelation" :key="dict.value" :label="dict.label" + :value="dict.value"></el-option> </el-select> </el-form-item> </el-col> @@ -635,11 +413,7 @@ <el-col :span="12"> <el-form-item align="left" label="淇℃伅鏉ユ簮"> <el-checkbox-group v-model="form.infosources"> - <el-checkbox - v-for="dict in dict.type.sys_InfoSources" - :key="dict.value" - :label="dict.value" - > + <el-checkbox v-for="dict in dict.type.sys_InfoSources" :key="dict.value" :label="dict.value"> {{ dict.label }} </el-checkbox> </el-checkbox-group> @@ -647,26 +421,14 @@ </el-col> <el-col :span="8"> <el-form-item label="鍏朵粬" prop="infosourcesOther"> - <el-input - v-model="form.infosourcesOther" - placeholder="璇疯緭鍏ヤ俊鎭潵婧愬叾浠�" - /> + <el-input v-model="form.infosourcesOther" placeholder="璇疯緭鍏ヤ俊鎭潵婧愬叾浠�" /> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="6"> - <el-form-item - align="left" - label="鑾峰彇缁勭粐" - prop="acquisitiontissuename" - > - <org-selecter - style="width: 260px" - ref="orgSelecter" - :org-type="'1'" - v-model="form.acquisitiontissueno" - /> + <el-form-item align="left" label="鑾峰彇缁勭粐" prop="acquisitiontissuename"> + <org-selecter style="width: 260px" ref="orgSelecter" :org-type="'1'" v-model="form.acquisitiontissueno" /> </el-form-item> </el-col> <el-col :span="8"> @@ -676,59 +438,34 @@ </el-col> <el-col :span="8"> <el-form-item label="鑱旂郴鐢佃瘽" prop="infophone"> - <el-input - v-model="form.infophone" - placeholder="璇疯緭鍏ヤ俊鎭憳鑱旂郴鐢佃瘽" - /> + <el-input v-model="form.infophone" placeholder="璇疯緭鍏ヤ俊鎭憳鑱旂郴鐢佃瘽" /> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="8"> <el-form-item align="left" label="绾㈠崄瀛椾細" prop="redorganno"> - <org-selecter - ref="addCrossOrgSelect" - :org-type="'2'" - v-model="form.redorganno" - /> + <org-selecter ref="addCrossOrgSelect" :org-type="'2'" v-model="form.redorganno" /> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="鑱旂郴浜�" prop="contactperson"> - <el-input - v-model="form.contactperson" - placeholder="璇疯緭鍏ヨ仈绯讳汉" - /> + <el-input v-model="form.contactperson" placeholder="璇疯緭鍏ヨ仈绯讳汉" /> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="鑱旂郴鏃堕棿" prop="contacttime"> - <el-date-picker - clearable - size="small" - style="width: 190px" - v-model="form.contacttime" - type="datetime" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="閫夋嫨鎶ュ憡鏃堕棿" - > + <el-date-picker clearable size="small" style="width: 190px" v-model="form.contacttime" type="datetime" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鎶ュ憡鏃堕棿"> </el-date-picker> </el-form-item> </el-col> </el-row> </el-form> <div class="dialog-footer"> - <el-button - v-show="!showTerminationBtn" - type="primary" - @click="submitForm" - >淇濆瓨</el-button - > - <el-button - :type="showTerminationBtn == 0 ? 'warning' : 'success'" - @click="Terminationcase" - >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button - > + <el-button v-show="!showTerminationBtn" type="primary" @click="submitForm">淇濆瓨</el-button> + <el-button :type="showTerminationBtn == 0 ? 'warning' : 'success'" @click="Terminationcase">{{ + showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button> <!-- <el-button v-show="Reportforreview" type="primary" @@ -739,219 +476,92 @@ </div> <!-- 鍖诲璇勪及 --> <div class="boxdiv" v-show="actives == 1"> - <el-form - ref="medicineform" - :model="medicineform" - :rules="medicinerules" - label-width="100px" - label-position="right" - > - <el-row - ><el-col :span="24"> - <el-form-item - label="鐥呮儏姒傚喌" - prop="illnessoverview" - style="margin-top: 20px" - > - <el-input - v-model="medicineform.illnessoverview" - type="textarea" - placeholder="璇疯緭鍏ュ唴瀹�" - /> </el-form-item></el-col></el-row - ><el-row - ><el-col :span="24"> + <el-form ref="medicineform" :model="medicineform" :rules="medicinerules" label-width="100px" + label-position="right"> + <el-row><el-col :span="24"> + <el-form-item label="鐥呮儏姒傚喌" prop="illnessoverview" style="margin-top: 20px"> + <el-input v-model="medicineform.illnessoverview" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" /> + </el-form-item></el-col></el-row><el-row><el-col :span="24"> <el-form-item label="鐤剧梾璇婃柇" prop="diagnosisname"> - <el-input - v-model="medicineform.diagnosisname" - type="textarea" - placeholder="璇疯緭鍏ョ柧鐥呰瘖鏂�" - /> </el-form-item></el-col - ></el-row> + <el-input v-model="medicineform.diagnosisname" type="textarea" placeholder="璇疯緭鍏ョ柧鐥呰瘖鏂�" /> + </el-form-item></el-col></el-row> <el-row> <el-col :span="7"> - <el-form-item - align="left" - label="闄㈢骇璇勪及鍖荤敓" - prop="hospitalassessdoctor" - > - <el-input - v-model="medicineform.hospitalassessdoctor" - placeholder="璇疯緭鍏ラ櫌绾ц瘎浼板尰鐢�" - /> + <el-form-item align="left" label="闄㈢骇璇勪及鍖荤敓" prop="hospitalassessdoctor"> + <el-input v-model="medicineform.hospitalassessdoctor" placeholder="璇疯緭鍏ラ櫌绾ц瘎浼板尰鐢�" /> </el-form-item> </el-col> <el-col :span="9"> - <el-form-item - align="left" - label="璇勪及鏃堕棿" - prop="hospitalassesstime" - > - <el-date-picker - clearable - size="small" - v-model="medicineform.hospitalassesstime" - type="date" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="閫夋嫨闄㈢骇璇勪及鏃堕棿" - > - </el-date-picker> </el-form-item - ></el-col> + <el-form-item align="left" label="璇勪及鏃堕棿" prop="hospitalassesstime"> + <el-date-picker clearable size="small" v-model="medicineform.hospitalassesstime" type="date" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨闄㈢骇璇勪及鏃堕棿"> + </el-date-picker> </el-form-item></el-col> <el-col :span="8"> - <el-form-item - align="left" - label="璇勪及缁撹" - prop="hospitalassessconclusion" - > - <el-select - v-model="medicineform.hospitalassessconclusion" - placeholder="璇烽�夋嫨闄㈢骇璇勪及缁撹" - > - <el-option - v-for="dict in dict.type.sys_BaseAssessConclusion" - :key="dict.value" - :label="dict.label" - :value="dict.value" - ></el-option> + <el-form-item align="left" label="璇勪及缁撹" prop="hospitalassessconclusion"> + <el-select v-model="medicineform.hospitalassessconclusion" placeholder="璇烽�夋嫨闄㈢骇璇勪及缁撹"> + <el-option v-for="dict in dict.type.sys_BaseAssessConclusion" :key="dict.value" :label="dict.label" + :value="dict.value"></el-option> </el-select> - </el-form-item> </el-col - ></el-row> + </el-form-item> </el-col></el-row> - <el-row - ><el-col :span="24"> - <el-form-item - label="闄㈢骇璇勪及鍐呭" - prop="provincialassesscontent" - align="left" - > - <el-input - v-model="medicineform.provincialassesscontent" - type="textarea" - placeholder="璇疯緭鍏ュ唴瀹�" - /> - </el-form-item> </el-col - ></el-row> - <el-row - ><el-col :span="7"> + <el-row><el-col :span="24"> + <el-form-item label="闄㈢骇璇勪及鍐呭" prop="provincialassesscontent" align="left"> + <el-input v-model="medicineform.provincialassesscontent" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" /> + </el-form-item> </el-col></el-row> + <el-row><el-col :span="7"> <el-form-item label="鐪佺骇璇勪及鍖荤敓" prop="provincialassessdoctor"> - <el-input - v-model="medicineform.provincialassessdoctor" - placeholder="璇疯緭鍏ョ渷绾ц瘎浼板尰鐢�" - /> </el-form-item></el-col - ><el-col :span="9"> + <el-input v-model="medicineform.provincialassessdoctor" placeholder="璇疯緭鍏ョ渷绾ц瘎浼板尰鐢�" /> + </el-form-item></el-col><el-col :span="9"> <el-form-item label="璇勪及鏃堕棿" prop="provincialassesstime"> - <el-date-picker - clearable - size="small" - v-model="medicineform.provincialassesstime" - type="date" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="閫夋嫨鐪佺骇璇勪及鏃堕棿" - > - </el-date-picker> </el-form-item></el-col - ><el-col :span="8"> - <el-form-item - label="璇勪及缁撹" - prop="provincialassessconclusion" - align="left" - > - <el-select - v-model="medicineform.provincialassessconclusion" - placeholder="璇烽�夋嫨鐪佺骇璇勪及缁撹" - > - <el-option - v-for="dict in dict.type.sys_BaseAssessConclusion" - :key="dict.value" - :label="dict.label" - :value="dict.value" - ></el-option> + <el-date-picker clearable size="small" v-model="medicineform.provincialassesstime" type="date" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鐪佺骇璇勪及鏃堕棿"> + </el-date-picker> </el-form-item></el-col><el-col :span="8"> + <el-form-item label="璇勪及缁撹" prop="provincialassessconclusion" align="left"> + <el-select v-model="medicineform.provincialassessconclusion" placeholder="璇烽�夋嫨鐪佺骇璇勪及缁撹"> + <el-option v-for="dict in dict.type.sys_BaseAssessConclusion" :key="dict.value" :label="dict.label" + :value="dict.value"></el-option> </el-select> - </el-form-item> </el-col - ></el-row> + </el-form-item> </el-col></el-row> <el-row> <el-col :span="24"> - <el-form-item - align="left" - label="鐪佺骇璇勪及鍐呭" - prop="hospitalassesscontent" - > - <el-input - v-model="medicineform.hospitalassesscontent" - type="textarea" - placeholder="璇疯緭鍏ュ唴瀹�" - /> + <el-form-item align="left" label="鐪佺骇璇勪及鍐呭" prop="hospitalassesscontent"> + <el-input v-model="medicineform.hospitalassesscontent" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" /> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="7"> <el-form-item label="鏍稿績璇勪及鍖荤敓" prop="coreteamassessdoctor"> - <el-input - v-model="medicineform.coreteamassessdoctor" - placeholder="璇疯緭鍏ユ牳蹇冩垚鍛樿瘎浼板尰鐢�" - /> + <el-input v-model="medicineform.coreteamassessdoctor" placeholder="璇疯緭鍏ユ牳蹇冩垚鍛樿瘎浼板尰鐢�" /> </el-form-item> </el-col> <el-col :span="9"> <el-form-item label="璇勪及鏃堕棿" prop="coreteamassesstime"> - <el-date-picker - clearable - size="small" - v-model="medicineform.coreteamassesstime" - type="date" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="璇勪及鏃堕棿" - > + <el-date-picker clearable size="small" v-model="medicineform.coreteamassesstime" type="date" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="璇勪及鏃堕棿"> </el-date-picker> </el-form-item> </el-col> <el-col :span="8"> - <el-form-item - label="璇勪及缁撹" - prop="coreteamassessconclusion" - align="left" - > - <el-select - v-model="medicineform.coreteamassessconclusion" - placeholder="璇烽�夋嫨鏍稿績鎴愬憳缁撹" - > - <el-option - v-for="dict in dict.type.sys_CoreAssessConclusion" - :key="dict.value" - :label="dict.label" - :value="dict.value" - ></el-option> + <el-form-item label="璇勪及缁撹" prop="coreteamassessconclusion" align="left"> + <el-select v-model="medicineform.coreteamassessconclusion" placeholder="璇烽�夋嫨鏍稿績鎴愬憳缁撹"> + <el-option v-for="dict in dict.type.sys_CoreAssessConclusion" :key="dict.value" :label="dict.label" + :value="dict.value"></el-option> </el-select> </el-form-item> </el-col> </el-row> - <el-row - ><el-col :span="24"> - <el-form-item - label="鏍稿績鎴愬憳璇勪及" - prop="coreteamassesscontent" - align="left" - > - <el-input - v-model="medicineform.coreteamassesscontent" - type="textarea" - placeholder="璇疯緭鍏ュ唴瀹�" - /> + <el-row><el-col :span="24"> + <el-form-item label="鏍稿績鎴愬憳璇勪及" prop="coreteamassesscontent" align="left"> + <el-input v-model="medicineform.coreteamassesscontent" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" /> </el-form-item> </el-col> </el-row> </el-form> <div class="dialog-footer"> - <el-button - v-show="!showTerminationBtn" - type="primary" - @click="Savethedetails" - >淇濆瓨</el-button - > - <el-button - :type="showTerminationBtn == 0 ? 'warning' : 'success'" - @click="Terminationcase" - >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button - > + <el-button v-show="!showTerminationBtn" type="primary" @click="Savethedetails">淇濆瓨</el-button> + <el-button :type="showTerminationBtn == 0 ? 'warning' : 'success'" @click="Terminationcase">{{ + showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button> <!-- <el-button v-show="makeastepforward" type="primary" @@ -963,13 +573,7 @@ </div> <!-- 鎹愮尞纭 --> <div class="boxdiv" v-show="actives == 2"> - <el-form - ref="affirmform" - :model="affirmform" - :rules="affirmrules" - label-width="100px" - label-position="right" - > + <el-form ref="affirmform" :model="affirmform" :rules="affirmrules" label-width="100px" label-position="right"> <el-row> <el-col :span="6"> <el-form-item label="浜插睘濮撳悕" prop="name"> @@ -977,40 +581,21 @@ </el-form-item> </el-col> <el-col :span="6"> - <el-form-item - align="left" - label="涓庢崘璧犺�呭叧绯�" - prop="familyrelations" - > - <el-select - v-model="affirmform.familyrelations" - placeholder="璇烽�夋嫨涓庢崘璧犺�呭叧绯�" - > - <el-option - v-for="dict in dict.type.sys_FamilyRelation" - :key="dict.value" - :label="dict.label" - :value="dict.value" - ></el-option> + <el-form-item align="left" label="涓庢崘璧犺�呭叧绯�" prop="familyrelations"> + <el-select v-model="affirmform.familyrelations" placeholder="璇烽�夋嫨涓庢崘璧犺�呭叧绯�"> + <el-option v-for="dict in dict.type.sys_FamilyRelation" :key="dict.value" :label="dict.label" + :value="dict.value"></el-option> </el-select> </el-form-item> </el-col> <el-col :span="6"> <el-form-item label="韬唤璇佸彿" prop="idcardno"> - <el-input - ref="updateBSvalue" - class="sfzcode" - v-model="affirmform.idcardno" - placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�" - /> + <el-input ref="updateBSvalue" class="sfzcode" v-model="affirmform.idcardno" placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�" /> </el-form-item> </el-col> <el-col :span="6"> <el-form-item label="鑱旂郴鐢佃瘽" prop="phone"> - <el-input - v-model="affirmform.phone" - placeholder="璇疯緭鍏ヨ仈绯荤數璇�" - /> + <el-input v-model="affirmform.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" /> </el-form-item> </el-col> </el-row> @@ -1018,20 +603,14 @@ <el-col :span="12"> <el-form-item label="浜插睘绫嶈疮" prop="residenceaddresss"> <div> - <li_area_select - v-model="defultAddresss" - ref="residenceaddresss" - ></li_area_select> + <li_area_select v-model="defultAddresss" ref="residenceaddresss"></li_area_select> <!-- <div>{{defultAddress}}</div> --> </div> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="鐜颁綇鍦板潃" prop="residenceaddress"> - <el-input - v-model="affirmform.residenceaddress" - placeholder="璇疯緭鍏ュ唴瀹�" - /> + <el-input v-model="affirmform.residenceaddress" placeholder="璇疯緭鍏ュ唴瀹�" /> </el-form-item> </el-col> </el-row> @@ -1039,11 +618,7 @@ <el-col :span="12"> <el-form-item label="绛惧瓧浜插睘" prop="kinshipconfirmationsign"> <el-checkbox-group v-model="organdecision"> - <el-checkbox - v-for="item in kinshiplist" - :key="item" - :label="item" - > + <el-checkbox v-for="item in kinshiplist" :key="item" :label="item"> {{ item == "瀛愬コ" ? item + "(浜�)" : item }} </el-checkbox> </el-checkbox-group> @@ -1051,29 +626,19 @@ </el-col> <el-col :span="6"> <el-form-item label="鎴愬勾瀛愬コ鏁�" prop="kinshipChildrennum"> - <el-input - v-model="affirmform.kinshipChildrennum" - placeholder="璇疯緭鍏ユ暟閲�" - /> + <el-input v-model="affirmform.kinshipChildrennum" placeholder="璇疯緭鍏ユ暟閲�" /> </el-form-item> </el-col> <el-col :span="6"> <el-form-item label="鍏朵粬浜插睘" prop="organdecisionOther"> - <el-input - v-model="affirmform.organdecisionOther" - placeholder="璇疯緭鍏ュ叾浠�" - /> + <el-input v-model="affirmform.organdecisionOther" placeholder="璇疯緭鍏ュ叾浠�" /> </el-form-item> </el-col> </el-row> <el-row> <el-form-item label-width="100px" label="鎹愮尞鍐冲畾"> <el-checkbox-group v-model="organdecision"> - <el-checkbox - v-for="item in organselection" - :key="item" - :label="item" - >{{ item }} + <el-checkbox v-for="item in organselection" :key="item" :label="item">{{ item }} </el-checkbox> </el-checkbox-group> </el-form-item> @@ -1096,95 +661,49 @@ <el-row> <el-col :span="12"> <el-form-item label="鑾峰彇缁勭粐" prop="acquisitiontissuename"> - <org-selecter - style="width: 260px" - ref="orgSelecter" - :org-type="'1'" - v-model="form.acquisitiontissueno" - /> + <org-selecter style="width: 260px" ref="orgSelecter" :org-type="'1'" v-model="form.acquisitiontissueno" /> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="6"> <el-form-item label="璐熻矗浜�" prop="responsibleuserid"> - <el-select - v-model="affirmform.responsibleuserid" - placeholder="璇烽�夋嫨" - > - <el-option - v-for="item in leaderlist" - :key="item.reportNo" - :label="item.reportName" - :value="item.reportNo" - > + <el-select v-model="affirmform.responsibleuserid" placeholder="璇烽�夋嫨"> + <el-option v-for="item in leaderlist" :key="item.reportNo" :label="item.reportName" + :value="item.reportNo"> </el-option> </el-select> </el-form-item> </el-col> <el-col :span="6"> <el-form-item label="鍗忚皟鍛�1" prop="coordinateduserido"> - <el-select - v-model="affirmform.coordinateduserido" - placeholder="璇烽�夋嫨" - > - <el-option - v-for="item in coordinatorlist1" - :key="item.reportNo" - :label="item.reportName" - :value="item.reportNo" - > + <el-select v-model="affirmform.coordinateduserido" placeholder="璇烽�夋嫨"> + <el-option v-for="item in coordinatorlist1" :key="item.reportNo" :label="item.reportName" + :value="item.reportNo"> </el-option> </el-select> </el-form-item> </el-col> <el-col :span="6"> <el-form-item label="鍗忚皟鍛�2" prop="coordinateduseridt"> - <el-select - v-model="affirmform.coordinateduseridt" - placeholder="璇烽�夋嫨" - > - <el-option - v-for="item in coordinatorlist1" - :key="item.reportNo" - :label="item.reportName" - :value="item.reportNo" - > + <el-select v-model="affirmform.coordinateduseridt" placeholder="璇烽�夋嫨"> + <el-option v-for="item in coordinatorlist1" :key="item.reportNo" :label="item.reportName" + :value="item.reportNo"> </el-option> </el-select> - </el-form-item> </el-col - ><el-col :span="6"> - <el-form-item - align="left" - label="绛惧瓧鏃ユ湡" - prop="signdate" - style="over-flow: hidden" - > - <el-date-picker - clearable - size="small" - v-model="affirmform.signdate" - type="date" - value-format="yyyy-MM-dd hh:mm:ss" - placeholder="閫夋嫨绛惧瓧鏃ユ湡" - > + </el-form-item> </el-col><el-col :span="6"> + <el-form-item align="left" label="绛惧瓧鏃ユ湡" prop="signdate" style="over-flow: hidden"> + <el-date-picker clearable size="small" v-model="affirmform.signdate" type="date" + value-format="yyyy-MM-dd hh:mm:ss" placeholder="閫夋嫨绛惧瓧鏃ユ湡"> </el-date-picker> </el-form-item> </el-col> </el-row> </el-form> <div class="dialog-footer"> - <el-button - v-show="!showTerminationBtn" - type="primary" - @click="Savethedetails" - >淇濆瓨</el-button - > - <el-button - :type="showTerminationBtn == 0 ? 'warning' : 'success'" - @click="Terminationcase" - >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button - > + <el-button v-show="!showTerminationBtn" type="primary" @click="Savethedetails">淇濆瓨</el-button> + <el-button :type="showTerminationBtn == 0 ? 'warning' : 'success'" @click="Terminationcase">{{ + showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button> <!-- <el-button v-show="makeastepforward" type="primary" @@ -1196,23 +715,13 @@ </div> <!-- 浼︾悊瀹℃煡 --> <div class="boxdiv" v-show="actives == 3"> - <el-form - ref="ethicform" - :model="ethicform" - :rules="ethicrules" - label-width="100px" - label-position="right" - > + <el-form ref="ethicform" :model="ethicform" :rules="ethicrules" label-width="100px" label-position="right"> <el-row> <el-col :span="18"> <el-form-item label="瀹℃煡缁撹"> <el-radio-group v-model="ethicform.expertconclusion"> - <el-radio - v-for="dict in dict.type.sys_EthicalReview" - :key="dict.value" - :label="parseInt(dict.value)" - >{{ dict.label }}</el-radio - > + <el-radio v-for="dict in dict.type.sys_EthicalReview" :key="dict.value" :label="parseInt(dict.value)">{{ + dict.label }}</el-radio> </el-radio-group> </el-form-item> </el-col> @@ -1220,11 +729,7 @@ <el-row> <el-col :span="18"> <el-form-item label="瀹℃煡鎰忚"> - <el-input - v-model="ethicform.expertopinion" - type="textarea" - placeholder="璇疯緭鍏ュ唴瀹�" - /> + <el-input v-model="ethicform.expertopinion" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" /> </el-form-item> </el-col> </el-row> @@ -1232,30 +737,15 @@ <!-- createtime 瀹℃煡鏃ユ湡 --> <el-col :span="18"> <el-form-item label="瀹℃煡鏃ユ湡"> - <el-date-picker - clearable - size="small" - v-model="ethicform.conclusiontime" - type="date" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="閫夋嫨缁撹鏃堕棿" - > + <el-date-picker clearable size="small" v-model="ethicform.conclusiontime" type="date" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨缁撹鏃堕棿"> </el-date-picker> - </el-form-item> </el-col - ></el-row> + </el-form-item> </el-col></el-row> </el-form> <div class="dialog-footer" style="min-height: 500px; margin: 20px 0; "> - <el-button - v-show="!showTerminationBtn" - type="primary" - @click="Savethedetails" - >淇濆瓨</el-button - > - <el-button - :type="showTerminationBtn == 0 ? 'warning' : 'success'" - @click="Terminationcase" - >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button - > + <el-button v-show="!showTerminationBtn" type="primary" @click="Savethedetails">淇濆瓨</el-button> + <el-button :type="showTerminationBtn == 0 ? 'warning' : 'success'" @click="Terminationcase">{{ + showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button> <!-- <el-button v-show="makeastepforward" type="primary" @@ -1267,22 +757,13 @@ </div> <!-- 鍣ㄥ畼鍒嗛厤 --> <div class="boxdiv" v-show="actives == 4"> - <el-form - ref="allocateddata" - :model="allocateddata" - :rules="allocationrules" - label-position="right" - > + <el-form ref="allocateddata" :model="allocateddata" :rules="allocationrules" label-position="right"> <el-row> <el-col> <el-form-item label-width="100px" label="鍒嗛厤鍣ㄥ畼"> <el-checkbox-group v-model="organList.organallocated"> - <el-checkbox - v-for="dict in dict.type.sys_Organ" - :key="dict.value" - :label="dict.value" - @change="changeorganState(dict.value)" - > + <el-checkbox v-for="dict in dict.type.sys_Organ" :key="dict.value" :label="dict.value" + @change="changeorganState(dict.value)"> {{ dict.label }} </el-checkbox> </el-checkbox-group> @@ -1293,69 +774,27 @@ <el-col> <el-form-item> <el-table v-loading="loading" border :data="allocateddata"> - <el-table-column - label="鍣ㄥ畼鍚嶇О" - align="center" - width="110" - prop="organname" - > + <el-table-column label="鍣ㄥ畼鍚嶇О" align="center" width="110" prop="organname"> <template slot-scope="scope"> - <el-input - v-model="scope.row.organname" - placeholder="鍣ㄥ畼鍚嶇О" - :disabled="scope.row.organno != 'C01'" - /> + <el-input v-model="scope.row.organname" placeholder="鍣ㄥ畼鍚嶇О" :disabled="scope.row.organno != 'C01'" /> </template> </el-table-column> - <el-table-column - label="鍣ㄥ畼缂栧彿" - align="center" - width="90" - prop="organno" - /> - <el-table-column - label="绯荤粺缂栧彿" - align="center" - width="120" - prop="caseno" - > + <el-table-column label="鍣ㄥ畼缂栧彿" align="center" width="90" prop="organno" /> + <el-table-column label="绯荤粺缂栧彿" align="center" width="120" prop="caseno"> <template slot-scope="scope"> - <el-input - v-model="scope.row.caseno" - placeholder="绯荤粺缂栧彿" - /> + <el-input v-model="scope.row.caseno" placeholder="绯荤粺缂栧彿" /> </template> </el-table-column> - <el-table-column - label="鎺ユ敹鏃堕棿" - align="center" - width="200" - prop="applicanttime" - > + <el-table-column label="鎺ユ敹鏃堕棿" align="center" width="200" prop="applicanttime"> <template slot-scope="scope"> - <el-date-picker - clearable - size="small" - style="width: 100%" - v-model="scope.row.applicanttime" - type="datetime" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="閫夋嫨鎺ユ敹鏃堕棿" - > + <el-date-picker clearable size="small" style="width: 100%" v-model="scope.row.applicanttime" + type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鎺ユ敹鏃堕棿"> </el-date-picker> </template> </el-table-column> - <el-table-column - label="鍙椾綋濮撳悕" - align="center" - width="120" - prop="name" - > + <el-table-column label="鍙椾綋濮撳悕" align="center" width="120" prop="name"> <template slot-scope="scope"> - <el-input - v-model="scope.row.name" - placeholder="鍙椾綋濮撳悕" - /> + <el-input v-model="scope.row.name" placeholder="鍙椾綋濮撳悕" /> </template> </el-table-column> <!-- @@ -1381,35 +820,16 @@ </template> </el-table-column> --> - <el-table-column - prop="reallocationreason" - label="璇存槑" - align="center" - > + <el-table-column prop="reallocationreason" label="璇存槑" align="center"> <template slot-scope="scope"> - <el-input - type="textarea" - clearable - v-model="scope.row.reallocationreason" - placeholder="璇疯緭鍏ヨ鏄�" - /> + <el-input type="textarea" clearable v-model="scope.row.reallocationreason" placeholder="璇疯緭鍏ヨ鏄�" /> </template> </el-table-column> - <el-table-column - label="鎿嶄綔" - align="center" - width="100" - class-name="small-padding fixed-width" - v-if="actives == 4" - > + <el-table-column label="鎿嶄綔" align="center" width="100" class-name="small-padding fixed-width" + v-if="actives == 4"> <template slot-scope="scope"> - <el-button - size="mini" - type="text" - icon="el-icon-copy-document" - @click="redistribution(scope.row)" - >閲嶅垎閰�</el-button - > + <el-button size="mini" type="text" icon="el-icon-copy-document" + @click="redistribution(scope.row)">閲嶅垎閰�</el-button> </template> </el-table-column> </el-table> @@ -1418,17 +838,9 @@ </el-row> </el-form> <div class="dialog-footer" v-show="actives == 4"> - <el-button - v-show="!showTerminationBtn" - type="primary" - @click="Savethedetails" - >淇濆瓨</el-button - > - <el-button - :type="showTerminationBtn == 0 ? 'warning' : 'success'" - @click="Terminationcase" - >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button - > + <el-button v-show="!showTerminationBtn" type="primary" @click="Savethedetails">淇濆瓨</el-button> + <el-button :type="showTerminationBtn == 0 ? 'warning' : 'success'" @click="Terminationcase">{{ + showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button> <!-- <el-button v-show="makeastepforward" type="primary" @@ -1440,27 +852,13 @@ </div> <!-- 鑾峰彇瑙佽瘉 --> <div class="boxdiv" v-show="actives == 5"> - <el-form - ref="witnessform" - :model="witnessform" - :rules="witnessrules" - label-width="100px" - label-position="right" - > + <el-form ref="witnessform" :model="witnessform" :rules="witnessrules" label-width="100px" label-position="right"> <el-row> <el-col :span="24"> - <el-form-item - align="left" - label="鎹愮尞绫诲埆" - prop="donationcategory" - > + <el-form-item align="left" label="鎹愮尞绫诲埆" prop="donationcategory"> <el-radio-group v-model="witnessform.donationcategory"> - <el-radio - v-for="dict in dict.type.sys_DonationCategory" - :key="dict.value" - :label="dict.value" - >{{ dict.label }}</el-radio - > + <el-radio v-for="dict in dict.type.sys_DonationCategory" :key="dict.value" :label="dict.value">{{ + dict.label }}</el-radio> </el-radio-group> </el-form-item> </el-col> @@ -1468,234 +866,100 @@ <el-row> </el-row> <el-row> <el-col :span="6"> - <el-form-item - align="left" - label="姝讳骸鍒ゅ畾锛氬尰鐢熶竴" - label-width="140px" - prop="deathjudgedocto" - > - <el-input - v-model="witnessform.deathjudgedocto" - placeholder="鍒ゅ畾鍖荤敓濮撳悕" - /> + <el-form-item align="left" label="姝讳骸鍒ゅ畾锛氬尰鐢熶竴" label-width="140px" prop="deathjudgedocto"> + <el-input v-model="witnessform.deathjudgedocto" placeholder="鍒ゅ畾鍖荤敓濮撳悕" /> </el-form-item> </el-col> <el-col :span="6"> - <el-form-item - align="left" - label="鍖荤敓浜�" - label-width="120px" - prop="deathjudgedoctt" - > - <el-input - v-model="witnessform.deathjudgedoctt" - placeholder="鍒ゅ畾鍖荤敓濮撳悕" - /> + <el-form-item align="left" label="鍖荤敓浜�" label-width="120px" prop="deathjudgedoctt"> + <el-input v-model="witnessform.deathjudgedoctt" placeholder="鍒ゅ畾鍖荤敓濮撳悕" /> </el-form-item> </el-col> <el-col :span="6"> - <el-form-item - align="left" - label="姝讳骸鏃堕棿" - label-width="120px" - prop="deathtime" - > - <el-date-picker - clearable - v-model="witnessform.deathtime" - type="datetime" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="閫夋嫨姝讳骸鏃堕棿" - > + <el-form-item align="left" label="姝讳骸鏃堕棿" label-width="120px" prop="deathtime"> + <el-date-picker clearable v-model="witnessform.deathtime" type="datetime" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨姝讳骸鏃堕棿"> </el-date-picker> </el-form-item> </el-col> <el-col :span="6"> - <el-form-item - align="left" - label="姝讳骸鍘熷洜" - label-width="120px" - prop="deathreason" - > - <el-input - v-model="witnessform.deathreason" - placeholder="璇疯緭鍏ユ浜″師鍥�" - /> + <el-form-item align="left" label="姝讳骸鍘熷洜" label-width="120px" prop="deathreason"> + <el-input v-model="witnessform.deathreason" placeholder="璇疯緭鍏ユ浜″師鍥�" /> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="6"> - <el-form-item - align="left" - label="鎵嬫湳锛氬紑濮嬫椂闂�" - label-width="140px" - prop="operationbegtime" - > - <el-date-picker - clearable - v-model="witnessform.operationbegtime" - type="datetime" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="閫夋嫨鎵嬫湳寮�濮嬫椂闂�" - > + <el-form-item align="left" label="鎵嬫湳锛氬紑濮嬫椂闂�" label-width="140px" prop="operationbegtime"> + <el-date-picker clearable v-model="witnessform.operationbegtime" type="datetime" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鎵嬫湳寮�濮嬫椂闂�"> </el-date-picker> </el-form-item> </el-col> <el-col :span="6"> - <el-form-item - align="left" - label="缁撴潫鏃堕棿" - label-width="120px" - prop="operationendtime" - > - <el-date-picker - clearable - v-model="witnessform.operationendtime" - type="datetime" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="閫夋嫨鎵嬫湳缁撴潫鏃堕棿" - > + <el-form-item align="left" label="缁撴潫鏃堕棿" label-width="120px" prop="operationendtime"> + <el-date-picker clearable v-model="witnessform.operationendtime" type="datetime" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鎵嬫湳缁撴潫鏃堕棿"> </el-date-picker> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="6"> - <el-form-item - label="鑵逛富鍔ㄨ剦锛氭彃绠℃椂闂�" - align="left" - label-width="140px" - prop="abdominalaortacannulatime" - > - <el-date-picker - clearable - v-model="witnessform.abdominalaortacannulatime" - type="datetime" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="閫夋嫨鑵逛富鍔ㄨ剦鎻掔鏃堕棿" - > + <el-form-item label="鑵逛富鍔ㄨ剦锛氭彃绠℃椂闂�" align="left" label-width="140px" prop="abdominalaortacannulatime"> + <el-date-picker clearable v-model="witnessform.abdominalaortacannulatime" type="datetime" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鑵逛富鍔ㄨ剦鎻掔鏃堕棿"> </el-date-picker> </el-form-item> </el-col> <el-col :span="6"> - <el-form-item - label="鐏屾敞鏃堕棿" - align="left" - label-width="120px" - prop="abdominalaortaperfusiontime" - > - <el-date-picker - clearable - v-model="witnessform.abdominalaortaperfusiontime" - type="datetime" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="閫夋嫨鑵逛富鍔ㄨ剦鐏屾敞鏃堕棿" - > + <el-form-item label="鐏屾敞鏃堕棿" align="left" label-width="120px" prop="abdominalaortaperfusiontime"> + <el-date-picker clearable v-model="witnessform.abdominalaortaperfusiontime" type="datetime" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鑵逛富鍔ㄨ剦鐏屾敞鏃堕棿"> </el-date-picker> </el-form-item> </el-col> <el-col :span="6"> - <el-form-item - label="闂ㄩ潤鑴夛細鎻掔鏃堕棿" - align="left" - label-width="140px" - prop="portalveincannulatime" - > - <el-date-picker - clearable - v-model="witnessform.portalveincannulatime" - type="datetime" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="閫夋嫨闂ㄩ潤鑴夎剦鎻掔鏃堕棿" - > + <el-form-item label="闂ㄩ潤鑴夛細鎻掔鏃堕棿" align="left" label-width="140px" prop="portalveincannulatime"> + <el-date-picker clearable v-model="witnessform.portalveincannulatime" type="datetime" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨闂ㄩ潤鑴夎剦鎻掔鏃堕棿"> </el-date-picker> </el-form-item> </el-col> <el-col :span="6"> - <el-form-item - label="鐏屾敞鏃堕棿" - align="left" - label-width="120px" - prop="portalveinperfusiontime" - > - <el-date-picker - clearable - v-model="witnessform.portalveinperfusiontime" - type="datetime" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="閫夋嫨闂ㄩ潤鑴夌亴娉ㄦ椂闂�" - > + <el-form-item label="鐏屾敞鏃堕棿" align="left" label-width="120px" prop="portalveinperfusiontime"> + <el-date-picker clearable v-model="witnessform.portalveinperfusiontime" type="datetime" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨闂ㄩ潤鑴夌亴娉ㄦ椂闂�"> </el-date-picker> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="6"> - <el-form-item - label="鑲哄姩鑴夛細鎻掔鏃堕棿" - align="left" - label-width="140px" - prop="pulmonaryarterycannulatime" - > - <el-date-picker - clearable - v-model="witnessform.pulmonaryarterycannulatime" - type="datetime" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="閫夋嫨闂ㄩ潤鑴夋彃绠℃椂闂�" - > + <el-form-item label="鑲哄姩鑴夛細鎻掔鏃堕棿" align="left" label-width="140px" prop="pulmonaryarterycannulatime"> + <el-date-picker clearable v-model="witnessform.pulmonaryarterycannulatime" type="datetime" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨闂ㄩ潤鑴夋彃绠℃椂闂�"> </el-date-picker> </el-form-item> </el-col> <el-col :span="6"> - <el-form-item - label="鐏屾敞鏃堕棿" - align="left" - label-width="120px" - prop="pulmonaryarteryperfusiontime" - > - <el-date-picker - clearable - v-model="witnessform.pulmonaryarteryperfusiontime" - type="datetime" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="閫夋嫨闂ㄩ潤鑴夌亴娉ㄦ椂闂�" - > + <el-form-item label="鐏屾敞鏃堕棿" align="left" label-width="120px" prop="pulmonaryarteryperfusiontime"> + <el-date-picker clearable v-model="witnessform.pulmonaryarteryperfusiontime" type="datetime" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨闂ㄩ潤鑴夌亴娉ㄦ椂闂�"> </el-date-picker> </el-form-item> </el-col> <el-col :span="6"> - <el-form-item - label="涓诲姩鑴夛細鐏屾敞鏃堕棿" - align="left" - label-width="140px" - prop="aortacannulatime" - > - <el-date-picker - clearable - v-model="witnessform.aortacannulatime" - type="datetime" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="閫夋嫨涓诲姩鑴夌亴娉ㄦ椂闂�" - > + <el-form-item label="涓诲姩鑴夛細鐏屾敞鏃堕棿" align="left" label-width="140px" prop="aortacannulatime"> + <el-date-picker clearable v-model="witnessform.aortacannulatime" type="datetime" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨涓诲姩鑴夌亴娉ㄦ椂闂�"> </el-date-picker> </el-form-item> </el-col> <el-col :span="6"> - <el-form-item - label="鐏屾敞鏃堕棿" - align="left" - label-width="120px" - prop="aortaperfusiontime" - > - <el-date-picker - clearable - v-model="witnessform.aortaperfusiontime" - type="datetime" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="閫夋嫨涓诲姩鑴夌亴娉ㄦ椂闂�" - > + <el-form-item label="鐏屾敞鏃堕棿" align="left" label-width="120px" prop="aortaperfusiontime"> + <el-date-picker clearable v-model="witnessform.aortaperfusiontime" type="datetime" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨涓诲姩鑴夌亴娉ㄦ椂闂�"> </el-date-picker> </el-form-item> </el-col> @@ -1704,12 +968,8 @@ <el-col> <el-form-item label-width="100px" label="鑾峰彇鍣ㄥ畼"> <el-checkbox-group v-model="organList.organprocured"> - <el-checkbox - v-for="dict in dict.type.sys_Organ" - :key="dict.value" - :label="dict.value" - @change="changeorganprocured(dict.value)" - > + <el-checkbox v-for="dict in dict.type.sys_Organ" :key="dict.value" :label="dict.value" + @change="changeorganprocured(dict.value)"> {{ dict.label }} </el-checkbox> </el-checkbox-group> @@ -1720,106 +980,42 @@ <el-col> <el-form-item> <el-table v-loading="loading" border :data="procureddata"> - <el-table-column - label="鍣ㄥ畼鍚嶇О" - align="center" - width="110" - prop="organname" - > + <el-table-column label="鍣ㄥ畼鍚嶇О" align="center" width="110" prop="organname"> <template slot-scope="scope"> - <el-input - v-model="scope.row.organname" - placeholder="鍣ㄥ畼鍚嶇О" - :disabled="scope.row.organno != 'C01'" - /> + <el-input v-model="scope.row.organname" placeholder="鍣ㄥ畼鍚嶇О" :disabled="scope.row.organno != 'C01'" /> </template> </el-table-column> - <el-table-column - label="鍣ㄥ畼缂栧彿" - align="center" - width="90" - prop="organno" - /> - <el-table-column - label="鍣ㄥ畼绂讳綋鏃堕棿" - align="center" - width="200" - prop="organgettime" - > + <el-table-column label="鍣ㄥ畼缂栧彿" align="center" width="90" prop="organno" /> + <el-table-column label="鍣ㄥ畼绂讳綋鏃堕棿" align="center" width="200" prop="organgettime"> <template slot-scope="scope"> - <el-date-picker - clearable - size="small" - style="width: 100%" - v-model="scope.row.organgettime" - type="datetime" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="璇疯緭鍏ュ櫒瀹樼浣撴椂闂�" - > + <el-date-picker clearable size="small" style="width: 100%" v-model="scope.row.organgettime" + type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="璇疯緭鍏ュ櫒瀹樼浣撴椂闂�"> </el-date-picker> </template> </el-table-column> - <el-table-column - label="鑾峰彇鍖婚櫌" - align="center" - width="230" - prop="gainhospitalno" - > + <el-table-column label="鑾峰彇鍖婚櫌" align="center" width="230" prop="gainhospitalno"> <template slot-scope="scope"> <div class="elldiv"> - <org-selecter - ref="tranHosSelect" - :org-type="'4'" - v-model="scope.row.gainhospitalno" - /> + <org-selecter ref="tranHosSelect" :org-type="'4'" v-model="scope.row.gainhospitalno" /> </div> </template> </el-table-column> - <el-table-column - label="鑾峰彇鍖诲笀" - align="center" - width="120" - prop="organgetdoct" - > + <el-table-column label="鑾峰彇鍖诲笀" align="center" width="120" prop="organgetdoct"> <template slot-scope="scope"> - <el-input - v-model="scope.row.organgetdoct" - placeholder="璇疯緭鍏ュ尰甯堝鍚�" - /> + <el-input v-model="scope.row.organgetdoct" placeholder="璇疯緭鍏ュ尰甯堝鍚�" /> </template> </el-table-column> - <el-table-column - label="鑾峰彇鐘舵��" - align="center" - width="150" - prop="organstate" - > + <el-table-column label="鑾峰彇鐘舵��" align="center" width="150" prop="organstate"> <template slot-scope="scope"> - <el-select - v-model="scope.row.organstate" - placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��" - > - <el-option - v-for="dict in organstatelist" - :key="dict.value" - :label="dict.label" - :value="dict.value" - ></el-option> + <el-select v-model="scope.row.organstate" placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"> + <el-option v-for="dict in organstatelist" :key="dict.value" :label="dict.label" + :value="dict.value"></el-option> </el-select> </template> </el-table-column> - <el-table-column - label="璇存槑" - align="center" - prop="notgetreason" - > + <el-table-column label="璇存槑" align="center" prop="notgetreason"> <template slot-scope="scope"> - <el-input - type="textarea" - clearable - v-model="scope.row.notgetreason" - placeholder="璇疯緭鍏ユ湭鑾峰彇璇存槑" - /> + <el-input type="textarea" clearable v-model="scope.row.notgetreason" placeholder="璇疯緭鍏ユ湭鑾峰彇璇存槑" /> </template> </el-table-column> </el-table> @@ -1830,70 +1026,40 @@ <el-col :span="12"> <el-form-item align="left" label="榛樺搥缂呮��浠紡"> <el-radio-group v-model="witnessform.isspendremember"> - <el-radio - v-for="dict in dict.type.sys_0_1" - :key="dict.value" - :label="parseInt(dict.value)" - >{{ dict.label }}</el-radio - > + <el-radio v-for="dict in dict.type.sys_0_1" :key="dict.value" :label="parseInt(dict.value)">{{ + dict.label }}</el-radio> </el-radio-group> </el-form-item> </el-col> <el-col :span="12"> <el-form-item align="left" label="鎭㈠閬椾綋浠"> <el-radio-group v-model="witnessform.isrestoreremains"> - <el-radio - v-for="dict in dict.type.sys_0_1" - :key="dict.value" - :label="parseInt(dict.value)" - >{{ dict.label }}</el-radio - > + <el-radio v-for="dict in dict.type.sys_0_1" :key="dict.value" :label="parseInt(dict.value)">{{ + dict.label }}</el-radio> </el-radio-group> - </el-form-item></el-col - > + </el-form-item></el-col> </el-row> <el-row> <el-col :span="8"> - <el-form-item - label="鎵嬫湳璐熻矗浜�" - label-width="140px" - prop="responsibleusername" - > - <el-input - v-model="witnessform.responsibleusername" - placeholder="璇疯緭鍏ヨ礋璐d汉濮撳悕" - /> + <el-form-item label="鎵嬫湳璐熻矗浜�" label-width="140px" prop="responsibleusername"> + <el-input v-model="witnessform.responsibleusername" placeholder="璇疯緭鍏ヨ礋璐d汉濮撳悕" /> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="鍗忚皟鍛樹竴" prop="coordinateduserido"> - <el-select - v-model="witnessform.coordinateduserido" - placeholder="璇烽�夋嫨" - > - <el-option - v-for="item in coordinatorlist1" - :key="item.reportNo" - :label="item.reportName" - :value="item.reportNo" - > + <el-select v-model="witnessform.coordinateduserido" placeholder="璇烽�夋嫨"> + <el-option v-for="item in coordinatorlist1" :key="item.reportNo" :label="item.reportName" + :value="item.reportNo"> </el-option> </el-select> </el-form-item> </el-col> <el-col :span="8"> <el-form-item label="鍗忚皟鍛樹簩" prop="coordinateduseridt"> - <el-select - v-model="witnessform.coordinateduseridt" - placeholder="璇烽�夋嫨" - > - <el-option - v-for="item in coordinatorlist1" - :key="item.reportNo" - :label="item.reportName" - :value="item.reportNo" - > + <el-select v-model="witnessform.coordinateduseridt" placeholder="璇烽�夋嫨"> + <el-option v-for="item in coordinatorlist1" :key="item.reportNo" :label="item.reportName" + :value="item.reportNo"> </el-option> </el-select> </el-form-item> @@ -1902,17 +1068,9 @@ </el-form> <div class="dialog-footer"> - <el-button - v-show="!showTerminationBtn" - type="primary" - @click="Savethedetails" - >淇濆瓨</el-button - > - <el-button - :type="showTerminationBtn == 0 ? 'warning' : 'success'" - @click="Terminationcase" - >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button - > + <el-button v-show="!showTerminationBtn" type="primary" @click="Savethedetails">淇濆瓨</el-button> + <el-button :type="showTerminationBtn == 0 ? 'warning' : 'success'" @click="Terminationcase">{{ + showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button> <!-- <el-button v-show="makeastepforward" type="primary" @@ -1925,23 +1083,14 @@ </div> <!-- 瀹屾垚鐧昏 --> <div class="boxdiv" v-show="actives == 6"> - <el-form - ref="accomplishform" - :model="accomplishform" - :rules="accomplishrules" - label-width="100px" - label-position="right" - > + <el-form ref="accomplishform" :model="accomplishform" :rules="accomplishrules" label-width="100px" + label-position="right"> <el-row> <el-col> <el-form-item label-width="100px" label="绉绘鍣ㄥ畼"> <el-checkbox-group v-model="organList.organtransplant"> - <el-checkbox - v-for="dict in dict.type.sys_Organ" - :key="dict.value" - :label="dict.value" - @change="changeorgantransplant(dict.value)" - > + <el-checkbox v-for="dict in dict.type.sys_Organ" :key="dict.value" :label="dict.value" + @change="changeorgantransplant(dict.value)"> {{ dict.label }} </el-checkbox> </el-checkbox-group> @@ -1952,106 +1101,42 @@ <el-col> <el-form-item> <el-table v-loading="loading" border :data="transplantdata"> - <el-table-column - label="鍣ㄥ畼鍚嶇О" - align="center" - width="110" - prop="organname" - > + <el-table-column label="鍣ㄥ畼鍚嶇О" align="center" width="110" prop="organname"> <template slot-scope="scope"> - <el-input - v-model="scope.row.organname" - placeholder="鍣ㄥ畼鍚嶇О" - :disabled="scope.row.organno != 'C01'" - /> + <el-input v-model="scope.row.organname" placeholder="鍣ㄥ畼鍚嶇О" :disabled="scope.row.organno != 'C01'" /> </template> </el-table-column> - <el-table-column - label="鍣ㄥ畼缂栧彿" - align="center" - width="90" - prop="organno" - /> - <el-table-column - label="绉绘鍖婚櫌" - align="center" - width="220" - prop="transplanthospitalname" - v-if="actives == 6" - > + <el-table-column label="鍣ㄥ畼缂栧彿" align="center" width="90" prop="organno" /> + <el-table-column label="绉绘鍖婚櫌" align="center" width="220" prop="transplanthospitalname" + v-if="actives == 6"> <template slot-scope="scope"> - <org-selecter - ref="tranHosSelect" - :org-type="'4'" - v-model="scope.row.transplanthospitalno" - style="width: 100%" - /> + <org-selecter ref="tranHosSelect" :org-type="'4'" v-model="scope.row.transplanthospitalno" + style="width: 100%" /> </template> </el-table-column> - <el-table-column - label="绉绘璐熻矗浜�" - align="center" - width="120" - prop="transplantdoct" - > + <el-table-column label="绉绘璐熻矗浜�" align="center" width="120" prop="transplantdoct"> <template slot-scope="scope"> - <el-input - v-model="scope.row.transplantdoct" - placeholder="鍖诲笀濮撳悕" - /> + <el-input v-model="scope.row.transplantdoct" placeholder="鍖诲笀濮撳悕" /> </template> </el-table-column> - <el-table-column - label="绉绘鏃堕棿" - align="center" - width="200" - prop="transplanttime" - > + <el-table-column label="绉绘鏃堕棿" align="center" width="200" prop="transplanttime"> <template slot-scope="scope"> - <el-date-picker - clearable - size="small" - style="width: 100%" - v-model="scope.row.transplanttime" - type="datetime" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="閫夋嫨绉绘鏃堕棿" - > + <el-date-picker clearable size="small" style="width: 100%" v-model="scope.row.transplanttime" + type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨绉绘鏃堕棿"> </el-date-picker> </template> </el-table-column> - <el-table-column - label="绉绘鐘舵��" - align="center" - width="150" - prop="transplantstate" - > + <el-table-column label="绉绘鐘舵��" align="center" width="150" prop="transplantstate"> <template slot-scope="scope"> - <el-select - v-model="scope.row.transplantstate" - placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��" - > - <el-option - v-for="dict in transplantstatelist" - :key="dict.value" - :label="dict.label" - :value="dict.value" - ></el-option> + <el-select v-model="scope.row.transplantstate" placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"> + <el-option v-for="dict in transplantstatelist" :key="dict.value" :label="dict.label" + :value="dict.value"></el-option> </el-select> </template> </el-table-column> - <el-table-column - prop="abandonreason" - label="璇存槑" - align="center" - > + <el-table-column prop="abandonreason" label="璇存槑" align="center"> <template slot-scope="scope"> - <el-input - type="textarea" - clearable - v-model="scope.row.abandonreason" - placeholder="璇疯緭鍏ュ純鐢ㄨ鏄�" - /> + <el-input type="textarea" clearable v-model="scope.row.abandonreason" placeholder="璇疯緭鍏ュ純鐢ㄨ鏄�" /> </template> </el-table-column> </el-table> @@ -2062,107 +1147,59 @@ <el-col :span="6"> <el-form-item align="left" label="閬椾綋鎹愮尞" prop="isbodydonation"> <el-radio-group v-model="accomplishform.isbodydonation"> - <el-radio - v-for="dict in dict.type.sys_0_1" - :key="dict.value" - :label="dict.value" - >{{ dict.label }}</el-radio - > + <el-radio v-for="dict in dict.type.sys_0_1" :key="dict.value" :label="dict.value">{{ dict.label + }}</el-radio> </el-radio-group> </el-form-item> </el-col> <el-col :span="12"> <el-form-item align="left" label="鎺ユ敹鍗曚綅" prop="receivingunit"> - <el-input - v-model="accomplishform.receivingunit" - placeholder="璇疯緭鍏ユ帴鍙楀崟浣�" - /> + <el-input v-model="accomplishform.receivingunit" placeholder="璇疯緭鍏ユ帴鍙楀崟浣�" /> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="6"> <el-form-item label="璐熻矗浜�" prop="responsibleuserid"> - <el-select - v-model="accomplishform.responsibleuserid" - placeholder="璇烽�夋嫨" - > - <el-option - v-for="item in leaderlist" - :key="item.reportNo" - :label="item.reportName" - :value="item.reportNo" - > + <el-select v-model="accomplishform.responsibleuserid" placeholder="璇烽�夋嫨"> + <el-option v-for="item in leaderlist" :key="item.reportNo" :label="item.reportName" + :value="item.reportNo"> </el-option> </el-select> </el-form-item> </el-col> <el-col :span="6"> <el-form-item label="鍗忚皟鍛樹竴" prop="coordinateduserido"> - <el-select - v-model="accomplishform.coordinateduserido" - placeholder="璇烽�夋嫨" - > - <el-option - v-for="item in coordinatorlist1" - :key="item.reportNo" - :label="item.reportName" - :value="item.reportNo" - > + <el-select v-model="accomplishform.coordinateduserido" placeholder="璇烽�夋嫨"> + <el-option v-for="item in coordinatorlist1" :key="item.reportNo" :label="item.reportName" + :value="item.reportNo"> </el-option> </el-select> </el-form-item> </el-col> <el-col :span="6"> <el-form-item label="鍗忚皟鍛樹簩" prop="coordinateduseridt"> - <el-select - v-model="accomplishform.coordinateduseridt" - placeholder="璇烽�夋嫨" - > - <el-option - v-for="item in coordinatorlist1" - :key="item.reportNo" - :label="item.reportName" - :value="item.reportNo" - > + <el-select v-model="accomplishform.coordinateduseridt" placeholder="璇烽�夋嫨"> + <el-option v-for="item in coordinatorlist1" :key="item.reportNo" :label="item.reportName" + :value="item.reportNo"> </el-option> </el-select> </el-form-item> </el-col> <el-col :span="6"> <el-form-item label="瀹屾垚鏃堕棿" prop="completetime"> - <el-date-picker - style="width: 167px" - clearable - size="small" - v-model="accomplishform.completetime" - type="date" - value-format="yyyy-MM-dd hh:mm:ss" - placeholder="閫夋嫨瀹屾垚鏃堕棿" - > + <el-date-picker style="width: 167px" clearable size="small" v-model="accomplishform.completetime" + type="date" value-format="yyyy-MM-dd hh:mm:ss" placeholder="閫夋嫨瀹屾垚鏃堕棿"> </el-date-picker> </el-form-item> </el-col> </el-row> </el-form> <div class="dialog-footer"> - <el-button - v-show="!showTerminationBtn" - type="primary" - @click="Savethedetails" - >淇濆瓨</el-button - > - <el-button - :type="showTerminationBtn == 0 ? 'warning' : 'success'" - @click="Terminationcase" - >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button - > - <el-button - v-show="Reportforreview" - type="primary" - @click="Reportforreview" - >鎻愪氦</el-button - > + <el-button v-show="!showTerminationBtn" type="primary" @click="Savethedetails">淇濆瓨</el-button> + <el-button :type="showTerminationBtn == 0 ? 'warning' : 'success'" @click="Terminationcase">{{ + showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button> + <el-button v-show="Reportforreview" type="primary" @click="Reportforreview">鎻愪氦</el-button> <!-- <el-button @click="cancel">鍙� 娑�</el-button> --> </div> </div> @@ -2174,30 +1211,16 @@ :src="require('@/assets/images/wanc.png')" ></el-image> --> <div style="padding: 20px 0; margin: 0 30px"> - <img - style="width: 60px; height: 60px" - src="@/assets/images/wanc.png" - class="user-avatar" - /> + <img style="width: 60px; height: 60px" src="@/assets/images/wanc.png" class="user-avatar" /> </div> <div style="font-size: 28px;">鍏ㄩ儴娴佺▼宸插畬缁擄紒</div> - <img - style="width: 100px; height: 100px" - src="@/assets/images/zhan.png" - class="user-avatar" - /> + <img style="width: 100px; height: 100px" src="@/assets/images/zhan.png" class="user-avatar" /> </div> </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 style="text-align: right;"> <el-button type="success" @click="drawer = true" >鏂囦欢鎸囧鐩綍</el-button @@ -2209,45 +1232,18 @@ <div class="pdfimg"> <div class="box-pdf"> <div> - <el-upload - size="mini" - class="upload-demo" - :action="uploadFileUrl" - :file-list="fileList" - :show-file-list="false" - multiple - drag - :headers="headers" - :on-success=" - (response, file, fileList) => + <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" + :show-file-list="false" multiple drag :headers="headers" :on-success="(response, file, fileList) => uploadSccess(response, file, fileList) - " - :on-preview="downFile" - :on-error="handleUploadError" - :on-remove="remove" - accept="image/*,.pdf" - > + " :on-preview="downFile" :on-error="handleUploadError" :on-remove="remove" accept="image/*,.pdf"> <i class="el-icon-upload"></i> <div class="el-upload__text"> 灏嗗彂绁ㄦ枃浠舵嫋鍒版澶勶紝鎴� - <em - ><el-button size="small" type="primary" - >鐐瑰嚮涓婁紶</el-button - ></em - > + <em><el-button 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="annexname" - :show-overflow-tooltip="true" - label="鍚嶇О" - > + <el-table :data="fileListto" @row-click="downFile" style="width: 100%" height="400"> + <el-table-column prop="annexname" :show-overflow-tooltip="true" label="鍚嶇О"> <template slot-scope="scope"> <i style="color:#409EFF" class=" el-icon-s-order" />{{ scope.row.annexname @@ -2255,25 +1251,12 @@ </template> </el-table-column> - <el-table-column - prop="name" - width="180" - :show-overflow-tooltip="true" - label="鍔熻兘" - > + <el-table-column prop="name" width="180" :show-overflow-tooltip="true" label="鍔熻兘"> <template slot-scope="scope"> - <el-button - type="primary" - size="mini" - @click.native.prevent.stop="deletedowfile(scope.row)" - >鍒犻櫎</el-button - > - <el-button - type="primary" - size="mini" - @click.native.prevent.stop="moveupdowfile(scope.row)" - >涓婄Щ</el-button - > + <el-button type="primary" size="mini" + @click.native.prevent.stop="deletedowfile(scope.row)">鍒犻櫎</el-button> + <el-button type="primary" size="mini" + @click.native.prevent.stop="moveupdowfile(scope.row)">涓婄Щ</el-button> </template> </el-table-column> </el-table> @@ -2282,11 +1265,7 @@ <div v-if="this.previewpdf && pdfimgsrcList.length" class="pdfimgmin"> <!-- <img :src="pdfimg" /> --> - <el-image - style="width: 95%; height: 90%" - :src="pdfimg" - :preview-src-list="pdfimgsrcList" - > + <el-image style="width: 95%; height: 90%" :src="pdfimg" :preview-src-list="pdfimgsrcList"> </el-image> </div> <div v-else class="pdfimgmins">{{ hintitle }}</div> @@ -2299,17 +1278,11 @@ <el-table ref="filterTable" :data="tableDatafile" style="width: 100%"> <el-table-column prop="name" label="鏂囦欢鍚�" width="250"> </el-table-column> - <el-table-column - prop="tag" - label="绫诲瀷" - :filters="[ - { text: '涓浗涓�绫�(DBD)', value: '涓浗涓�绫�(DBD)' }, - { text: '涓浗浜岀被(DCD)', value: '涓浗浜岀被(DCD)' }, - { text: '涓浗涓夌被(DBCD)', value: '涓浗涓夌被(DBCD)' } - ]" - :filter-method="filterTag" - filter-placement="bottom-end" - > + <el-table-column prop="tag" label="绫诲瀷" :filters="[ + { text: '涓浗涓�绫�(DBD)', value: '涓浗涓�绫�(DBD)' }, + { text: '涓浗浜岀被(DCD)', value: '涓浗浜岀被(DCD)' }, + { text: '涓浗涓夌被(DBCD)', value: '涓浗涓夌被(DBCD)' } + ]" :filter-method="filterTag" filter-placement="bottom-end"> <template slot-scope="scope"> <el-tag :type="scope.row.type" disable-transitions>{{ scope.row.tag @@ -2385,6 +1358,7 @@ } from "@/api/project/donationwitness"; import { listnewDonatecompletioninfo, + listDonatecompletioninfo, addDonatecompletioninfo, updateDonatecompletioninfo, listDonatecomporgan, @@ -2859,7 +1833,8 @@ }); } // 鑾峰彇瀹屾垚鐧昏淇℃伅 - listnewDonatecompletioninfo(accpre).then(response => { + // listnewDonatecompletioninfo(accpre).then(response => { + listDonatecompletioninfo(accpre).then(response => { if (response.code == 200 && response.rows.length) { this.accomplishform = response.rows[0]; this.accomplishform.infoid = this.infoid; @@ -3108,7 +2083,7 @@ }); // 淇濆瓨纭淇℃伅 - if (this.accomplishform.dcid) { + if (this.accomplishform.id) { updateDonatecompletioninfo(this.accomplishform).then(response => { this.$modal.msgSuccess("瀹屾垚鐧昏淇℃伅淇敼鎴愬姛"); }); @@ -3377,7 +2352,7 @@ } }, // 涓婃姤瀹℃牳 - Reportforreview() {}, + Reportforreview() { }, // 缁堟妗堜緥 Terminationcase() { this.form.terminationCase == 1 @@ -3386,7 +2361,7 @@ this.submitForm(); }, // 杩斿洖涓婁竴椤� - cancel() {}, + cancel() { }, // ----------------------------------鏂囦欢 // 鑾峰彇璇锋眰澶� Getnetworkheader() { @@ -3460,7 +2435,7 @@ } }, //鏂囦欢涓婁紶 - handleUploadError() {}, + handleUploadError() { }, remove(file, fileList) { this.fileListto.splice(this.fileListto.indexOf(file), 1); this.annexfilesList = this.fileListto; @@ -3644,8 +2619,8 @@ d.getFullYear() - birthdays.getFullYear() - (d.getMonth() < birthdays.getMonth() || - (d.getMonth() == birthdays.getMonth() && - d.getDate() < birthdays.getDate()) + (d.getMonth() == birthdays.getMonth() && + d.getDate() < birthdays.getDate()) ? 1 : 0); // 璧嬪�肩粰琛ㄦ牸 @@ -3654,7 +2629,7 @@ this.form.age = age; } else { } - } catch {} + } catch { } }, //閲嶆柊鍒嗛厤鍣ㄥ畼 diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue index 8418eb9..8b17f43 100644 --- a/src/views/project/fund/applyDetail/index.vue +++ b/src/views/project/fund/applyDetail/index.vue @@ -7,45 +7,22 @@ <el-row> <el-col :span="5"> <el-form-item label="鎶ラ攢鍗曞彿" prop="bh"> - <el-input - v-model="form.bh" - :disabled="true" - placeholder="鎶ラ攢鍗曞彿" - clearable - /> + <el-input v-model="form.bh" :disabled="true" placeholder="鎶ラ攢鍗曞彿" clearable /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="鐢宠鏃ユ湡" prop="applyTime"> - <el-date-picker - clearable - :disabled="true" - style="width: 100%" - v-model="form.applyTime" - type="date" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="鏃� 鏈�" - > + <el-date-picker clearable :disabled="true" style="width: 100%" v-model="form.applyTime" type="date" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="鏃� 鏈�"> </el-date-picker> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="缁忓姙浜�" prop="username"> - <el-select - v-model="form.username" - placeholder="鐢宠浜�" - clearable - filterable - allow-create - style="width: 100%" - @change="getUserAccount" - > - <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%" + @change="getUserAccount"> + <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> @@ -72,40 +49,24 @@ </el-col> <el-col :span="5" v-if="ismanager == true"> <el-form-item label="鐢宠閲戦" prop="pretaxcost"> - <el-input - v-model="form.pretaxcost" - placeholder="绋庡墠閲戦鍚堣" - :disabled="true" - /> + <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname"> - <el-input - v-model="form.deptmentname" - placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" - clearable - /> + <el-input v-model="form.deptmentname" placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" clearable /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="缁勯暱" prop="managername"> - <el-input - v-model="form.managername" - placeholder="璇疯緭鍏ョ粍闀�" - clearable - /> + <el-input v-model="form.managername" placeholder="璇疯緭鍏ョ粍闀�" clearable /> </el-form-item> </el-col> </el-row> <el-row style="text-align: left"> <el-col :span="5"> <el-form-item label="鎹愮尞妗堜緥" prop="name"> - <el-input - :disabled="true" - v-model="form.donorname" - placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" - /> + <el-input :disabled="true" v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" /> </el-form-item> </el-col> <el-col :span="10"> @@ -127,69 +88,34 @@ <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> <el-col :span="3" v-if="businessType == '1'"> <div style="margin-bottom: 15px;"> - <el-button - type="primary" - icon="el-icon-download" - size="small" - @click.native.prevent="importFeeItems" - > + <el-button type="primary" icon="el-icon-download" size="small" @click.native.prevent="importFeeItems"> 鎵归噺瀵煎叆鏈嶅姟椤圭洰 </el-button> </div> </el-col> <el-col :span="3" v-if="businessType == 2"> <div style="margin-bottom: 15px;"> - <el-button - type="primary" - icon="el-icon-download" - size="small" - @click="Batchentry" - >鎵归噺褰曞叆涓撳</el-button - > + <el-button type="primary" icon="el-icon-download" size="small" @click="Batchentry">鎵归噺褰曞叆涓撳</el-button> </div> </el-col> - <el-col - :span="3" - v-if=" - userprofile.nickName == '闄堟厱鍗�' && - (businessType == '1' || businessType == '2') - " - > + <el-col :span="3" v-if="userprofile.nickName == '闄堟厱鍗�' && + (businessType == '1' || businessType == '2') + "> <div style="margin-bottom: 15px;"> - <el-button - type="success" - icon="el-icon-edit-outline" - size="small" - @click="Manualcalculationfn" - >璁$畻涓◣</el-button - > + <el-button type="success" icon="el-icon-edit-outline" size="small" + @click="Manualcalculationfn">璁$畻涓◣</el-button> </div> </el-col> </el-row> <el-row> - <el-table - :data="rbDetails" - v-loading="loading" - max-height="800" - border - highlight-current-row - > - <el-table-column - prop="orderno" - align="center" - label="搴忓彿" - width="88" - > + <el-table :data="rbDetails" v-loading="loading" max-height="800" border highlight-current-row> + <el-table-column prop="orderno" align="center" label="搴忓彿" width="88"> <template slot-scope="scope"> <el-input v-model="scope.row.orderno" placeholder="搴忓彿" /> </template> @@ -198,192 +124,83 @@ <el-table-column prop="itemcode" align="center" label="椤圭洰缂栧彿" show-overflow-tooltip="" v-if="form.applytype == '1'"> </el-table-column>--> - <el-table-column - prop="applytype" - align="center" - label="鏈嶅姟绫诲瀷" - width="200" - > + <el-table-column prop="applytype" align="center" label="鏈嶅姟绫诲瀷" width="200"> <template slot-scope="scope"> - <el-select - v-model="scope.row.applytype" - placeholder="璇烽�夋嫨鏈嶅姟绫诲瀷" - @change="verifyFeeItemType(scope.row)" - > - <el-option - v-for="dict in rowfeeItemTypes" - :key="dict.index" - :label="dict.label" - :value="dict.value" - ></el-option> + <el-select v-model="scope.row.applytype" placeholder="璇烽�夋嫨鏈嶅姟绫诲瀷" @change="verifyFeeItemType(scope.row)"> + <el-option v-for="dict in rowfeeItemTypes" :key="dict.index" :label="dict.label" + :value="dict.value"></el-option> </el-select> </template> </el-table-column> - <el-table-column - prop="itemid" - align="center" - label="鏈嶅姟椤圭洰" - width="260" - > + <el-table-column prop="itemid" align="center" label="鏈嶅姟椤圭洰" width="260"> <template slot-scope="scope"> - <el-select - v-model="scope.row.itemid" - placeholder="璇烽�夋嫨鏈嶅姟椤圭洰" - filterable - @change="verifyFeeItem(scope.row)" - :filter-method="val => searchItemType(val, scope)" - > - <el-option - v-for="dict in scope.row.itemlist" - :key="dict.index" - :label="dict.itemName" - :value="dict.id" - ></el-option> + <el-select v-model="scope.row.itemid" placeholder="璇烽�夋嫨鏈嶅姟椤圭洰" filterable @change="verifyFeeItem(scope.row)" + :filter-method="val => searchItemType(val, scope)"> + <el-option v-for="dict in scope.row.itemlist" :key="dict.index" :label="dict.itemName" + :value="dict.id"></el-option> </el-select> </template> </el-table-column> - <el-table-column - prop="servicesscope" - align="center" - label="鏈嶅姟璇存槑" - v-if="businessType == '1'" - width="180" - > + <el-table-column prop="servicesscope" align="center" label="鏈嶅姟璇存槑" v-if="businessType == '1'" width="180"> <template slot-scope="scope"> - <el-select - v-model="scope.row.servicesscope" - placeholder="鏈嶅姟璇存槑" - clearable - allow-create - @change="verifyFeeRemark(scope.row)" - > - <el-option - v-for="dict in scope.row.rowfeeblocks" - :key="dict.servicesscope" - :label="dict.remark" - :value="dict.servicesscope" - ></el-option> + <el-select v-model="scope.row.servicesscope" placeholder="鏈嶅姟璇存槑" clearable allow-create + @change="verifyFeeRemark(scope.row)"> + <el-option v-for="dict in scope.row.rowfeeblocks" :key="dict.servicesscope" :label="dict.remark" + :value="dict.servicesscope"></el-option> </el-select> </template> </el-table-column> - <el-table-column - prop="price" - align="center" - label="鍗曚环" - width="120" - v-if="businessType == 4" - > + <el-table-column prop="price" align="center" label="鍗曚环" width="120" v-if="businessType == 4"> <template slot-scope="scope"> - <el-input - v-model="scope.row.price" - placeholder="鍗曚环" - @blur=" - val => { - sumTotalFee(scope.row); - } - " - /> + <el-input v-model="scope.row.price" placeholder="鍗曚环" @blur="val => { + sumTotalFee(scope.row); + } + " /> </template> </el-table-column> - <el-table-column - prop="quantity" - align="center" - label="鏁伴噺" - width="120" - v-if="businessType == 4" - > + <el-table-column prop="quantity" align="center" label="鏁伴噺" width="120" v-if="businessType == 4"> <template slot-scope="scope"> - <el-input - v-model="scope.row.quantity" - placeholder="鏁伴噺" - @blur=" - val => { - sumTotalFee(scope.row); - } - " - /> + <el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="val => { + sumTotalFee(scope.row); + } + " /> </template> </el-table-column> - <el-table-column - prop="amount" - align="center" - :label="amountlabel" - width="120" - > + <el-table-column prop="amount" align="center" :label="amountlabel" width="120"> <template slot-scope="scope"> <el-input v-model="scope.row.amount" placeholder="閲戦" /> </template> </el-table-column> - <el-table-column - prop="taxamount" - align="center" - label="鎵g◣閲戦" - width="120" - v-if=" - ismanager == true && - (businessType == '1' || businessType == '2') - " - > + <el-table-column prop="taxamount" align="center" label="鎵g◣閲戦" width="120" v-if="ismanager == true && + (businessType == '1' || businessType == '2') + "> <template slot-scope="scope"> - <el-input - v-model="scope.row.taxamount" - placeholder="鎵g◣閲戦" - /> + <el-input v-model="scope.row.taxamount" placeholder="鎵g◣閲戦" /> </template> </el-table-column> - <el-table-column - prop="taxedamount" - align="center" - label="绋庡悗閲戦" - width="120" - v-if=" - ismanager == true && - (businessType == '1' || businessType == '2') - " - > + <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="ismanager == true && + (businessType == '1' || businessType == '2') + "> <template slot-scope="scope"> - <el-input - v-model="scope.row.taxedamount" - placeholder="绋庡悗閲戦" - /> + <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" /> </template> </el-table-column> - <el-table-column - prop="beneficiaryname" - column-key="sdad" - align="center" - :label="beneficiarylabel" - width="200" - > + <el-table-column prop="beneficiaryname" column-key="sdad" align="center" :label="beneficiarylabel" + width="200"> <template slot-scope="scope"> - <el-button - type="primary" - plain - @click="showSelectionDialog(scope, 'account')" - >{{ - scope.row.beneficiaryname - ? scope.row.beneficiaryname - : "鐐瑰嚮閫夋嫨" - }}</el-button - > + <el-button type="primary" plain @click="showSelectionDialog(scope, 'account')">{{ + scope.row.beneficiaryname + ? scope.row.beneficiaryname + : "鐐瑰嚮閫夋嫨" + }}</el-button> </template> </el-table-column> - <el-table-column - prop="unitno" - align="center" - label="涓撳鎵�鍦ㄥ崟浣�" - width="250" - v-if="businessType == '1' || businessType == '2'" - > + <el-table-column prop="unitno" align="center" label="涓撳鎵�鍦ㄥ崟浣�" width="250" + v-if="businessType == '1' || businessType == '2'"> <template slot-scope="scope"> - <el-button - type="primary" - plain - @click="showSelectionDialog(scope, 'workunit')" - >{{ - scope.row.unitname ? scope.row.unitname : "鐐瑰嚮閫夋嫨" - }}</el-button - > + <el-button type="primary" plain @click="showSelectionDialog(scope, 'workunit')">{{ + scope.row.unitname ? scope.row.unitname : "鐐瑰嚮閫夋嫨" + }}</el-button> </template> </el-table-column> <!-- @@ -413,137 +230,59 @@ </template> </el-table-column> --> - <el-table-column - prop="title" - align="center" - label="鑱岀О" - width="120" - v-if="businessType == '1' || businessType == '2'" - > + <el-table-column prop="title" align="center" label="鑱岀О" width="120" + v-if="businessType == '1' || businessType == '2'"> <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" - v-if="businessType == '1' || businessType == '2'" - > + <el-table-column prop="idcardno" align="center" label="韬唤璇佸彿" width="200" + v-if="businessType == '1' || businessType == '2'"> <template slot-scope="scope"> <el-form-item label-width="0"> - <el-input - :disabled="userprofile.nickName != '闄堟厱鍗�'" - v-model.number="scope.row.idcardno" - @input="tableParValueChange1(scope.row)" - placeholder="韬唤璇佸彿" - /> + <el-input :disabled="userprofile.nickName != '闄堟厱鍗�'" v-model.number="scope.row.idcardno" + @input="tableParValueChange1(scope.row)" placeholder="韬唤璇佸彿" /> </el-form-item> </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 - :disabled="userprofile.nickName != '闄堟厱鍗�'" - v-model="scope.row.depositbank" - placeholder="寮�鎴烽摱琛�" - /> + <el-input :disabled="userprofile.nickName != '闄堟厱鍗�'" 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 - :disabled="userprofile.nickName != '闄堟厱鍗�'" - v-model="scope.row.bankcardno" - placeholder="閾惰甯愬彿" - /> + <el-input :disabled="userprofile.nickName != '闄堟厱鍗�'" v-model="scope.row.bankcardno" placeholder="閾惰甯愬彿" /> </template> </el-table-column> - <el-table-column - prop="itemdescrisca" - align="center" - width="330" - label="椤圭洰璇存槑" - > + <el-table-column prop="itemdescrisca" align="center" width="330" label="椤圭洰璇存槑"> <template slot-scope="scope"> - <el-input - type="textarea" - :rows="2" - v-model="scope.row.itemdescribe" - placeholder="椤圭洰璇存槑" - /> + <el-input type="textarea" :rows="2" v-model="scope.row.itemdescribe" placeholder="椤圭洰璇存槑" /> </template> </el-table-column> - <el-table-column - prop="remark" - align="center" - width="330" - label="澶囨敞" - v-show="ismanager == true" - > + <el-table-column prop="remark" align="center" width="330" label="澶囨敞" v-show="ismanager == true"> <template slot-scope="scope"> - <el-input - type="textarea" - :rows="2" - v-model="scope.row.remark" - placeholder="澶囨敞" - /> + <el-input type="textarea" :rows="2" v-model="scope.row.remark" placeholder="澶囨敞" /> </template> </el-table-column> - <el-table-column - fixed="right" - align="center" - label="鎿嶄綔" - width="180" - > + <el-table-column fixed="right" align="center" label="鎿嶄綔" width="180"> <template slot-scope="scope"> - <el-button - type="text" - size="mini" - @click="addRow(scope.$index)" - v-if=" - operationType == 'add' || - operationType == 'update' || - operationType == 'check' - " - >鏂板</el-button - > - <el-button - @click.native.prevent=" - deleteRows(scope.row, scope.$index, rbDetails) - " - type="text" - size="small" - v-if=" - operationType == 'add' || - operationType == 'update' || - operationType == 'check' - " - > + <el-button type="text" size="mini" @click="addRow(scope.$index)" v-if="operationType == 'add' || + operationType == 'update' || + operationType == 'check' + ">鏂板</el-button> + <el-button @click.native.prevent=" + deleteRows(scope.row, scope.$index, rbDetails) + " type="text" size="small" v-if="operationType == 'add' || + operationType == 'update' || + operationType == 'check' + "> 鍒犻櫎 </el-button> - <el-button - @click.native.prevent=" - Filepopup(scope.$index, rbDetails, scope.row) - " - type="text" - size="small" - v-if=" - businessType == 2 || businessType == 3 || businessType == 4 - " - >绁ㄦ嵁</el-button - > + <el-button @click.native.prevent=" + Filepopup(scope.$index, rbDetails, scope.row) + " type="text" size="small" v-if="businessType == 2 || businessType == 3 || businessType == 4 + ">绁ㄦ嵁</el-button> </template> </el-table-column> </el-table> @@ -551,55 +290,20 @@ <el-row> <el-col :span="12"> - <el-form-item - label="璐圭敤鐢宠闄勪欢" - align="left" - prop="annexbankcard" - v-if="businessType == 0" - > - <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" - > + <el-form-item label="璐圭敤鐢宠闄勪欢" align="left" prop="annexbankcard" v-if="businessType == 0"> + <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 - > + <em><el-button :disabled="operationType == 'detail'" size="small" type="primary">鐐瑰嚮涓婁紶</el-button></em> </div> </el-upload> - <el-table - :data="fileListto" - @row-click="downFile" - style="width: 100%" - height="400" - > - <el-table-column - prop="name" - :show-overflow-tooltip="true" - label="鍚嶇О" - > + <el-table :data="fileListto" @row-click="downFile" style="width: 100%" height="400"> + <el-table-column prop="name" :show-overflow-tooltip="true" label="鍚嶇О"> <template slot-scope="scope"> <i style="color:#409EFF" class=" el-icon-s-order" />{{ scope.row.name @@ -607,74 +311,37 @@ </template> </el-table-column> - <el-table-column - prop="name" - width="180" - :show-overflow-tooltip="true" - label="鍔熻兘" - > + <el-table-column prop="name" width="180" :show-overflow-tooltip="true" label="鍔熻兘"> <template slot-scope="scope"> - <el-button - type="primary" - size="mini" - @click.native.prevent.stop="deletedowfile(scope.row)" - >鍒犻櫎</el-button - > - <el-button - type="primary" - size="mini" - @click.native.prevent.stop="moveupdowfile(scope.row)" - >涓婄Щ</el-button - > + <el-button type="primary" size="mini" + @click.native.prevent.stop="deletedowfile(scope.row)">鍒犻櫎</el-button> + <el-button type="primary" size="mini" + @click.native.prevent.stop="moveupdowfile(scope.row)">涓婄Щ</el-button> </template> </el-table-column> </el-table> </el-form-item> </el-col> </el-row> - <el-row - v-if=" - operationType == 'detail' || - operationType == 'check' || - operationType == 'update' - " - > + <el-row v-if="operationType == 'detail' || + operationType == 'check' || + operationType == 'update' + "> <el-table :data="fundflowList" border> - <el-table-column - label="瀹℃牳鏃ユ湡" - align="center" - width="160" - prop="createTime" - /> - <el-table-column - label="瀹℃牳浜�" - align="center" - width="120" - prop="checkusername" - /> - <el-table-column - label="瀹℃牳缁撴灉" - align="center" - width="200" - prop="flowconclusion" - > + <el-table-column label="瀹℃牳鏃ユ湡" align="center" width="160" prop="createTime" /> + <el-table-column label="瀹℃牳浜�" align="center" width="120" prop="checkusername" /> + <el-table-column label="瀹℃牳缁撴灉" align="center" width="200" prop="flowconclusion"> <template slot-scope="scope"> <span v-if="scope.row.flowconclusion == 1">閫氳繃</span> <span v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span> </template> </el-table-column> - <el-table-column - label="瀹℃牳澶囨敞" - align="center" - prop="flowcontent" - /> + <el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" /> </el-table> </el-row> - <el-row - style="margin-top: 25px; margin-bottom: 5px" - v-if="operationType == 'check' && userprofile.nickName == '闄堟厱鍗�'" - > + <el-row style="margin-top: 25px; margin-bottom: 5px" + v-if="operationType == 'check' && userprofile.nickName == '闄堟厱鍗�'"> <el-col :span="20"> <el-form-item label="棰勫鏉愭枡" prop="infoid"> <el-radio-group v-model="form.checkstatus" align="left"> @@ -685,10 +352,7 @@ </el-form-item> </el-col> </el-row> - <el-row - style="margin-top: 5px; margin-bottom: 5px" - v-if="operationType == 'check'" - > + <el-row style="margin-top: 5px; margin-bottom: 5px" v-if="operationType == 'check'"> <el-col :span="20"> <el-form-item label="瀹℃牳缁撴灉" align="left"> <el-radio-group v-model="checkObj.flowlevelone" align="left"> @@ -707,103 +371,45 @@ </el-row> </el-form> <div slot="footer" class="dialog-footer"> - <el-button - type="primary" - @click="submitForm" - v-if=" - operationType == 'add' || - operationType == 'update' || - ismanager == true - " - >淇濆瓨</el-button - > - <el-button - type="success" - @click="handleup" - v-if="operationType == 'add' || operationType == 'update'" - >涓婃姤</el-button - > - <el-button - type="primary" - @click="checksubmit" - v-if="operationType == 'check'" - >鎻愪氦瀹℃牳</el-button - > + <el-button type="primary" @click="submitForm" v-if="operationType == 'add' || + operationType == 'update' || + ismanager == true + ">淇濆瓨</el-button> + <el-button type="success" @click="handleup" + v-if="operationType == 'add' || operationType == 'update'">涓婃姤</el-button> + <el-button type="primary" @click="checksubmit" v-if="operationType == 'check'">鎻愪氦瀹℃牳</el-button> <el-button @click="cancel">鍏� 闂�</el-button> </div> </div> - <el-dialog - :visible.sync="showselectiondialog" - :close-on-click-modal="false" - :title="'璐︽埛淇℃伅/鍗曚綅淇℃伅閫夋嫨'" - width="650px" - style="text-align: center" - v-loading="loading" - > - <el-form - ref="accountselectform" - :rules="dialogrules" - :model="accountselectform" - label-width="120px" - > + <el-dialog :visible.sync="showselectiondialog" :close-on-click-modal="false" :title="'璐︽埛淇℃伅/鍗曚綅淇℃伅閫夋嫨'" width="650px" + style="text-align: center" v-loading="loading"> + <el-form ref="accountselectform" :rules="dialogrules" :model="accountselectform" label-width="120px"> <el-row v-if="selectionType == 'workunit'"> <el-col :span="24"> - <el-form-item - label="鍗曚綅鍚嶇О" - prop="expertunitname" - label-width="120px" - > - <el-select - v-model="accountselectform.expertunitname" - placeholder="鍗曚綅鍚嶇О" - clearable - filterable - allow-create - style="width: 100%" - > - <el-option - v-for="(spec, index) in unitList" - :key="index" - :label="spec.organizationname" - :value="spec.organizationname" - ></el-option> + <el-form-item label="鍗曚綅鍚嶇О" prop="expertunitname" label-width="120px"> + <el-select v-model="accountselectform.expertunitname" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create + style="width: 100%"> + <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname" + :value="spec.organizationname"></el-option> </el-select> </el-form-item> </el-col> </el-row> <el-row v-if="selectionType == 'account'"> <el-col> - <el-form-item - label="璐︽埛鏉ユ簮" - prop="accountfrom" - class="left-align" - > + <el-form-item label="璐︽埛鏉ユ簮" prop="accountfrom" class="left-align"> <el-radio-group v-model="accountfrom" style="margin-bottom: 0"> <el-radio label="1">浠庤处鎴峰簱</el-radio> - <el-radio label="2" - >鏂板璐︽埛锛堟柊澧炰笓瀹惰处鎴峰悗闇�瑕佸鏍稿惎鐢ㄦ墠鑳戒娇鐢級</el-radio - > + <el-radio label="2">鏂板璐︽埛锛堟柊澧炰笓瀹惰处鎴峰悗闇�瑕佸鏍稿惎鐢ㄦ墠鑳戒娇鐢級</el-radio> </el-radio-group> </el-form-item> </el-col> <el-col :span="24" v-if="accountfrom == '1'"> <el-form-item label="璐︽埛鍚嶇О" prop="accountname"> - <el-select - filterable - allow-create - ref="accountname" - default-first-option - v-model="accountselectform.accountname" - placeholder="璇烽�夋嫨" - style="width: 100%" - > - <el-option - v-for="item in accountlist" - :key="item.id" - :label="item.username" - :value="item.username" - > + <el-select filterable allow-create ref="accountname" default-first-option + v-model="accountselectform.accountname" placeholder="璇烽�夋嫨" style="width: 100%"> + <el-option v-for="item in accountlist" :key="item.id" :label="item.userid" :value="item.id"> </el-option> </el-select> </el-form-item> @@ -812,175 +418,102 @@ <el-row v-if="selectionType == 'account' && accountfrom == '2'"> <el-col :span="24"> <el-form-item label="鏂板绫诲瀷" prop="usertype" class="left-align"> - <el-radio-group - v-model="accountselectform.usertype" - style="margin-bottom: 0" - @change="userTypeChange(accountselectform.usertype)" - > - <el-radio label="expert">涓撳璐﹀彿</el-radio> - <el-radio label="org">鍗曚綅璐﹀彿</el-radio> - <el-radio label="donor">鎹愮尞鑰呬翰灞炶处鍙�</el-radio> + <el-radio-group v-model="accountselectform.usertype" style="margin-bottom: 0" + @change="userTypeChange(accountselectform.usertype)"> + <el-radio label="expert">涓撳璐︽埛</el-radio> + <el-radio label="org">鍗曚綅璐︽埛</el-radio> + <el-radio label="donor">鎹愮尞鑰呬翰灞炶处鎴�</el-radio> </el-radio-group> </el-form-item> </el-col> </el-row> <el-row v-if="selectionType == 'account' && accountfrom == '2'"> <el-col :span="24"> - <el-form-item label="璐﹀彿鍚嶇О" prop="username"> - <el-input - v-model="accountselectform.username" - placeholder="璇疯緭鍏ュ崟浣嶅悕绉帮紝鎴栦笓瀹跺鍚嶏紝鎴栧叾浠栬处鍙�" - /> + <el-form-item label="璐︽埛鍚嶇О" prop="username"> + <el-input v-model="accountselectform.username" placeholder="璇疯緭鍏ュ崟浣嶅悕绉帮紝鎴栦笓瀹跺鍚嶏紝鎴栧叾浠栬处鍙�" /> </el-form-item> </el-col> </el-row> - <el-row - v-if=" - selectionType == 'account' && - accountfrom == '2' && - accountselectform.usertype != 'org' - " - > + <el-row v-if="selectionType == 'account' && + accountfrom == '2' && + accountselectform.usertype != 'org' + "> <el-col :span="12"> <el-form-item label="韬唤璇佸彿" prop="idcardno"> - <el-input - v-model="accountselectform.idcardno" - placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" - /> + <el-input v-model="accountselectform.idcardno" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" /> </el-form-item> </el-col> <el-col :span="12" v-if="accountselectform.usertype == 'expert'"> <el-form-item label="鑱岀О" prop="title"> - <el-select - v-model="accountselectform.title" - placeholder="璇烽�夋嫨浜哄憳鑱岀О" - > - <el-option - v-for="dict in dict.type.sys_professionaltitle" - :key="dict.value" - :label="dict.label" - :value="dict.label" - ></el-option> + <el-select v-model="accountselectform.title" placeholder="璇烽�夋嫨浜哄憳鑱岀О"> + <el-option v-for="dict in dict.type.sys_professionaltitle" :key="dict.value" :label="dict.label" + :value="dict.label"></el-option> </el-select> </el-form-item> </el-col> </el-row> - <el-row - v-if=" - selectionType == 'account' && - accountfrom == '2' && - accountselectform.usertype == 'expert' - " - > + <el-row v-if="selectionType == 'account' && + accountfrom == '2' && + accountselectform.usertype == 'expert' + "> <el-col> <el-form-item label="鎵�鍦ㄥ崟浣�" prop="unitno"> - <el-select - v-model="accountselectform.unitno" - placeholder="鍗曚綅鍚嶇О" - clearable - filterable - allow-create - style="width: 100%" - > - <el-option - v-for="(spec, index) in unitList" - :key="index" - :label="spec.organizationname" - :value="spec.organizationid" - ></el-option> + <el-select v-model="accountselectform.unitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create + style="width: 100%"> + <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname" + :value="spec.organizationid"></el-option> </el-select> </el-form-item> </el-col> <el-col> <el-form-item label="鍗曚綅宸ュ彿" prop="personnelunitno"> - <el-input - v-model="accountselectform.personnelunitno" - placeholder="璇疯緭鍏ユ墍鍦ㄥ崟浣嶇殑宸ュ彿" - /> + <el-input v-model="accountselectform.personnelunitno" placeholder="璇疯緭鍏ユ墍鍦ㄥ崟浣嶇殑宸ュ彿" /> </el-form-item> </el-col> </el-row> <el-row v-if="selectionType == 'account' && accountfrom == '2'"> - <el-col - ><el-form-item label="寮�鎴烽摱琛�" prop="depositbank"> - <el-input - v-model="accountselectform.depositbank" - placeholder="璇疯緭鍏ュ紑鎴烽摱琛屽悕绉�" - /> + <el-col><el-form-item label="寮�鎴烽摱琛�" prop="depositbank"> + <el-input v-model="accountselectform.depositbank" placeholder="璇疯緭鍏ュ紑鎴烽摱琛屽悕绉�" /> </el-form-item> </el-col> - <el-col - ><el-form-item label="閾惰鍗″彿" prop="bankcardno"> - <el-input - v-model="accountselectform.bankcardno" - placeholder="璇疯緭鍏ラ摱琛屽崱鍙�" - /> + <el-col><el-form-item label="閾惰鍗″彿" prop="bankcardno"> + <el-input v-model="accountselectform.bankcardno" placeholder="璇疯緭鍏ラ摱琛屽崱鍙�" /> </el-form-item> </el-col> </el-row> <el-row v-if="selectionType == 'account' && accountfrom == '2'"> <el-col> <el-form-item label="鑱旂郴鍦板潃" prop="address"> - <el-input - v-model="accountselectform.address" - placeholder="璇疯緭鍏ヨ仈绯诲湴鍧�" - /> + <el-input v-model="accountselectform.address" placeholder="璇疯緭鍏ヨ仈绯诲湴鍧�" /> </el-form-item> </el-col> </el-row> <el-row v-if="selectionType == 'account' && accountfrom == '2'"> <el-col> <el-form-item label="鑱旂郴鐢佃瘽" prop="telephone"> - <el-input - v-model="accountselectform.telephone" - placeholder="璇疯緭鍏ヨ仈绯荤數璇�" - /> + <el-input v-model="accountselectform.telephone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" /> </el-form-item> </el-col> </el-row> </el-form> <span slot="footer" class="dialog-footer"> - <el-button type="primary" @click="confirmSelectionDialog()" - >纭� 瀹�</el-button - > + <el-button type="primary" @click="confirmSelectionDialog()">纭� 瀹�</el-button> <el-button @click="showselectiondialog = false">鍙� 娑�</el-button> </span> </el-dialog> - <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 - v-if="businessType == 4" - prop="price" - align="center" - label="鍗曚环" - > + <el-table-column v-if="businessType == 4" prop="price" align="center" label="鍗曚环"> </el-table-column> - <el-table-column - prop="quantity" - align="center" - label="鏁伴噺" - v-if="businessType == 4" - > + <el-table-column prop="quantity" align="center" label="鏁伴噺" v-if="businessType == 4"> </el-table-column> <el-table-column prop="amount" align="center" :label="amountlabel"> </el-table-column> - <el-table-column - prop="taxedamount" - align="center" - label="绋庡悗閲戦" - v-if=" - (this.ismanager == true) & - (form.applytype == '1' || form.applytype == '2') - " - > + <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" v-if="(this.ismanager == true) & + (form.applytype == '1' || form.applytype == '2') + "> </el-table-column> <!-- <el-table-column prop="beneficiaryname" @@ -1000,137 +533,61 @@ </el-table-column> --> <el-table-column prop="" align="center" label="鍗曚綅/涓汉" width="250"> </el-table-column> - <el-table-column - prop="title" - align="center" - label="鑱岀О" - width="120" - v-if="form.applytype == '1' || form.applytype == '2'" - > + <el-table-column prop="title" align="center" label="鑱岀О" width="120" + v-if="form.applytype == '1' || form.applytype == '2'"> </el-table-column> - <el-table-column - prop="idcardno" - align="center" - label="韬唤璇佸彿" - width="200" - v-if="form.applytype == '1' || form.applytype == '2'" - > + <el-table-column prop="idcardno" align="center" label="韬唤璇佸彿" width="200" + v-if="form.applytype == '1' || form.applytype == '2'"> </el-table-column> <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�"> </el-table-column> - <el-table-column - prop="bankcardno" - align="center" - label="閾惰甯愬彿" - width="210" - > + <el-table-column prop="bankcardno" align="center" label="閾惰甯愬彿" width="210"> </el-table-column> </el-table> </div> - <el-tabs - style="margin-top: 20px;" - v-model="activeName" - type="border-card" - @tab-click="handleClick" - > + <el-tabs style="margin-top: 20px;" v-model="activeName" type="border-card" @tab-click="handleClick"> <el-tab-pane label="鏅�氶檮浠�" :name="1"> <div class="pdfimg"> <div class="box-pdf"> <div> - <el-upload - size="mini" - class="upload-demo" - :action="uploadFileUrl" - :file-list="fileListto" - :show-file-list="false" - multiple - drag - :headers="headers" - :on-success=" - (response, file, fileList) => - uploadSccess(response, file, fileList) - " - :on-preview="downFile" - :disabled="operationType == 'detail'" - :on-error="handleUploadError" - :on-remove="remove" - accept="image/*,.pdf" - > + <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 - > + <em><el-button :disabled="operationType == 'detail'" size="small" type="primary">鐐瑰嚮涓婁紶</el-button></em> </div> </el-upload> - <el-table - :data="fileListto" - @row-click="downFile" - style="width: 100%" - height="400" - > - <el-table-column - prop="name" - :show-overflow-tooltip="true" - label="鍚嶇О" - > + <el-table :data="fileListto" @row-click="downFile" style="width: 100%" height="400"> + <el-table-column prop="name" :show-overflow-tooltip="true" label="鍚嶇О"> <template slot-scope="scope"> <i style="color:#409EFF" class=" el-icon-s-order" /> <span>{{ scope.row.name }}</span> </template> </el-table-column> - <el-table-column - prop="name" - width="190" - :show-overflow-tooltip="true" - label="鍔熻兘" - > + <el-table-column prop="name" width="190" :show-overflow-tooltip="true" label="鍔熻兘"> <template slot-scope="scope"> - <el-button - type="primary" - size="mini" - @click.native.prevent.stop="deletedowfile(scope.row)" - >鍒犻櫎</el-button - > - <el-button - type="primary" - size="mini" - @click.native.prevent.stop="moveupdowfile(scope.row)" - >涓婄Щ</el-button - > - <el-button - type="success" - size="mini" - icon="el-icon-search" - circle - @click.native.prevent.stop="Downloadfile(scope.row)" - ></el-button> + <el-button type="primary" size="mini" + @click.native.prevent.stop="deletedowfile(scope.row)">鍒犻櫎</el-button> + <el-button type="primary" size="mini" + @click.native.prevent.stop="moveupdowfile(scope.row)">涓婄Щ</el-button> + <el-button type="success" size="mini" icon="el-icon-search" circle + @click.native.prevent.stop="Downloadfile(scope.row)"></el-button> </template> </el-table-column> </el-table> </div> </div> - <div - v-if="this.previewpdf && pdfimgsrcList.length" - class="pdfimgmin" - > + <div v-if="this.previewpdf && pdfimgsrcList.length" class="pdfimgmin"> <!-- <img :src="pdfimg" /> --> - <el-image - style="width: 95%; height: 90%" - @error="handleImageError" - @load="handleImageLoad" - :src="pdfimg" - :preview-src-list="pdfimgsrcList" - > + <el-image style="width: 95%; height: 90%" @error="handleImageError" @load="handleImageLoad" :src="pdfimg" + :preview-src-list="pdfimgsrcList"> <!-- <div slot="error" class="image-slot"> <i class="el-icon-picture-outline"></i> </div> --> @@ -1143,99 +600,43 @@ <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" - > + <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 - > + <em><el-button :disabled="operationType == 'detail'" size="small" type="primary">鐐瑰嚮涓婁紶</el-button></em> </div> </el-upload> - <el-table - :data="invoicefileListto" - @row-click="downFile" - style="width: 100%" - height="400" - > - <el-table-column - prop="name" - :show-overflow-tooltip="true" - label="鍚嶇О" - > + <el-table :data="invoicefileListto" @row-click="downFile" style="width: 100%" height="400"> + <el-table-column prop="name" :show-overflow-tooltip="true" label="鍚嶇О"> <template slot-scope="scope"> <i style="color:#409EFF" class=" el-icon-s-order" /> <span>{{ scope.row.name }}</span> </template> </el-table-column> - <el-table-column - prop="name" - width="190" - :show-overflow-tooltip="true" - label="鍔熻兘" - > + <el-table-column prop="name" width="190" :show-overflow-tooltip="true" label="鍔熻兘"> <template slot-scope="scope"> - <el-button - type="primary" - size="mini" - @click.native.prevent.stop="deletedowfile(scope.row)" - >鍒犻櫎</el-button - > - <el-button - type="primary" - size="mini" - @click.native.prevent.stop="moveupdowfile(scope.row)" - >涓婄Щ</el-button - > - <el-button - type="success" - size="mini" - icon="el-icon-search" - circle - @click.native.prevent.stop="Downloadfile(scope.row)" - ></el-button> + <el-button type="primary" size="mini" + @click.native.prevent.stop="deletedowfile(scope.row)">鍒犻櫎</el-button> + <el-button type="primary" size="mini" + @click.native.prevent.stop="moveupdowfile(scope.row)">涓婄Щ</el-button> + <el-button type="success" size="mini" icon="el-icon-search" circle + @click.native.prevent.stop="Downloadfile(scope.row)"></el-button> </template> </el-table-column> </el-table> </div> </div> - <div - v-if="this.previewpdf && invoicepdfimgsrcList.length" - class="pdfimgmin" - > + <div v-if="this.previewpdf && invoicepdfimgsrcList.length" class="pdfimgmin"> <!-- <img :src="pdfimg" /> --> - <el-image - style="width: 95%; height: 90%" - @error="handleImageError" - @load="handleImageLoad" - :src="invoicepdfimg" - :preview-src-list="invoicepdfimgsrcList" - > + <el-image style="width: 95%; height: 90%" @error="handleImageError" @load="handleImageLoad" + :src="invoicepdfimg" :preview-src-list="invoicepdfimgsrcList"> <!-- <div slot="error" class="image-slot"> <i class="el-icon-picture-outline"></i> </div> --> @@ -1247,14 +648,10 @@ </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 type="primary" @click="Savenow">纭� 瀹�</el-button> @@ -1263,30 +660,13 @@ </el-dialog> <!-- 鎵归噺閫夊彇 --> - <el-dialog - title="鎵归噺鐢熸垚鏄庣粏淇℃伅" - :visible.sync="batchdialogVisible" - width="30%" - > + <el-dialog title="鎵归噺鐢熸垚鏄庣粏淇℃伅" :visible.sync="batchdialogVisible" width="30%"> <div style="max-height: 300px; overflow-y: auto"> - <el-checkbox - :indeterminate="isIndeterminate" - v-model="checkAll" - @change="handleCheckAllChange" - >鍏ㄩ��</el-checkbox - > + <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">鍏ㄩ��</el-checkbox> <div style="margin: 15px 0;"></div> - <el-checkbox-group - v-model="checkedCities" - @change="handleCheckedCitiesChange" - > - <el-checkbox - border - v-for="city in cityOptions" - :label="city" - :key="city.reportNo" - >{{ city.reportName }}</el-checkbox - > + <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange"> + <el-checkbox border v-for="city in cityOptions" :label="city" :key="city.reportNo">{{ city.reportName + }}</el-checkbox> </el-checkbox-group> </div> @@ -1685,13 +1065,13 @@ watch: {}, //鏂规硶闆嗗悎 methods: { - bbaaccss(val) {}, + bbaaccss(val) { }, // 娴忚鍣ㄩ〉闈㈠叧闂垨鍒锋柊鎻愮ず beforeunloadHandler(e) { if ( (JSON.stringify(this.form) == sessionStorage.getItem("apiform") && JSON.stringify(this.rbDetails) == - sessionStorage.getItem("apifunddetail")) || + sessionStorage.getItem("apifunddetail")) || !sessionStorage.getItem("apifunddetail") ) { } else { @@ -1982,7 +1362,7 @@ handleDelete() { this.$modal .confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵") - .then(function() { + .then(function () { return delFund(this.curId); }) .then(() => { @@ -1995,7 +1375,7 @@ this.getfundList(); this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); }) - .catch(() => {}); + .catch(() => { }); }, /** 涓婃姤鎸夐挳鎿嶄綔 */ @@ -2003,7 +1383,7 @@ if ( (JSON.stringify(this.form) == sessionStorage.getItem("apiform") && JSON.stringify(this.rbDetails) == - sessionStorage.getItem("apifunddetail")) || + sessionStorage.getItem("apifunddetail")) || !sessionStorage.getItem("apifunddetail") ) { } else { @@ -2072,7 +1452,7 @@ return randomString; }, /** 鎻愪氦鎸夐挳 */ - submitForm: debounce(function() { + submitForm: debounce(function () { if (!this.randomnumber) { this.randomnumber = this.generateRandomString(9); this.form.randomnumber = this.randomnumber; @@ -2088,8 +1468,8 @@ if (tempDetail.itemid == null) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�" + (k + 1).toString() + + "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2098,8 +1478,8 @@ if (tempDetail.servicesscope == null) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�" + (k + 1).toString() + + "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2107,8 +1487,8 @@ if (tempDetail.beneficiaryno == null) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�" + (k + 1).toString() + + "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2155,8 +1535,8 @@ ) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (j + 1).toString() + - "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" + (j + 1).toString() + + "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2170,8 +1550,8 @@ ) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (j + 1).toString() + - "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" + (j + 1).toString() + + "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2364,22 +1744,39 @@ //鑾峰彇涓撳銆佸崟浣嶆満鏋勭殑璐︽埛鍒楄〃 getAccountList() { listExternalperson().then(res => { - this.accountlist = res.rows; + // this.accountlist = res.rows; //鑾峰彇鍚敤鐨勮处鎴峰垪琛� - for (let j = 0; j < res.length; j++) { + for (let j = 0; j < res.rows.length; j++) { //鍗曚綅璐﹀彿鍒楄〃 - if (res.userstatus == "1") { - this.accountlist.push({ - id: res.id, - userno: res.userno, - username: res.username, - idcardno: res.idcardno, - title: res.title, - depositbank: res.depositbank, - bankcardno: res.bankcardno, - unitno: res.unitno, - unitname: res.unitname - }); + if (res.rows[j].userstatus == "1") { + if (res.rows[j].usertype == "org") { + this.accountlist.push({ + id: res.rows[j].id, + userno: res.rows[j].userno, + username: res.rows[j].username, + idcardno: res.rows[j].idcardno, + title: res.rows[j].title, + depositbank: res.rows[j].depositbank, + bankcardno: res.rows[j].bankcardno, + unitno: res.rows[j].unitno, + unitname: res.rows[j].unitname, + userid: res.rows[j].username + }); + } + else { + this.accountlist.push({ + id: res.rows[j].id, + userno: res.rows[j].userno, + username: res.rows[j].username, + idcardno: res.rows[j].idcardno, + title: res.rows[j].title, + depositbank: res.rows[j].depositbank, + bankcardno: res.rows[j].bankcardno, + unitno: res.rows[j].unitno, + unitname: res.rows[j].unitname, + userid: res.rows[j].username + '锛�' + res.rows[j].idcardno + '锛�' + }); + } } } }); @@ -2667,8 +2064,8 @@ if (tempDetail.itemid == null) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�" + (k + 1).toString() + + "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2677,8 +2074,8 @@ if (tempDetail.servicesscope == null) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�" + (k + 1).toString() + + "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2686,8 +2083,8 @@ if (tempDetail.beneficiaryno == null) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�" + (k + 1).toString() + + "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2734,8 +2131,8 @@ ) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (j + 1).toString() + - "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" + (j + 1).toString() + + "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -2749,8 +2146,8 @@ ) { this.$modal.msgWarning( "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (j + 1).toString() + - "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" + (j + 1).toString() + + "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�" ); return; } @@ -3139,7 +2536,7 @@ // 鍥剧墖鍔犺浇鎴愬姛鏃舵墽琛岀殑鎿嶄綔 console.log("Image loaded successfully"); }, - handleUploadError() {}, + handleUploadError() { }, remove(file, fileList) { const rbDetails = [...this.rbDetails]; if (this.activeName == 1) { @@ -3423,7 +2820,12 @@ if (this.selectionType == "account") { //榛樿浠庤处鎴峰簱閫夋嫨锛�1,璐︽埛搴擄紱2锛屾柊寤鸿处鎴� this.accountfrom = "1"; - this.accountselectform.accountname = scope.row.beneficiaryname; + if (scope.row.idcardno == undefined || scope.row.idcardno == null) { + this.accountselectform.accountname = scope.row.beneficiaryname; + } + else { + this.accountselectform.accountname = scope.row.beneficiaryname + '锛�' + scope.row.idcardno + '锛�'; + } this.accountselectform.accountno = scope.row.beneficiaryno; this.accountselectform.expertunitname = ""; this.accountselectform.expertunitno = ""; @@ -3454,12 +2856,9 @@ if (this.selectionType == "account") { if (this.accountfrom == "1") { //璧嬪�间俊鎭� - if ( - this.rbDetails[tempIndex].beneficiaryname != - this.accountselectform.accountname - ) { + if (this.rbDetails[tempIndex].userno != this.accountselectform.userno) { this.accountlist.map(res => { - if (res.username == this.accountselectform.accountname) { + if (res.id == this.accountselectform.accountname) { this.rbDetails[tempIndex].beneficiaryno = res.userno; this.rbDetails[tempIndex].beneficiaryname = res.username; this.rbDetails[tempIndex].depositbank = res.depositbank; @@ -3486,8 +2885,8 @@ //鑾峰彇鐢ㄦ埛缂栧彿 getOnlyCode(this.seqnoParams).then(res => { this.accountform.userno = res.data.currentvalue; - this.accountform.id = null; + this.accountform.id = null; this.accountform.usertype = this.accountselectform.usertype; this.accountform.username = this.accountselectform.username; this.accountform.idcardno = this.accountselectform.idcardno; @@ -3513,52 +2912,73 @@ } }); } + else { + this.accountform.userstatus = 1; + } addExternalperson(this.accountform).then(response => { - if (response.code == 200) { - if (this.accountselectform.usertype == "expert") { - this.$modal.msgSuccess( - "鏂拌处鎴蜂俊鎭凡娣诲姞鎴愬姛,闇�瑕佸湪璐﹀彿鐘舵�佸惎鐢ㄥ悗鎵嶈兘琚娇鐢紒" - ); - return; - } else { - this.$modal.msgSuccess("鏂拌处鎴蜂俊鎭凡娣诲姞鎴愬姛锛�"); - } + if (response.code == 200) { + // //閲嶆柊鑾峰彇璐︽埛鍒楄〃 + // listExternalperson().then(res => { + // this.accountlist = res.rows; + // }); - this.accountselectform.accountno = this.accountselectform.userno; + console.log("addExternalperson", response.data.id); + if (this.accountselectform.usertype == "org") { + this.accountlist.push({ + id: response.data.id, + userno: this.accountform.userno, + username: this.accountform.username, + idcardno: this.accountform.idcardno, + title: this.accountform.title, + depositbank: this.accountform.depositbank, + bankcardno: this.accountform.bankcardno, + unitno: this.accountform.unitno, + unitname: this.accountform.unitname, + userid: this.accountform.username + }); + this.$modal.msgSuccess("鎮ㄥ凡娣诲姞鎴愬姛鏂拌处鎴蜂俊鎭紒"); + } else { + this.accountlist.push({ + id: response.data.id, + userno: this.accountform.userno, + username: this.accountform.username, + idcardno: this.accountform.idcardno, + title: this.accountform.title, + depositbank: this.accountform.depositbank, + bankcardno: this.accountform.bankcardno, + unitno: this.accountform.unitno, + unitname: this.accountform.unitname, + userid: this.accountform.username + '锛�' + this.accountform.idcardno + '锛�' + }); + this.$modal.msgSuccess("鎮ㄥ凡娣诲姞鎴愬姛鏂拌处鎴蜂俊鎭�,闇�瑕佸湪璐﹀彿鐘舵�佸惎鐢ㄥ悗鎵嶈兘琚娇鐢紒"); + return; + } + this.accountselectform.accountno = this.accountform.userno; this.accountselectform.accountname = this.accountselectform.username; - //閲嶆柊鑾峰彇璐︽埛鍒楄〃 - listExternalperson().then(res => { - this.accountlist = res.rows; + //璧嬪�间俊鎭� + this.accountlist.map(res => { + if (res.userno == this.accountselectform.accountno) { + this.rbDetails[tempIndex].beneficiaryno = res.userno; + this.rbDetails[tempIndex].beneficiaryname = res.username; + this.rbDetails[tempIndex].depositbank = res.depositbank; + this.rbDetails[tempIndex].branchbankname = res.branchbankname; + this.rbDetails[tempIndex].bankcardno = res.bankcardno; + this.rbDetails[tempIndex].phone = res.telephone; - //璧嬪�间俊鎭� - this.accountlist.map(res => { - if (res.username == this.accountselectform.accountname) { - this.rbDetails[tempIndex].beneficiaryno = res.userno; - this.rbDetails[tempIndex].beneficiaryname = - res.username; - this.rbDetails[tempIndex].depositbank = res.depositbank; - this.rbDetails[tempIndex].branchbankname = - res.branchbankname; - this.rbDetails[tempIndex].bankcardno = res.bankcardno; - this.rbDetails[tempIndex].phone = res.telephone; - - if (res.usertype == "org") { - this.rbDetails[tempIndex].idcardno = ""; - this.rbDetails[tempIndex].title = ""; - this.rbDetails[tempIndex].unitno = ""; - this.rbDetails[tempIndex].unitname = ""; - } else { - this.rbDetails[tempIndex].idcardno = res.idcardno; - this.rbDetails[tempIndex].title = res.title; - this.rbDetails[tempIndex].unitno = parseInt( - res.unitno - ); - this.rbDetails[tempIndex].unitname = res.unitname; - } + if (res.usertype == "org") { + this.rbDetails[tempIndex].idcardno = ""; + this.rbDetails[tempIndex].title = ""; + this.rbDetails[tempIndex].unitno = ""; + this.rbDetails[tempIndex].unitname = ""; + } else { + this.rbDetails[tempIndex].idcardno = res.idcardno; + this.rbDetails[tempIndex].title = res.title; + this.rbDetails[tempIndex].unitno = parseInt(res.unitno); + this.rbDetails[tempIndex].unitname = res.unitname; } - }); + } }); } }); @@ -3638,15 +3058,15 @@ this.$destroy(); next(); }, - beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠 - beforeMount() {}, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠 - beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠 - updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗 - beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓� + beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠 + beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠 + beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠 + updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗 + beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓� destroyed() { window.removeEventListener("beforeunload", e => this.beforeunloadFn(e)); }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴� - activated() {} //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂 + activated() { } //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂 }; </script> @@ -3729,7 +3149,7 @@ line-height: 25px; } -::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered { +::v-deep .el-checkbox.is-bordered+.el-checkbox.is-bordered { margin-left: 0 !important; margin-bottom: 10px; } -- Gitblit v1.9.3