打印物流单子

ghsApp/src/admin/billing/result.vue

@@ -12,8 +12,8 @@
     分享给<text style="font-weight:bold;margin-left:12upx;">{{customName}}</text>
   </button>
   <!-- #endif -->
-	<button v-if="option.title != '报损成功'" class="admin-button-com big" @click="gotoOrderDetail()">订单详情</button>
-  <button v-if="option.title != '报损成功'" class="admin-button-com big" @click="printOrder()">打印(无价格)</button>
+  <button v-if="option.title != '报损成功'" class="admin-button-com big" style="background-color: green;border-color: green;color:white;" @click="printOrder()">打印(无价格)</button>
+  	<button v-if="option.title != '报损成功'" class="admin-button-com big" @click="gotoOrderDetail()">订单详情</button>
 	<button class="admin-button-com big" @click="goBackHome">返回首页</button>
 
   <!-- #ifdef MP-WEIXIN -->

ghsApp/src/admin/home/order.vue

@@ -23,14 +23,14 @@
 
     <view class="input-wrap_box">
 
-      <view>
-        <button class="admin-button-com big" style="width:140upx;margin-right:18upx;" @click="clearSearch()">清空搜索</button>
-      </view>
-      <view> <AppSearchModule placeholder="这里搜索" @input="searchFn"/> </view>
-
       <view class="select-dn_bx">
         <DateSelect class="bar" top="0" @selectDateFn="selectDateFn" defaultShowName='时间' />
       </view>
+      <view> <AppSearchModule placeholder="这里搜索" @input="searchFn"/> </view>
+      <view>
+        <button class="admin-button-com big" style="width:120upx;margin-left:16upx;" @click="getMore()">更多</button>
+      </view>
+
     </view>
     <view class="app-tabs">
       <app-tabs :tabs="tabs" :isFixed="false" :top="50" :currentTab="tabIndex" :height="100" @change="change" itemWidth="20%" />
@@ -70,6 +70,14 @@
 
     <NotLogin></NotLogin>
 
+		<uni-popup ref="rightShowMore" background-color="#fff" type="center" :animation="true" class="class-popup-style">
+			<view style="display:flex;width:100vw;padding:20upx 20upx 40upx 20upx;height:auto;justify-content: space-between;align-items:center;flex-wrap:wrap;max-height:100vh;overflow:auto;">
+				<view style="width:100vw;"><button @click="clearSearch()">清空搜索</button></view>
+        <view style="width:100vw;margin-top:20upx;"><button @click="printWlList()">打印物流列表</button></view>
+				<view style="width:100vw;margin-top:35upx;"><button @click="closeMore()">取消</button></view>
+			</view>
+		</uni-popup>
+
   </view>
 </template>
 <script>
@@ -354,6 +362,16 @@ export default {
       this.resetList()
       this.getOrderList()
     },
+    getMore(){
+			this.$refs.rightShowMore.open('top')
+    },
+    closeMore(){
+      this.$refs.rightShowMore.close()
+    },
+    printWlList(){
+      this.closeMore()
+      this.$util.pageTo({url: "/pagesOrder/printWlList"})
+    },
     getCustom(item){
       this.showSearch = false
       this.customId = item.id
@@ -417,7 +435,8 @@ page{
   padding-bottom: 1upx;
 	overflow: hidden;
   .select-dn_bx {
-    padding-left: 18upx;
+    padding-left: 14upx;
+    padding-right:10upx;
   }
   .app-tabs {
     position: fixed;

ghsApp/src/pages.json

@@ -112,7 +112,8 @@
 				{"path": "refundList","style": {"navigationBarTitleText": "售后记录", "enablePullDownRefresh": true}},
 				{"path": "refundAllList","style": {"navigationBarTitleText": "售后记录", "enablePullDownRefresh": false}},
 				{"path": "bookChange","style": {"navigationBarTitleText": "变动记录", "enablePullDownRefresh": false}},
-				{"path": "combine","style": {"navigationBarTitleText": "分配结果", "enablePullDownRefresh": false}}
+				{"path": "combine","style": {"navigationBarTitleText": "分配结果", "enablePullDownRefresh": false}},
+				{"path": "printWlList","style": {"navigationBarTitleText": "打印物流列表", "enablePullDownRefresh": false}}
 			]
 		},
 		{

ghsApp/src/pagesOrder/detail.vue

@@ -2,8 +2,10 @@
 	<view class="app-content">
 
 		<view v-if="!$util.isEmpty(detailInfo)" class="info-content_box">
-			<view class="flex-space title">
+			<view class="flex-space title" style="position: relative;">
 				客户
+				<button class="admin-button-com bule" @click.stop="copyCustom(detailInfo)" 
+				style="width:170upx;height:70upx;line-height:50upx;position: absolute;right:4upx;">复制地址</button>
 			</view>
 			<view class="address-des_bx content-box">
 				<view @click.stop="goCustom(detailInfo)">
@@ -14,10 +16,9 @@
 						<block v-if="!$util.isEmpty(detailInfo.showAddress) && detailInfo.showAddress != detailInfo.customAddress">（{{detailInfo.showAddress}}）</block>
 					</view>
 				</view>
-				<view style="position: relative;">
+				<view>
 					<i @click.stop="callUp(detailInfo.customMobile)" class="iconfont icondianhua1"></i>
 					<i @click.stop="navigateTo(detailInfo.lat,detailInfo.long,detailInfo.customName)" class="iconfont icondianhua" style="font-size:53upx;margin-left:40upx;margin-right:25upx;color:#3385ff;"></i>
-					<button class="admin-button-com bule" @click.stop="copyCustom(detailInfo)" style="position: absolute;right:25upx;top:75upx;width:140upx;height:70upx;line-height:50upx;">复制</button>
 				</view>
 			</view>
 

ghsApp/src/pagesOrder/printWlList.vue

@@ -0,0 +1,46 @@
+<template>
+<view class="app-content">
+	<view style="padding-top:50upx;margin-left:45%;">
+        <DateSelect class="bar" top="0" @selectDateFn="selectDateFn" defaultShowName='今天' /> 
+	</view>
+    <view style="text-align: center;margin-top:50upx;">
+        <button class="admin-button-com big" @click="printList(0)">打印全部</button>
+        <button class="admin-button-com big" @click="printList(1)" style="margin-left:50upx;">打印新单</button>
+    </view>
+    <view style="margin-top:30upx;text-align: center;font-size:26upx;">打印新单时，已经打印过的，不会再打印</view>
+</view>
+</template>
+<script>
+import DateSelect from "@/components/module/dateSelect";
+export default {
+	components: {
+        DateSelect
+    },
+	mixins: [],
+	data() {
+		return {
+		};
+	},
+	onPullDownRefresh() {
+	},
+	onLoad(e) {
+	},
+	methods: {
+		init(){
+
+        },
+        printList(type){
+            let hint = '确认打印全部？'
+            if(type == 1){
+                hint = '确认打印新单？'
+            }
+            this.$util.confirmModal({content:hint},() => {
+
+            })
+        }
+
+	}
+};
+</script>
+<style lang="scss" scoped>
+</style>