展示优化

ghsApp/src/admin/cp/cpDetail.vue

@@ -166,17 +166,17 @@
         <view class="module-com input-line-wrap">
   
           <tui-list-cell class="line-cell" :hover="false">
-              <view class="tui-title">大客价加价</view>
+              <view class="tui-title">大客加价</view>
               <input v-model="form.hjAddPrice" placeholder-class="phcolor" class="tui-input" name="hjAddPrice" @focus="form.hjAddPrice=''" placeholder="在成本价基础上多卖的金额" maxlength="50" type="digit" />
             </tui-list-cell>
   
             <tui-list-cell class="line-cell" :hover="false">
-              <view class="tui-title">批发价加价</view>
+              <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>
+              <view class="tui-title">零售加价</view>
               <input v-model="form.skMore" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="在成本价基础上多卖的金额" type="digit" />
             </tui-list-cell>
   
@@ -717,15 +717,15 @@
                       return;
                   }
                   if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.hjAddPrice) == false){
-                      uni.showToast({title:"请填写大客价加价",icon:"none"})
+                      uni.showToast({title:"请填写大客加价",icon:"none"})
                       return;
                   }
                   if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.addPrice) == false){
-                      uni.showToast({title:"请填写批发价加价",icon:"none"})
+                      uni.showToast({title:"请填写批发加价",icon:"none"})
                       return;
                   }
                   if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.skMore) == false){
-                      uni.showToast({title:"请填写零售价加价",icon:"none"})
+                      uni.showToast({title:"请填写零售加价",icon:"none"})
                       return;
                   }
         }
@@ -795,12 +795,12 @@
           {
             name: "hjAddPrice",
             rule: ["required"],
-            msg: ["请填写大客价加价"]
+            msg: ["请填写大客加价"]
           },
           {
             name: "addPrice",
             rule: ["required"],
-            msg: ["请填写批发价加价"]
+            msg: ["请填写批发加价"]
           },
           {
             name: "discountPrice",
@@ -815,7 +815,7 @@
           {
             name: "skMore",
             rule: ["required"],
-            msg: ["请填写零售价加价"]
+            msg: ["请填写零售加价"]
           },
           {
             name: "weight",

ghsApp/src/admin/item/add.vue

@@ -47,8 +47,16 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">库存</div>
-          <input v-model="form.stock" style="width:340upx;" placeholder-class="phcolor" @focus="form.stock=''" @input="changeStock($event)" class="tui-input" name="stock" placeholder="请输入" type="digit"/>
+          <view class="tui-title" style="color:#3385FF;font-weight:bold;">库存</view>
+          <input v-model="form.stock" style="color:#3385FF;width:300upx;font-weight:bold;" placeholder-class="phcolor" @focus="form.stock=''" @input="changeStock($event)" class="tui-input" name="stock" placeholder="请输入" type="digit"/>
+        </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">库存不足</view>
+          <view class="tui-input">
+            <button class="admin-button-com middle" :class="form.virtualStock == 0 ? 'blue' : 'default'" @click="virtualStockChange(0)">无需自动补充</button>
+            <button class="admin-button-com middle" :class="form.virtualStock == 1 ? 'blue' : 'default'" @click="virtualStockChange(1)" style="margin-left:38upx;">需要自动补充</button>
+          </view>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false" :arrow="true">
@@ -81,17 +89,11 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">包装类型</div>
-          <radio-group class="tui-input" @change="ratioTypeChange">
-            <label class="list" for="fixedLink">
-              <radio id="fixedLink" value="0" :checked="form.ratioType == 0" style="transform: scale(0.7,0.7);" />
-              <span class="checkbox-text" style="font-size:30upx;">固定支数</span>
-            </label>
-            <label class="list" for="dimLink">
-              <radio id="dimLink" value="1" :checked="form.ratioType == 1" style="transform: scale(0.7,0.7);" />
-              <span class="checkbox-text" style="font-size:30upx;">没有固定</span>
-            </label>
-          </radio-group>
+          <view class="tui-title">包装类型</view>
+          <view class="tui-input">
+            <button class="admin-button-com middle" :class="form.ratioType == 0 ? 'blue' : 'default'" @click="ratioTypeChange(0)">固定支数</button>
+            <button class="admin-button-com middle" :class="form.ratioType == 1 ? 'blue' : 'default'" @click="ratioTypeChange(1)" style="margin-left:40upx;">没有固定</button>
+          </view>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false" v-if="form.ratioType == 0">
@@ -143,17 +145,17 @@
       <view class="module-com input-line-wrap">
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">大客价加价</view>
+          <view class="tui-title">大客加价</view>
           <input v-model="form.hjAddPrice" placeholder-class="phcolor" class="tui-input" name="hjAddPrice" placeholder="在成本价基础上多卖的金额" maxlength="50" type="digit" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">批发价加价</div>
+          <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">
-          <view class="tui-title">零售价加价</view>
+          <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>
 
@@ -248,6 +250,7 @@ export default {
         status:2,
         itemId:0,
         smallRatio:1,
+        virtualStock:0,
         ratioType:0,
         inTurn:100,
         cpInfo:[]
@@ -408,8 +411,11 @@ export default {
     statusChange(e){
       this.form.status = e.detail.value ? 1 : 2;
     },
-    ratioTypeChange(e){
-      this.form.ratioType = e.detail.value
+    ratioTypeChange(value){
+      this.form.ratioType = value;
+    },
+    virtualStockChange(value){
+      this.form.virtualStock = value
     },
     //如果库存被修改则花材状态变化
     changeStock(event){
@@ -611,15 +617,15 @@ export default {
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.addPrice) == false){
-					uni.showToast({title:"请填写批发价加价",icon:"none"})
+					uni.showToast({title:"请填写批发加价",icon:"none"})
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.skMore) == false){
-					uni.showToast({title:"请填写零售价加价",icon:"none"})
+					uni.showToast({title:"请填写零售加价",icon:"none"})
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.hjAddPrice) == false){
-					uni.showToast({title:"请填写大客价加价",icon:"none"})
+					uni.showToast({title:"请填写大客加价",icon:"none"})
 					return;
 				}
       }
@@ -693,17 +699,17 @@ export default {
         {
           name: "skMore",
           rule: ["required"],
-          msg: ["请填写零售价加价"]
+          msg: ["请填写零售加价"]
         },
         {
           name: "addPrice",
           rule: ["required"],
-          msg: ["请填写批发价加价"]
+          msg: ["请填写批发加价"]
         },
         {
           name: "hjAddPrice",
           rule: ["required"],
-          msg: ["请填写大客价加价"]
+          msg: ["请填写大客加价"]
         },
         {
           name: "discountPrice",

ghsApp/src/admin/item/copy.vue

@@ -149,17 +149,17 @@
       <view class="module-com input-line-wrap">
 
         <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">大客价加价</view>
+            <view class="tui-title">大客加价</view>
             <input v-model="form.hjAddPrice" placeholder-class="phcolor" class="tui-input" name="hjAddPrice" @focus="form.hjAddPrice=''" placeholder="在成本价基础上多卖的金额" maxlength="50" type="digit" />
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">批发价加价</view>
+            <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>
+            <view class="tui-title">零售加价</view>
             <input v-model="form.skMore" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="在成本价基础上多卖的金额" type="digit" />
           </tui-list-cell>
 
@@ -610,15 +610,15 @@ export default {
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.addPrice) == false){
-					uni.showToast({title:"请填写批发价加价",icon:"none"})
+					uni.showToast({title:"请填写批发加价",icon:"none"})
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.skMore) == false){
-					uni.showToast({title:"请填写零售价加价",icon:"none"})
+					uni.showToast({title:"请填写零售加价",icon:"none"})
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.hjAddPrice) == false){
-					uni.showToast({title:"请填写大客价加价",icon:"none"})
+					uni.showToast({title:"请填写大客加价",icon:"none"})
 					return;
 				}
       }
