shish 2 лет назад
Родитель
Сommit
2a991ce18f
3 измененных файлов с 16 добавлено и 44 удалено
  1. 1 1
      ghs/src/mock/userInfo.js
  2. 14 42
      ghs/src/views/in/components/order-detail.vue
  3. 1 1
      ghs/src/views/in/list.vue

+ 1 - 1
ghs/src/mock/userInfo.js

@@ -163,7 +163,7 @@ let menu = {
 		{id: '303',parentId: 3,name: '预订客户',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/book/custom',viewPath: 'views/book/custom.vue',keepAlive: 1},
 		{id: '306',parentId: 3,name: '预订明细',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/book/itemCustom',viewPath: 'views/book/itemCustom.vue',keepAlive: 1},
 
-		{id: '15',parentId: null,name: '货',type: 0,icon: 'icondingdanguanli',orderNum: 3,router: '/in/ghs',viewPath: 'views/in/ghs.vue',keepAlive: 1},
+		{id: '15',parentId: null,name: '货',type: 0,icon: 'icondingdanguanli',orderNum: 3,router: '/in/ghs',viewPath: 'views/in/ghs.vue',keepAlive: 1},
 		{id: '1505',parentId: 15,name: '商家列表',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/ghs',viewPath: 'views/in/ghs.vue',keepAlive: 1},
 		{id: '1509',parentId: 15,name: '商家业绩',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/yj',viewPath: 'views/in/yj.vue',keepAlive: 1},
 		{id: '1515',parentId: 15,name: '实时应付',type: 1,icon: 'icondingdanguanli',orderNum: 3,router: '/in/due',viewPath: 'views/in/due.vue',keepAlive: 1},

+ 14 - 42
ghs/src/views/in/components/order-detail.vue

@@ -1,57 +1,31 @@
 <template>
 	<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 }">
-					</div>
-				</div>
-			</template>
+		<el-drawer :visible.sync="showOrderDetail" size="1000px" :before-close="closeFn" custom-class="order-draw-wrap" direction="ltr" >
 			<div class="order-manage-wrap" v-if="data!=''">
 
-				<div class="card-wrap">
+				<div class="card-wrap" style="margin-top:0;">
 					<div class="card-tit">花材信息</div>
 					<div class="card-body">
-						<el-table :data="data[0].itemInfo" show-summary>
+						<el-table :data="data[0].itemInfo">
 							<el-table-column label="花材图片">
 								<template slot-scope="scope">
-									<cl-avatar
-										shape="square"
-										:size="30"
-										:src="scope.row.cover"
-									></cl-avatar>
+									<cl-avatar shape="square" :size="30" :src="scope.row.cover" ></cl-avatar>
 								</template>
 							</el-table-column>
 							<el-table-column property="name" label="花材名称"></el-table-column>
-							<el-table-column property="itemNum" label="数量"></el-table-column>
-							<el-table-column property="refundNum" label="已退数量"></el-table-column>
 							<el-table-column property="bigPrice" label="单价"></el-table-column>
-						</el-table>
-					</div>
-				</div>
 
-				<div class="card-wrap">
-					<div class="card-tit">供货商</div>
-					<div class="card-body">
-						<el-table :data="data">
-							<el-table-column property="customName" label="名称"></el-table-column>
-							<el-table-column property="customMobile" label="手机号"></el-table-column>
-							<el-table-column property="fullAddress" label="地址" width="280px"></el-table-column>
-							<el-table-column property="showAddress" label="完整地址" width="280px"></el-table-column>
-						</el-table>
-					</div>
-				</div>
+							<el-table-column label="数量">
+								<template slot-scope="scope">
+									<span>{{ scope.row.itemNum?scope.row.itemNum:0 }}</span><span v-if="Number(scope.row.refundNum)>0">(退 {{ scope.row.refundNum }})</span>
+								</template>
+							</el-table-column>
 
-				<div class="card-wrap">
-					<div class="card-tit">基本信息</div>
-					<div class="card-body">
-						<el-table :data="data">
-							<el-table-column property="orderSn" label="订单编号" width="280px"></el-table-column>
-							<el-table-column property="sendCost" label="运费"></el-table-column>
-							<el-table-column property="prePrice" label="合计"></el-table-column>
-							<el-table-column property="actPrice" label="实付款"></el-table-column>
+							<el-table-column label="合计">
+								<template slot-scope="scope">
+									<span>¥{{ scope.row.totalPrice }}</span>
+								</template>
+							</el-table-column>
 						</el-table>
 					</div>
 				</div>
@@ -60,7 +34,6 @@
 		</el-drawer>
 	</div>
 </template>
-
 <script>
 export default {
 	name: 'order-detail',
@@ -89,7 +62,6 @@ export default {
 	}
 };
 </script>
-
 <style lang="scss">
 .order-draw-wrap {
 	.el-drawer__header {

+ 1 - 1
ghs/src/views/in/list.vue

@@ -112,7 +112,7 @@
       <template #slot-search-option="{scope}">
         <el-input v-model="searchContent" placeholder="核销码 / 供货商名 / 手机号" size="medium" style="width:220px;" :clearable="true" ref="itemSearchRef" @input="changeSearch()" @focus="search=''"></el-input>
 
-				<el-select size="medium" v-model="currentCgStaffName" placeholder="采购人" style="width:120px;margin-left:10px;" @change="getCgStaff" :clearable="true">
+				<el-select size="medium" v-model="currentCgStaffName" placeholder="采购人" style="width:110px;margin-left:10px;" @change="getCgStaff" :clearable="true">
 					<el-option v-for="item in staffList" :key="item.id" :label="item.name" :value="item.id"></el-option>
 				</el-select>