From 05c3df33bd02a611c4930f38f3e6f5ca034e1c38 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期二, 14 四月 2026 09:36:51 +0800
Subject: [PATCH] 省人民提交
---
src/views/project/donationdetails/index.vue | 172 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 94 insertions(+), 78 deletions(-)
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 7c004c2..42ecc25 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -1195,20 +1195,29 @@
</el-row>
<el-row>
<el-form-item label-width="100px" label="鎹愮尞鍐冲畾">
- <el-checkbox-group v-model="organdecision">
- <el-checkbox
- v-for="item in fixedOrganSelection"
- :key="item"
- :label="item"
- >{{ item }}
- </el-checkbox>
- <el-checkbox
- v-if="shouldShowConditionalOrgan"
- :key="conditionalOrgan"
- :label="conditionalOrgan"
- >{{ conditionalOrgan }}</el-checkbox
- >
- </el-checkbox-group>
+ <el-checkbox-group v-model="organdecision">
+ <!-- 绗竴琛� -->
+ <el-checkbox
+ v-for="item in firstLineOrgans"
+ :key="item"
+ :label="item"
+ >{{ item }}</el-checkbox>
+
+ <!-- 绗簩琛� -->
+ <div style="clear: both;"></div>
+
+ <el-checkbox
+ v-for="item in secondLineOrgans"
+ :key="item"
+ :label="item"
+ >{{ item }}</el-checkbox>
+
+ <el-checkbox
+ v-if="shouldShowConditionalOrgan"
+ :key="conditionalOrgan"
+ :label="conditionalOrgan"
+ >{{ conditionalOrgan }}</el-checkbox>
+</el-checkbox-group>
<el-input
v-if="organdecision.includes('鍏朵粬')"
v-model="affirmform.organdecisionOther"
@@ -1978,27 +1987,6 @@
</el-table-column> -->
<el-table-column
- v-if="organgettimetrue"
- 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>
- </template>
- </el-table-column>
-
- <el-table-column
label="鑾峰彇鍖婚櫌"
align="center"
width="280"
@@ -2043,6 +2031,26 @@
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="璇疯緭鍏ヨ幏鍙栧紑濮嬫椂闂�"
+ >
+ </el-date-picker>
+ </template>
+ </el-table-column>
+ <el-table-column
+ v-if="organgettimetrue"
+ 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>
</template>
@@ -2845,18 +2853,14 @@
kinshiplist: ["閰嶅伓", "鐖朵翰", "姣嶄翰", "瀛愬コ", "鍙楁墭浜�"],
// 鍥哄畾鐨勯�夐」鍒楄〃锛堢Щ闄や簡"閬椾綋"锛�
- fixedOrganSelection: [
- "鑲濊剰",
- "鑲捐剰",
- "鍗曞乏鑲�",
- "鍗曞彸鑲�",
- "蹇冭剰",
- "鑲鸿剰",
- "鑳拌吅",
- "灏忚偁",
- "鍙岀溂缁勭粐",
- "鍏朵粬"
- ],
+ firstLineOrgans: [
+ "鑲濊剰", "鑲捐剰", "宸﹁偩鑴�", "鍙宠偩鑴�",
+ "蹇冭剰", "鑲鸿剰", "鑳拌吅", "灏忚偁"
+ ],
+ // 绗簩琛岄�夐」锛堟偍闇�瑕佷竴璧锋崲琛岀殑涓ら」锛�
+ secondLineOrgans: [
+ "鍙岀溂缁勭粐", "鍏朵粬"
+ ],
// 闇�瑕佹潯浠舵樉绀虹殑閫夐」
conditionalOrgan: "閬椾綋",
@@ -3067,7 +3071,7 @@
],
coreteamassessdoctor: [
{ required: true, message: "璇疯緭鍏ユ牳蹇冩垚鍛樿瘎浼板尰鐢�", trigger: "blur" }
- ],
+ ]
},
affirmrules: {
name: [
@@ -3288,32 +3292,41 @@
} else if (this.actives == 2) {
this.activetele = "鎹愮尞纭";
- 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(",")
- .flatMap(item => (item === "鍙岃偩鑴�" ? ["宸﹁偩", "鍙宠偩"] : item));
- }
- if (this.affirmform.kinship) {
- this.kinship = this.affirmform.kinship.split(",");
- }
- if (!this.affirmform) {
- this.affirmform = {};
- this.affirmform.residenceprovincename = "";
- this.affirmform.residencecityname = "";
- this.affirmform.residencetownname = "";
- }
- this.defultAddresss.sheng = this.affirmform.residenceprovincename;
- this.defultAddresss.shi = this.affirmform.residencecityname;
- this.defultAddresss.qu = this.affirmform.residencetownname;
- } else {
- // this.$modal.msgError(
- // "鏌ヨ鏄惁瀛樺湪纭鐧昏璁板綍澶辫触" + JSON.stringify(response)
- // );
- }
- });
+ listRelativesconfirmation(searchParam).then(response => {
+ if (response.code == 200 && response.rows[0]) {
+ this.affirmform = response.rows[0];
+
+ // 淇敼鍣ㄥ畼鍐崇瓥鐨勬樉绀烘枃鏈�
+ if (this.affirmform.organdecision) {
+ // 鏇挎崲鍣ㄥ畼鍚嶇О
+ let organdecision = this.affirmform.organdecision
+ .replace(/鍗曞乏鑲�/g, '宸﹁偩鑴�')
+ .replace(/鍗曞彸鑲�/g, '鍙宠偩鑴�')
+ .replace(/鍙岃偩鑴�/g, '鍙岃偩鑴�'); // 淇濇寔鍙岃偩鑴忎笉鍙�
+
+ this.organdecision = organdecision
+ .split(",")
+ .flatMap(item => (item === "鍙岃偩鑴�" ? ["宸﹁偩", "鍙宠偩"] : item));
+ }
+
+ if (this.affirmform.kinship) {
+ this.kinship = this.affirmform.kinship.split(",");
+ }
+ if (!this.affirmform) {
+ this.affirmform = {};
+ this.affirmform.residenceprovincename = "";
+ this.affirmform.residencecityname = "";
+ this.affirmform.residencetownname = "";
+ }
+ this.defultAddresss.sheng = this.affirmform.residenceprovincename;
+ this.defultAddresss.shi = this.affirmform.residencecityname;
+ this.defultAddresss.qu = this.affirmform.residencetownname;
+ } else {
+ // this.$modal.msgError(
+ // "鏌ヨ鏄惁瀛樺湪纭鐧昏璁板綍澶辫触" + JSON.stringify(response)
+ // );
+ }
+});
} else if (this.actives == 3) {
this.activetele = "浼︾悊瀹℃煡";
@@ -4538,7 +4551,6 @@
}
// 鎶樺彔鐘舵�佷笅璋冩暣鏍囬鏂囧瓧
-
}
// 鎶樺彔鐘舵�佷笅闅愯棌瀹屾暣鏍囬鏂囧瓧
@@ -4556,10 +4568,14 @@
}
}
}
-.Ticket-button{
- text-align: right;
- margin-right: 50px;
+ .new-line {
+ clear: both; /* 鍏抽敭灞炴�э細娓呴櫎涓や晶娴姩锛屽己鍒舵崲琛� */
+ display: block; /* 鍙�夛細璁剧疆涓哄潡绾у厓绱狅紝纭繚鐙崰涓�琛� */
}
+ .Ticket-button {
+ text-align: right;
+ margin-right: 50px;
+ }
// 鍙充晶鍐呭鍖哄煙
.right-content {
flex: 1;
--
Gitblit v1.9.3