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

Merge

Browse Source
master
xiaozhiyong 2 years ago
parent 778f1626f5 f9ea54767b
commit 1973d1f0ac
8 changed files with 218 additions and 173 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 Download Patch File Download Diff File
  1. 2
      .env.development
  2. 2
      package.json
  3. 8
      src/api/order.js
  4. 1
      src/utils/request.js
  5. 91
      src/views/order/components/billOfLading.vue
  6. 23
      src/views/order/index.vue
  7. 4
      src/views/product/components/create.vue
  8. 2
      vue.config.js

2
.env.development
Unescape View File

@ -1,4 +1,4 @@
ENV = 'development'
VUE_APP_BASE_API = '/api'
VUE_APP_ENV = 'development'
VUE_APP_ENV = 'production'

2
package.json
Unescape View File

@ -13,7 +13,7 @@
"bcryptjs": "^2.4.3",
"better-scroll": "1.8.0",
"clipboard": "^2.0.11",
"core-js": "3.6.5",
"core-js": "^3.29.1",
"crypto-js": "^4.1.1",
"element-ui": "^2.15.12",
"js-cookie": "2.2.0",

8
src/api/order.js
Unescape View File

@ -15,6 +15,10 @@ const billSave = (params) => {
const update = (params) => {
return request.putJson("/oil-refinery/xoilRefineryDelivery/update", params);
};
//取消提货单
const cancel = (params) => {
return request.putJson("/oil-refinery/xoilRefineryOrder/update", params);
};
//查看订单信息
const findByOrderId = (id) => {
return request.get(`/oil-refinery/xoilRefineryDelivery/findByOrderId/${id}`);
@ -36,6 +40,7 @@ const orderLock = (params) => {
export default {
getByPage,
findDeliveryByOrderId,
@ -44,5 +49,6 @@ export default {
update,
deleteBill,
orderSuccess,
orderLock
orderLock,
cancel
};

1
src/utils/request.js
Unescape View File

@ -22,6 +22,7 @@ service.interceptors.request.use(
const JSESSIONID = utils.uuid();
config.headers["JSESSIONID"] = JSESSIONID;
config.headers["token"] = utils.bcrypt(JSESSIONID);
config.headers['dataSources'] = 'WEB'
if (env === "development") {
return config;

91
src/views/order/components/billOfLading.vue
Unescape View File

@ -1,12 +1,6 @@
<template>
<el-drawer
direction="ltr"
size="40%"
:visible="controlWindows.bill"
@opened="openDrawer"
:before-close="closeWindow"
:show-close = false
>
<el-drawer direction="ltr" size="40%" :visible="controlWindows.bill" @opened="openDrawer" :before-close="closeWindow"
:show-close=false>
<div class="create" v-if="controlWindows.bill">
<el-form label-width="100px">
<div class="billTop">
@ -19,7 +13,8 @@
</el-form-item>
</div>
<el-form-item label="订单状态">
<el-tag effect='dark' :type="orderTagType(billData.orderInfo.orderStatus).orderType">{{orderTagType(billData.orderInfo.orderStatus).orderLabel}}</el-tag>
<el-tag effect='dark' :type="orderTagType(billData.orderInfo.orderStatus).orderType">{{
orderTagType(billData.orderInfo.orderStatus).orderLabel }}</el-tag>
</el-form-item>
</div>
<div>
@ -60,7 +55,8 @@
<el-form-item label="提货单">
<span>{{ item.id }}</span>
</el-form-item>
<el-tag :type="orderTagType(item.deliveryStatus).type">{{orderTagType(item.deliveryStatus).label}}</el-tag>
<el-tag :type="orderTagType(item.deliveryStatus).type">{{ orderTagType(item.deliveryStatus).label
}}</el-tag>
</div>
<div class="billBottom-body-middle">
<div class="billBottom-body-middle-info">
@ -83,7 +79,8 @@
</el-form-item>
</div>
</div>
<div v-show="item.deliveryStatus=='SUBMITED'" style="text-align: right;color: #409EFF;" @click="billAdd(item,index)">修改信息</div>
<div v-show="item.deliveryStatus == 'SUBMITED'" style="text-align: right;color: #409EFF;"
@click="billAdd(item, index)">修改信息</div>
<div class="billBottom-body-bottom">
<div>
<el-form-item label="创建时间">
@ -94,8 +91,13 @@
</el-form-item>
</div>
<div>
<el-button v-show="item.deliveryStatus=='SUBMITED'&&billData.orderInfo.orderStatus=='DELIVERING'&&billData.orderInfo.payStatus!=='REFUNDED'" type="danger" @click="billDelete(item,index)">删除提货单</el-button>
<el-button :effect="orderTagType(item.deliveryStatus).effect" :disabled="item.deliveryStatus!=='SUBMITED'" @click="billAddSave(2,item)" :type="orderTagType(item.deliveryStatus).type1">{{orderTagType(item.deliveryStatus).info}}</el-button>
<el-button
v-show="item.deliveryStatus == 'SUBMITED' && billData.orderInfo.orderStatus == 'DELIVERING' && billData.orderInfo.payStatus !== 'REFUNDED'"
type="danger" @click="billDelete(item, index)">删除提货单</el-button>
<el-button :effect="orderTagType(item.deliveryStatus).effect"
:disabled="item.deliveryStatus !== 'SUBMITED'" @click="billAddSave(2, item)"
:type="orderTagType(item.deliveryStatus).type1">{{ orderTagType(item.deliveryStatus).info
}}</el-button>
</div>
</div>
</div>
@ -107,10 +109,11 @@
<el-button @click="controlWindows.bill = false">取消 </el-button>
<!-- <el-button @click="submit">订单确认</el-button> -->
</div>
<el-dialog :close-on-click-modal="false" :append-to-body="true" title="提货单信息" width="400px" :visible.sync="dialogBillAdd">
<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">
<el-form-item label="预约提货量" prop="preDeliveryQuantity">
<el-input v-model="billAddData.preDeliveryQuantity"></el-input>元/吨
<el-input v-model="billAddData.preDeliveryQuantity"></el-input>吨
</el-form-item>
<el-form-item label="提货人" prop="driverName">
<el-input v-model="billAddData.driverName"></el-input>
@ -129,12 +132,8 @@
<!-- <el-button v-show="billTitle" type="primary" @click="billAddSave(2)">修改并锁定</el-button> -->
</div>
</el-dialog>
<el-dialog
destroy-on-close
title="提示"
:close-on-click-modal="false" :append-to-body="true"
:visible.sync="dialogDelivery"
width="30%">
<el-dialog destroy-on-close title="提示" :close-on-click-modal="false" :append-to-body="true"
:visible.sync="dialogDelivery" width="30%">
<el-form v-if="dialogDelivery">
<el-form-item label="实际提货量" prop="plateNumber">
<el-input v-model="deliveryQuantity"></el-input>
@ -230,7 +229,8 @@ export default {
this.$message.success(res.msg)
this.dialogDelivery = false
}
})
});
this.$emit('billOfLading', this.billData, 2)
},
billSubmit(e, index) {
if (e.deliveryStatus == 'PLATENUM_SUCCESS') {
@ -247,7 +247,9 @@ export default {
this.billListMeth()
// this.$set(this.billData.list,index,this.billAddData)
this.$message.success(res.msg)
this.dialogBillAdd = false
this.dialogBillAdd = false;
this.$emit('billOfLading', this.billData, 2)
}
})
})
@ -261,6 +263,7 @@ export default {
case 'DELIVERING': return { orderLabel: '提货中', label: '提货中', type: '', orderType: 'info' }
case 'COMPLETE': return { orderLabel: '订单完成', label: '提货完成', info: '提货完成', type: 'success', type1: 'info', orderType: 'success' }
case 'CANCELED': return { orderLabel: '订单取消', label: '订单取消', info: '订单取消', type: 'info', type1: 'dark', orderType: 'info' }
default: return { orderLabel: '暂无数据', label: '暂无数据', info: '暂无数据', type: 'info', type1: 'dark', orderType: 'info' }
}
return { label: val ? val : '暂无数据', info: val ? val : '暂无数据', type: 'info' }
},
@ -284,22 +287,27 @@ export default {
this.billData.list.push(this.billAddData)
this.billListMeth()
this.$message.success(res.msg)
this.dialogBillAdd = false
this.dialogBillAdd = false;
}
})
}
})}})
})
} else {
this.$confirm('确定锁定提货单?', '提示', { type: 'error' }).then(() => {
this.billAddData = item?JSON.parse(JSON.stringify(item)):{}
this.billAddData.deliveryStatus = e==2?'PLATENUM_LOCKED':''
this.$confirm(`确定${e==1?'修改':'锁定'}提货单?`, '提示', { type: 'error' }).then(() => {
// this.billAddData = item ? JSON.parse(JSON.stringify(item)) : {};
this.billAddData.deliveryStatus = e == 2 ? 'PLATENUM_LOCKED' : '';
console.log(this.billAddData,'this.billAddData')
order.update(this.billAddData).then(res => {
if (res.code == 20000) {
this.billListMeth()
this.$message.success(res.msg)
this.dialogBillAdd = false
this.dialogBillAdd = false;
}
})
})
}
this.$emit('billOfLading', this.billData.orderInfo, 2)
},
//更新提货单数据
billListMeth() {
@ -317,7 +325,9 @@ export default {
if (res.code == 20000) {
this.$message.success(res.msg)
this.dialogBillAdd = false;
this.billListMeth()
this.billListMeth();
this.$emit('billOfLading', this.billData, 2)
}
})
this.$set(this.billData.list, index, '')
@ -371,6 +381,7 @@ export default {
<style lang="scss" scoped>
.create {
padding: 40px;
.el-input,
.el-select,
.el-textarea,
@ -378,6 +389,7 @@ export default {
width: 300px;
}
}
.buttons {
background: #fff;
position: absolute;
@ -389,60 +401,77 @@ export default {
line-height: 80px;
text-align: right;
border-top: 1px solid #f2f3f5;
.el-button {
text-align: right;
font-size: 14px;
border-radius: 5px;
}
}
.billTop {
background: #f0f0f0;
padding: 15px 35px;
border-radius: 5px;
}
.billTop-top,.billBottom-title,.billBottom-body-top,.billBottom-body-bottom{
.billTop-top,
.billBottom-title,
.billBottom-body-top,
.billBottom-body-bottom {
display: flex;
justify-content: space-between;
}
.billTop-top-left {
display: flex;
::v-deep .el-form-item {
margin-bottom: 0
}
}
.billBottom {
.billBottom-title {
align-items: center;
margin: 20px 0;
}
}
.billBottom-body-middle {
::v-deep .el-form-item {
margin-bottom: 0
}
.billBottom-body-middle-info {
display: flex;
}
}
.billBottom-body {
padding: 20px;
box-shadow: 0 1px 4px rgba(0, 21, 41, .50);
margin: 25px 0px;
}
.billBottom-body-bottom {
::v-deep .el-form-item {
margin-bottom: 0
}
align-items: center;
margin-top: 20px;
}
::v-deep .el-drawer__header {
display: none;
}
::v-deep .billBottom .el-form-item__label {
line-height: 20px;
color: #999;
}
::v-deep .billBottom .el-form-item__content {
line-height: 20px;
}

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

@ -151,7 +151,7 @@
<el-popconfirm
title="是否确认取消订单？"
icon-color="red"
@confirm="deleteRow(row)"
@confirm="deleteRow(row,'delete')"
>
<el-link v-show="row.orderStatus=='SUBMITED'" slot="reference" type="primary" :underline="false"
>订单取消</el-link
@ -192,7 +192,7 @@
</general-details>
</el-drawer>
<!-- 提货单 -->
<billOfLading :billData="billData" :controlWindows="controlWindows" @closeWindow="handleCurrentChange" />
<billOfLading @billOfLading="billOfLading" :billData="billData" :controlWindows="controlWindows" @closeWindow="handleCurrentChange" />
</div>
</template>
@ -253,7 +253,8 @@ export default {
currentPage: 1,
pageSize: 10,
total: 0,
params: {},
params: {
},
},
oilCompanyMatch: {},
billData:[],
@ -335,6 +336,7 @@ export default {
},
//table list
getByPage() {
this.parameter.params.customerId=this.$store.state.user.companyId
order.getByPage(this.parameter).then((res) => {
this.tableData = res.data.list;
this.total = res.data.totalCount;
@ -352,14 +354,18 @@ export default {
this.controlWindows.add = true;
},
//提货单
async billOfLading(row){
async billOfLading(row,selectIndex){
this.controlWindows.addInfo.title = "";
if(!selectIndex||selectIndex==1){
await order.findDeliveryByOrderId(row.id).then((res) => {
this.billData.list = res.data
});
}
if(!selectIndex||selectIndex==2){
await order.findByOrderId(row.id).then((res) => {
this.billData.orderInfo = res.data
this.billData.orderInfo = Object.assign(res.data,{id:row.id})
});
}
this.controlWindows.addInfo = row
this.controlWindows.bill = true
},
@ -369,8 +375,11 @@ export default {
this.controlWindows.detail = true;
},
//订单锁定
deleteRow(row) {
order.orderLock({id:row.id}).then((res) => {
deleteRow(row,type) {
let api = type&&type=='delete'?'cancel':'orderLock';
let data = {id:row.id};
(api=='cancel')&&(data['orderStatus']='CANCELED');
order[api](data).then((res) => {
if(res.code == 20000){
this.getByPage()
}

4
src/views/product/components/create.vue
Unescape View File

@ -107,14 +107,14 @@ export default {
"form.salePrice": {
handler(n, o) {
if(n){
this.form.preAmount = this.form.salePrice*(this.form.preQuantity?this.form.preQuantity:0)
this.form.preAmount = (this.form.salePrice*(this.form.preQuantity?this.form.preQuantity:0)).toFixed(2)
}
},
},
"form.preQuantity": {
handler(n, o) {
if(n){
this.form.preAmount = this.form.preQuantity*(this.form.salePrice?this.form.salePrice:0)
this.form.preAmount = (this.form.preQuantity*(this.form.salePrice?this.form.salePrice:0)).toFixed(2)
}
},
}

2
vue.config.js
Unescape View File

@ -30,7 +30,7 @@ module.exports = {
[process.env.VUE_APP_BASE_API]: {
// target: `https://3816t6291y.oicp.vip`,
// target: 'https://6l438d1757.zicp.fun',
target: "http://192.168.0.23:38080",
target: "http://uat.xingoil.com/adminapi",
changeOrigin: true,
pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "",

Write Preview
Loading…
Cancel
Save