From 6febe66ed8e154fd0c7949cefe71c18c7a209b31 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期四, 15 一月 2026 17:30:06 +0800
Subject: [PATCH] 档案相关国家表功能同步
---
src/views/project/donationdetails/index.vue | 111 +++++++++++++++++++++++++++++--------------------------
1 files changed, 59 insertions(+), 52 deletions(-)
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 7c004c2..6b894dc 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: [
@@ -4538,7 +4542,6 @@
}
// 鎶樺彔鐘舵�佷笅璋冩暣鏍囬鏂囧瓧
-
}
// 鎶樺彔鐘舵�佷笅闅愯棌瀹屾暣鏍囬鏂囧瓧
@@ -4556,10 +4559,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