CzRger 4 months ago
parent
commit
b711ec8181

+ 1 - 1
snowy-admin-web/src/views/gsc/basic/detail.vue

@@ -143,7 +143,7 @@ const imgOptions = ref({
 const onOpen = (record, view = false) => {
 	open.value = true
 	if (record) {
-    basicApi.passengerinfoDetail({id: record.id}).then(res => {
+    basicApi.passengerinfoDetail({id: record.id, queryType: 1}).then(res => {
 			formData.value = Object.assign({}, res)
 		})
 	}

+ 1 - 1
snowy-admin-web/src/views/gsc/basic/index.vue

@@ -189,7 +189,7 @@ const loadData = (parameter) => {
     searchFormStateReal.value.travelTimeEnd = proxy.$util.YMDHms(searchFormStateReal.value.travelTime[1])
     delete searchFormStateReal.value.travelTime
   }
-  return basicApi.passengerInfoPage(Object.assign(parameter, searchFormStateReal.value)).then((data) => {
+  return basicApi.passengerInfoPage(Object.assign(parameter, searchFormStateReal.value, {queryType: 1})).then((data) => {
     return data
   })
 }

+ 9 - 5
snowy-admin-web/src/views/gsc/check/detail.vue

@@ -76,10 +76,9 @@
       </a-form>
       <div class="__cus-title_1">查验过程记录</div>
       <a-timeline>
-        <a-timeline-item>Create a services site 2015-09-01</a-timeline-item>
-        <a-timeline-item>Solve initial network problems 2015-09-01</a-timeline-item>
-        <a-timeline-item>Technical testing 2015-09-01</a-timeline-item>
-        <a-timeline-item>Network problems being solved 2015-09-01</a-timeline-item>
+        <template v-for="item in formData.checks">
+          <a-timeline-item>{{ item.createTime }}<span style="margin-left: 20px"/>{{ item.checkStep }}</a-timeline-item>
+        </template>
       </a-timeline>
       <div class="__cus-title_1">行李物品信息</div>
       <a-table
@@ -180,7 +179,7 @@ const imgOptions = ref({
 const onOpen = (record, view = false) => {
 	open.value = true
 	if (record) {
-    basicApi.passengerinfoDetail({id: record.id}).then(res => {
+    basicApi.passengerinfoDetail({id: record.id, queryType: 1}).then(res => {
 			formData.value = Object.assign({}, res)
 		})
 	}
@@ -210,4 +209,9 @@ defineExpose({
 	overflow-y: auto;
 	overflow-x: hidden;
 }
+:deep(.ant-timeline-item-last) {
+  .ant-timeline-item-content {
+    min-height: unset;
+  }
+}
 </style>

+ 1 - 1
snowy-admin-web/src/views/gsc/check/index_all.vue

@@ -200,7 +200,7 @@ const loadData = (parameter) => {
     searchFormStateReal.value.travelTimeEnd = proxy.$util.YMDHms(searchFormStateReal.value.travelTime[1])
     delete searchFormStateReal.value.travelTime
   }
-  return basicApi.passengerInfoPage(Object.assign(parameter, searchFormStateReal.value)).then((data) => {
+  return basicApi.passengerInfoPage(Object.assign(parameter, searchFormStateReal.value, {queryType: 2})).then((data) => {
     return data
   })
 }

+ 1 - 1
snowy-admin-web/src/views/gsc/check/index_noPass.vue

@@ -191,7 +191,7 @@ const loadData = (parameter) => {
     searchFormStateReal.value.checkTimeEnd = proxy.$util.YMDHms(searchFormStateReal.value.checkTime[1])
     delete searchFormStateReal.value.checkTime
   }
-  return basicApi.passengerInfoPage(Object.assign(parameter, searchFormStateReal.value, {checkStatus: 1})).then((data) => {
+  return basicApi.passengerInfoPage(Object.assign(parameter, searchFormStateReal.value, {checkStatus: 1, queryType: 2})).then((data) => {
     return data
   })
 }

+ 1 - 1
snowy-admin-web/src/views/gsc/check/index_pass.vue

@@ -177,7 +177,7 @@ const loadData = (parameter) => {
     searchFormStateReal.value.checkTimeEnd = proxy.$util.YMDHms(searchFormStateReal.value.checkTime[1])
     delete searchFormStateReal.value.checkTime
   }
-  return basicApi.passengerInfoPage(Object.assign(parameter, searchFormStateReal.value, {checkStatus: 1})).then((data) => {
+  return basicApi.passengerInfoPage(Object.assign(parameter, searchFormStateReal.value, {checkStatus: 1, queryType: 2})).then((data) => {
     return data
   })
 }