小单位下单

ghsApp/src/admin/item/add.vue

@@ -41,16 +41,6 @@
           <button v-if="productData.id > 0" class="admin-button-com blue small" @click="goStockDetail(productData.id)">库存明细</button>
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">花店价比成本贵</div>
-          <input v-model="form.addPrice" placeholder-class="phcolor" class="tui-input" name="addPrice" @focus="form.addPrice=''" placeholder="请填写" maxlength="50" type="digit" />
-        </tui-list-cell>
-
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">散客价比花店贵</div>
-          <input v-model="form.skMore" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="请填写" maxlength="50" type="digit" />
-        </tui-list-cell>
-
         <tui-list-cell class="line-cell" :arrow="true">
           <div class="tui-title">分类</div>
           <picker mode="selector" :value="form.classId" :range="itemClassData" range-key="name" @change="changeItemClassFn" class="tui-input" >
@@ -83,15 +73,6 @@
           <input v-model="form.weight" placeholder-class="phcolor" class="tui-input" name="weight" placeholder="单位为公斤，参考红玫每扎1.2公斤" maxlength="50" type="digit" />
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">颜色管理</view>
-          <view class="switch_bx">
-            <switch :checked="form.variety == 0 ? false : true" @change="varietyChange" style="transform: scale(0.8,0.8)" />
-            <text v-if="form.variety == 1">开启</text>
-            <text v-else>关闭</text>
-          </view>
-        </tui-list-cell>
-
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">库存预警值</div>
           <input v-model="form.stockWarning" placeholder-class="phcolor" class="tui-input" name="stockWarning" placeholder="请填写" maxlength="50" type="number" />
@@ -129,11 +110,52 @@
         </view>
       </div>
 
-      <div class="app-footer">
+      <view class="module-com input-line-wrap">
+        <tui-list-cell class="line-cell" :hover="false">
+          <div class="tui-title">花店价比成本贵</div>
+          <input v-model="form.addPrice" placeholder-class="phcolor" class="tui-input" name="addPrice" @focus="form.addPrice=''" placeholder="请填写" maxlength="50" type="digit" />
+        </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :hover="false">
+          <div class="tui-title">散客价比花店贵</div>
+          <input v-model="form.skMore" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="请填写" maxlength="50" type="digit" />
+        </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">颜色管理</view>
+          <view class="switch_bx">
+            <switch :checked="form.variety == 0 ? false : true" @change="varietyChange" style="transform: scale(0.8,0.8)" />
+            <text v-if="form.variety == 1">开启</text>
+            <text v-else>关闭</text>
+          </view>
+        </tui-list-cell>
+
+          <tui-list-cell class="line-cell" :hover="false">
+            <view class="tui-title">开单默认基数</view>
+            <input v-model="form.scanNum" @focus="form.scanNum=''" placeholder-class="phcolor" class="tui-input" name="scanNum" placeholder="0表示1扎，大于0表示增加多少支" maxlength="50" type="number" />
+          </tui-list-cell>
+
+          <tui-list-cell class="line-cell" :hover="false">
+            <view class="tui-title">允许单支购买</view>
+            <view class="switch_bx">
+              <switch :checked="form.smallShow == 0 ? false : true" @change="smallShowChange" style="transform: scale(0.8,0.8)" />
+              <text v-if="form.smallShow == 1">是</text>
+              <text v-else>否</text>
+            </view>
+          </tui-list-cell>
+
+          <tui-list-cell class="line-cell" :hover="false">
+            <view class="tui-title">单支价格基数</view>
+            <input v-model="form.smallRatio" @focus="form.smallRatio=''" placeholder-class="phcolor" class="tui-input" name="smallRatio" placeholder="请填写" maxlength="50" type="number" />
+          </tui-list-cell>
+
+      </view>
+
+      <view class="app-footer">
         <button class="admin-button-com big default" @click="goBack()">取消</button>
         <button v-if="option.ptItemId" class="admin-button-com big blue" formType="submit" @click="status = 1">添加</button>
         <button v-else class="admin-button-com big blue" formType="submit" @click="status = 1">确认</button>
