优化

ghsApp/src/admin/expend/list.vue

@@ -15,9 +15,11 @@
 						<t-td align="center" color="info">{{item.type == 0 ? '店租':item.type==1?'水电':item.type==2?'物业':item.type==3?'伙食':item.type==4?'房租':'其它'}}</t-td>
 						<t-td align="center" color="info">{{item.amount?parseFloat(item.amount):0}}</t-td>
 					</t-tr>
-					<t-tr>
-						<t-td align="center" color="info">{{ item.remark }}</t-td>
-					</t-tr>
+					<block v-if="!$util.isEmpty(item.remark)">
+						<t-tr>
+							<t-td align="center" color="info">{{ item.remark }}</t-td>
+						</t-tr>
+					</block>
 				</view>
 			</t-table>
 		</block>
@@ -75,4 +77,8 @@ export default {
 	
 };
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.app-content{
+	padding-bottom:120upx;
+}
+</style>

ghsApp/src/admin/home/apply.vue

@@ -54,7 +54,6 @@ export default {
                         {name: "花材销量",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/productSale"},
                         {name: "客户下单榜",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/customSale"},
                         {name: "采购统计",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/cgStat"},
-                        {name: "员工业绩",img: `${this.$constant.imgUrl}/ghs/home/icon_ygyj.png`,url: "/admin/staff/achieve"},
                         {name: "库存总览",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/stock"},
                         {name: "报损统计",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/wastage"},
                     ]
@@ -70,6 +69,7 @@ export default {
                     title:'门店与员工',
                     list:[
                         {name: "员工",img: `${this.$constant.imgUrl}/ghs/home/yggl.png`,url: "/admin/staff/list"},
+                        {name: "员工业绩",img: `${this.$constant.imgUrl}/ghs/home/icon_ygyj.png`,url: "/admin/staff/achieve"},
                         {name: "门店",img: `${this.$constant.imgUrl}/ghs/home/shop.png`,url: "/admin/shop/list"}
                     ]
                 },

ghsApp/src/admin/home/me.vue

@@ -105,7 +105,7 @@
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/admin/shop/sk' })" class="line-cell" :hover="false" :arrow="true">
-              <view class="tui-title">自用开单</view>
+              <view class="tui-title">自用门店</view>
             </tui-list-cell>
 
             <!-- #ifdef APP-PLUS -->

ghsApp/src/admin/shop/sk.vue

@@ -4,7 +4,7 @@
       <form @submit="formSubmit">
         <div class="module-com input-line-wrap">
           <tui-list-cell class="line-cell" :arrow="true" @click="selectCustom">
-            <div class="tui-title">请选择客户：</div>
+            <div class="tui-title">请选择：</div>
             <view>{{form.customName}}</view>
           </tui-list-cell>
         </div>

ghsApp/src/pages.json

@@ -162,7 +162,7 @@
 				{"path": "print","style": {"navigationBarTitleText": "云打印"}},
 				{"path": "trumpet","style": {"navigationBarTitleText": "收款播报设置"}},
 				{"path": "changeShop","style": {"navigationBarTitleText": "切换门店"}},
-				{"path": "sk","style": {"navigationBarTitleText": "自用开单"}},
+				{"path": "sk","style": {"navigationBarTitleText": "自用门店设置"}},
 				{"path": "password","style": {"navigationBarTitleText": "密码修改"}},
 				{"path": "selectShop","style": {"navigationBarTitleText": "选择门店"}}
 			]

hdPad/src/api/order/index.js

@@ -1,7 +1,9 @@
 import https from "@/plugins/luch-request_0.0.7/request";
-/** *
- * 商城下单-生成订单 m
- */
+
+export const onlinePrintOrder = data => {
+	return https.get("/order/print-order", data);
+};
+
 export const getList = data => {
 	return https.get("/order/list", data);
 };

hdPad/src/pages/home/components/orderInfo.vue

@@ -69,7 +69,7 @@
     </view>
 
     <view class="button-area">
-      <view :class="[orderInfo.status!=1 ? 'active' : '']" @click="printFn(orderInfo)">打印</view>
+      <view :class="[orderInfo.status==1 || orderInfo.status==5 ? '' : 'active']" @click="printFn(orderInfo)">打印</view>
       <view :class="[orderInfo.status==1 ? 'active' : '']" @click="cancelFn(orderInfo)">取消</view>
     </view>
 
@@ -95,7 +95,7 @@
 </view>
 </template>
 <script>
-import { getDetail } from '@/api/order'
+import { getDetail,onlinePrintOrder } from '@/api/order'
 import wastageSelectNum from './wastageSelectNum.vue'
 import { mapGetters } from "vuex";
 import productMins from "@/mixins/product";
@@ -153,6 +153,13 @@ export default {
 
 	},
   methods:{
+    printFn(item){
+      onlinePrintOrder({id:item.id}).then(res=>{
+        if(res.code == 1){
+          this.$msg('操作成功')
+        }
+      })
+    },
 		previewImage(url){
 			uni.previewImage({urls:[url]})
 		},
@@ -184,9 +191,6 @@ export default {
           this.orderInfo = res.data
         }
       })
-    },
-    printFn(){
-
     },
     cancelFn(){
 

hdPad/src/pages/home/components/orderList.vue

@@ -26,8 +26,9 @@
                 </view>
             </view>
         </scroll-view>
-        <view style="width:35upx;height:35upx;position:fixed;bottom:10upx;left:178upx;background-color:#3385FF;border-radius:30upx;display:flex;justify-content:center;align-items:center;
-        font-size:16upx;color:white;" @click="select()">查</view>
+
+        <!-- <view style="width:35upx;height:35upx;position:fixed;bottom:10upx;left:178upx;background-color:#3385FF;border-radius:30upx;display:flex;justify-content:center;align-items:center;
+        font-size:16upx;color:white;" @click="select()">查</view>-->
 
 		<uni-popup ref="inputDialog" type="dialog">
 			<uni-popup-dialog ref="inputClose"  mode="input" :title="snTitle" value="" placeholder="请输入" @confirm="dialogInputConfirm"></uni-popup-dialog>
@@ -131,11 +132,6 @@ export default {
             this.$emit('getOrderInfo',item)
         },
         changeStatus(status){
-            if(status !== 1){
-                clearInterval(this.t)
-            }else{
-                this.listenOrder()
-            }
             this.status = status
             this.resetList()
             this.getOrderInfoList()
@@ -149,14 +145,10 @@ export default {
                 uni.stopPullDownRefresh();
             }
         },
-        getOrderInfoList(type=0){
+        getOrderInfoList(){
             let params = {page: this.list.page,pageSize:50,status:this.status,sn:this.sn,thirdSn:this.thirdSn,isCashier:1}
             return getList(params).then(res=>{
                 if(res.code == 1){
-                    if(type == 1){
-                        this.list.data = res.data.list
-                        return
-                    }
                     this.completes(res)
                     if(this.list.data && this.list.data[0]){
                         this.getOrderInfo(this.list.data[0])