From c594eef54b6a7ae813ac3aede5ff6207d60b92e7 Mon Sep 17 00:00:00 2001
From: pyt <626651354@qq.com>
Date: 星期四, 20 三月 2025 14:35:03 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/chongzhouResettle

---
 src/views/applicationBatchList/components/ApprovalDialog.vue |  395 ++++++++++----------------------------------------------
 1 files changed, 71 insertions(+), 324 deletions(-)

diff --git a/src/views/applicationBatchList/components/ApprovalDialog.vue b/src/views/applicationBatchList/components/ApprovalDialog.vue
index d3bf664..d44afd1 100644
--- a/src/views/applicationBatchList/components/ApprovalDialog.vue
+++ b/src/views/applicationBatchList/components/ApprovalDialog.vue
@@ -1,428 +1,198 @@
 <template>
-  <el-dialog
-    :title="type === 'audit' ? '审批安置户申请信息' : '安置户申请信息'"
-    :visible.sync="dialogVisible"
-    width="80%"
-    :close-on-click-modal="false"
-    :append-to-body="true"
-  >
+  <el-dialog :title="type === 'audit' ? '审批安置户申请信息' : '安置户申请信息'" :visible.sync="dialogVisible" width="80%"
+    :close-on-click-modal="false" :append-to-body="true">
     <div class="approval-content">
       <!-- 左侧表格区域 -->
       <div class="table-container">
-        <el-table
-          :data="tableData"
-          border
-          style="width: 100%"
-          :row-class-name="tableRowClassName"
-        >
-          <el-table-column
-            type="index"
-            label="序号"
-            width="50"
-            align="center"
-          />
-          <el-table-column
-            prop="town"
-            label="镇(街道)"
-            align="center"
-            width="80"
-          >
+        <el-table :data="tableData" border style="width: 100%" :row-class-name="tableRowClassName">
+          <el-table-column type="index" label="序号" width="50" align="center" />
+          <el-table-column prop="town" label="镇(街道)" align="center" width="80">
             <template slot-scope="scope">
               {{ scope.row.town }}
-              <el-tooltip
-                v-if="scope.row.errors && scope.row.errors.town"
-                placement="top"
-              >
+              <el-tooltip v-if="scope.row.errors && scope.row.errors.town" placement="top">
                 <div slot="content">{{ scope.row.errors.town }}</div>
-                <i
-                  class="el-icon-warning"
-                  style="color: #e6a23c; margin-left: 5px"
-                ></i>
+                <i class="el-icon-warning" style="color: #e6a23c; margin-left: 5px"></i>
               </el-tooltip>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="projectName"
-            label="拆迁项目名称"
-            align="center"
-            width="150"
-          >
+          <el-table-column prop="projectName" label="拆迁项目名称" align="center" width="150">
             <template slot-scope="scope">
               {{ scope.row.projectName }}
-              <el-tooltip
-                v-if="scope.row.errors && scope.row.errors.projectName"
-                placement="top"
-              >
+              <el-tooltip v-if="scope.row.errors && scope.row.errors.projectName" placement="top">
                 <div slot="content">{{ scope.row.errors.projectName }}</div>
-                <i
-                  class="el-icon-warning"
-                  style="color: #e6a23c; margin-left: 5px"
-                ></i>
+                <i class="el-icon-warning" style="color: #e6a23c; margin-left: 5px"></i>
               </el-tooltip>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="village"
-            label="所在村(社区)"
-            align="center"
-            width="100"
-          >
+          <el-table-column prop="village" label="所在村(社区)" align="center" width="100">
             <template slot-scope="scope">
               {{ scope.row.village }}
-              <el-tooltip
-                v-if="scope.row.errors && scope.row.errors.village"
-                placement="top"
-              >
+              <el-tooltip v-if="scope.row.errors && scope.row.errors.village" placement="top">
                 <div slot="content">{{ scope.row.errors.village }}</div>
-                <i
-                  class="el-icon-warning"
-                  style="color: #e6a23c; margin-left: 5px"
-                ></i>
+                <i class="el-icon-warning" style="color: #e6a23c; margin-left: 5px"></i>
               </el-tooltip>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="time"