-      </div>
+      </view>
 
     </form>
   </div>
@@ -178,7 +200,10 @@ export default {
         status:2,
         delStatus:0,
         itemId:0,
-        variety:0
+        variety:0,
+        smallRatio:1,
+        smallShow:0,
+        scanNum:0
       },
       itemClassSelectedData:{},
       itemClassData:[],
@@ -212,6 +237,9 @@ export default {
     varietyChange(e){
       this.form.variety = e.detail.value ? 1 : 0;
     },
+    smallShowChange(e){
+      this.form.smallShow = e.detail.value ? 1 : 0;
+    },
     statusChange(e){
       this.form.status = e.detail.value ? 1 : 2;
     },

ghsApp/src/admin/item/copy.vue

@@ -37,17 +37,7 @@
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">库存</view>
           <input v-model="form.stock" style="width:260upx;" placeholder-class="phcolor" @focus="form.stock=''" @input="changeStock($event)" class="tui-input" name="stock" placeholder="请输入" type="digit"/>
-          <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="goStockDetail(productData.id)">库存变动明细</button>
-        </tui-list-cell>
-
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">花店价比成本贵</view>
-          <input v-model="form.addPrice" placeholder-class="phcolor" class="tui-input" name="addPrice" @focus="form.addPrice=''" placeholder="请填写" maxlength="50" type="digit" />
-        </tui-list-cell>
-
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">散客价比花店贵</view>
-          <input v-model="form.skMore" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="请填写" maxlength="50" type="digit" />
+          <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="goStockDetail(productData.id)">库存变动记录</button>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :arrow="true">
@@ -82,15 +72,6 @@
           <input v-model="form.weight" placeholder-class="phcolor" class="tui-input" name="weight" @focus="form.weight=''" placeholder="单位为公斤，参考红玫每扎1.2公斤" maxlength="50" type="digit" />
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">颜色管理</view>
-          <view class="switch_bx">
-            <switch :checked="form.variety == 0 ? false : true" @change="varietyChange" style="transform: scale(0.8,0.8)" />
-            <text v-if="form.variety == 1">开启</text>
-            <text v-else>关闭</text>
-          </view>
-        </tui-list-cell>
-
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">库存预警值</view>
           <input v-model="form.stockWarning" @focus="form.stockWarning=''" placeholder-class="phcolor" class="tui-input" name="stockWarning" placeholder="请填写" maxlength="50" type="number" />
@@ -128,6 +109,47 @@
         </view>
       </view>
 
+      <view class="module-com input-line-wrap">
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">花店价比成本贵</view>
+          <input v-model="form.addPrice" placeholder-class="phcolor" class="tui-input" name="addPrice" @focus="form.addPrice=''" placeholder="请填写" maxlength="50" type="digit" />
+        </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">散客价比花店贵</view>
+          <input v-model="form.skMore" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="请填写" maxlength="50" type="digit" />
+        </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">颜色管理</view>
+          <view class="switch_bx">
+            <switch :checked="form.variety == 0 ? false : true" @change="varietyChange" style="transform: scale(0.8,0.8)" />
+            <text v-if="form.variety == 1">开启</text>
+            <text v-else>关闭</text>
+          </view>
+        </tui-list-cell>
+
+          <tui-list-cell class="line-cell" :hover="false">
+            <view class="tui-title">开单默认基数</view>
+            <input v-model="form.scanNum" @focus="form.scanNum=''" placeholder-class="phcolor" class="tui-input" name="scanNum" placeholder="0表示1扎，大于0表示增加多少支" maxlength="50" type="number" />
+          </tui-list-cell>
+
+          <tui-list-cell class="line-cell" :hover="false">
+            <view class="tui-title">允许单支购买</view>
+            <view class="switch_bx">
+              <switch :checked="form.smallShow == 0 ? false : true" @change="smallShowChange" style="transform: scale(0.8,0.8)" />
+              <text v-if="form.smallShow == 1">是</text>
+              <text v-else>否</text>
+            </view>
+          </tui-list-cell>
+
+          <tui-list-cell class="line-cell" :hover="false">
+            <view class="tui-title">单支价格基数</view>
+            <input v-model="form.smallRatio" @focus="form.smallRatio=''" placeholder-class="phcolor" class="tui-input" name="smallRatio" placeholder="请填写" maxlength="50" type="number" />
+          </tui-list-cell>
+
+      </view>
+
       <view class="app-footer">
         <button class="admin-button-com big default" @click="goBack()">取消</button>
         <button v-if="option.ptItemId" class="admin-button-com big blue" formType="submit" @click="status = 1">添加</button>
@@ -177,7 +199,10 @@ export default {
         status:2,
         delStatus:0,
         itemId:0,
-        variety:0
+        variety:0,
+        smallRatio:1,
+        smallShow:0,
+        scanNum:0
       },
       itemClassSelectedData:{},
       itemClassData:[],

ghsApp/src/admin/item/detail.vue

@@ -38,17 +38,7 @@
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">库存</view>
           <input v-model="form.stock" style="width:260upx;" placeholder-class="phcolor" @focus="form.stock=''" @input="changeStock($event)" class="tui-input" name="stock" placeholder="请输入" type="digit"/>
-          <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="goStockDetail(productData.id)">库存变动明细</button>
-        </tui-list-cell>
-
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">花店价比成本贵</view>
-          <input v-model="form.addPrice" placeholder-class="phcolor" class="tui-input" name="addPrice" @focus="form.addPrice=''" placeholder="请填写" maxlength="50" type="digit" />
-        </tui-list-cell>
-
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">散客价比花店贵</view>
-          <input v-model="form.skMore" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="请填写" maxlength="50" type="digit" />
+          <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="goStockDetail(productData.id)">库存变动记录</button>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :arrow="true">
@@ -83,20 +73,6 @@
           <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="doPrintLabel(productData.id)">打标签</button>
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">颜色管理</view>
-          <view class="switch_bx">
-            <switch :checked="form.variety == 0 ? false : true" @change="varietyChange" style="transform: scale(0.8,0.8)" />
-            <text v-if="form.variety == 1">开启</text>
-            <text v-else>关闭</text>
-          </view>
-        </tui-list-cell>
-
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">开单基数</view>
-          <input v-model="form.scanNum" style="width:300upx;" @focus="form.scanNum=''" placeholder-class="phcolor" class="tui-input" name="scanNum" placeholder="0表示增加1扎，大于0表示增加多少支" maxlength="50" type="number" />
-        </tui-list-cell>
-
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">上架状态</view>
           <view class="switch_bx">
@@ -117,6 +93,8 @@
 
       </view>
 
+
+
       <view class="module-com input-line-wrap goods-wrap">
         <view class="module-tit">
           <span>花材图片</span>
@@ -129,6 +107,49 @@
         </view>
       </view>
 
+
+      <view class="module-com input-line-wrap">
+
+          <tui-list-cell class="line-cell" :hover="false">
+            <view class="tui-title">花店价比成本贵</view>
+            <input v-model="form.addPrice" placeholder-class="phcolor" class="tui-input" name="addPrice" @focus="form.addPrice=''" placeholder="请填写" maxlength="50" type="digit" />
+          </tui-list-cell>
+
+          <tui-list-cell class="line-cell" :hover="false">
+            <view class="tui-title">散客价比花店贵</view>
+            <input v-model="form.skMore" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="请填写" maxlength="50" type="digit" />
+          </tui-list-cell>
+
+          <tui-list-cell class="line-cell" :hover="false">
+            <view class="tui-title">颜色管理</view>
+            <view class="switch_bx">
+              <switch :checked="form.variety == 0 ? false : true" @change="varietyChange" style="transform: scale(0.8,0.8)" />
+              <text v-if="form.variety == 1">启用</text>
+              <text v-else>关闭</text>
+            </view>
+          </tui-list-cell>
+
+          <tui-list-cell class="line-cell" :hover="false">
+            <view class="tui-title">开单默认基数</view>
+            <input v-model="form.scanNum" @focus="form.scanNum=''" placeholder-class="phcolor" class="tui-input" name="scanNum" placeholder="0表示1扎，大于0表示增加多少支" maxlength="50" type="number" />
+          </tui-list-cell>
+
+          <tui-list-cell class="line-cell" :hover="false">
+            <view class="tui-title">允许单支购买</view>
+            <view class="switch_bx">
+              <switch :checked="form.smallShow == 0 ? false : true" @change="smallShowChange" style="transform: scale(0.8,0.8)" />
+              <text v-if="form.smallShow == 1">是</text>
+              <text v-else>否</text>
+            </view>
+          </tui-list-cell>
+
+          <tui-list-cell class="line-cell" :hover="false">
+            <view class="tui-title">单支价格基数</view>
+            <input v-model="form.smallRatio" @focus="form.smallRatio=''" placeholder-class="phcolor" class="tui-input" name="smallRatio" placeholder="请填写" type="number" />
+          </tui-list-cell>
+
+      </view>
+
       <view class="app-footer">
         <button class="admin-button-com big default" @click="goBack()">取消</button>
         <button v-if="option.ptItemId" class="admin-button-com big blue" formType="submit" @click="status = 1">添加</button>
@@ -137,11 +158,6 @@
 
     </form>
 
-    <!--<uni-popup ref="inputDialog" type="dialog">
-			<uni-popup-dialog ref="inputClose"  mode="input" title="标签数量" value=""
-				placeholder="请输入标签数量" @confirm="dialogPrintLabelConfirm"></uni-popup-dialog>
-		</uni-popup>-->
-
 		<modal-module :show="printLabelShow" @click="dialogInputConfirm" :maskClosable="true" title="打印数量" padding="30rpx 30rpx" >
 		<template v-slot:content>
 			<div class="app-modal-input-wrap">
@@ -200,7 +216,9 @@ export default {
         delStatus:0,
         itemId:0,
         scanNum:0,
-        variety:0
+        variety:0,
+        smallRatio:1,
+        smallShow:0
       },
       itemClassSelectedData:{},
       itemClassData:[],
@@ -297,6 +315,9 @@ export default {
     varietyChange(e){
       this.form.variety = e.detail.value ? 1 : 0;
     },
+    smallShowChange(e){
+      this.form.smallShow = e.detail.value ? 1 : 0;
+    },
     statusChange(e){
       this.form.status = e.detail.value ? 1 : 2;
     },
@@ -569,7 +590,7 @@ export default {
         {
           name: "scanNum",
           rule: ["required"],
-          msg: ["请填写开单基数数量"]
+          msg: ["请填写开单默认基数数量"]
         }
       ];
       // 进行表单检查

ghsApp/src/admin/shop/add.vue

@@ -246,7 +246,7 @@ export default {
 			uni.showLoading({mask:true})
 			hostFn(this.form).then(res => {
 				uni.hideLoading()
-				let promptText = this.option.id ? '修改成功！' : '添加成功！'
+				let promptText = this.option.id ? '修改成功' : '添加成功'
 				this.$msg(promptText)
 				uni.removeStorageSync('modifyShopB')
 				setTimeout(() => {

hdApp/src/admin/billing/affirmGhs.vue

@@ -33,7 +33,7 @@
 											<i class="iconfont iconjian" @click="delItem(item)" v-if="item.bigCount > 0 || item.smallCount > 0"></i>
 											<text class="num" @click="customUpdate(item)">
 											<text v-if="item.bigCount > 0" style="font-size:24upx;font-weight:bold;color:#3385ff;">{{ item.bigCount }}</text>
-											<text v-if="item.smallCount > 0" style="font-size:24upx;">{{ item.smallCount }}</text>
+											<text v-if="item.smallCount > 0" style="font-size:24upx;"><text v-if="item.bigCount > 0">/</text>{{ item.smallCount }}</text>
 											</text>
 											<i class="iconfont iconzeng" @click="addEvents(item)"></i>
 										</view>
@@ -44,8 +44,7 @@
 						</view>
 						<view class="summary-bar">
 							<view class="operate-view" @click="gobackEvent">
-								<text class="iconfont icongouwuche"></text>
-								修改花材
+								<text class="iconfont icongouwuche"></text>修改花材
 							</view>
 							<view class="describe-view">共{{ allCountFun.bigLength }}扎,合计 ¥<text class="price">{{ allPriceFun }}</text></view>
 						</view>
@@ -87,12 +86,13 @@
 			<button class="admin-button-com blue big" @click="affirmFormSubmit">提交</button>
 		</view>
 
-		<modal-module :show="isModel" @cancel="modalCancel" @click="affirm" :title="customData.itemName" color="#333" :size="32" padding="30upx 30upx" >
+		<modal-module :show="isModel" @cancel="modalCancel" @click="affirm" :title="customData.itemName" color="#333" :size="32" padding="30rpx 30rpx" >
 			<template slot="customContent">
 				<view class="select-cmd_bx" v-if="customData">
 					<view class="kc"> </view>
 					<view class="num_bx">
 						<input v-model="customData.bigCount" :focus="isFocus" type="number" placeholder="扎数" />
+						<input v-if="customData.smallShow && customData.smallShow == 1" v-model="customData.smallCount" type="number" style="margin-left:20upx" placeholder="支数" />
 					</view>
 				</view>
 			</template>
@@ -722,14 +722,14 @@ export default {
 		& .num_bx {
 			display: flex;
 			align-items: center;
+			justify-content:center;
 			margin-bottom: 80upx;
 			& > input {
-				width: 480upx;
+				width: 280upx;
 				height: 80upx;
 				border: 1px solid #dddddd;
 				border-radius: 4upx;
 				text-align: center;
-				margin-left: 50upx;
 				font-size: 40upx;
 			}
 		}

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -91,12 +91,13 @@
 			</scroll-view>
 		</view>
 		
-		<modal-module :show="isModel" @cancel="modalCancel" @click="affirm" :title="customData.itemName" color="#333" :size="32" padding="30upx 30upx" >
+		<modal-module :show="isModel" @cancel="modalCancel" @click="affirm" :title="customData.itemName" color="#333" :size="32" padding="30rpx 30rpx" >
 			<template slot="customContent">
 				<view class="select-cmd_bx" v-if="customData">
 					<view class="kc"> </view>
 					<view class="num_bx">
 						<input v-model="customData.bigCount" :focus="isFocus" type="number" placeholder="扎数" />
+						<input v-if="customData.smallShow && customData.smallShow == 1" v-model="customData.smallCount" type="number" style="margin-left:24upx" placeholder="支数" />
 					</view>
 				</view>
 			</template>
@@ -143,7 +144,7 @@
 										<i class="iconfont iconjian" @click="delItem(item)" v-if="item.bigCount > 0 || item.smallCount > 0"></i>
 										<text class="num" @click="customUpdate(item)">
 										<text v-if="item.bigCount > 0" style="font-size:24upx;font-weight:bold;color:#3385ff;">{{ item.bigCount }}</text>
-										<text v-if="item.smallCount > 0" style="font-size:24upx;">{{ item.smallCount }}</text>
+										<text v-if="item.smallCount > 0" style="font-size:24upx;"><text v-if="item.bigCount > 0">/</text>{{ item.smallCount }}</text>
 										</text>
 										<i class="iconfont iconzeng" @click="addEvents(item)"></i>
 									</view>
@@ -839,14 +840,14 @@ export default {
 		& .num_bx {
 			display: flex;
 			align-items: center;
+			justify-content:center;
 			margin-bottom: 80upx;
 			& > input {
-				width: 480upx;
+				width: 280upx;
 				height: 80upx;
 				border: 1px solid #dddddd;
 				border-radius: 4upx;
 				text-align: center;
-				margin-left: 50upx;
 				font-size: 40upx;
 			}
 		}