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

Compare commits

base: xiaozhiyong:bfb9fc7761f1e74503d1474b91c51592638c9151
Branches Tags
xiaozhiyong:KongDuo
xiaozhiyong:caolc
xiaozhiyong:lixuan
xiaozhiyong:master
xiaozhiyong:xiaozy_0517
xiaozhiyong:xiaozy_产品列表
xiaozhiyong:zyj
..
compare: xiaozhiyong:1126906b5e6f3ff7ac32b66e426f937cbcfbf296
Branches Tags
xiaozhiyong:KongDuo
xiaozhiyong:caolc
xiaozhiyong:lixuan
xiaozhiyong:master
xiaozhiyong:xiaozy_0517
xiaozhiyong:xiaozy_产品列表
xiaozhiyong:zyj

No commits in common. 'bfb9fc7761f1e74503d1474b91c51592638c9151' and '1126906b5e6f3ff7ac32b66e426f937cbcfbf296' have entirely different histories.
bfb9fc7761 ... 1126906b5e

3 changed files with 84 additions and 168 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats
  1. 226
      src/views/order/index.vue
  2. 2
      src/views/product/components/adjust.vue
  3. 2
      src/views/product/index.vue

226
src/views/order/index.vue
Unescape View File

@ -1,12 +1,7 @@
<template>
<div class="order">
<div class="frame">
<el-input
class="mr20"
v-model="parameter.params.id"
placeholder="订单编号"
clearable
></el-input>
<el-input class="mr20" v-model="parameter.params.id" placeholder="订单编号" clearable></el-input>
<!-- 公司名称 -->
<autocomplete
class="mr20"
@ -89,30 +84,19 @@
</template>
</el-table-column>
<el-table-column prop="salePrice" label="价格" minWidth="90">
<el-table-column
prop="salePrice" label="价格" minWidth="90">
</el-table-column>
<el-table-column
prop="payStatus"
label="支付状态"
minWidth="120"
show-overflow-tooltip
>
<el-table-column prop="payStatus" label="支付状态" minWidth="120" show-overflow-tooltip>
<template slot-scope="{ row }">
<el-tag
:effect="payTagType(row.payStatus).effect"
:type="payTagType(row.payStatus).type"
>{{ payTagType(row.payStatus).label }}</el-tag
>
<el-tag :effect="payTagType(row.payStatus).effect" :type="payTagType(row.payStatus).type">{{ payTagType(row.payStatus).label }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="orderStatus" label="订单状态" minWidth="120">
<template slot-scope="{ row }">
<el-tag
:effect="orderTagType(row.orderStatus).effect"
:type="orderTagType(row.orderStatus).type"
>{{ orderTagType(row.orderStatus).label }}</el-tag
>
<el-tag :effect="orderTagType(row.orderStatus).effect" :type="orderTagType(row.orderStatus).type">{{ orderTagType(row.orderStatus).label }}</el-tag>
</template>
</el-table-column>
@ -122,11 +106,7 @@
minWidth="180"
>
<template slot-scope="{ row }">
<span
>{{ row.actQuantity | toNumberFixed }} /
{{ row.preQuantity | toNumberFixed }}
{{ row.productMeasurement }}</span
>
<span>{{ row.actQuantity|toNumberFixed }} / {{ row.preQuantity|toNumberFixed }} {{row.productMeasurement}}</span>
</template>
</el-table-column>
@ -136,10 +116,7 @@
minWidth="180"
>
<template slot-scope="{ row }">
<span
>{{ row.actAmount | toNumberFixed }} /
{{ row.preAmount | toNumberFixed }} 元</span
>
<span>{{ row.actAmount|toNumberFixed}} / {{ row.preAmount|toNumberFixed }} 元</span>
</template>
</el-table-column>
<el-table-column label="时间" minWidth="235">
@ -152,71 +129,30 @@
</p>
</template>
</el-table-column>
<el-table-column
prop="orderSerialNumber"
fixed="right"
label="操作"
width="250"
>
<el-table-column prop="orderSerialNumber" fixed="right" label="操作" width="250">
<template slot-scope="{ row }">
<el-link type="primary" :underline="false" @click="detail(row)"
>详情</el-link
>
<el-link
v-show="
row.orderStatus !== 'SUBMITED' &&
row.orderStatus !== 'ORDER_LOCKED'
"
type="primary"
:underline="false"
@click="billOfLading(row)"
<el-link v-show="row.orderStatus!=='SUBMITED'&&row.orderStatus!=='ORDER_LOCKED'" type="primary" :underline="false" @click="billOfLading(row)"
>提货单</el-link
>
<el-popconfirm
:title="
row.orderStatus == 'SUBMITED'
? '是否确认订单锁定？'
: '是否确认下单？'
"
:title="row.orderStatus=='SUBMITED'?'是否确认订单锁定？':'是否确认下单？'"
icon-color="red"
@confirm="Locked(row)"
>
<el-link
v-show="
row.orderStatus == 'SUBMITED' ||
row.orderStatus == 'ORDER_LOCKED'
"
slot="reference"
type="primary"
:underline="false"
>{{
row.orderStatus == "SUBMITED" ? "订单锁定" : "下单确认"
}}</el-link
<el-link v-show="row.orderStatus=='SUBMITED'||row.orderStatus=='ORDER_LOCKED'" slot="reference" type="primary" :underline="false"
>{{row.orderStatus=='SUBMITED'?'订单锁定':'下单确认'}}</el-link
>
</el-popconfirm>
<el-popconfirm
:title="
row.orderStatus == 'SUBMITED' ||
row.orderStatus == 'ORDER_LOCKED'
? '是否确认取消订单？'
: '是否确认退款？'
"
:title="row.orderStatus=='SUBMITED'||row.orderStatus=='ORDER_LOCKED'?'是否确认取消订单？':'是否确认退款？'"
icon-color="red"
@confirm="orderCencle(row)"
>
<el-link
v-show="
row.orderStatus !== 'CANCELED' && row.payStatus !== 'REFUNDED'
"
slot="reference"
type="primary"
:underline="false"
>{{
row.orderStatus == "SUBMITED" ||
row.orderStatus == "ORDER_LOCKED"
? "订单取消"
: "订单退款"
}}</el-link
<el-link v-show="row.orderStatus!=='CANCELED'&&row.payStatus!=='REFUNDED'" slot="reference" type="primary" :underline="false"
>{{row.orderStatus=='SUBMITED'||row.orderStatus=='ORDER_LOCKED'?'订单取消':'订单退款'}}</el-link
>
</el-popconfirm>
</template>
@ -254,11 +190,7 @@
</general-details>
</el-drawer>
<!-- 提货单 -->
<billOfLading
:billData="billData"
:controlWindows="controlWindows"
@closeWindow="handleCurrentChange"
/>
<billOfLading :billData="billData" :controlWindows="controlWindows" @closeWindow="handleCurrentChange" />
</div>
</template>
@ -272,20 +204,20 @@ import autocomplete from "components/autocomplete/index.vue";
import billOfLading from "./components/billOfLading.vue";
export default {
filters: {
toNumberFixed(val) {
if (val) {
return Number(val).toFixed(2);
} else {
return "--";
filters:{
toNumberFixed(val){
if(val){
return Number(val).toFixed(2)
}else{return '--'}
}
},
},
data() {
return {
controlWindows: {
add: false,
addInfo: {},
addInfo: {
},
detail: false,
bill: false,
},
@ -299,7 +231,7 @@ export default {
},
configAutocompleteLc: {
serveTarget: serve.findByEntity,
autocompleteKey: "refineryName",
autocompleteKey: "name",
labelKey: "refineryName",
valueKey: "id",
placeholder: "炼厂名称",
@ -330,7 +262,7 @@ export default {
params: {},
},
oilCompanyMatch: {},
billData: [],
billData:[],
mappingData: [
{
carTitle: "",
@ -353,7 +285,7 @@ export default {
generalDetails,
billOfLading,
autocomplete,
productApi,
productApi
},
mounted() {
this.$nextTick(() => {
@ -369,43 +301,29 @@ export default {
this.getByPage();
},
methods: {
payTagType(val) {
switch (val) {
case "PREPAID":
return { label: "预支付", type: "info" };
case "PAYING":
return { label: "支付中", type: "warning" };
case "SUCCESS":
return { label: "支付成功", type: "success", effect: "dark" };
case "FAILURE":
return { label: "支付失败", type: "danger", effect: "dark" };
case "CANCELED":
return { label: "支付取消", type: "info" };
case "REFUNDED":
return { label: "退款成功", type: "danger", effect: "dark" };
case "REFUNDING":
return { label: "退款中", type: "warning" };
case "REFUNDFAIL":
return { label: "退款失败", type: "info", effect: "dark" };
payTagType(val){
switch(val){
case 'PREPAID': return {label:'预支付',type:'info'}
case 'PAYING': return {label:'支付中',type:'warning'}
case 'SUCCESS': return {label:'支付成功',type:'success',effect:'dark'}
case 'FAILURE': return {label:'支付失败',type:'danger',effect:'dark'}
case 'CANCELED': return {label:'支付取消',type:'info'}
case 'REFUNDED': return {label:'退款成功',type:'danger',effect:'dark'}
case 'REFUNDING': return{label:'退款中',type:'warning'}
case 'REFUNDFAIL': return{label:'退款失败',type:'info',effect:'dark'}
}
return { label: val ? val : "暂无数据", type: "info", effect: "plain" };
return {label:val?val:'暂无数据',type:'info',effect:'plain'}
},
orderTagType(val) {
switch (val) {
case "SUBMITED":
return { label: "订单提交 ", type: "info" };
case "ORDER_LOCKED":
return { label: "订单锁定", type: "warning" };
case "ORDER_SUCCESS":
return { label: "下单成功", type: "success", effect: "dark" };
case "DELIVERING":
return { label: "提货中", type: "" };
case "COMPLETE":
return { label: "订单完成", type: "success", effect: "dark" };
case "CANCELED":
return { label: "订单取消", type: "info" };
orderTagType(val){
switch(val){
case 'SUBMITED': return {label:'订单提交 ',type:'info'}
case 'ORDER_LOCKED': return {label:'订单锁定',type:'warning'}
case 'ORDER_SUCCESS': return {label:'下单成功',type:'success',effect:'dark'}
case 'DELIVERING': return {label:'提货中', type: ''}
case 'COMPLETE': return {label:'订单完成',type:'success',effect:'dark'}
case 'CANCELED': return {label:'订单取消',type:'info'}
}
return { label: val ? val : "暂无数据", type: "info" };
return {label:val?val:'暂无数据',type:'info'}
},
// currentPage change
handleCurrentChange(page) {
@ -432,19 +350,17 @@ export default {
});
},
//下单取消
orderCencle(row) {
if (row.orderStatus == "SUBMITED" || row.orderStatus == "ORDER_LOCKED") {
order
.orderUpdate({ id: row.id, orderStatus: "CANCELED" })
.then((res) => {
if (res.code == 20000) {
this.getByPage();
orderCencle(row){
if(row.orderStatus=='SUBMITED'||row.orderStatus=='ORDER_LOCKED'){
order.orderUpdate({id:row.id,orderStatus:'CANCELED'}).then((res) => {
if(res.code==20000){
this.getByPage()
}
});
} else {
order.orderRefund({ id: row.id }).then((res) => {
if (res.code == 20000) {
this.getByPage();
}else{
order.orderRefund({id:row.id}).then((res) => {
if(res.code==20000){
this.getByPage()
}
});
}
@ -455,16 +371,16 @@ export default {
this.controlWindows.add = true;
},
//提货单
async billOfLading(row) {
async billOfLading(row){
this.controlWindows.addInfo.title = "";
await order.findDeliveryByOrderId(row.id).then((res) => {
this.billData.list = res.data;
this.billData.list = res.data
});
await order.findByOrderId(row.id).then((res) => {
this.billData.orderInfo = res.data;
this.billData.orderInfo = res.data
});
this.controlWindows.addInfo = row;
this.controlWindows.bill = true;
this.controlWindows.addInfo = row
this.controlWindows.bill = true
},
//详情
detail(row) {
@ -473,16 +389,16 @@ export default {
},
//订单锁定
Locked(row) {
if (row.orderStatus == "SUBMITED") {
order.orderLock({ id: row.id }).then((res) => {
if (res.code == 20000) {
this.getByPage();
if(row.orderStatus=='SUBMITED'){
order.orderLock({id:row.id}).then((res) => {
if(res.code == 20000){
this.getByPage()
}
});
} else {
order.orderSuccess({ id: row.id }).then((res) => {
if (res.code == 20000) {
this.getByPage();
}else{
order.orderSuccess({id:row.id}).then((res) => {
if(res.code == 20000){
this.getByPage()
}
});
}

2
src/views/product/components/adjust.vue
Unescape View File

@ -47,7 +47,7 @@ export default {
};
let validatorSalePrice2company = (rule, value, callback) => {
if (!value || !+value) return callback("企业销售价不能为0或空");
if (+value < +this.form.floorPrice)
if (+value < this.form.floorPrice)
return callback("企业销售价不能低于成本价");
callback();
};

2
src/views/product/index.vue
Unescape View File

@ -277,7 +277,7 @@ export default {
],
configAutocomplete: {
serveTarget: serve.findByEntity,
autocompleteKey: "refineryName",
autocomplateKey: "refineryName",
valueKey: "refineryName",
valueKey: "id",
placeholder: "炼厂名称",

Write Preview
Loading…
Cancel
Save