This commit is contained in:
aihe 2024-05-09 00:44:38 +08:00
parent 219088a4a0
commit addf064b30
2 changed files with 16 additions and 10 deletions

View File

@ -100,7 +100,7 @@
<tpx-dialog v-model:show="noticeDetailDialog.show" title="公告详情" type="type-dialog">
<view style="min-height: 100rpx;width: 500rpx;">
<u-parse :content="noticeDetailDialog.content"></u-parse>
<rich-text :nodes="noticeDetailDialog.content"></rich-text>
</view>
</tpx-dialog>
</tpx-page>

View File

@ -7,19 +7,20 @@
<u-row justify="between">
<view class="clr-wht font-32 font-weight">订单概况</view>
<tpx-select mode="drop" v-model:value="searchParam.keyword" :list="dateRangeList" >
<view style="width: 200rpx;;">
<u-button :hairline="false" shape="circle" size="mini" custom-style="border-radius: 23rpx;font-size: 26rpx;height: 50rpx;width: 130rpx;">
<tpx-select mode="drop" v-model:value="searchParam.date" :list="dateRangeList" >
<u-row custom-style="width: 200rpx;;" justify="end">
<u-button :hairline="false" shape="circle" size="mini" custom-style="border-radius: 23rpx;font-size: 26rpx;height: 50rpx;min-width: 130rpx;width: auto;display:inline-grid;margin:0;">
<u-row justify="between" custom-style="width: 100%;">
<view :style="'padding-right: 4rpx;white-space: nowrap;' + 'color: #666;'">
统计
统计-
<tpx-text-dic :value="searchParam.date" :list="dateRangeList"></tpx-text-dic>
</view>
<u-icon :name="showSearchMore?'arrow-up-fill':'arrow-down-fill'"
color="#666" size="18" custom-style="margin-top: 2rpx;"
></u-icon>
</u-row>
</u-button>
</view>
</u-row>
</tpx-select>
</u-row>
@ -53,7 +54,7 @@
<u-row justify="between" align="top">
<u-col span="12">
<!-- 订单状态 -->
<tpx-tabs :list="ordStatusList" v-model:value="searchParam.ordStatus"
<tpx-tabs :list="dicData.emis_waybill_stat_type" v-model:value="searchParam.waybillStatType"
@tabchange="(val)=> { handleSearchParamChange() }" v-slot="curOrdTab"
>
<text slot>
@ -138,7 +139,7 @@
</template>
<script>
import { dateRangeList, ordStatusList } from "@/common/enum"
import { dateRangeList } from "@/common/enum"
import * as apiService from "@/common/api"
export default {
@ -153,10 +154,12 @@
},
},
data() {
let { dicData } = this.$store.getters
return {
...JSON.parse(JSON.stringify({ dateRangeList, ordStatusList })),
...JSON.parse(JSON.stringify({ dateRangeList })),
searchParam: {
searchValue: ''
date: dateRangeList[0].val,
waybillStatType: dicData?.emis_waybill_stat_type?.[0]?.val,
},
queryOption: {
@ -210,6 +213,9 @@
default:
break;
}
},
handleSearchParamChange() {
}
}
}