违法上报详情修改

src/views/demo/illegalconstruction/reportviolations/ShowInfoModal/index.vue

@@ -25,12 +25,35 @@
               </template>
             </a-image-preview-group>
           </template>
+          <template v-else-if="item.key == 'otherPersons'">
+            <a-table :dataSource="props.modalData['otherPersons']" :columns="otherPropertiesColumns" :pagination="false">
+              <template #bodyCell="{ column, record, text }">
+                <template v-if="column.key === 'images'">
+                  <a-image-preview-group
+                    :preview="{
+                      getContainer: getContainer,
+                    }"
+                  >
+                    <template v-for="(imageItem, imageIndex) in text" :key="imageIndex">
+                      <a-image
+                        v-if="imageItem.image"
+                        width="100px"
+                        height="100px"
+                        :src="`${VITE_GLOB_INFO_IMAGE_URL}/${imageItem.image}`"
+                        :preview="{
+                          getContainer,
+                        }"
+                      ></a-image>
+                    </template>
+                  </a-image-preview-group>
+                </template>
+              </template>
+            </a-table>
+          </template>
           <template v-else-if="item.key == 'vehicles'">
             <a-table :dataSource="props.modalData['vehicles']" :columns="vehiclesColumns" :pagination="false">
               <template #bodyCell="{ column, record, text }">
-                <template v-if="column.key === 'type'">
-                  {{ getLabel('type', text) }}
-                </template>
+
                 <template v-if="column.key === 'vehicleImages'">
                   <a-image-preview-group
                     :preview="{
@@ -53,7 +76,7 @@
               </template>
             </a-table>
           </template>
-          <template v-else>{{ props.modalData[item.folder][item.key] }}</template>
+          <template v-else>{{ props.modalData[item.folder]? props.modalData[item.folder][item.key]: '' }}</template>
         </a-descriptions-item>
     </a-descriptions>
   </div>
@@ -83,31 +106,44 @@ const showInfoColumn = [
   { label: '当事人姓名', key: 'partyName', folder: 'violationReport', },
   { label: '当事人电话', key: 'partyPhone', folder: 'violationReport', },
   { label: '违法类型', key: 'violationTypeName', folder: 'violationReport', },
+  { label: '矿产类型', key: 'mineralTypes', folder: 'violationReport', },
   { label: '问题描述', key: 'problemDescription', folder: 'violationReport', },
   { label: '上报人', key: 'reporterName', folder: 'violationReport', },
   { label: '上报时间', key: 'reportTime', folder: 'violationReport', },
   { label: '上报单位', key: 'reportUnitName', folder: 'violationReport', },
   { label: '状态', key: 'statusName', folder: 'violationReport', },
-  { label: '处理意见', key: 'handlingOpinion', folder: 'violationReport', },
-  { label: '处理单位', key: 'handUnitName', folder: 'violationReport', },
-  { label: '处理人', key: 'handlerName', folder: 'violationReport', },
-  { label: '处理时间', key: 'handlingTime', folder: 'violationReport', },
+  { label: '初审人员', key: 'reviewerName', folder: 'violationReport', },
+  { label: '初审时间', key: 'reviewTime', folder: 'violationReport', },
+  { label: '初审内容', key: 'reviewComments', folder: 'violationReport', },
+  { label: '复审人员', key: 'seReviewerName', folder: 'violationReport', },
+  { label: '复审时间', key: 'seReviewTime', folder: 'violationReport', },
+  { label: '复审内容', key: 'seReviewComments', folder: 'violationReport', },
+  // { label: '处理意见', key: 'handlingOpinion', folder: 'violationReport', },
+  // { label: '处理单位', key: 'handUnitName', folder: 'violationReport', },
+  // { label: '处理人', key: 'handlerName', folder: 'violationReport', },
+  // { label: '处理时间', key: 'handlingTime', folder: 'violationReport', },
   { label: '停车场编号', key: 'parkingCode', folder: 'parking', },
   { label: '停车场名称', key: 'parkingName', folder: 'parking', },
   { label: '停车场地址', key: 'address', folder: 'parking', },
   { label: '停车场电话', key: 'phone', folder: 'parking', },
   { label: '现场照片', key: 'scenePhotos', span: 3},
+  { label: '其他人员', key: 'otherPersons', span: 3},
   { label: '车辆信息', key: 'vehicles', span: 3},
 ]
 const vehiclesColumns = [
-  { title: '身份证', dataIndex: 'idCard', key: 'idCard',},
+  // { title: '身份证', dataIndex: 'idCard', key: 'idCard',},
   { title: '姓名', dataIndex: 'name', key: 'name',},
   { title: '联系方式', dataIndex: 'phone', key: 'phone',},
-  { title: '类型', dataIndex: 'type', key: 'type',},
-  { title: '牌照', dataIndex: 'licensePlate', key: 'licensePlate',},
+  { title: '类型', dataIndex: 'typeName', key: 'typeName',},
+  // { title: '牌照', dataIndex: 'licensePlate', key: 'licensePlate',},
   { title: '图片', dataIndex: 'vehicleImages', key: 'vehicleImages',},
 ]
-
+const otherPropertiesColumns = [
+  { title: '姓名', dataIndex: 'name', key: 'name',},
+  { title: '联系方式', dataIndex: 'phone', key: 'phone',},
+  { title: '关系', dataIndex: 'relationShip', key: 'relationShip',},
+  { title: '图片', dataIndex: 'images', key: 'images',},
+]
 onMounted(() => {
 })
 

src/views/demo/illegalconstruction/reportviolations/index.vue

@@ -3,8 +3,8 @@
     <BasicTable @register="registerTable">
       <template #toolbar>
         <!-- <PermissionBtn @btnEvent="buttonClick"></PermissionBtn> -->
-        <a-button type="primary" :disabled="processDisabled"  @click="buttonClick('process')">处理</a-button>
-        <a-button type="primary" :disabled="getCarDisabled" @click="buttonClick('getcar')">提车</a-button>
+        <!-- <a-button type="primary" :disabled="processDisabled"  @click="buttonClick('process')">处理</a-button>
+        <a-button type="primary" :disabled="getCarDisabled" @click="buttonClick('getcar')">提车</a-button> -->
       </template>
       <template #bodyCell="{ column, record, index, text }">
         <template v-if="column.key === 'action'">