-            label="拆迁时间"
-            align="center"
-            width="100"
-          >
+          <el-table-column prop="time" label="拆迁时间" align="center" width="100">
             <template slot-scope="scope">
               {{ scope.row.time }}
-              <el-tooltip
-                v-if="scope.row.errors && scope.row.errors.time"
-                placement="top"
-              >
+              <el-tooltip v-if="scope.row.errors && scope.row.errors.time" placement="top">
                 <div slot="content">{{ scope.row.errors.time }}</div>
-                <i
-                  class="el-icon-warning"
-                  style="color: #e6a23c; margin-left: 5px"
-                ></i>
+                <i class="el-icon-warning" style="color: #e6a23c; margin-left: 5px"></i>
               </el-tooltip>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="owner"
-            label="产主姓名"
-            align="center"
-            width="80"
-          >
+          <el-table-column prop="owner" label="产主姓名" align="center" width="80">
             <template slot-scope="scope">
               {{ scope.row.owner }}
-              <el-tooltip
-                v-if="scope.row.errors && scope.row.errors.owner"
-                placement="top"
-              >
+              <el-tooltip v-if="scope.row.errors && scope.row.errors.owner" placement="top">
                 <div slot="content">{{ scope.row.errors.owner }}</div>
-                <i
-                  class="el-icon-warning"
-                  style="color: #e6a23c; margin-left: 5px"
-                ></i>
+                <i class="el-icon-warning" style="color: #e6a23c; margin-left: 5px"></i>
               </el-tooltip>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="idCard"
-            label="身份证号"
-            align="center"
-            width="180"
-          >
+          <el-table-column prop="idCard" label="身份证号" align="center" width="180">
             <template slot-scope="scope">
               {{ scope.row.idCard }}
-              <el-tooltip
-                v-if="scope.row.errors && scope.row.errors.idCard"
-                placement="top"
-              >
+              <el-tooltip v-if="scope.row.errors && scope.row.errors.idCard" placement="top">
                 <div slot="content">{{ scope.row.errors.idCard }}</div>
-                <i
-                  class="el-icon-warning"
-                  style="color: #e6a23c; margin-left: 5px"
-                ></i>
+                <i class="el-icon-warning" style="color: #e6a23c; margin-left: 5px"></i>
               </el-tooltip>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="contact"
-            label="联系电话"
-            align="center"
-            width="120"
-          >
+          <el-table-column prop="contact" label="联系电话" align="center" width="120">
             <template slot-scope="scope">
               {{ scope.row.contact }}
-              <el-tooltip
-                v-if="scope.row.errors && scope.row.errors.contact"
-                placement="top"
-              >
+              <el-tooltip v-if="scope.row.errors && scope.row.errors.contact" placement="top">
                 <div slot="content">{{ scope.row.errors.contact }}</div>
-                <i
-                  class="el-icon-warning"
-                  style="color: #e6a23c; margin-left: 5px"
-                ></i>
+                <i class="el-icon-warning" style="color: #e6a23c; margin-left: 5px"></i>
               </el-tooltip>
             </template>
           </el-table-column>
           <el-table-column label="家庭安置人数(人)" align="center">
-            <el-table-column
-              prop="resettlementPeople"
-              label="集体经济组织成员"
-              align="center"
-              width="120"
-            >
+            <el-table-column prop="resettlementPeople" label="集体经济组织成员" align="center" width="120">
               <template slot-scope="scope">
                 {{ scope.row.resettlementPeople }}
-                <el-tooltip
-                  v-if="scope.row.errors && scope.row.errors.resettlementPeople"
-                  placement="top"
-                >
+                <el-tooltip v-if="scope.row.errors && scope.row.errors.resettlementPeople" placement="top">
                   <div slot="content">
                     {{ scope.row.errors.resettlementPeople }}
                   </div>
-                  <i
-                    class="el-icon-warning"
-                    style="color: #e6a23c; margin-left: 5px"
-                  ></i>
+                  <i class="el-icon-warning" style="color: #e6a23c; margin-left: 5px"></i>
                 </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="additionalPeople"
-              label="非集体经济组织成员"
-              align="center"
-              width="120"
-            >
+            <el-table-column prop="additionalPeople" label="非集体经济组织成员" align="center" width="120">
               <template slot-scope="scope">
                 {{ scope.row.additionalPeople }}
