开单

ghs/src/views/in/list.vue

@@ -55,9 +55,9 @@
       </template>
 
       <template #slot-column-option="{scope}">
-        <el-button @click.stop="printOrder(scope.row)" size="medium" type="primary">改价入库</el-button>
-        <el-button @click.stop="detailShowFn(scope.row)" size="medium" type="success">详情</el-button>
-        <el-button @click.stop="detailShowFn(scope.row)" size="medium" type="primary">取消</el-button>
+        <el-button @click.stop="printOrder(scope.row)" size="small" type="primary">改价入库</el-button>
+        <el-button @click.stop="detailShowFn(scope.row)" size="small" type="success">详情</el-button>
+        <el-button @click.stop="detailShowFn(scope.row)" size="small" type="primary">取消</el-button>
       </template>
 
     </x-crud>

ghs/src/views/member/list.vue

@@ -29,6 +29,26 @@
 				<span v-else>-</span>
 			</template>
 
+			<template #table-column-debtAmount="{scope}">
+				<span v-if="scope.row.debtAmount > 0" style="color:red;font-weight:bold;">{{ scope.row.debtAmount?parseFloat(scope.row.debtAmount):0 }}</span>
+				<span v-else>0</span>
+			</template>
+						
+			<template #table-column-debt="{scope}">
+				<span v-if="scope.row.debt == 1" style="font-weight:bold;color:green;">允许</span>
+				<span v-else>-</span>
+			</template>
+
+			<template #table-column-debtLimit="{scope}">
+				<span v-if="scope.row.debt == 1" style="font-weight:bold;color:green;">{{ scope.row.debtLimit ? parseFloat(scope.row.debtLimit) : 0 }}</span>
+				<span v-else>-</span>
+			</template>
+
+			<template #table-column-buyAmount="{scope}">
+				<span>{{ scope.row.buyAmount ? parseFloat(scope.row.buyAmount) : 0 }}</span>
+			</template>
+			
+
 			<template #table-column-name="{scope}">
 				<el-link
 					:underline="true"
@@ -41,34 +61,9 @@
 				<span>{{ scope.row.balance }}</span>
 			</template>
 
-			<template #table-column-growth="{scope}">
-				<span>{{ scope.row.growth }}</span>
-			</template>
-
-			<template #table-column-subscribe="{scope}">
-				<i
-					class="el-icon-success"
-					v-if="scope.row.subscribe == 1"
-					style="color:#67C23A;font-size:19px;"
-				></i>
-				<i class="el-icon-success" v-else style="color:#C0C4CC;font-size:19px;"></i>
-			</template>
-
-			<template #table-column-store="{scope}">
-				<div class="store-icon">
-					<i class="el-icon-s-shop" v-if="scope.row.store == 1" style="color:#67C23A"></i>
-					<i class="el-icon-s-shop" v-else style="color:#C0C4CC"></i>
-				</div>
-			</template>
-
-			<template #table-column-sourceType="{scope}">
-				<span v-if="scope.row.sourceType == 0">微信</span>
-				<span v-else-if="scope.row.sourceType == 1">支付宝</span>
-				<span v-else-if="scope.row.sourceType == 2">小程序</span>
-				<span v-else-if="scope.row.sourceType == 3">朋友圈</span>
-				<span v-else-if="scope.row.sourceType == 4">美团</span>
-				<span v-else-if="scope.row.sourceType == 5">系统</span>
-				<span v-else></span>
+			<template #slot-column-option="{scope}">
+				<el-button size="small" type="primary">充值</el-button>
+				<el-button size="small" type="primary">授信</el-button>
 			</template>
 
 		</x-crud>
@@ -98,7 +93,7 @@ export default {
 					val: 0
 				},
 				{
-					text: '欠款',
+					text: '赊账',
 					key: '1',
 					val: 0
 				}
@@ -141,13 +136,13 @@ export default {
 							prop: 'id',
 							label: 'ID',
 							align: 'center',
-							width: 120
+							width: 100
 						},
 						{
 							prop: 'avatar',
 							label: '头像',
 							align: 'center',
-							width: 120
+							width: 100
 						},
 						{
 							prop: 'name',
@@ -159,7 +154,7 @@ export default {
 							prop: 'mobile',
 							label: '手机号',
 							align: 'center',
-							width: 180
+							width: 160
 						},
 						{
 							prop: 'debtAmount',
@@ -168,28 +163,34 @@ export default {
 							width: 130
 						},
 						{
-							prop: 'debtNum',
-							label: '欠款笔数',
+							prop: 'balance',
+							label: '余额',
 							align: 'center',
-							width: 130
+							width: 110
 						},
 						{
-							prop: 'buyAmount',
-							label: '累计消费',
+							prop: 'debt',
+							label: '线上赊账',
 							align: 'center',
-							width: 130
+							width: 100
+						},
+						{
+							prop: 'debtLimit',
+							label: '信用额度',
+							align: 'center',
+							width: 110
 						},
 						{
 							prop: 'buyNum',
 							label: '消费次数',
 							align: 'center',
-							width: 130
+							width: 110
 						},
 						{
-							prop: 'growth',
-							label: '成长值',
+							prop: 'buyAmount',
+							label: '累计消费',
 							align: 'center',
-							width: 100
+							width: 130
 						},
 						{
 							prop: 'visitTime',
@@ -198,16 +199,15 @@ export default {
 							width: 160
 						}
 					],
-					// 操作列
 					op: {
-						visible: true, // 是否显示
+						visible: true,
 						props: {
-							width: 180,
+							width: 200,
 							align: 'center',
 							fixed: 'right',
 							label: '操作'
 						},
-						layout: []
+						layout: ['slot-column-option']
 					}
 				})
 				.set('dict', {
@@ -216,7 +216,7 @@ export default {
 					}
 				})
 				.set('search', {
-					key: { placeholder: '请填写名称，支持拼音首字母' }
+					key: { placeholder: '这里搜索' }
 				})
 				.set('layout', [
 					['slot-tabs'],

ghs/src/views/order/list.vue

@@ -56,8 +56,9 @@
       </template>
 
       <template #slot-column-option="{scope}">
-        <el-button v-if="scope.row.status != 1 && scope.row.status != 5" @click.stop="printOrder(scope.row)" size="mini" type="primary">打A4</el-button>
-        <el-button v-else disabled size="mini">打A4</el-button>
+        <el-button v-if="scope.row.status != 1 && scope.row.status != 5" @click.stop="printOrder(scope.row)" size="small" type="primary">打A4</el-button>
+        <el-button v-else disabled size="small">打A4</el-button>
+        <el-button @click.stop="detailShowFn(scope.row)" size="small" type="success">详情</el-button>
       </template>
 
       <template #slot-order-book="{scope}">