@@ -689,12 +689,12 @@ export default {
         {
           name: "addPrice",
           rule: ["required"],
-          msg: ["请填写批发价加价"]
+          msg: ["请填写批发加价"]
         },
         {
           name: "hjAddPrice",
           rule: ["required"],
-          msg: ["请填写大客价加价"]
+          msg: ["请填写大客加价"]
         },
         {
           name: "discountPrice",
@@ -709,7 +709,7 @@ export default {
         {
           name: "skMore",
           rule: ["required"],
-          msg: ["请填写零售价加价"]
+          msg: ["请填写零售加价"]
         },
         {
           name: "weight",

ghsApp/src/admin/item/detail.vue

@@ -215,17 +215,17 @@
       <view class="module-com input-line-wrap">
 
         <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">大客价加价</view>
+            <view class="tui-title">大客加价</view>
             <input v-model="form.hjAddPrice" placeholder-class="phcolor" class="tui-input" name="hjAddPrice" @focus="form.hjAddPrice=''" placeholder="在成本价基础上多卖的金额" maxlength="50" type="digit" />
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">批发价加价</view>
+            <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>
+            <view class="tui-title">零售加价</view>
             <input v-model="form.skMore" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="在成本价基础上多卖的金额" type="digit" />
           </tui-list-cell>
 
@@ -1290,15 +1290,15 @@ export default {
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.hjAddPrice) == false){
-					uni.showToast({title:"请填写大客价加价",icon:"none"})
+					uni.showToast({title:"请填写大客加价",icon:"none"})
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.addPrice) == false){
-					uni.showToast({title:"请填写批发价加价",icon:"none"})
+					uni.showToast({title:"请填写批发加价",icon:"none"})
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.skMore) == false){
-					uni.showToast({title:"请填写零售价加价",icon:"none"})
+					uni.showToast({title:"请填写零售加价",icon:"none"})
 					return;
 				}
       }
