xiaozhiyong/refinery-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xiugai

Browse Source
This commit is contained in:
lixuan
2023-02-23 10:40:37 +08:00
parent 12d6fb072f
commit 5d836a3aaa
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/order/components/billOfLading.vue
View File

@@ -94,7 +94,7 @@
</el-form-item>
</div>
<div>
<el-button v-show="item.deliveryStatus=='SUBMITED'" type="danger" @click="billDelete(item,index)">删除提货单</el-button>
<el-button v-show="billData.orderInfo.orderStatus=='DELIVERING'&&billData.orderInfo.payStatus!=='REFUNDED'" type="danger" @click="billDelete(item,index)">删除提货单</el-button>
<el-button :disabled="item.deliveryStatus!=='PLATENUM_LOCKED'&&item.deliveryStatus!=='PLATENUM_SUCCESS'" @click="billSubmit(item,index)" :type="orderTagType(item.deliveryStatus).type1">{{orderTagType(item.deliveryStatus).info}}</el-button>
</div>
</div>
@@ -105,7 +105,7 @@
</div>
<div class="buttons">
<el-button @click="controlWindows.bill = false">取消 </el-button>
<el-button v-show="billData.orderInfo.orderStatus=='PLATENUM_SUCCESS'" @click="submit">订单确认</el-button>
<el-button v-show="billData.orderInfo&&billData.orderInfo.orderStatus&&billData.orderInfo.orderStatus=='DELIVERING'" @click="submit">订单确认</el-button>
</div>
<el-dialog :close-on-click-modal="false" :append-to-body="true" title="提货单信息" width="400px" :visible.sync="dialogBillAdd">
<el-form v-if="dialogBillAdd" :model="billAddData" ref="form" :rules="rules">
@@ -290,7 +290,6 @@ export default {
}
})
}else{
delete this.billAddData.orderId
delete this.billAddData.productMeasurement
this.billAddData.deliveryStatus = e==2?'PLATENUM_LOCKED':''
order.update(this.billAddData).then(res=>{