소스 검색

修复bug 4034

sunshibo 1 일 전
부모
커밋
fea9bb07be
2개의 변경된 파일16개의 추가작업 그리고 17개의 파일을 삭제
  1. 2 2
      src/api/modules/licenseManagement.ts
  2. 14 15
      src/views/licenseManagement/entertainmentLicense.vue

+ 2 - 2
src/api/modules/licenseManagement.ts

@@ -31,7 +31,7 @@ export const queryContractByStatusList = params => {
 
 // 获取食品经营许可证变更记录
 export const getChangeRecords = params => {
-  return http.get(PORT_NONE + `/license/queryLicenceByStatusList`, params);
+  return http.get(PORT_NONE + `/info/getOtherQualificationHistory`, params);
 };
 
 // 获取营业执照变更记录
@@ -41,7 +41,7 @@ export const getBusinessLicenseChangeRecords = params => {
 
 // 获取其他资质证明变更记录
 export const getEntertainmentChangeRecords = params => {
-  return http.get(PORT_NONE + `/license/queryEntertainmentByStatusList`, params);
+  return httpApi.get(`/alienStore/store/info/getOtherQualificationHistory`, params);
 };
 // 获取合同审核状态
 export const getStoreContractStatus = params => {

+ 14 - 15
src/views/licenseManagement/entertainmentLicense.vue

@@ -78,20 +78,20 @@
     <el-dialog v-model="changeRecordDialogVisible" title="变更记录" width="900px" :close-on-click-modal="false">
       <el-scrollbar height="400px" class="change-record-scrollbar">
         <div v-if="changeRecordList && changeRecordList.length > 0" class="change-record-content">
-          <div v-for="(item, index) in changeRecordList" :key="index" class="record-group">
+          <div v-for="(item, index) in changeRecordList" :key="item.id ?? index" class="record-group">
             <div class="record-date">
-              {{ item.createdDateFormat }}
+              {{ item.createdTime || item.updatedTime || "--" }}
             </div>
             <div class="record-items">
               <div class="record-item">
-                <div class="record-status-badge" :class="getStatusClass(item.licenseExecuteStatus)">
-                  {{ item.licenseExecuteName }}
+                <div class="record-status-badge" :class="getChangeRecordStatusClass(item)">
+                  {{ getChangeRecordStatusText(item) }}
                 </div>
                 <el-image
                   :src="item.imgUrl"
                   fit="cover"
                   class="record-image"
-                  :preview-src-list="changeRecordList.map(record => record.imgUrl)"
+                  :preview-src-list="changeRecordList.map(record => record.imgUrl).filter(Boolean)"
                   :initial-index="Number(index)"
                 >
                   <template #error>
@@ -570,18 +570,17 @@ const handleSubmitReplace = async () => {
   }
 };
 
-const getStatusClass = (status: string) => {
-  const statusInfo = statusMap[status];
-  return statusInfo ? statusInfo.class : "";
+/** 变更记录:与 getOtherQualificationHistory 返回的 licenseExecuteStatus / licenseStatus 对齐 */
+const getChangeRecordStatusText = (item: { licenseExecuteStatus?: number; licenseStatus?: number }) => {
+  const status = item.licenseExecuteStatus ?? item.licenseStatus;
+  if (status == null) return "未知";
+  return statusMap[status]?.name ?? "未知";
 };
 
-const getStatusText = (status: string) => {
-  const map: Record<string, string> = {
-    pending: "审核中",
-    success: "审核通过",
-    failed: "审核拒绝"
-  };
-  return map[status] || "未知";
+const getChangeRecordStatusClass = (item: { licenseExecuteStatus?: number; licenseStatus?: number }) => {
+  const status = item.licenseExecuteStatus ?? item.licenseStatus;
+  if (status == null) return "";
+  return statusMap[status]?.class ?? "";
 };
 </script>