-                <el-tooltip
-                  v-if="scope.row.errors && scope.row.errors.additionalPeople"
-                  placement="top"
-                >
+                <el-tooltip v-if="scope.row.errors && scope.row.errors.additionalPeople" placement="top">
                   <div slot="content">
                     {{ scope.row.errors.additionalPeople }}
                   </div>
-                  <i
-                    class="el-icon-warning"
-                    style="color: #e6a23c; margin-left: 5px"
-                  ></i>
+                  <i class="el-icon-warning" style="color: #e6a23c; margin-left: 5px"></i>
                 </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="totalPeople"
-              label="合计"
-              align="center"
-              width="60"
-            >
+            <el-table-column prop="totalPeople" label="合计" align="center" width="60">
               <template slot-scope="scope">
                 {{ scope.row.totalPeople }}
-                <el-tooltip
-                  v-if="scope.row.errors && scope.row.errors.totalPeople"
-                  placement="top"
-                >
+                <el-tooltip v-if="scope.row.errors && scope.row.errors.totalPeople" placement="top">
                   <div slot="content">{{ scope.row.errors.totalPeople }}</div>
-                  <i
-                    class="el-icon-warning"
-                    style="color: #e6a23c; margin-left: 5px"
-                  ></i>
+                  <i class="el-icon-warning" style="color: #e6a23c; margin-left: 5px"></i>
                 </el-tooltip>
               </template>
             </el-table-column>
           </el-table-column>
-          <el-table-column
-            prop="houseName"
-            label="待安置家庭成员姓名"
-            align="center"
-            width="120"
-          >
+          <el-table-column prop="houseName" label="待安置家庭成员姓名" align="center" width="120">
             <template slot-scope="scope">
               {{ scope.row.houseName }}
-              <el-tooltip
-                v-if="scope.row.errors && scope.row.errors.houseName"
-                placement="top"
-              >
+              <el-tooltip v-if="scope.row.errors && scope.row.errors.houseName" placement="top">
                 <div slot="content">{{ scope.row.errors.houseName }}</div>
-                <i
-                  class="el-icon-warning"
-                  style="color: #e6a23c; margin-left: 5px"
-                ></i>
+                <i class="el-icon-warning" style="color: #e6a23c; margin-left: 5px"></i>
               </el-tooltip>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="area"
-            label="待安置人员应安置面积合计(㎡)"
-            align="center"
-            width="120"
-          >
+          <el-table-column prop="area" label="待安置人员应安置面积合计(㎡)" align="center" width="120">
             <template slot-scope="scope">
               {{ scope.row.area }}
-              <el-tooltip
-                v-if="scope.row.errors && scope.row.errors.area"
-                placement="top"
-              >
+              <el-tooltip v-if="scope.row.errors && scope.row.errors.area" placement="top">
                 <div slot="content">{{ scope.row.errors.area }}</div>
-                <i
-                  class="el-icon-warning"
-                  style="color: #e6a23c; margin-left: 5px"
-                ></i>
+                <i class="el-icon-warning" style="color: #e6a23c; margin-left: 5px"></i>
               </el-tooltip>
             </template>
           </el-table-column>
           <el-table-column label="补偿金额(万元)" align="center">
-            <el-table-column
-              prop="firstPayment"
-              label="新建商品住房、商业用房、停车位"
-              align="center"
-              width="100"
-            >
+            <el-table-column prop="firstPayment" label="新建商品住房、商业用房、停车位" align="center" width="100">
               <template slot-scope="scope">
                 {{ scope.row.firstPayment }}
-                <el-tooltip
-                  v-if="scope.row.errors && scope.row.errors.firstPayment"
-                  placement="top"
-                >
+                <el-tooltip v-if="scope.row.errors && scope.row.errors.firstPayment" placement="top">
                   <div slot="content">{{ scope.row.errors.firstPayment }}</div>
-                  <i
-                    class="el-icon-warning"
-                    style="color: #e6a23c; margin-left: 5px"
-                  ></i>
+                  <i class="el-icon-warning" style="color: #e6a23c; margin-left: 5px"></i>
                 </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="secondPayment"
-              label="二手住房"
-              align="center"
-              width="80"
-            >
+            <el-table-column prop="secondPayment" label="二手住房" align="center" width="80">
               <template slot-scope="scope">
                 {{ scope.row.secondPayment }}
