shish пре 2 година
родитељ
комит
64bf2cdfef
2 измењених фајлова са 27 додато и 26 уклоњено
  1. 8 3
      ghs/src/service/order/index.js
  2. 19 23
      ghs/src/views/order/components/order-detail.vue

+ 8 - 3
ghs/src/service/order/index.js

@@ -5,9 +5,14 @@ import { baseUrl } from '@/config/env';
 @Service('order')
 @Service('order')
 export class OrderService extends BaseService {
 export class OrderService extends BaseService {
 
 
-	/**
-	 * 发快递配送费计算  姜枫2021.04.19
-	 */
+	modifyRemark(data) {
+		return this.request({
+			url: '/modify-remark',
+			method: 'POST',
+			data: data
+		});
+	}
+
 	freight(data) {
 	freight(data) {
 		return this.request({
 		return this.request({
 			url: '/freight',
 			url: '/freight',

+ 19 - 23
ghs/src/views/order/components/order-detail.vue

@@ -1,24 +1,20 @@
 <template>
 <template>
 	<div class="order-detail">
 	<div class="order-detail">
-		<!-- 抽屉 -->
-		<el-drawer
-			:visible.sync="showOrderDetail"
-			size="1000px"
-			:before-close="closeFn"
-			custom-class="order-draw-wrap"
-		>
-			<template slot="title">
-				<div class="title-status-wrap">
-					<div class="title-text">订单详情</div>
-					<div class="title-status" :class="{ success: orderOperate.status == 5 }">
-						<span>当前订单状态:</span>
-						<span>{{ orderOperate.status | constantfilter('ORDER_STATUS') }}</span>
+
+
+		<el-drawer :visible.sync="showOrderDetail" size="1000px" :before-close="closeFn" custom-class="order-draw-wrap" >
+			<div class="order-manage-wrap" v-if="data!=''">
+
+				<div class="card-wrap">
+					<div class="card-tit">备注</div>
+					<div class="card-body">
+						<el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="data[0].remark"></el-input>
+					</div>
+					<div style="text-align:center;margin-top:4px;">
+					<el-button @click.stop="modifyRemark()" size="small" type="primary" style="margin:0 auto;">修改</el-button>
 					</div>
 					</div>
 				</div>
 				</div>
-			</template>
-			<div class="order-manage-wrap" v-if="data!=''">
 
 
-				<!-- 花材信息 -->
 				<div class="card-wrap">
 				<div class="card-wrap">
 					<div class="card-tit">花材信息</div>
 					<div class="card-tit">花材信息</div>
 					<div class="card-body">
 					<div class="card-body">
@@ -39,8 +35,6 @@
 						</el-table>
 						</el-table>
 					</div>
 					</div>
 				</div>
 				</div>
-
-				<!-- 客户信息 -->
 				<div class="card-wrap">
 				<div class="card-wrap">
 					<div class="card-tit">客户</div>
 					<div class="card-tit">客户</div>
 					<div class="card-body">
 					<div class="card-body">
@@ -52,8 +46,6 @@
 						</el-table>
 						</el-table>
 					</div>
 					</div>
 				</div>
 				</div>
-
-				<!-- 信息 -->
 				<div class="card-wrap">
 				<div class="card-wrap">
 					<div class="card-tit">基本信息</div>
 					<div class="card-tit">基本信息</div>
 					<div class="card-body">
 					<div class="card-body">
@@ -75,8 +67,6 @@
 						</el-table>
 						</el-table>
 					</div>
 					</div>
 				</div>
 				</div>
-
-
 			</div>
 			</div>
 		</el-drawer>
 		</el-drawer>
 	</div>
 	</div>
@@ -98,9 +88,15 @@ export default {
 		};
 		};
 	},
 	},
 	methods: {
 	methods: {
+		modifyRemark(){
+			this.$service.order.modifyRemark({ id: this.orderOperate.id,remark:this.data[0].remark }).then(res => {
+				this.$notify({ title: '修改成功', message: 'SUCCESS', type: 'success'})
+			})
+		},
 		init() {
 		init() {
 			this.$service.order.info({ id: this.orderOperate.id }).then(res => {
 			this.$service.order.info({ id: this.orderOperate.id }).then(res => {
 				this.data = [res];
 				this.data = [res];
+				console.log(this.data)
 				this.showOrderDetail = true;
 				this.showOrderDetail = true;
 			});
 			});
 		},
 		},
@@ -114,7 +110,7 @@ export default {
 <style lang="scss">
 <style lang="scss">
 .order-draw-wrap {
 .order-draw-wrap {
 	.el-drawer__header {
 	.el-drawer__header {
-		margin-bottom: 20px;
+		margin-bottom: 2px;
 	}
 	}
 	.el-table__header-wrapper {
 	.el-table__header-wrapper {
 		.el-table__header tr,
 		.el-table__header tr,