From 916735aca6816732bc43a186dd9d7ccf5e5a1989 Mon Sep 17 00:00:00 2001 From: yxh <172933527@qq.com> Date: 星期四, 14 十二月 2023 23:09:47 +0800 Subject: [PATCH] yxh:修改了账户管理和案例编辑 --- src/views/project/donationdetails/index.vue | 542 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 281 insertions(+), 261 deletions(-) diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue index b51a3b4..26cdb13 100644 --- a/src/views/project/donationdetails/index.vue +++ b/src/views/project/donationdetails/index.vue @@ -71,16 +71,16 @@ > <template slot="description" - v-if="Processdata.ethicalreviewopinions.createtime" + v-if="Processdata.donateflowcharts.createtime" > <p> 鎻愪氦鏃堕棿锛�<span>{{ - parseTime(Processdata.ethicalreviewopinions.createtime) + parseTime(Processdata.donateflowcharts.createtime) }}</span> </p> <p> 鏇存柊鏃堕棿锛�<span>{{ - parseTime(Processdata.ethicalreviewopinions.updatetime) + parseTime(Processdata.donateflowcharts.updatetime) }}</span> </p> </template> @@ -156,7 +156,7 @@ <div style="background: #fff;"> <!-- 椤堕儴鏁版嵁 --> <div class="boxdiv"> - <div class="top-text">鎹愮尞鑰呰褰曞伐浣滃彴</div> + <div class="top-text">鎹愮尞妗堜緥淇℃伅</div> <el-form ref="form" :model="form" @@ -171,32 +171,49 @@ " > <el-row style="margin-top: 10px"> - <el-col :span="8"> + <el-col :span="6"> <el-form-item label="鎹愮尞缂栧彿" prop="donorno"> <el-input v-model="form.donorno" disabled /> </el-form-item> </el-col> - <el-col :span="8"> - <el-form-item - align="left" - label="鍖荤枟鏈烘瀯" - prop="treatmenthospitalno" - > - <org-selecter - ref="addOrgSelect" - :org-type="'3'" - v-model="form.treatmenthospitalno" - /> + <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-option> + </el-select> </el-form-item> </el-col> - <el-col :span="8"> - <el-form-item label="绉戝" prop="treatmentdeptno"> + <el-col :span="6"> + <el-form-item label="鑱旂郴鐢佃瘽" prop="reporterphone"> <el-input - v-model="form.treatmentdeptname" - placeholder="璇疯緭鍏ョ瀹�" + 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> + </el-form-item> + </el-col> </el-row> <el-row> <el-col :span="6"> @@ -204,36 +221,6 @@ <el-input v-model="form.name" placeholder="蹇呭~椤�" /> </el-form-item> </el-col> - <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-select> - </el-form-item> - </el-col> - <el-col :span="6"> - <el-form-item label="绫嶈疮" prop="nativeplace"> - <el-input - v-model="form.nativeplace" - placeholder="璇疯緭鍏ュ浗绫�" - /> - </el-form-item> - </el-col> - <el-col :span="6"> - <el-form-item label="鍥界睄" prop="nationality"> - <el-input - v-model="form.nationality" - placeholder="璇疯緭鍏ュ浗绫�" - /> - </el-form-item> - </el-col> - </el-row> - <el-row> <el-col :span="6"> <el-form-item label="璇佷欢绫诲瀷" prop="idcardtype"> <el-select @@ -252,7 +239,6 @@ <el-col :span="6"> <el-form-item label="璇佷欢鍙风爜" prop="idcardno"> <el-input - style="width: 174px" ref="updateBSvalue" class="sfzcode" v-model="form.idcardno" @@ -260,7 +246,22 @@ @blur="updateMessage" /> </el-form-item> - </el-col> + </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> + </el-form-item> + </el-col> + </el-row> + <el-row> <el-col :span="6"> <el-form-item label="鎬у埆" prop="sex"> <el-select v-model="form.sex" placeholder="璇疯緭鍏ユ�у埆"> @@ -278,84 +279,26 @@ <el-input v-model="form.age" placeholder="璇疯緭鍏ュ勾榫�" /> </el-form-item> </el-col> - </el-row> - <el-row> <el-col :span="6"> - <el-form-item label="鍑虹敓鏃ユ湡" prop="birthday"> - <el-date-picker - clearable - size="small" - v-model="form.birthday" - type="date" - style="width: 174px" - value-format="yyyy-MM-dd HH:mm:ss" - placeholder="閫夋嫨鍑虹敓鏃ユ湡" - > - </el-date-picker> + <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="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-select> + <el-form-item label="绉戝" prop="treatmentdeptno"> + <el-input + v-model="form.treatmentdeptname" + placeholder="璇疯緭鍏ョ瀹�" + /> </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-select> - </el-form-item> - </el-col> - </el-row> - <el-row> - <el-col :span="12"> - <el-form-item label="浣忓潃" prop="residenceaddress"> - <div> - <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-col> - </el-row> - - <el-row> - <el-col :span="12"> - <el-form-item label="鐜版墍鍦ㄥ湴" prop="registeraddress"> - <div> - <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-col> </el-row> </div> @@ -429,6 +372,95 @@ placeholder="璇疯緭鍏ョ柧鐥呰瘖鏂悕绉�" /> </el-form-item> + </el-col> + </el-row> + <el-row> + <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-select> + </el-form-item> + </el-col> + <el-col :span="6"> + <el-form-item label="绫嶈疮" prop="nativeplace"> + <el-input v-model="form.nativeplace" placeholder="璇疯緭鍏ュ浗绫�" /> + </el-form-item> + </el-col> + <el-col :span="6"> + <el-form-item label="鍥界睄" prop="nationality"> + <el-input v-model="form.nationality" placeholder="璇疯緭鍏ュ浗绫�" /> + </el-form-item> + </el-col> + </el-row> + <el-row> + <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-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-select> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="12"> + <el-form-item label="浣忓潃" prop="residenceaddress"> + <div> + <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-col> + </el-row> + + <el-row> + <el-col :span="12"> + <el-form-item label="鐜版墍鍦ㄥ湴" prop="registeraddress"> + <div> + <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-col> </el-row> <el-row> @@ -623,6 +655,20 @@ </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> + </el-col> <el-col :span="8"> <el-form-item label="淇℃伅鍛�" prop="infoname"> <el-input v-model="form.infoname" placeholder="璇疯緭鍏ヤ俊鎭憳" /> @@ -670,84 +716,27 @@ </el-form-item> </el-col> </el-row> - <el-row> - <el-col :span="24"> - <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-row> - <el-row> - <el-col :span="8"> - <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-option> - </el-select> - </el-form-item> - </el-col> - <el-col :span="8"> - <el-form-item label="鑱旂郴鐢佃瘽" prop="reporterphone"> - <el-input - v-model="form.reporterphone" - placeholder="璇疯緭鍏ヨ仈绯荤數璇�" - /> - </el-form-item> - </el-col> - <el-col :span="8"> - <el-form-item label="鎶ュ憡鏃堕棿" align="left" prop="reporttime"> - <el-date-picker - clearable - size="small" - style="width: 190px" - v-model="form.reporttime" - 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 > <el-button :type="showTerminationBtn == 0 ? 'warning' : 'success'" @click="Terminationcase" - >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button + >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button > <el-button v-show="Reportforreview" type="primary" @click="Reportforreview" - >涓婃姤瀹℃牳</el-button + >鎻愪氦</el-button > - <el-button @click="cancel">鍙� 娑�</el-button> + <!-- <el-button @click="cancel">鍙� 娑�</el-button> --> <!-- <el-button @click="handleapproval">鎻愪氦瀹℃牳</el-button> --> </div> </div> @@ -959,12 +948,12 @@ v-show="!showTerminationBtn" type="primary" @click="Savethedetails" - >淇濆瓨璇勪及淇℃伅</el-button + >淇濆瓨</el-button > <el-button :type="showTerminationBtn == 0 ? 'warning' : 'success'" @click="Terminationcase" - >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button + >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button > <!-- <el-button v-show="makeastepforward" @@ -972,7 +961,7 @@ @click="makeastepforward" >涓嬩竴姝�</el-button > --> - <el-button @click="cancel">鍙� 娑�</el-button> + <!-- <el-button @click="cancel">鍙� 娑�</el-button> --> </div> </div> <!-- 鎹愮尞纭 --> @@ -984,6 +973,13 @@ label-width="100px" label-position="right" > + <el-form-item label-width="100px" label="閫夋嫨鍣ㄥ畼"> + <el-checkbox-group v-model="organdecision"> + <el-checkbox v-for="item in organlist" :label="item"> + {{ item }} + </el-checkbox> + </el-checkbox-group> + </el-form-item> <el-row> <el-col :span="6"> <el-form-item label="瀛愬コ鏁伴噺" prop="kinshipChildrennum"> @@ -1159,12 +1155,12 @@ v-show="!showTerminationBtn" type="primary" @click="Savethedetails" - >淇濆瓨鎹愮尞淇℃伅</el-button + >淇濆瓨</el-button > <el-button :type="showTerminationBtn == 0 ? 'warning' : 'success'" @click="Terminationcase" - >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button + >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button > <!-- <el-button v-show="makeastepforward" @@ -1172,7 +1168,7 @@ @click="makeastepforward" >涓嬩竴姝�</el-button > --> - <el-button @click="cancel">鍙� 娑�</el-button> + <!-- <el-button @click="cancel">鍙� 娑�</el-button> --> </div> </div> <!-- 浼︾悊瀹℃煡 --> @@ -1227,12 +1223,12 @@ v-show="!showTerminationBtn" type="primary" @click="Savethedetails" - >淇濆瓨浼︾悊淇℃伅</el-button + >淇濆瓨</el-button > <el-button :type="showTerminationBtn == 0 ? 'warning' : 'success'" @click="Terminationcase" - >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button + >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button > <!-- <el-button v-show="makeastepforward" @@ -1240,7 +1236,7 @@ @click="makeastepforward" >涓嬩竴姝�</el-button > --> - <el-button @click="cancel">鍙� 娑�</el-button> + <!-- <el-button @click="cancel">鍙� 娑�</el-button> --> </div> </div> <!-- 鍣ㄥ畼鍒嗛厤 --> @@ -1605,12 +1601,12 @@ v-show="!showTerminationBtn" type="primary" @click="Savethedetails" - >淇濆瓨鍣ㄥ畼鍒嗛厤淇℃伅</el-button + >淇濆瓨</el-button > <el-button :type="showTerminationBtn == 0 ? 'warning' : 'success'" @click="Terminationcase" - >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button + >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button > <!-- <el-button v-show="makeastepforward" @@ -1618,7 +1614,7 @@ @click="makeastepforward" >涓嬩竴姝�</el-button > --> - <el-button @click="cancel">鍙� 娑�</el-button> + <!-- <el-button @click="cancel">鍙� 娑�</el-button> --> </div> </div> <!-- 鑾峰彇瑙佽瘉 --> @@ -1960,12 +1956,12 @@ v-show="!showTerminationBtn" type="primary" @click="Savethedetails" - >淇濆瓨瑙佽瘉淇℃伅</el-button + >淇濆瓨</el-button > <el-button :type="showTerminationBtn == 0 ? 'warning' : 'success'" @click="Terminationcase" - >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button + >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button > <!-- <el-button v-show="makeastepforward" @@ -1974,7 +1970,7 @@ >涓嬩竴姝�</el-button > --> - <el-button @click="cancel">鍙� 娑�</el-button> + <!-- <el-button @click="cancel">鍙� 娑�</el-button> --> </div> </div> <!-- 瀹屾垚鐧昏 --> @@ -2082,20 +2078,20 @@ v-show="!showTerminationBtn" type="primary" @click="Savethedetails" - >瀹屾垚鐧昏</el-button + >淇濆瓨</el-button > <el-button :type="showTerminationBtn == 0 ? 'warning' : 'success'" @click="Terminationcase" - >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button + >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button > <el-button v-show="Reportforreview" type="primary" @click="Reportforreview" - >涓婃姤瀹℃牳</el-button + >鎻愪氦</el-button > - <el-button @click="cancel">鍙� 娑�</el-button> + <!-- <el-button @click="cancel">鍙� 娑�</el-button> --> </div> </div> <!-- 瀹岀粨娴佺▼ --> @@ -2314,30 +2310,6 @@ AnnexUpload, ReportName }, - // dicts: [ - // "sys_nation", - // "sys_occupation", - // "sys_education", - // "sys_Organ", - // "sys_user_sex", - // "sys_IDType", - // "sys_BloodType", - // "sys_0_1", - // "sys_patientstate", - // "sys_DonationCategory", - // "sys_Kinship", - // "sys_Infectious", - // "sys_bloodtype_rhd", - // "sys_InfoSources", - // "sys_OtherCases", - // "sys_DiseaseType", - // "sys_SelfWill", - // "sys_FamilyRelation", - // "sys_OrganDecision", - // "sys_CoreAssessConclusion", - // "sys_BaseAssessConclusion", - // "sys_EthicalReview" - // ], data() { return { infoid: 736, @@ -2349,35 +2321,36 @@ address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�", tag: "涓浗涓�绫�(DBD)", type: "success" - }, - { - name: "鐜嬪皬铏�", - address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1517 寮�", - tag: "涓浗浜岀被(DCD)", - type: "danger" - }, - { - name: "鐜嬪皬铏�", - address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�", - tag: "涓浗涓夌被(DBCD)", - type: "warning" - }, - { - name: "鐜嬪皬铏�", - address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�", - tag: "涓浗涓夌被(DBCD)", - type: "warning" } ], medicineform: { infoid: null }, affirmform: { - infoid: null + infoid: null, + organdecision: [] }, + organdecision: [], ethicform: { infoid: null }, + organlist: [ + "蹇冭剰", + "鍏ㄨ倽", + "宸﹁倽", + "鍙宠倽", + "宸﹁偩", + "鍙宠偩", + "鍏ㄨ偩", + "宸﹁偤", + "鍙宠偤", + "灏忚偁", + "鑵轰綋", + "閬椾綋", + "宸︾溂瑙掕啘", + "鍙崇溂瑙掕啘", + "鍏朵粬" + ], allocationstatuslist: [ { value: 0, label: "鏈垎閰�" }, { value: 1, label: "宸插垎閰�" }, @@ -2511,7 +2484,32 @@ }, // 鍚勭骇鏄庣粏鏁堥獙 medicinerules: {}, - affirmrules: {}, + affirmrules: { + name: [ + { required: true, message: "浜插睘濮撳悕涓嶈兘涓虹┖", trigger: "blur" } + ], + phone: [ + { required: true, message: "瀹跺睘鑱旂郴鐢佃瘽涓嶄负绌�", trigger: "blur" } + ], + signfamilyrelations: [ + { required: true, message: "涓庢崘鐚�呭叧绯�", trigger: "blur" } + ], + idcardno: [ + { required: true, message: "璇佷欢鍙蜂笉鑳戒负绌�", trigger: "blur" } + ], + organdecision: [ + { required: true, message: "鎹愮尞鍐冲畾涓嶈兘涓虹┖", trigger: "blur" } + ], + responsibleuserid: [ + { required: true, message: "璐熻矗浜轰笉鑳戒负绌�", trigger: "blur" } + ], + coordinateduserido: [ + { required: true, message: "鍗忚皟鍛�1涓嶈兘涓虹┖", trigger: "blur" } + ], + coordinateduseridt: [ + { required: true, message: "鍗忚皟鍛�2涓嶈兘涓虹┖", trigger: "blur" } + ] + }, ethicrules: {}, allocationrules: {}, witnessrules: {}, @@ -2596,18 +2594,21 @@ this.residenceAddresss.shi = response.data.residencecityname; this.residenceAddresss.qu = response.data.residencetownname; this.registerAddresss.qu = response.data.registertownname; + // 鑾峰彇浜岀骇琛� + this.GetAttacheddata(); }); - // 鑾峰彇浜岀骇琛� - this.GetAttacheddata(); }, // 鑾峰彇浜岀骇琛ㄦ暟鎹� GetAttacheddata() { let searchParam = { infoid: this.infoid }; - if (this.actives == 1 && !this.medicineform.infoid) { + if (this.actives == 1) { this.annexfilesList = this.medicinelist; this.activetele = "鍖诲璇勪及"; + if (this.medicineform.infoid) { + return; + } listMedicalevaluation(searchParam).then(response => { if (response.code == 200 && response.rows[0]) { this.medicineform = response.rows[0]; @@ -2617,12 +2618,18 @@ // ); } }); - } else if (this.actives == 2 && !this.affirmform.infoid) { + } else if (this.actives == 2) { this.annexfilesList = this.affirmlist; this.activetele = "鎹愮尞纭"; + if (this.affirmform.infoid) { + return; + } listRelativesconfirmation(searchParam).then(response => { if (response.code == 200 && response.rows[0]) { this.affirmform = response.rows[0]; + if (this.affirmform.organdecision) { + this.organdecision = this.affirmform.organdecision.split(","); + } if (!this.affirmform) { this.affirmform = {}; this.affirmform.residenceprovincename = ""; @@ -2646,10 +2653,12 @@ // ); } }); - } else if (this.actives == 3 && !this.ethicform.infoid) { + } else if (this.actives == 3) { this.annexfilesList = this.ethiclist; this.activetele = "浼︾悊瀹℃煡"; - + if (this.ethicform.infoid) { + return; + } listDonateflowchart(searchParam).then(response => { if (response.code == 200 && response.rows.length) { this.ethicform = response.rows[0]; @@ -2701,9 +2710,12 @@ // ); } }); - } else if (this.actives == 6 && !this.allocationform.infoid) { + } else if (this.actives == 6) { this.annexfilesList = this.registerlist; this.activetele = "瀹屾垚鐧昏"; + if (this.allocationform.infoid) { + return; + } let accpre = { id: searchParam.infoid }; @@ -2732,7 +2744,7 @@ } }); } else if (this.actives == 0) { - this.annexfilesList = this.registerlist; + this.annexfilesList = this.potentiallist; this.activetele = "娼滃湪鎹愮尞"; } }, @@ -2842,6 +2854,7 @@ }); } else if (this.actives == 2) { this.affirmform.infoid = this.infoid; + this.affirmform.organdecision = this.organdecision.join(","); this.$refs["affirmform"].validate(valid => { if (valid) { if (this.affirmform.id != null) { @@ -3065,9 +3078,14 @@ // this.GetAttacheddata(); } else if (this.form.workflow > this.actives) { // this.submitForm(); + Modifydonationattachment(this.donatelist).then(res => { + console.log(res); + }); + this.listDonateannex(); this.GetAttacheddata(); } else { - this.$modal.msgWarning("璇峰厛瀹屾垚鍓嶉儴姝ラ"); + this.submitForm(); + // this.$modal.msgWarning("璇峰厛瀹屾垚鍓嶉儴姝ラ"); return; } console.log(this.form.workflow); @@ -3300,19 +3318,20 @@ <style lang="scss" scoped> .particularsdiv { - display: flex; + display: -webkit-box; background-color: #f5f7fa; height: 100%; .left-course { background: #fff; - width: 20%; + width: 17vw; text-align: center; margin: 20px 10px; padding: 10px; margin-top: 0; + min-height: 888px; .postfilx { - width: 15%; + width: 15vw; text-align: center; margin: 20px 10px; padding: 10px; @@ -3378,6 +3397,7 @@ padding-right: 66px; } .boxdiv { + max-width: 85vw; font-size: 18px; padding: 0 30px; padding-bottom: 10px; -- Gitblit v1.9.3