开发

ghs/src/views/item-class/add.vue

@@ -104,7 +104,7 @@
       border-top: 1px solid #dadada;
     }
   }
-  .unSlect {
+  .unSelect {
     color: #b3b3b3;
   }
   .select {
@@ -134,7 +134,7 @@
           <div class="flex-center item-seek-box">
             <input
               type="text"
-              placeholder="请输入花材名称，支持拼音首字母搜索"
+              placeholder="请填写名称，支持拼音首字母搜索"
               v-model="keyword"
             >
             <div class="flex-center-center item-seek-btn" @click="search">搜索</div>
@@ -144,7 +144,7 @@
             v-infinite-scroll="classIfyClick"
             style="overflow:auto"
             :infinite-scroll-delay="100"
-            :infinite-scroll-distance="100"
+            :infinite-scroll-distance="300"
           >
             <li
               v-for="(value, index) in leftItemList"
@@ -158,10 +158,10 @@
               ></span>
               <span
                 class="el-icon-success"
-                :class="value.Uselect ? 'select' : 'unSlect'"
+                :class="value.Uselect ? 'select' : 'unSelect'"
                 v-else
               ></span>
-              <span>{{ index + 1 }}</span>
+              <span style="width:30px;">{{ index + 1 }}</span>
               <img
                 :src="value.cover"
                 alt=""
@@ -181,15 +181,10 @@
     <div class="flex-center-center content-box">
       <div class="switchover-box">
         <!-- 向右移动 -->
-        <div
-          class="flex-center-center"
-          @click="turnRight"
-        >→</div>
+        <div class="flex-center-center" @click="turnRight"><i class="el-icon-right"></i></div>
         <!-- 向左移动 -->
-        <div
-          class="flex-center-center"
-          @click="turnLsft"
-        >←</div>
+        <div class="flex-center-center" @click="turnLsft"><i class="el-icon-back"></i>
+        </div>
       </div>
     </div>
     <div class="right-box">
@@ -201,7 +196,7 @@
             <div style="width: 70px;text-align: center">图片</div>
             <div style="width: 100px;text-align: center">名称</div>
             <div style="width: 100px;text-align: center">售价</div>
-            <div style="width: 100px;text-align: center">初始库存</div>
+            <div style="width: 100px;text-align: center">库存</div>
             <div style="width: 100px;text-align: center">库存预警</div>
           </div>
           <ul
@@ -209,7 +204,7 @@
             v-infinite-scroll="rightcell"
             style="height: calc(100% - 80px);overflow:auto"
             :infinite-scroll-delay="100"
-            :infinite-scroll-distance="100"
+            :infinite-scroll-distance="300"
           >
             <li
               v-for="(item, index) in rightItemList"
@@ -225,7 +220,7 @@
                 <span
                   class="el-icon-success"
                   v-else
-                  :class="item.Uselect ? 'select' : 'unSlect'"
+                  :class="item.Uselect ? 'select' : 'unSelect'"
                 ></span>
               </div>
               <div style="width: 70px;text-align: center">
@@ -236,7 +231,7 @@
               </div>
               <div style="width: 100px;text-align: center">
                 <el-input
-                  style="width: 80px;"
+                  style="width: 100px;"
                   v-model="item.uname"
                   placeholder="请输入"
                   :disabled="item.select"

ghs/src/views/item/list.vue

@@ -137,7 +137,8 @@
 
 
       <template #slot-add-goods-btn>
-        <el-button type="primary" size="mini" @click="addFn()">从平台导入</el-button>
+		<!-- <el-button type="primary" size="mini" @click="addFn()">从平台导入</el-button> -->
+        <el-button type="primary" size="mini" @click="$util.pageTo({url: '/item-class/add'})">从平台导入</el-button>
       </template>
 		<template #slot-addNew-goods-btn>
         <el-button type="primary" size="mini" @click="replaceBtnFn(0)">新增</el-button>

ghsApp/src/pagesClient/member/detail.vue

@@ -51,7 +51,7 @@
       <view class="module-com user-open_bx">
         <view class="input-line-wrap">
             <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="pageTo({ url: '/admin/clear/customList',query: {customId: userInfo.id}})">
-              <div class="tui-title">结帐单</div>
+              <div class="tui-title">帐单</div>
             </tui-list-cell>
             <tui-list-cell class="line-cell" :hover="false">
               <div class="tui-title">允许欠款</div>

ghsApp/src/pagesGys/details.vue

@@ -140,10 +140,10 @@ export default {
 	},
 	methods: {
 		clearSelectedOrder(){
-				if (this.$util.isEmpty(this.selectList)) {
-					this.$msg("请选择还款订单");
-					return;
-				}
+			if (this.$util.isEmpty(this.selectList)) {
+				this.$msg("请选择还款订单");
+				return;
+			}
 			this.showClearModel = true;
 		},
 		async initData() {
@@ -192,21 +192,30 @@ export default {
 				}
 			}
 		},
-		confirmClear() {
+		confirmClear(val) {
+			//取消
+			if(val.index == 0){
+				this.showClearModel = false
+				return false
+			}
 			try {
 				if (this.$util.isEmpty(this.selectList)) {
-					this.$msg("请选择还款订单");
+					this.$msg("请选择订单");
+					return;
+				}
+				if (this.$util.isEmpty(this.modifyPrice)) {
+					this.$msg("请填写实收金额");
 					return;
 				}
 				let ids = this.selectList.map(ele => {
 					return {id:ele.id};
 				});
-			let parameter = {
-				id:JSON.stringify(ids),
-				ghsId:this.ghsInfo.id,
-				modifyPrice:this.modifyPrice
-			}
-			let self = this;
+				let parameter = {
+					id:JSON.stringify(ids),
+					ghsId:this.ghsInfo.id,
+					modifyPrice:this.modifyPrice
+				}
+				let self = this;
 				uni.showModal({
 					title: '提示',
 					content: '确认提交？',

ghsApp/src/pagesPurchase/supplier.vue

@@ -30,7 +30,7 @@
                 结账
               </view>
               <view class="btn_entrance" @click.stop="pageTo({ url: '/admin/clear/list',query: {ghsId: item.id}})">
-                结账单
+                账单
               </view>
             </view>
           </view>