-                <el-tooltip
-                  v-if="scope.row.errors && scope.row.errors.secondPayment"
-                  placement="top"
-                >
+                <el-tooltip v-if="scope.row.errors && scope.row.errors.secondPayment" placement="top">
                   <div slot="content">{{ scope.row.errors.secondPayment }}</div>
-                  <i
-                    class="el-icon-warning"
-                    style="color: #e6a23c; margin-left: 5px"
-                  ></i>
+                  <i class="el-icon-warning" style="color: #e6a23c; margin-left: 5px"></i>
                 </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="totalPayment"
-              label="合计"
-              align="center"
-              width="60"
-            >
+            <el-table-column prop="totalPayment" label="合计" align="center" width="60">
               <template slot-scope="scope">
                 {{ scope.row.totalPayment }}
-                <el-tooltip
-                  v-if="scope.row.errors && scope.row.errors.totalPayment"
-                  placement="top"
-                >
+                <el-tooltip v-if="scope.row.errors && scope.row.errors.totalPayment" placement="top">
                   <div slot="content">{{ scope.row.errors.totalPayment }}</div>
-                  <i
-                    class="el-icon-warning"
-                    style="color: #e6a23c; margin-left: 5px"
-                  ></i>
+                  <i class="el-icon-warning" style="color: #e6a23c; margin-left: 5px"></i>
                 </el-tooltip>
               </template>
             </el-table-column>
           </el-table-column>
-          <el-table-column
-            prop="monthlyPayment"
-            label="25%首付款(万元)"
-            align="center"
-            width="130"
-          >
+          <el-table-column prop="monthlyPayment" label="25%首付款(万元)" align="center" width="130">
             <template slot-scope="scope">
               {{ scope.row.monthlyPayment }}
-              <el-tooltip
-                v-if="scope.row.errors && scope.row.errors.monthlyPayment"
-                placement="top"
-              >
+              <el-tooltip v-if="scope.row.errors && scope.row.errors.monthlyPayment" placement="top">
                 <div slot="content">{{ scope.row.errors.monthlyPayment }}</div>
-                <i
-                  class="el-icon-warning"
-                  style="color: #e6a23c; margin-left: 5px"
-                ></i>
+                <i class="el-icon-warning" style="color: #e6a23c; margin-left: 5px"></i>
               </el-tooltip>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="remainingPayment"
-            label="每季度需支付款项(万元)"
-            align="center"
-            width="120"
-          >
+          <el-table-column prop="remainingPayment" label="每季度需支付款项(万元)" align="center" width="120">
             <template slot-scope="scope">
               {{ scope.row.remainingPayment }}
-              <el-tooltip
-                v-if="scope.row.errors && scope.row.errors.remainingPayment"
-                placement="top"
-              >
+              <el-tooltip v-if="scope.row.errors && scope.row.errors.remainingPayment" placement="top">
                 <div slot="content">
                   {{ scope.row.errors.remainingPayment }}
                 </div>
-                <i
-                  class="el-icon-warning"
-                  style="color: #e6a23c; margin-left: 5px"
-                ></i>
+                <i class="el-icon-warning" style="color: #e6a23c; margin-left: 5px"></i>
               </el-tooltip>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="totalPaid"
-            label="过渡补贴(万元)"
-            align="center"
-            width="60"
-          >
+          <el-table-column prop="totalPaid" label="过渡补贴(万元)" align="center" width="60">
             <template slot-scope="scope">
               {{ scope.row.totalPaid }}
-              <el-tooltip
-                v-if="scope.row.errors && scope.row.errors.totalPaid"
-                placement="top"
-              >
+              <el-tooltip v-if="scope.row.errors && scope.row.errors.totalPaid" placement="top">
                 <div slot="content">{{ scope.row.errors.totalPaid }}</div>
-                <i
-                  class="el-icon-warning"
-                  style="color: #e6a23c; margin-left: 5px"
-                ></i>
+                <i class="el-icon-warning" style="color: #e6a23c; margin-left: 5px"></i>
               </el-tooltip>
             </template>
           </el-table-column>
           <el-table-column prop="remark" label="备注" align="center" width="60">
             <template slot-scope="scope">
               {{ scope.row.remark }}
