pull/1/head
lixuan 2 years ago
parent 12d6fb072f
commit 5d836a3aaa
  1. 5
      src/views/order/components/billOfLading.vue
  2. 15
      src/views/order/index.vue
  3. 2
      src/views/product/index.vue

@ -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=>{

@ -1,6 +1,7 @@
<template>
<div class="order">
<div class="frame">
<el-input class="mr20" v-model="parameter.params.id" placeholder="订单编号" clearable></el-input>
<!-- 公司名称 -->
<autocomplete
class="mr20"
@ -23,11 +24,11 @@
:config="configAutocompleteLc"
/>
<!-- 产品名称 -->
<autocomplete
<!-- <autocomplete
class="mr20"
:params="parameter.params"
:config="configAutocompleteCp"
/>
/> -->
<!-- <el-select v-model="parameter.params.id" placeholder="产品名称" clearable>
<el-option
v-for="item in refineryList"
@ -115,7 +116,7 @@
minWidth="180"
>
<template slot-scope="{ row }">
<span>{{ row.actAmount }} / {{ row.preAmount }} </span>
<span>{{ row.actAmount?row.actAmount:'--' }} / {{ row.preAmount?row.preAmount:'--' }} </span>
</template>
</el-table-column>
<el-table-column label="时间" minWidth="235">
@ -196,6 +197,7 @@
<script>
import serve from "api/refineryInfo.js";
import commonServe from "api/common.js";
import productApi from "api/product.js";
import order from "api/order.js";
import generalDetails from "components/generalDetails/index.vue";
import autocomplete from "components/autocomplete/index.vue";
@ -229,12 +231,12 @@ export default {
querykey: "refineryId",
},
configAutocompleteCp: {
serveTarget: serve.findByEntity,
serveTarget: productApi.getRefineryProductList,
autocompleteKey: "name",
labelKey: "refineryName",
valueKey: "id",
placeholder: "产品名称",
querykey: "refineryId",
querykey: "productId",
},
refineryTypeEnum: [
{
@ -275,7 +277,8 @@ export default {
components: {
generalDetails,
billOfLading,
autocomplete
autocomplete,
productApi
},
mounted() {
this.$nextTick(() => {

@ -348,7 +348,7 @@ export default {
//
updateCreate(row){
this.controlWindows.addInfo = {
title: "修改订单",
title: "创建订单",
...row,
};
this.controlWindows.create = true;

Loading…
Cancel
Save