张田田 3 месяцев назад
Родитель
Сommit
52957408bd
1 измененных файлов с 16 добавлено и 8 удалено
  1. 16 8
      src/service/SingleItemDetail.vue

+ 16 - 8
src/service/SingleItemDetail.vue

@@ -27,7 +27,7 @@ const mockLogisticsData = computed(() => {
     trackingNumber: `${expressTypeText[props.data.expressType || '']} ${props.data.expressNo || ''}`,
     recipientName: props.data.liaison || '',
     recipientPhone: props.data.phone || '',
-    recipientAddress: props.data.provinceName + ' ' + (props.data.cityName !== null ? props.data.cityName + ' ' : '') + (props.data.areaName !== null ? props.data.areaName + ' ' : '') + props.data.detailAddress !== null ? props.data.detailAddress : ''
+    recipientAddress: (props.data.provinceName!==null ? props.data.provinceName + ' ' : '') + (props.data.cityName !== null ? props.data.cityName + ' ' : '') + (props.data.areaName !== null ? props.data.areaName + ' ' : '') + (props.data.detailAddress !== null ? props.data.detailAddress : '')
   };
 });
 const expressTypeText: Record<string, string> = {
@@ -96,25 +96,25 @@ const sellTypeText: Record<string, string> = {
         <div class="info-content">
           <div class="info-row">
             <div class="info-item">
-              <span class="info-label">商品类型</span>
+              <span class="info-label">商品类型:</span>
               <span class="info-value">{{ sellTypeText[data.sellType] || '-' }}</span>
             </div>
             <div class="info-item">
-              <span class="info-label">方案类型</span>
+              <span class="info-label">方案类型:</span>
               <span class="info-value">{{ data.conditioningProgramType || '-' }}</span>
             </div>
           </div>
           <div class="info-row">
             <div class="info-item">
-              <span class="info-label">数量</span>
+              <span class="info-label">数量:</span>
               <span class="info-value">{{ data?.totalMeasure || '-' }}</span>
             </div>
             <div class="info-item">
-              <span class="info-label">商品总价</span>
+              <span class="info-label">商品总价:</span>
               <span class="info-value">¥{{ data?.totalPrice || '-' }}</span>
             </div>
             <div class="info-item" v-if="data?.sellType === '1' ? data?.receiptStatus : data?.progress">
-              <span class="info-label">商品状态</span>
+              <span class="info-label">商品状态:</span>
               <span class="info-value">
                 {{ data?.sellType === '1'
                   ? (data?.receiptStatus ? receiptStatusText[data.receiptStatus] : '-')
@@ -215,8 +215,16 @@ const sellTypeText: Record<string, string> = {
         <vxe-column field="operateTime" title="核销时间" align="center" />
         <vxe-column field="startTime" title="操作开始时间" align="center" />
         <vxe-column field="endTime" title="操作结束时间" align="center" />
-        <vxe-column field="operateDuration" title="治疗时长" align="center" />
-        <vxe-column field="arrangeDuration" title="预定服务时长" align="center" />
+        <vxe-column field="operateDuration" title="治疗时长" align="center" >
+          <template #default="{ row }">
+            {{ row.operateDuration ? row.operateDuration + '分钟' : '' }}
+          </template>
+        </vxe-column>
+        <vxe-column field="arrangeDuration" title="预定服务时长" align="center" >
+          <template #default="{ row }">
+            {{ row.arrangeDuration ? row.arrangeDuration + '分钟' : '' }}
+          </template>
+        </vxe-column>
         <vxe-column field="operateBy" title="操作人" align="center" />
         <vxe-column field="feedback" title="治疗备注" align="center" />
       </vxe-table>