花材管理

ghsApp/src/admin/home/workbench.vue

@@ -48,7 +48,7 @@
 				</div>
 			</div>
 			<div style="text-align:center;padding-bottom:12upx;color:#666666;font-size:25upx;">
-				<text style="margin-right:10upx;">实收总计 {{countStat.actTotalCount}}笔 ¥{{countStat.actTotalIncome}}</text> | 今日欠款 ¥{{todayDebt}} | 总欠款 ¥{{}}
+				<text style="margin-right:10upx;">实收总计 {{countStat.actTotalCount}}笔 ¥{{countStat.actTotalIncome}}</text> | 今日欠款 ¥{{todayDebt}} | 总欠款 ¥{{totalDebt}}
 			</div>
 		</div>
 

ghsApp/src/admin/item/add.vue

@@ -34,11 +34,6 @@
           <input v-model="form.ratio" placeholder-class="phcolor" class="tui-input" name="ratio" placeholder="如：1扎=20支，请填写20" maxlength="50" type="number" />
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">单支售价涨幅</view>
-          <input v-model="form.smallRatio" placeholder-class="phcolor" class="tui-input" name="smallRatio" placeholder="请填写，最小填1" style="width:230upx;" @focus="form.smallRatio=''"
-          maxlength="50" type="number" /><text style="color:#333333;">单支售价 ¥<text>{{smallPrice}}</text></text>
-        </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">库存</div>
@@ -116,7 +111,7 @@
       <div class="module-com input-line-wrap goods-wrap">
         <div class="module-tit">
           <span>花材图片</span>
-          <span class="app-color-3">（建议比例 1:1）</span>
+          <span class="app-color-3"></span>
         </div>
         <view class="module-det">
           <htz-image-upload :max="1" :compress="true" v-model="currentImgData" :headers="headers"
@@ -165,13 +160,12 @@ export default {
         smallUnitId:2,
         classId:'',
         price:'',
-        skMore:'',
-        addPrice:'',
-        discountPrice:'',
-        smallRatio:'',
-        weight:'',
+        skMore:3,
+        addPrice:3,
+        discountPrice:0,
+        weight:1,
         cover:[],
-        stockWarning:'',
+        stockWarning:5,
         status:2,
         delStatus:0,
         itemId:0,
@@ -187,16 +181,7 @@ export default {
     };
   },
 	computed:{
-		...mapGetters(["getLoginInfo","getDictionariesInfo"]),
-    smallPrice(){
-       let price = 0
-        if(Number(this.form.price) > 0 && Number(this.form.ratio)>0){
-          let div = Number(this.form.price)/Number(this.form.ratio)
-          price = div*Number(this.form.smallRatio)
-          price = parseFloat(price.toFixed(2))
-        }
-        return price
-    }
+		...mapGetters(["getLoginInfo","getDictionariesInfo"])
 	},
   onLoad(option) {
     if(option.id){
@@ -278,8 +263,8 @@ export default {
         this.form.delStatus = 0
         this.form.id = 0
         this.form.price = ''
-        this.form.skMore =''
-        this.form.addPrice =''
+        this.form.skMore =3
+        this.form.addPrice =3
         this.form.discountPrice = ''
       })
     },
@@ -379,10 +364,6 @@ export default {
 					uni.showToast({title:"请填写特价，没有特价请填0",icon:"none"})
 					return;
 				}
