Jason/water_dealer-agent
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
张冬雪
2023-08-24 10:27:57 +08:00
parent 6a4aa2826a
commit de844a9462
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

3
src/views/sales/Offline.vue
View File

@@ -68,8 +68,11 @@
{{ record.channel == 'express' ?'快递':'自提' }} {{ record.channel == 'express' ?'快递':'自提' }}
</div> </div>
<div slot="express" slot-scope="text, record"> <div slot="express" slot-scope="text, record">
<div v-if="record.channel === 'express'">
{{ record.express.name || '-' }} <div>{{ record.express.express_no || '-' }}</div> {{ record.express.name || '-' }} <div>{{ record.express.express_no || '-' }}</div>
</div> </div>
<div v-else>发货时间：{{ record.deliver_at }}</div>
</div>
</s-table> </s-table>
</a-card> </a-card>
</page-header-wrapper> </page-header-wrapper>

4
src/views/sales/widgets/AddOffline.vue
View File

@@ -107,11 +107,11 @@
'deliver_at', 'deliver_at',
{ {
rules: [ rules: [
{ required: true, message: `请选择自提时间!` }, { required: false, message: `请选择发货时间!` },
] ]
} }
]" ]"
:placeholder="`请选择自提时间!`" :placeholder="`请选择发货时间!`"
style="width: 100%" /> style="width: 100%" />
</a-form-item> </a-form-item>
</a-form> </a-form>