现金管理

ghsApp/src/admin/home/me.vue

@@ -38,7 +38,8 @@
               <view> <text>¥ </text> {{ shopInfo.balance||0 }} </view>
               <view>
                 可提现 ¥ {{ shopInfo.txBalance||0 }}
-                <text v-if="shopInfo.txBalance > 0" @click="checkToApplyCash" class="to-cash" >提现</text>
+                <text class="to-cash" @click="pageTo({ url: '/admin/shopYeChange/list' })" style="margin-left:50upx;">变动明细</text>
+                <text v-if="shopInfo.txBalance > 0" @click="checkToApplyCash" class="to-cash" style="margin-left:50upx;">提现</text>
               </view>
             </view>
           </view>
@@ -47,10 +48,11 @@
           <view class="account-info_box content_box">
             <view class="info-lf_box">
               <view> 现金（元） </view>
-              <view> <text>¥ </text> {{ 0 }} </view>
+              <view> <text>¥ </text> {{ shopInfo.money||0 }} </view>
               <view>
-                <text @click="outCash" class="to-cash" style="margin-left:0upx;">提取</text>
-                <text @click="inCash" class="to-cash" style="margin-left:30upx;">存入</text>
+                <text class="to-cash" @click="pageTo({ url: '/admin/shopMoneyChange/list' })" style="margin-left:0upx;">变动明细</text>
+                <text @click="outAmountFn" class="to-cash" style="margin-left:50upx;">取出</text>
+                <text @click="inAmountFn" class="to-cash" style="margin-left:50upx;">存入</text>
               </view>
             </view>
           </view>
@@ -62,10 +64,6 @@
               <view class="tui-title">切换门店</view>
             </tui-list-cell>
 
-            <tui-list-cell @click="pageTo({ url: '/admin/shopYeChange/list' })" class="line-cell" :hover="false" :arrow="true" >
-              <view class="tui-title">余额变动明细</view>
-            </tui-list-cell>
-
             <tui-list-cell @click="pageTo({ url: '/pagesStore/me/income' })" class="line-cell" :hover="false" :arrow="true" >
               <view class="tui-title">收入明细</view>
             </tui-list-cell>
@@ -97,10 +95,6 @@
             <tui-list-cell @click="pageTo({ url: '/admin/shop/print' })" class="line-cell" :hover="false" :arrow="true">
               <view class="tui-title">小票标签机设置</view>
             </tui-list-cell>
- 
-            <!-- <tui-list-cell @click="pageTo({ url: '/admin/tools/blue' })" class="line-cell" :hover="false" :arrow="true">
-              <view class="tui-title">标签机设置</view>
-            </tui-list-cell> -->
 
             <tui-list-cell @click="pageTo({ url: '/admin/shop/trumpet' })" class="line-cell" :hover="false" :arrow="true">
               <view class="tui-title">收款播报设置</view>
@@ -120,9 +114,10 @@
             </tui-list-cell>
 
             <tui-list-cell @click="loginOut()" class="line-cell" :hover="false" :arrow="true" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentGhsShopId > 0">
-              <view class="tui-title">退出登陆</view>
+              <view class="tui-title">退出当前账号</view>
             </tui-list-cell>
             <!-- #endif -->
+
           </view>
         </view>
         
@@ -136,6 +131,31 @@
     </template>
     <ShopSelect ref="shopSelectComponent" class="bar" :isShowTit="false" top="0upx" @selectShopFn="selectShopFn" />
     <NotLogin></NotLogin>
+
+		<modal-module :show="outAmountShow" @click="outAmountConfirm" :maskClosable="true" title="提取金额" padding="30rpx 30rpx" >
+      <template v-slot:content>
+        <view class="app-modal-input-wrap">
+        <view class="inp-list-line">
+          <view class="line-input">
+          <input type="digit" ref="input" style="width:61.8%;text-align:center;" focus="outAmountFocus" v-model="outAmount" :adjust-position="false" class="inp-input" />
+          </view>
+        </view>
+        </view>
+      </template>
+		</modal-module>
+
+		<modal-module :show="inAmountShow" @click="inAmountConfirm" :maskClosable="true" title="存入金额" padding="30rpx 30rpx" >
+      <template v-slot:content>
+        <view class="app-modal-input-wrap">
+        <view class="inp-list-line">
+          <view class="line-input">
+          <input type="digit" ref="input" style="width:61.8%;text-align:center;" :focus="inAmountFocus" v-model="inAmount" :adjust-position="false" class="inp-input" />
+          </view>
+        </view>
+        </view>
+      </template>
+		</modal-module>
+
   </view>
 </template>
 <script>
@@ -143,19 +163,21 @@ import AppAvatarModule from "@/components/module/app-avatar";
 import TuiListCell from "@/components/plugin/list-cell";
 import { mainMy, applyCash } from "@/api/home";
 import { toggleShop } from "@/api/common";
+import { inMoney,outMoney } from "@/api/shop-money";
 import ShopSelect from "@/components/module/shopSelect";
 import { list } from "@/mixins";
 import { mapGetters } from "vuex";
 import NotLogin from "@/components/not-login";
 import { getShopInfo } from "@/utils/auth";
-import { shopAll } from '@/api/common'
+import ModalModule from "@/components/plugin/modal"
 export default {
   name: "me",
   components: {
     AppAvatarModule,
     TuiListCell,
     ShopSelect,
-    NotLogin
+    NotLogin,
+    ModalModule
   },
   mixins: [list],
   computed: {
@@ -165,7 +187,13 @@ export default {
     return {
       constant: this.$constant,
       shopInfo: {},
-      version:'1.0.0'
+      version:'1.0.0',
+      inAmount:'',
+      outAmount:'',
+      outAmountShow:false,
+      inAmountShow:false,
+      inAmountFocus:false,
+      outAmountFocus:false
     };
   },
   onPullDownRefresh () {
@@ -188,6 +216,60 @@ export default {
     // #endif
   },
   methods: {
+    inAmountFn(){
+      this.inAmountShow = true
+			setTimeout(x => {
+				this.$nextTick(() => this.setInAmountFocus())
+			}, 200)
+    },
+    setInAmountFocus(){
+      this.inAmountFocus = true
+    },
+    outAmountFn(){
+      this.outAmountShow = true
+			setTimeout(x => {
+				this.$nextTick(() => this.setOutAmountFocus())
+			}, 200)
+    },
+    setOutAmountFocus(){
+      this.outAmountFocus = true
+    },
+    outAmountConfirm(val){
+			let that=this;
+			if (val.index == 0) {
+				that.outAmountShow = false
+				return
+			}
+      if(that.$util.isEmpty(that.outAmount) || Number(that.outAmount)<=0){
+        that.$msg('请填写金额')
+        return false
+      }
+      outMoney({amount:that.outAmount}).then(res=>{
+        if(res.code == 1){
+          that.$msg('操作成功')
+         that.outAmountShow = false
+         that.init()
+        }
+      })
+    },
+    inAmountConfirm(val){
+			let that=this;
+			if (val.index == 0) {
+				that.inAmountShow = false
+				return
+			}
+      if(that.$util.isEmpty(that.inAmount) || Number(that.inAmount)<=0){
+        that.$msg('请填写金额')
+        return false
+      }
+      inMoney({amount:that.inAmount}).then(res=>{
+        if(res.code == 1){
+          that.$msg('操作成功')
+          that.inAmountShow = false
+          that.init()
+        }
+      })
+    },
 		goToService(){
 			plus.runtime.openURL('http://www.wixhb.com/main/xhb-register')
 		},

ghsApp/src/admin/item/list.vue

@@ -55,7 +55,7 @@
 			<div class="app-modal-input-wrap">
 			<div class="inp-list-line">
 				<div class="line-input">
-				<input type="number" ref="input" style="width:61.8%;text-align:center;" @focus="focus" @blur="blur" :focus="printFocus" v-model="printNum" :adjust-position="false" class="inp-input" />
+				<input type="number" ref="input" style="width:61.8%;text-align:center;" @blur="blur" :focus="printFocus" v-model="printNum" :adjust-position="false" class="inp-input" />
 				</div>
 			</div>
 			</div>
@@ -74,7 +74,6 @@ import { mapGetters } from "vuex";
 import { getWeixinId } from "@/api/invite/index";
 import { generatePriceTable,generateBarcodeTable,print,statusUpdate } from '@/api/product';
 import uniPopup from '@/uni_modules/uni-popup/components/uni-popup/uni-popup.vue';
-import { CURRENT_ENV } from '@/config'
 import ModalModule from "@/components/plugin/modal"
 export default {
 	name: "item_list",
@@ -120,9 +119,6 @@ export default {
 		})
 	},
 	methods: {
-		focus() {
-			//this.printFocus = true
-		},
 		blur() {
 			this.printFocus = false
 		},

ghsApp/src/admin/shopMoneyChange/list.vue

@@ -0,0 +1,80 @@
+<template>
+<view class="app-content">
+		<block v-if="!$util.isEmpty(list.data)">
+			<t-table :headerBackgroundColor="'#F0F2F6'">
+				<t-tr header>
+					<t-th><view style="width:150upx;">来源</view></t-th>
+					<t-th><view style="width:200upx;">事项</view></t-th>
+					<t-th>金额</t-th>
+					<t-th>余额</t-th>
+				</t-tr>
+				<view v-for="(item, index) in list.data" :key="index" @click="goDetail(item)">
+					<t-tr>
+						<t-td align="center" color="info">
+							<view style="width:150upx;">
+								<view>{{ item.addTime.substr(5,11) }}</view>
+								<view>{{item.ptStyle==1?'零售':'批发'}}</view>
+							</view>
+						</t-td>
+						<t-td align="center" color="info"><view style="width:200upx;">{{ item.event }}</view></t-td>
+						<t-td align="center" color="info"><view >{{ parseFloat(item.amount) }}</view></t-td>
+						<t-td align="center" color="info"><view >{{ parseFloat(item.balance) }}</view></t-td>
+					</t-tr>
+				</view>
+			</t-table>
+		</block>
+		<block v-else>
+			<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
+		</block>
+	</view>
+</template>
+<script>
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import { changeList } from '@/api/shop-money-change'
+import list from '@/mixins/list'
+export default {
+	name: "cashList",
+	components: {
+		AppWrapperEmpty
+	},
+	mixins:[list],
+	data() {
+		return {
+		};
+	},
+	methods: {
+		async init(){
+			const res = await changeList({
+				page:this.list.page,tx:0
+			})
+			if (this.$util.isEmpty(res.data.list)){
+				this.completes(res)
+				return
+			}
+			let currentList = res.data.list
+			currentList.forEach(function(item,index,array){
+				array[index].amount = item.io ==0 ? '-'+item.amount : '+'+item.amount
+			});
+			res.data.list = currentList
+			this.completes(res)
+		},
+		goDetail(item){
+		}
+	},
+	async onPullDownRefresh() {
+		this.resetList();
+		await this.init()
+		uni.stopPullDownRefresh();
+	},
+	async onReachBottom() {
+		if (!this.list.finished) {
+			await this.init()
+			uni.stopPullDownRefresh();;
+		} else {
+			uni.stopPullDownRefresh();
+		}
+	},
+	
+};
+</script>
+<style lang="scss" scoped></style>

ghsApp/src/api/shop-money-change/index.js

@@ -0,0 +1,5 @@
+import https from '@/plugins/luch-request_0.0.7/request'
+
+export const changeList = data => {
+	return https.get('/shop-money-change/list', data)
+}

ghsApp/src/api/shop-money/index.js

@@ -0,0 +1,9 @@
+import https from '@/plugins/luch-request_0.0.7/request'
+
+export const inMoney = data => {
+	return https.get('/shop-money/in', data)
+}
+
+export const outMoney = data => {
+	return https.get('/shop-money/out', data)
+}

ghsApp/src/pages.json

@@ -34,7 +34,13 @@
 		{
 			"root": "admin/shopYeChange",
 			"pages": [
-				{"path": "list","style": {"navigationBarTitleText": "余额明细"}}
+				{"path": "list","style": {"navigationBarTitleText": "余额变动明细"}}
+			]
+		},
+		{
+			"root": "admin/shopMoneyChange",
+			"pages": [
+				{"path": "list","style": {"navigationBarTitleText": "现金变动明细"}}
 			]
 		},
 		{

hdApp/src/admin/home/me.vue

@@ -30,7 +30,6 @@
             <button @click="shopShow" v-if="loginInfo.switchShop" class="admin-button-com default chang-shop_btn" > <i class="iconfont iconqiehuan1"></i>切换门店</button>
           </view>
           <view class="image-box" > <image :src="`${constant.imgUrl}/ghs/me/upgrade2.png`"></image> </view>
-          <!-- @click=" pageTo({ url: '/pagesClient/official/renewal' }) " -->
         </view>
         <view class="account-info_box content_box">
           <view class="info-lf_box">
@@ -112,7 +111,7 @@
               <view class="tui-title">关闭APP</view>
             </tui-list-cell>
             <tui-list-cell @click="loginOut()" class="line-cell" :hover="false" :arrow="true" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentShopId > 0">
-              <view class="tui-title">退出登陆</view>
+              <view class="tui-title">退出当前账号</view>
             </tui-list-cell>
             <!-- #endif -->