-				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.smallRatio) == false){
-					uni.showToast({title:"请填写涨幅，最小请填1",icon:"none"})
-					return;
-				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.price) == false){
 					uni.showToast({title:"请填写售价",icon:"none"})
 					return;
@@ -469,11 +450,6 @@ export default {
           rule: ["required"],
           msg: ["不做特价请填0"]
         },
-        {
-          name: "smallRatio",
-          rule: ["required"],
-          msg: ["请填单支售价涨幅"]
-        },
         {
           name: "weight",
           rule: ["required"],

ghsApp/src/admin/item/copy.vue

@@ -34,12 +34,6 @@
           <input v-model="form.ratio" placeholder-class="phcolor" class="tui-input" name="ratio" @focus="form.ratio=''" placeholder="如：1扎=20支，请填写20" maxlength="50" type="number" />
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">单支售价涨幅</view>
-          <input v-model="form.smallRatio" placeholder-class="phcolor" class="tui-input" name="smallRatio" placeholder="请填写，最小填1" style="width:230upx;" @focus="form.smallRatio=''"
-          maxlength="50" type="number" /><text style="color:#333333;">单支售价 ¥<text>{{smallPrice}}</text></text>
-        </tui-list-cell>
-
         <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"/>
@@ -116,7 +110,7 @@
       <view class="module-com input-line-wrap goods-wrap">
         <view class="module-tit">
           <span>花材图片</span>
-          <span class="app-color-3">（建议比例 1:1）</span>
+          <span class="app-color-3"></span>
         </view>
         <view class="module-det">
           <htz-image-upload :max="1" :compress="true" v-model="currentImgData" :headers="headers"
@@ -161,17 +155,16 @@ export default {
         py:"",
         stock:'',
         ratio:'',
-        smallRatio:'',
         bigUnitId:1,
         smallUnitId:2,
         classId:'',
         price:'',
-        skMore:'',
-        addPrice:'',
+        skMore:3,
+        addPrice:3,
         discountPrice:'',
         weight:'',
         cover:[],
-        stockWarning:'',
+        stockWarning:5,
         status:2,
         delStatus:0,
         itemId:0,
@@ -187,16 +180,7 @@ export default {
     };
   },
 	computed:{
-		...mapGetters(["getLoginInfo","getDictionariesInfo"]),
-    smallPrice(){
-       let price = 0
-        if(Number(this.form.price) > 0 && Number(this.form.ratio)>0){
-          let div = Number(this.form.price)/Number(this.form.ratio)
-          price = div*Number(this.form.smallRatio)
-          price = parseFloat(price.toFixed(2))
-        }
-        return price
-    }
+		...mapGetters(["getLoginInfo","getDictionariesInfo"])
 	},
   onLoad(option) {
     if(option.id){
@@ -276,8 +260,8 @@ export default {
         this.form.delStatus = 0
         this.form.id = 0
         this.form.price = ''
-        this.form.skMore =''
-        this.form.addPrice =''
+        this.form.skMore =3
+        this.form.addPrice =3
         this.form.discountPrice = ''
       })
     },
@@ -444,11 +428,6 @@ export default {
           rule: ["required"],
           msg: ["请填写单位比"]
         },
-        {
-          name: "smallRatio",
-          rule: ["required"],
-          msg: ["请填写单支售价涨幅"]
-        },
         {
           name: "price",
           rule: ["required"],

ghsApp/src/admin/item/detail.vue

@@ -35,12 +35,6 @@
           class="tui-input" name="ratio" placeholder="如：1扎=20支，请填写20" maxlength="50" type="number" />
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">单支售价涨幅</view>
-          <input v-model="form.smallRatio" placeholder-class="phcolor" class="tui-input" name="smallRatio" placeholder="请填写" style="width:200upx;" @focus="form.smallRatio=''" maxlength="50" type="number" />
-          <text style="color:#333333;">单支售价 ¥<text>{{smallPrice}}</text></text>
-        </tui-list-cell>
-
         <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"/>
@@ -117,7 +111,7 @@
       <view class="module-com input-line-wrap goods-wrap">
         <view class="module-tit">
           <span>花材图片</span>
-          <span class="app-color-3">（建议比例 1:1）</span>
+          <span class="app-color-3"></span>
         </view>
         <view class="module-det">
           <htz-image-upload :max="1" :compress="true" v-model="currentImgData" :headers="headers"
@@ -183,17 +177,16 @@ export default {
         py:"",
         stock:'',
         ratio:'',
-        smallRatio:'',
         bigUnitId:1,
         smallUnitId:2,
         classId:'',
         price:'',
-        addPrice:'',
-        discountPrice:'',
-        skMore:'',
+        addPrice:3,
+        discountPrice:0,
+        skMore:3,
         weight:'',
         cover:[],
-        stockWarning:'',
+        stockWarning:5,
         status:2,
         delStatus:0,
         itemId:0,
@@ -215,16 +208,7 @@ export default {
     };
   },
 	computed:{
-		...mapGetters(["getLoginInfo","getDictionariesInfo"]),
-    smallPrice(){
-       let price = 0
-        if(Number(this.form.price) > 0 && Number(this.form.ratio)>0){
-          let div = Number(this.form.price)/Number(this.form.ratio)
-          price = div*Number(this.form.smallRatio)
-          price = parseFloat(price.toFixed(2))
-        }
-        return price
-    }
+		...mapGetters(["getLoginInfo","getDictionariesInfo"])
 	},
   onLoad(option) {
     if(option.id){
@@ -362,9 +346,10 @@ export default {
         this.form.delStatus = 0
         this.form.id = 0
         this.form.price = ''
-        this.form.addPrice =''
+        this.form.scanNum = 0
+        this.form.addPrice = 3
         this.form.discountPrice = ''
-        this.form.skMore = ''
+        this.form.skMore = 3
         this.cost = res.data.cost || 0
       })
     },
@@ -533,11 +518,6 @@ export default {
           rule: ["required"],
           msg: ["请填写单位比"]
         },
-        {
-          name: "smallRatio",
-          rule: ["required"],
-          msg: ["请填写单支售价涨幅"]
-        },
         {
           name: "price",
           rule: ["required"],

ghsApp/src/admin/ptItem/itemList.vue

@@ -6,7 +6,7 @@
 				<app-search-module v-model="py" placeholder="输入拼音首字母搜索" @input="searchFnContrapose"/>
 			</view>
 			<view style="padding:0 0upx 0 20upx;" >
-				<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/item/add',type:2 })">新品种</button>
+				<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/item/add',type:2 })">新花材</button>
 			</view>
 		</view>
 		<view class="scroll-middle_bx">