@@ -1368,12 +1368,12 @@ export default {
         {
           name: "hjAddPrice",
           rule: ["required"],
-          msg: ["请填写大客价加价"]
+          msg: ["请填写大客加价"]
         },
         {
           name: "addPrice",
           rule: ["required"],
-          msg: ["请填写批发价加价"]
+          msg: ["请填写批发加价"]
         },
         {
           name: "discountPrice",
@@ -1388,7 +1388,7 @@ export default {
         {
           name: "skMore",
           rule: ["required"],
-          msg: ["请填写零售价加价"]
+          msg: ["请填写零售加价"]
         },
         {
           name: "weight",

hdApp/src/admin/item/add.vue

@@ -149,17 +149,17 @@
       <view class="module-com input-line-wrap">
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">大客价加价</view>
+          <view class="tui-title">大客加价</view>
           <input v-model="form.hjAddPrice" placeholder-class="phcolor" class="tui-input" name="hjAddPrice" placeholder="在成本价基础上多卖的金额" maxlength="50" type="digit" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">批发价加价</div>
+          <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">
-          <view class="tui-title">零售价加价</view>
+          <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>
 
@@ -610,15 +610,15 @@ export default {
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.addPrice) == false){
-					uni.showToast({title:"请填写批发价加价",icon:"none"})
+					uni.showToast({title:"请填写批发加价",icon:"none"})
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.skMore) == false){
-					uni.showToast({title:"请填写零售价加价",icon:"none"})
+					uni.showToast({title:"请填写零售加价",icon:"none"})
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.hjAddPrice) == false){
-					uni.showToast({title:"请填写大客价加价",icon:"none"})
+					uni.showToast({title:"请填写大客加价",icon:"none"})
 					return;
 				}
       }
@@ -689,17 +689,17 @@ export default {
         {
           name: "skMore",
           rule: ["required"],
-          msg: ["请填写零售价加价"]
+          msg: ["请填写零售加价"]
         },
         {
           name: "addPrice",
           rule: ["required"],
-          msg: ["请填写批发价加价"]
+          msg: ["请填写批发加价"]
         },
         {
           name: "hjAddPrice",
           rule: ["required"],
-          msg: ["请填写大客价加价"]
+          msg: ["请填写大客加价"]
         },
         {
           name: "discountPrice",

hdApp/src/admin/item/copy.vue

@@ -149,17 +149,17 @@
       <view class="module-com input-line-wrap">
 
         <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">大客价加价</view>
+            <view class="tui-title">大客加价</view>
             <input v-model="form.hjAddPrice" placeholder-class="phcolor" class="tui-input" name="hjAddPrice" @focus="form.hjAddPrice=''" placeholder="在成本价基础上多卖的金额" maxlength="50" type="digit" />
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false">
-            <view class="tui-title">批发价加价</view>
+            <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>
+            <view class="tui-title">零售加价</view>
             <input v-model="form.skMore" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="在成本价基础上多卖的金额" type="digit" />
           </tui-list-cell>
 
@@ -619,15 +619,15 @@ export default {
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.addPrice) == false){
-					uni.showToast({title:"请填写批发价加价",icon:"none"})
+					uni.showToast({title:"请填写批发加价",icon:"none"})
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.skMore) == false){
-					uni.showToast({title:"请填写零售价加价",icon:"none"})
+					uni.showToast({title:"请填写零售加价",icon:"none"})
 					return;
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.hjAddPrice) == false){
-					uni.showToast({title:"请填写大客价加价",icon:"none"})
+					uni.showToast({title:"请填写大客加价",icon:"none"})
 					return;
 				}
       }
@@ -718,7 +718,7 @@ export default {
         {
           name: "skMore",
           rule: ["required"],
-          msg: ["请填写零售价加价"]
+          msg: ["请填写零售加价"]
         },
         {
           name: "weight",

hdApp/src/admin/item/detail.vue

@@ -230,17 +230,17 @@
 
           <block v-if="Number(getMyShopInfo.pfShopId)>0">
             <tui-list-cell class="line-cell" :hover="false">
-              <view class="tui-title">大客价加价</view>
+              <view class="tui-title">大客加价</view>
               <input v-model="form.hjAddPrice" placeholder-class="phcolor" class="tui-input" name="hjAddPrice" @focus="form.hjAddPrice=''" placeholder="在成本价基础上多卖的金额" maxlength="50" type="digit" />
             </tui-list-cell>
 
             <tui-list-cell class="line-cell" :hover="false">
-              <view class="tui-title">批发价加价</view>
+              <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>
+              <view class="tui-title">零售加价</view>
               <input v-model="form.skMore" placeholder-class="phcolor" class="tui-input" name="skMore" @focus="form.skMore=''" placeholder="在成本价基础上多卖的金额" type="digit" />
             </tui-list-cell>
           </block>