Commit 9edf0ce5 authored by yaya's avatar yaya

feat: bugfix

parent e3b5989b
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<el-button <el-button
type="primary" type="primary"
size="mini" size="mini"
@click="imageValueDialogShow = true">寄出快递 @click="logisticDialogShow = true">寄出快递
</el-button> </el-button>
</div> </div>
</div> </div>
...@@ -92,7 +92,15 @@ ...@@ -92,7 +92,15 @@
:show-video-dialog="showVideoDialog" :show-video-dialog="showVideoDialog"
:video-url="consignDetail.videosUrl" :video-url="consignDetail.videosUrl"
@closeLargeDialog="showVideoDialog = false" /> @closeLargeDialog="showVideoDialog = false" />
<!--图文估价-->
<ReturnLogisticDialog
v-if="logisticDialogShow"
:return-order-id="returnOrderId"
:logistic-dialog-show="logisticDialogShow"
@cancelDialog="logisticDialogShow = false"
@refreshList="handleGetDetail"/>
</div> </div>
</template> </template>
<script> <script>
...@@ -105,10 +113,11 @@ import SaleConsignDialog from './components/SaleConsignDialog' ...@@ -105,10 +113,11 @@ import SaleConsignDialog from './components/SaleConsignDialog'
import FinishSettlementDialog from './components/FinishSettlementDialog' import FinishSettlementDialog from './components/FinishSettlementDialog'
import CancelConsignDialog from './components/CancelConsignDialog' import CancelConsignDialog from './components/CancelConsignDialog'
import NormalCountdown from './components/NormalCountdown' import NormalCountdown from './components/NormalCountdown'
import ReturnLogisticDialog from './components/ReturnLogisticDialog'
export default { export default {
name: 'ConsignBackDetail', name: 'ConsignBackDetail',
components: { NormalCountdown, CancelConsignDialog, FinishSettlementDialog, SaleConsignDialog, ImageValueDialog, IdentifyValueDialog, CheckVideoDialog, CheckLargeImageDialog }, components: { ReturnLogisticDialog, NormalCountdown, CancelConsignDialog, FinishSettlementDialog, SaleConsignDialog, ImageValueDialog, IdentifyValueDialog, CheckVideoDialog, CheckLargeImageDialog },
data() { data() {
return { return {
returnOrderId: '', returnOrderId: '',
...@@ -122,19 +131,8 @@ export default { ...@@ -122,19 +131,8 @@ export default {
imgValuation: '', imgValuation: '',
remark: '' remark: ''
}, },
// 图文估价 // 寄出快递
imageValueDialogShow: false, logisticDialogShow: false,
// 实物估价
identifyValueDialogShow: false,
// 货品售出
finishDialogShow: false,
// 寄售凭证
finishSettlementDialogShow: false,
// 取消
cancelConsignDialogShow: false,
imageUrl: '', imageUrl: '',
showLargeDialog: false, showLargeDialog: false,
showVideoDialog: false, showVideoDialog: false,
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
</el-tabs> </el-tabs>
<div class="filter-item" style="margin-bottom: 20px"> <div class="filter-item" style="margin-bottom: 20px">
<el-input <el-input
v-model="listQuery.returnOrderID" v-model="listQuery.returnOrderId"
clearable clearable
size="mini" size="mini"
class="filter-item" class="filter-item"
...@@ -120,7 +120,7 @@ export default { ...@@ -120,7 +120,7 @@ export default {
listQuery: { listQuery: {
page: 1, page: 1,
size: 20, size: 20,
returnOrderID: '', returnOrderId: '',
state: '10' state: '10'
}, },
list: [], list: [],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment