现金备注

ghsApp/src/admin/home/me.vue

@@ -242,6 +242,11 @@
           <input type="digit" ref="input" style="width:61.8%;text-align:center;" v-model="outAmount" :adjust-position="false" class="inp-input" />
           </view>
         </view>
+        <view class="inp-list-line remark-line">
+          <view class="line-input">
+          <input type="text" class="remark-input" v-model="outAmountRemark" maxlength="50" placeholder="备注（选填）" :adjust-position="false" />
+          </view>
+        </view>
         </view>
       </template>
 		</modal-module>
@@ -254,6 +259,11 @@
           <input type="digit" ref="input" style="width:61.8%;text-align:center;" v-model="inAmount" :adjust-position="false" class="inp-input" />
           </view>
         </view>
+        <view class="inp-list-line remark-line">
+          <view class="line-input">
+          <input type="text" class="remark-input" v-model="inAmountRemark" maxlength="50" placeholder="备注（选填）" :adjust-position="false" />
+          </view>
+        </view>
         </view>
       </template>
 		</modal-module>
@@ -345,6 +355,8 @@ export default {
       version:'1.0.0',
       inAmount:'',
       outAmount:'',
+      inAmountRemark:'',
+      outAmountRemark:'',
       outAmountShow:false,
       inAmountShow:false,
       inAmountFocus:false,
@@ -455,6 +467,7 @@ export default {
       uni.makePhoneCall({ phoneNumber: phone })
     },
     inAmountFn(){
+      this.inAmountRemark = ''
       this.inAmountShow = true
 			setTimeout(x => {
 				this.$nextTick(() => this.setInAmountFocus())
@@ -464,6 +477,7 @@ export default {
       this.inAmountFocus = true
     },
     outAmountFn(){
+      this.outAmountRemark = ''
       this.outAmountShow = true
 			setTimeout(x => {
 				this.$nextTick(() => this.setOutAmountFocus())
@@ -472,20 +486,30 @@ export default {
     setOutAmountFocus(){
       this.outAmountFocus = true
     },
+    resetOutAmountForm(){
+      this.outAmount = ''
+      this.outAmountRemark = ''
+    },
+    resetInAmountForm(){
+      this.inAmount = ''
+      this.inAmountRemark = ''
+    },
     outAmountConfirm(val){
 			let that=this;
 			if (val.index == 0) {
 				that.outAmountShow = false
+        that.resetOutAmountForm()
 				return
 			}
       if(that.$util.isEmpty(that.outAmount) || Number(that.outAmount)<=0){
         that.$msg('请填写金额')
         return false
       }
-      outMoney({amount:that.outAmount}).then(res=>{
+      outMoney({amount:that.outAmount, remark: that.outAmountRemark}).then(res=>{
         if(res.code == 1){
           that.$msg('操作成功')
          that.outAmountShow = false
+         that.resetOutAmountForm()
          that.init()
         }
       })
@@ -494,16 +518,18 @@ export default {
 			let that=this;
 			if (val.index == 0) {
 				that.inAmountShow = false
+        that.resetInAmountForm()
 				return
 			}
       if(that.$util.isEmpty(that.inAmount) || Number(that.inAmount)<=0){
         that.$msg('请填写金额')
         return false
       }
-      inMoney({amount:that.inAmount}).then(res=>{
+      inMoney({amount:that.inAmount, remark: that.inAmountRemark}).then(res=>{
         if(res.code == 1){
           that.$msg('操作成功')
           that.inAmountShow = false
+          that.resetInAmountForm()
           that.init()
         }
       })
@@ -1194,4 +1220,19 @@ export default {
     }
   }
 }
+
+.remark-line {
+  margin-top: 20upx;
+}
+
+.remark-input {
+  width: 100%;
+  height: 72upx;
+  padding: 0 20upx;
+  border: 1upx solid #e5e9e7;
+  border-radius: 14upx;
+  color: #111416;
+  font-size: 28upx;
+  box-sizing: border-box;
+}
 </style>

ghsApp/src/admin/shopMoneyChange/list.vue

@@ -16,7 +16,12 @@
 								<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 style="width:200upx;">
+								<view>{{ item.event }}</view>
+								<view v-if="!$util.isEmpty(item.remark)" class="change-remark">{{ item.remark }}</view>
+							</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>
@@ -77,4 +82,12 @@ export default {
 	
 };
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.change-remark {
+  margin-top: 8upx;
+  color: #999;
+  font-size: 24upx;
+  line-height: 32upx;
+  word-break: break-all;
+}
+</style>

hdApp/src/admin/home/me.vue

@@ -164,6 +164,11 @@
               <input type="digit" ref="input" class="amount-input" v-model="outAmount" :adjust-position="false" />
             </view>
           </view>
+          <view class="inp-list-line remark-line">
+            <view class="line-input">
+              <input type="text" class="remark-input" v-model="outAmountRemark" maxlength="50" placeholder="备注（选填）" :adjust-position="false" />
+            </view>
+          </view>
         </view>
       </template>
     </modal-module>
@@ -176,6 +181,11 @@
               <input type="digit" ref="input" class="amount-input" v-model="inAmount" :adjust-position="false" />
             </view>
           </view>
+          <view class="inp-list-line remark-line">
+            <view class="line-input">
+              <input type="text" class="remark-input" v-model="inAmountRemark" maxlength="50" placeholder="备注（选填）" :adjust-position="false" />
+            </view>
+          </view>
         </view>
       </template>
     </modal-module>
@@ -263,6 +273,8 @@ export default {
       lookMoney: 0,
       inAmount: "",
       outAmount: "",
+      inAmountRemark: "",
+      outAmountRemark: "",
       outAmountShow: false,
       inAmountShow: false,
       menuList: [
@@ -406,25 +418,36 @@ export default {
       this.$util.pageTo({ url: "/admin/shop/myShop" });
     },
     inAmountFn () {
+      this.inAmountRemark = "";
       this.inAmountShow = true;
     },
     outAmountFn () {
+      this.outAmountRemark = "";
       this.outAmountShow = true;
     },
+    resetOutAmountForm () {
+      this.outAmount = "";
+      this.outAmountRemark = "";
+    },
+    resetInAmountForm () {
+      this.inAmount = "";
+      this.inAmountRemark = "";
+    },
     outAmountConfirm (val) {
       if (val.index == 0) {
         this.outAmountShow = false;
+        this.resetOutAmountForm();
         return;
       }
       if (this.$util.isEmpty(this.outAmount) || Number(this.outAmount) <= 0) {
         this.$msg("请填写金额");
         return false;
       }
-      outMoney({ amount: this.outAmount }).then(res => {
+      outMoney({ amount: this.outAmount, remark: this.outAmountRemark }).then(res => {
         if (res.code == 1) {
           this.$msg("操作成功");
           this.outAmountShow = false;
-          this.outAmount = "";
+          this.resetOutAmountForm();
           this.getMyInfo();
         }
       });
@@ -432,17 +455,18 @@ export default {
     inAmountConfirm (val) {
       if (val.index == 0) {
         this.inAmountShow = false;
+        this.resetInAmountForm();
         return;
       }
       if (this.$util.isEmpty(this.inAmount) || Number(this.inAmount) <= 0) {
         this.$msg("请填写金额");
         return false;
       }
-      inMoney({ amount: this.inAmount }).then(res => {
+      inMoney({ amount: this.inAmount, remark: this.inAmountRemark }).then(res => {
         if (res.code == 1) {
           this.$msg("操作成功");
           this.inAmountShow = false;
-          this.inAmount = "";
+          this.resetInAmountForm();
           this.getMyInfo();
         }
       });
@@ -934,6 +958,21 @@ export default {
   box-sizing: border-box;
 }
 
+.remark-line {
+  margin-top: 20upx;
+}
+
+.remark-input {
+  width: 100%;
+  height: 72upx;
+  padding: 0 20upx;
+  border: 1upx solid #e5e9e7;
+  border-radius: 14upx;
+  color: #111416;
+  font-size: 28upx;
+  box-sizing: border-box;
+}
+
 .guest-page {
   min-height: 100vh;
   background: #f2f7f4;

hdApp/src/admin/home/moneyChangeList.vue

@@ -16,7 +16,12 @@
 								<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 style="width:200upx;">
+								<view>{{ item.event }}</view>
+								<view v-if="!$util.isEmpty(item.remark)" class="change-remark">{{ item.remark }}</view>
+							</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>
@@ -77,4 +82,12 @@ export default {
 	
 };
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.change-remark {
+  margin-top: 8upx;
+  color: #999;
+  font-size: 24upx;
+  line-height: 32upx;
+  word-break: break-all;
+}
+</style>