-              <el-tooltip
-                v-if="scope.row.errors && scope.row.errors.remark"
-                placement="top"
-              >
+              <el-tooltip v-if="scope.row.errors && scope.row.errors.remark" placement="top">
                 <div slot="content">{{ scope.row.errors.remark }}</div>
-                <i
-                  class="el-icon-warning"
-                  style="color: #e6a23c; margin-left: 5px"
-                ></i>
+                <i class="el-icon-warning" style="color: #e6a23c; margin-left: 5px"></i>
               </el-tooltip>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="difference"
-            label="购房差异情况"
-            align="center"
-            width="60"
-          >
+          <el-table-column prop="difference" label="购房差异情况" align="center" width="60">
             <template slot-scope="scope">
               {{ scope.row.difference }}
-              <el-tooltip
-                v-if="scope.row.errors && scope.row.errors.difference"
-                placement="top"
-              >
+              <el-tooltip v-if="scope.row.errors && scope.row.errors.difference" placement="top">
                 <div slot="content">{{ scope.row.errors.difference }}</div>
-                <i
-                  class="el-icon-warning"
-                  style="color: #e6a23c; margin-left: 5px"
-                ></i>
+                <i class="el-icon-warning" style="color: #e6a23c; margin-left: 5px"></i>
               </el-tooltip>
             </template>
           </el-table-column>
@@ -436,11 +206,7 @@
           <template v-if="type === 'audit'">
             <div class="timeline-item">
               <div class="timeline-icon">
-                <el-avatar
-                  size="small"
-                  icon="el-icon-user"
-                  :style="{ background: '#6d78ff' }"
-                ></el-avatar>
+                <el-avatar size="small" icon="el-icon-user" :style="{ background: '#6d78ff' }"></el-avatar>
               </div>
               <div class="timeline-content info-box">
                 <div class="info-line">
@@ -458,16 +224,10 @@
             <div class="timeline-divider"></div>
             <div class="timeline-item">
               <div class="timeline-icon">
-                <el-avatar
-                  size="small"
-                  icon="el-icon-time"
-                  :style="{ background: '#909399' }"
-                ></el-avatar>
+                <el-avatar size="small" icon="el-icon-time" :style="{ background: '#909399' }"></el-avatar>
               </div>
               <div class="timeline-content">
-                <el-button size="small" disabled class="waiting-btn"
-                  >等待审核</el-button
-                >
+                <el-button size="small" disabled class="waiting-btn">等待审核</el-button>
               </div>
             </div>
           </template>
@@ -475,11 +235,7 @@
           <template v-else>
             <div class="timeline-item">
               <div class="timeline-icon">
-                <el-avatar
-                  size="small"
-                  icon="el-icon-user"
-                  :style="{ background: '#6d78ff' }"
-                ></el-avatar>
+                <el-avatar size="small" icon="el-icon-user" :style="{ background: '#6d78ff' }"></el-avatar>
               </div>
               <div class="timeline-content info-box">
                 <div class="info-line">
@@ -497,11 +253,7 @@
             <div class="timeline-divider"></div>
             <div class="timeline-item">
               <div class="timeline-icon">
-                <el-avatar
-                  size="small"
-                  icon="el-icon-user"
-                  :style="{ background: '#6d78ff' }"
-                ></el-avatar>
+                <el-avatar size="small" icon="el-icon-user" :style="{ background: '#6d78ff' }"></el-avatar>
               </div>
               <div class="timeline-content info-box">
                 <div class="info-line">
@@ -542,13 +294,8 @@
 
       <div class="audit-comment">
         <div class="comment-title">审批意见</div>
-        <el-input
-          type="textarea"
-          :rows="4"
-          placeholder="请输入审批意见"
-          v-model="form.auditComment"
-          :disabled="type === 'detail'"
-        ></el-input>
+        <el-input type="textarea" :rows="4" placeholder="请输入审批意见" v-model="form.auditComment"
+          :disabled="type === 'detail'"></el-input>
       </div>
     </div>
 
@@ -869,4 +616,4 @@
 .error-row {
   background-color: #ffecec !important;
 }
-</style> 
\ No newline at end of file
+</style>
\ No newline at end of file

--
Gitblit v1.7.1