员工管理

ghsApp/src/admin/staff/list.vue

@@ -35,6 +35,7 @@
 										<span :class="[item.status == 1 ? 'app-color-1' : 'app-color-3' ]">业绩 ¥{{item.kdAmount}}</span>
 									</div>
 								</div>
+								<view class="super-class" v-if="item.founder == 2">超管</view>
 							</div>
 							<div class="list-det-right">
 								<div v-if="item.founder != 2 && item.id != loginInfo.shopAdminId" @click="delModalFn(item)"> <i class="iconfont iconshanchu1"></i> </div>
@@ -333,6 +334,7 @@ export default {
 			margin-left: 20upx;
 			@include disFlex(center, space-between);
 			.list-det-left {
+				position:relative;
 				.staff-name {
 					color: #333;
 					font-size: 30upx;
@@ -344,6 +346,19 @@ export default {
 					white-space: nowrap;
 					width:150upx;
 				}
+				.super-class{
+					background-color: #3385FF;
+					border:none;
+					color:white;
+					font-size:20upx;
+					border-radius:20upx;
+					width:70upx;
+					text-align: center;
+					padding:6upx 0 6upx 0;
+					position:absolute;
+					right:-90upx;
+					top:9upx;
+				}
 				.flex-center {
 					margin-top: 10upx;
 				}

hdApp/src/admin/home/apply.vue

@@ -71,7 +71,7 @@ export default {
             { name: "调拨出库", img: `${this.$constant.imgUrl}/ghs/home/dbck.png`, url: "/pagesStorehouse/allot/allotEx",pf:0},
             { name: "调拨入库", img: `${this.$constant.imgUrl}/ghs/home/dbrk.png`, url: "/pagesStorehouse/allot/allotPut",pf:0},
             { name: "库存预警", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/pagesStorehouse/stockWarn/manage",pf:1},
-            { name: "员工", img: `${this.$constant.imgUrl}/ghs/home/yggl.png`, url: "/admin/staff/list",pf:0},
+            { name: "员工", img: `${this.$constant.imgUrl}/ghs/home/yggl.png`, url: "/admin/staff/list",pf:1},
             { name: "员工业绩", img: `${this.$constant.imgUrl}/ghs/home/icon_ygyj.png`, url: "/admin/staff/achieve",pf:1},
             { name: "供货商", img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`, url: "/pagesPurchase/order",pf:1},
             { name: "已屏蔽", img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`, url: "/pagesPurchase/pb",pf:1},

hdApp/src/admin/home/components/order-item.vue

@@ -23,6 +23,10 @@
 						<text>时间：</text>
 						<text>{{info.addTime.substr(5,11)}}</text>
 					</view>
+					<view style="margin-top:3upx;">
+						<text>编号：</text>
+						<text>{{info.orderSn}}</text>
+					</view>
 					<view style="margin-top:3upx;">
 						<text>备注：</text>
 						<text style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:420upx;display:inline-block;line-height:27upx;">{{info.remark||''}}</text>

hdApp/src/admin/home/order.vue

@@ -3,7 +3,7 @@
     <app-tabs :tabs="tabs" :isFixed="true" :currentTab="tabIndex" :height="100" @change="change" itemWidth="20%" />
 		<view class="input-wrap" >
 			<view class="search-bar">
-				<app-search-module v-model="py" placeholder="输入价格搜索" @input="searchFn" />
+				<app-search-module v-model="py" placeholder="订单编号" @input="searchFn" />
 			</view>
 			<view style="float:right">
       <button class="admin-button-com middle blue" style="margin-right:10upx;" @click="selectStaffFn()">开单人</button>

hdApp/src/admin/order/detail.vue

@@ -81,7 +81,7 @@
           <text>订单信息</text>
           <block v-if="orderInfo.payStatus == 1">
             <text style="float:right;color: #3385ff;font-weight:normal;" v-if="orderInfo.onlinePay ==2 || orderInfo.payWay == 3" @click.stop="goRefund()">发起退款</text>
-            <text style="float:right;color: #3385ff;font-weight:normal;" v-else @click.stop="goRefund()">发起线下退款</text>
+            <text style="float:right;color: #3385ff;font-weight:normal;" v-else @click.stop="goRefund()">发起退款</text>
           </block>
         </view>
         <view class="module-det">

hdApp/src/admin/order/refund.vue

@@ -63,6 +63,7 @@
 			<view class="refund-label">备注：</view>
 			<textarea v-model="remark" />
 		</view>
+		<view v-if="orderInfo.onlinePay == 1" style="color:red;margin:15upx 0 15upx 0;font-weight:bold;">请注意：此单线下付款，退货钱不会原路退回，只回滚库存，操作后请线下给客户退款。</view>
 		<view class="flex-center btn-box" style="margin-bottom:50upx;margin-top:20upx;">
 			<view class="flex-center btn" @tap="cancelRefund">取消</view>
 			<view class="flex-center btn active" @tap="confirmRefund" style="margin-left: 80upx">确定</view>

hdApp/src/admin/staff/list.vue

@@ -23,7 +23,7 @@
 									<div class="status-list">
 										<span :class="[item.status == 1 ? 'app-color-1' : 'app-color-3' ]">业绩 ¥{{item.kdAmount}}</span>
 									</div>
-
+									<view class="super-class" v-if="item.founder == 2">超管</view>
 								</div>
 							</div>
 							<div class="list-det-right">
@@ -277,12 +277,26 @@ export default {
 			margin-left: 20upx;
 			@include disFlex(center, space-between);
 			.list-det-left {
+				position:relative;
 				.staff-name {
 					color: #333;
 					font-size: 30upx;
 					font-weight: 600;
 					margin-right: 10upx;
 				}
+				.super-class{
+					background-color: #3385FF;
+					border:none;
+					color:white;
+					font-size:20upx;
+					border-radius:20upx;
+					width:70upx;
+					text-align: center;
+					padding:6upx 0 6upx 0;
+					position:absolute;
+					right:-90upx;
+					top:9upx;
+				}
 				.flex-center {
 					margin-top: 10upx;
 				}