shish 4 лет назад
Родитель
Сommit
f8b674a0db

+ 27 - 26
ghsApp/src/admin/billing/affirm.vue

@@ -77,7 +77,7 @@
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-show="form.sendType == 1" >
             <view class="tui-title">运费</view>
-            <input @blur="sendCostBlur" type="number" placeholder="请填写,留空免运费" @input="calcPrice" v-model="form.sendCost" placeholder-class="tui-placeholder"/>
+            <input @blur="sendCostBlur" type="number" placeholder="请填写,留空免运费" v-model="form.sendCost" placeholder-class="tui-placeholder"/>
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :arrow="true" v-if="form.debt == 0">
@@ -107,7 +107,7 @@
                 <text v-if="form.debt == 1">应收金额</text><text v-else>已收金额</text>
               </text>  
             </view>
-            <text style="color: #3385FF">{{parseFloat(modifyPrice)}}</text>
+            <text style="color: #3385FF">{{parseFloat(finalPrice)}}</text>
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
@@ -126,9 +126,9 @@
           <text>{{form.debt == 1 ? "欠款" : "已收款"}}</text>
         </text>
         <text class="price-title" v-else>金额</text>
-        <text class="price-number">¥<text class="large">{{ modifyPrice }}</text></text>
+        <text class="price-number">¥<text class="large">{{ finalPrice }}</text></text>
       </view>
-      <button class="admin-button-com blue middle" @click="affirmFormSubmit">开单</button>
+      <button class="admin-button-com blue middle" @click="confirmSubmit">开单</button>
     </view>
 
 
@@ -193,7 +193,6 @@ export default {
         needPrint:1,//订单生成时打印订单1需要2不需要
       },
       money: "",
-      modifyPrice: 0,
       showCustomer: false,
       customInfo:{discount:1},
       currentItemData: { bigCount: 0, smallCount: 0, userPrice: 0 },
@@ -217,7 +216,6 @@ export default {
     } else {
       uni.setNavigationBarTitle({ title: this.getMerchantInfo.name, })
     }
-    this.modifyPrice = this.allPrice.toFixed(2);
     
     //默认自取
     this.courier(2);
@@ -229,9 +227,6 @@ export default {
         that.form.customName = res.data.name
         that.customInfo = res.data
         that.$forceUpdate()
-        if(res.data.discount && res.data.discount < 1){
-          that.calcPrice()
-        }
       })
     }
 
@@ -246,6 +241,11 @@ export default {
 	},
   computed: {
     ...mapGetters(["getMerchantInfo", "getLoginInfo"]),
+    finalPrice(){
+      let totalPrice = this.allPrice.toFixed(2)
+      let finalPrice = (Number(totalPrice) + Number(this.form.sendCost)).toFixed(2)
+      return parseFloat(finalPrice)
+    }
   },
   methods: {
     ...mapActions(["initMerchantInfo"]),
@@ -321,7 +321,6 @@ export default {
 					this.updateItemEvent(this.currentItemData);
 					this.addModelCancel();
 				}
-        this.calcPrice()
 		},
 		//显示可以修改花材的弹框
 		showAddModel(info) {
@@ -347,7 +346,6 @@ export default {
 			}else{
 				this.$msg("小菊请去列表页修改")
 			}
-      this.calcPrice()
 		},
     //添加花材
 		addItem(item) {
@@ -368,9 +366,18 @@ export default {
 				}
 				this.addEvent(item)
 			}else{
-				this.$msg("小菊请去列表页修改")
+				//去特殊品种页
+				this.$emit("goToSpecialVariety", item);
+			}
+		},
+		//去特殊品种页,如小菊等
+		goToSpecialVariety(info){
+			this.xjDataInfo = info
+			if(info.stock <= 0){
+				uni.showToast({title:"没有库存",icon:"none"})
+			}else{
+				this.$util.pageTo({url: "/admin/item/xj",query: {stock:info.stock,price: info.price,customId:this.option.customId,userPrice:info.userPrice}})
 			}
-      this.calcPrice()
 		},
     init () {
       this._getDet();
@@ -382,11 +389,6 @@ export default {
 			this.payWayindex = index
       this.form.payWay = this.payWayList[index].id
 		},
-    calcPrice () {
-      let totalPrice = this.allPrice.toFixed(2)
-      this.modifyPrice = (Number(totalPrice) + Number(this.form.sendCost)).toFixed(2)
-      this.modifyPrice = parseFloat(this.modifyPrice)
-    },
     setPayWay(payWay){
       this.form.payWay = payWay
     },
@@ -442,7 +444,7 @@ export default {
         options.sendCost = "";
       }
       let Fn = createOrder
-      let params = {...options,modifyPrice: this.modifyPrice,newVersion:1};
+      let params = {...options,modifyPrice: this.finalPrice,newVersion:1};
       if(this.option.orderId && this.option.orderId > 0){
         Fn = updateOrder
         params = {...params,id:this.option.orderId}
@@ -454,14 +456,14 @@ export default {
 
       Fn(params).then((res) => {
         if(res.code == 1){
-          //删除记忆
-          this.removeMemory(that.option.customId)
+          //删除记忆花材
+          this.removeMemoryDirect(that.option.customId)
           const {data: { id, orderSn },} = res;
           this.$util.pageTo({ url: '/admin/billing/result',type:2,query: {orderId:id,orderSn:orderSn}})
         }
       });
     },
-    affirmFormSubmit () {
+    confirmSubmit () {
       let self = this;
       
         let rules = [
@@ -478,8 +480,8 @@ export default {
         }
         uni.showModal({
           title: "提示",
-          content: "确认打印订单?",
-          cancelText: "不需要",
+          content: "打印小票?",
+          cancelText: "不",
           confirmText: "打印",
           confirmColor: '#39B54A',
           cancelColor: '#777777',
@@ -493,12 +495,11 @@ export default {
             }
           },
         });
-      
+
     },
     // 表单验证
     async formSubmit () {
       try {
-        // 进行表单检查
         this.form;
         let formData = this.form;
         let price = 0;

+ 2 - 6
ghsApp/src/admin/billing/customerPlace.vue

@@ -84,15 +84,11 @@
 									:smallCount="
 										getSelectItemById(productItem.id, classItem.classId).smallCount
 									"
-									@customNum="customNum"
+									@showAddModel="showAddModel"
 									@add="addEvent"
 									@del="delEvent"
 								></Commondity>
 							</view>
-							<!-- <Commondity
-							:type="COMMODITY_TYPE.CHANGE"
-							@customNum="customNum"
-						></Commondity> -->
 						</template>
 					</view>
 				</block>
@@ -222,7 +218,7 @@ export default {
 
 	methods: {
 		//自定义数量
-		customNum(info) {
+		showAddModel(info) {
 			this.isModel = true;
 			this.customData = info;
 		},

+ 2 - 12
ghsApp/src/admin/billing/result.vue

@@ -46,13 +46,7 @@ export default {
     },
     //订单详情
     gotoOrderDetail() {
-
-      this.$util.pageTo({
-        url: "/pagesOrder/detail",
-        type: 3,
-        query: { id: this.option.orderId },
-      });
-
+      this.$util.pageTo({url: "/pagesOrder/detail",query: { id: this.option.orderId }})
     },
     gotoPlace() {
       uni.navigateBack({ delta: 1 });
@@ -61,11 +55,7 @@ export default {
       uni.navigateTo({ url: `/admin/order/print?id=${this.option.orderId}` });
     },
     goBackHome() {
-      this.$util.pageTo({
-        url: "/admin/home/workbench",
-        type: 4,
-        query: { tabIndex: 0 },
-      });
+      this.$util.pageTo({ url: "/admin/home/workbench", type: 4, query: { tabIndex: 0 }})
     },
   },
 };

+ 1 - 1
ghsApp/src/admin/breakage/confirm.vue

@@ -222,7 +222,7 @@ export default {
           if (res.confirm) {
             wastage({product:JSON.stringify(product),remark:that.form.remark}).then((res) => {
               //删除记忆
-              that.removeMemory()
+              that.removeMemoryDirect()
               const {data: { id, orderSn },} = res;
               let url = '/admin/breakage/result';
               uni.redirectTo({url: url,success: (result) => { },fail: () => { },complete: () => { },});

+ 3 - 3
ghsApp/src/admin/breakage/index.vue

@@ -5,7 +5,7 @@
 				<app-search-module v-model="py" placeholder="输入字母搜索" @input="searchFn" />
 			</view>
 			<view style="float:right">
-				<button class="admin-button-com middle blue" @click="removeMemory()">清除花材</button>
+				<button class="admin-button-com middle blue" @click="removeMemory(0)">清除花材</button>
 			</view>
 
 		</view>
@@ -40,7 +40,7 @@
 									:info="productItem"
 									:bigCount="getSelectItemById(productItem.id, classItem.classId).bigCount"
 									:smallCount="getSelectItemById(productItem.id, classItem.classId).smallCount"
-									@customNum="customNum"
+									@showAddModel="showAddModel"
 									@add="addEvent"
 									@setInfoBeforeShowModel="groupInfoBeforeShowModel"
 									@del="delEvent"
@@ -133,7 +133,7 @@ export default {
 
 	methods: {
 		//自定义数量
-		customNum(info) {
+		showAddModel(info) {
 			this.isModel = true;
 			this.customData = info;
 			this.isFocus = false;

+ 1 - 1
ghsApp/src/admin/custom/selectCustom.vue

@@ -85,7 +85,7 @@ export default {
 	},
   methods: {
     pdaKd(custom){
-      this.$util.pageTo({url: "/admin/billing/affirm?customId="+custom.id+"&customName="+custom.name,type:2});
+      this.$util.pageTo({url: '/admin/billing/affirm',type:2,query:{customId:custom.id,kdType:'PDA'}})
     },
     selectCurrent(item){
       let style = this.option.style ? this.option.style : 1

+ 0 - 618
ghsApp/src/admin/home/pda.vue

@@ -1,618 +0,0 @@
-<template>
-  <view class="affirm-page">
-    <view class="affirm-view overscroll">
-      <!-- 门店信息 -->
-      <form>
-        <view class="module-com">
-          <view class="commodity-view">
-            <view class="commodity-list">
-              <view class="commodity-item" v-for="(item, index) in selectList" :key="index">
-                <image class="item-icon" :src="item.cover" alt="" />
-                <view class="item-info">
-                  <view class="info-line">
-                    <text class="item-name">{{ item.itemName }}</text>
-                    <text class="item-price">
-                      <text class="unit">¥</text>
-                      <text class="price">
-                        {{ parseFloat(item.userPrice)||0 }}
-                      </text>
-                    </text>
-                  </view>
-                  <view class="info-line">
-                    <text class="item-type"></text>
-                    <text class="item-count">
-
-
-
-					<view class="open-bx" >
-						<i class="iconfont iconjian" :class="delAnimationData?'animation':''" @click.stop="delEvent(info.variety)" v-if="item.bigCount > 0 || item.smallCount > 0"></i>
-						<text class="num" >
-							<text v-if="item.bigCount > 0 || smallCount > 0">{{ `${item.bigCount}` }}</text>
-							<text v-if="item.smallCount > 0">/</text>
-							<text v-if="item.smallCount > 0">{{ `${item.smallCount}` }}</text>
-						</text>
-						<i class="iconfont iconzeng" :class="addAnimationData?'animation':''" @click.stop="addEvents(info.variety)"></i>
-					</view>
-
-
-
-
-                    </text>
-                  </view>
-                </view>
-              </view>
-            </view>
-            <view class="summary-bar">
-              <view class="operate-view" @click="removeMemory()">
-                <text class="iconfont iconshanchu1"></text>清除花材
-              </view>
-              <view class="describe-view">
-                共{{ selectList.length }}种,合计 ¥<text class="price">{{ allPrice }}</text>
-              </view>
-            </view>
-          </view>
-        </view>
-        <view class="module-com input-line-wrap">
-					<view class="" v-if="isBilling">
-          <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="selectCustom">
-            <view class="tui-title">客户</view>
-            <view class="tui-input" v-if="form.customId" >{{ form.customName }}</view>
-            <view class="tui-placeholder" style="width: 100%" v-else >请选择客户</view>
-          </tui-list-cell>
-
-          <tui-list-cell class="line-cell" :hover="false" :arrow="false">
-            <view class="tui-title">送货</view>
-            <button @tap="courier(2)" class="admin-button-com mini-btn" :class="form.sendType == 2 ? 'blue' : 'default'">自取</button>
-            <button @click="courier(1)" class="admin-button-com mini-btn" :class="form.sendType == 1 ? 'blue' : 'default'">配送</button>
-          </tui-list-cell>
-          <tui-list-cell class="line-cell" :hover="false" :arrow="false">
-            <view class="tui-title">结算类型</view>
-            <button @tap="form.debt = 1" class="admin-button-com mini-btn" :class="form.debt == 1 ? 'blue' : 'default'">欠款</button>
-            <button @click="form.debt = 0" class="admin-button-com mini-btn" :class="form.debt == 0 ? 'blue' : 'default'">已收款</button>
-          </tui-list-cell>
-
-          <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-show="form.sendType == 1" >
-            <view class="tui-title">运费</view>
-            <input @blur="sendCostBlur" type="number" placeholder="请填写,留空免运费" @input="calcPrice" v-model="form.sendCost" placeholder-class="tui-placeholder"/>
-          </tui-list-cell>
-
-          <tui-list-cell class="line-cell" :arrow="true" v-if="form.debt == 0">
-            <div class="tui-title">收款方式</div>
-            <picker
-              mode="selector"
-              :value="form.payWay"
-              :range="payWayList"
-              range-key="name"
-              @change="payWayChange"
-              class="tui-input"
-            >
-              <input v-model="form.payWay" name="payWay" type="text" hidden />
-              <div style="padding:6upx 0 6upx 0;">{{payWayList[payWayindex].name}}</div>
-            </picker>
-          </tui-list-cell>
-
-          <tui-list-cell class="line-cell" :hover="false" :arrow="false" >
-            <view class="tui-title">总金额</view>
-            <text style="color: #3385FF" v-if="form.sendType == 1">{{	(allPrice + Number(form.sendCost)).toFixed(2) }}</text>
-            <text style="color: #3385FF" v-else >{{ allPrice.toFixed(2) }}</text>
-          </tui-list-cell>
-
-          <tui-list-cell class="line-cell" :hover="false" :arrow="false" >
-            <view class="tui-title">
-              <text>
-                <text v-if="form.debt == 1">应收金额</text><text v-else>已收金额</text>
-              </text>
-            </view>
-            <text style="color: #3385FF">{{modifyPrice}}</text>
-          </tui-list-cell>
-
-          <tui-list-cell class="line-cell" :hover="false" :arrow="false">
-            <view class="tui-title">备注</view>
-						<textarea style="height: 100upx" v-model="form.remark" placeholder="选填"/>
-					</tui-list-cell>
-
-          </view>
-        </view>
-      </form>
-    </view>
-    <view class="under-bar">
-      <view class="price-view">
-        <text class="price-title" v-if="isBilling">
-          <text>{{form.debt == 1 ? "欠款" : "已收款"}}</text>
-        </text>
-        <text class="price-title" v-else>金额</text>
-        <text class="price-number">¥<text class="large">{{ modifyPrice }}</text></text>
-      </view>
-      <button class="admin-button-com blue middle" @click="affirmFormSubmit">开单</button>
-    </view>
-
-  </view>
-</template>
-
-<script>
-import TuiListCell from "@/components/plugin/list-cell";
-import AppAvatarModule from "@/components/module/app-avatar";
-import SimpleAddress from "@/components/plugin/simple-address";
-import AppAreaSel from "@/components/app-area-sel";
-import productMins from "@/mixins/product";
-import appFormRadioBtn from "@/components/app-formRadio-btn";
-import appAddressGroup from "@/components/app-address-group";
-import appSendTime from "@/components/app-send-time";
-import appFormSend from "@/components/app-form-send";
-const formUtil = require("@/utils/formValidation.js");
-import { createOrder, updateOrder } from "@/api/order/index";
-import { mapActions, mapGetters } from "vuex";
-import { getUserDet} from "@/api/member";
-export default {
-  name: "pda", //PDA极速开单
-  components: {
-    TuiListCell,
-    AppAvatarModule,
-    SimpleAddress,
-    AppAreaSel,
-    appFormRadioBtn,
-    appAddressGroup,
-    appSendTime,
-    appFormSend,
-  },
-  mixins: [productMins],
-  data () {
-    return {
-      autoLoad: false,
-      isBilling: true,
-			payWayList:[{name:"微信",id:0},{name:"支付宝",id:1},{name:"现金",id:4},{name:"银行卡",id:5}],
-			payWayindex:0,
-      form: {
-        debt: 1, //付款方式 1欠款订单 0正常订单
-        shopId: "",
-        shopName: "",
-        receiveProvince: "",
-        receiveCity: "",
-        receiveFloor: "",
-        receiveAddress: "",
-        receiveLong: "",
-        receiveLat: "",
-        sendType: 2,
-        sendSide: "2",
-        sendDate: "",
-        sendTimeWant: "",
-        sendCost: "",
-        customId: "",
-        product: "",
-        remark:"",
-        payWay:0,
-        needPrint:1,//订单生成时打印订单1需要2不需要
-      },
-      money: "",
-      modifyPrice: 0,
-      showCustomer: false,
-      customInfo:{discount:1}
-    };
-  },
-  onLoad (option) {
-    if (!this.getMerchantInfo) {
-      this.initMerchantInfo().then((data) => {
-        uni.setNavigationBarTitle({
-          title: data.name,
-        });
-      });
-    } else {
-      uni.setNavigationBarTitle({
-        title: this.getMerchantInfo.name,
-      });
-    }
-    this.modifyPrice = this.allPrice.toFixed(2);
-    //默认自取
-    this.courier(2);
-    if(option.customId){
-      this.form.customId = option.customId
-      let that = this
-      getUserDet({ id: option.customId }).then(res => {
-        that.form.customName = res.data.name
-        that.customInfo = res.data
-        if(res.data.discount && res.data.discount < 1){
-          that.calcPrice()
-        }
-      })
-    }
-  },
-	onShow(){
-		if(!this.$util.isEmpty(uni.getStorageSync("newClient"))){
-			this.showCustomer = true;
-		}
-	},
-	onUnload(){
-			uni.removeStorageSync('newClient');
-	},
-  computed: {
-    ...mapGetters(["getMerchantInfo", "getLoginInfo"]),
-  },
-  methods: {
-    ...mapActions(["initMerchantInfo"]),
-    init () {
-      this._getDet();
-    },
-    selectCustom(){
-      this.$util.pageTo({ url: '/admin/custom/selectCustom',query: {style:2}})
-    },
-		payWayChange(e){
-			let index = e.detail.value
-			this.payWayindex = index
-      this.form.payWay = this.payWayList[index].id
-		},
-    calcPrice () {
-      let totalPrice = this.allPrice.toFixed(2)
-      this.modifyPrice = (Number(totalPrice) + Number(this.form.sendCost)).toFixed(2)
-      this.modifyPrice = parseFloat(this.modifyPrice)
-    },
-    setPayWay(payWay){
-      this.form.payWay = payWay
-    },
-    courier (type) {
-      this.form.sendType = type;
-      if (type === 2) {
-        this.form.sendCost = "";
-      } else if(type == 1){
-        this.form.sendCost = this.money;
-      }
-    },
-    sendCostBlur () {
-      if (this.form.sendType === 1) {
-        this.money = this.form.sendCost;
-      }
-    },
-    _getDet () {
-      let data = uni.getStorageSync("modifyShopB");
-      if (this.$util.isEmpty(data)) return;
-      Object.keys(this.form).forEach((i, index) => {
-        this.form[i] = data[i];
-      });
-    },
-    changeCustomerFn (info) {
-      const product = this.selectList.map((ele) => {
-        return {
-          productId: ele.id,
-          bigNum: ele.bigCount,
-          smallNum: ele.smallCount,
-          classId: ele.classId,
-          itemId: ele.itemId,
-        };
-      });
-      let params = {
-        customId: info.id,
-        product: JSON.stringify(product),
-        province: info.province,
-        city: info.city,
-        address: info.address,
-        floor: info.floor,
-        long: info.long,
-        lat: info.lat,
-      };
-      this.form.sendCost = '';
-      this.form.customId = info.id;
-      this.form.customName = info.name;
-    },
-    confirmFn (options) {
-      let that = this
-      if (options.sendType == 2) {
-        options.sendCost = "";
-      }
-      let Fn = createOrder
-      let params = {...options,modifyPrice: this.modifyPrice,newVersion:1};
-      if(this.option.orderId && this.option.orderId > 0){
-        Fn = updateOrder
-        params = {...params,id:this.option.orderId}
-      }
-
-      //小菊
-      let xj = uni.getStorageSync("xj"+this.option.customId)
-      params = {...params,xj:JSON.stringify(xj)}
-
-      Fn(params).then((res) => {
-        if(res.code == 1){
-          //删除记忆
-          this.removeMemory(that.option.customId)
-          const {data: { id, orderSn },} = res;
-          this.$util.pageTo({ url: '/admin/billing/result',type:2,query: {orderId:id,orderSn:orderSn}})
-        }
-      });
-    },
-    affirmFormSubmit () {
-      let self = this;
-
-        let rules = [
-          {
-            name: "customId",
-            rule: ["required"],
-            msg: ["请选择客户"],
-          },
-        ];
-        let checkRes = formUtil.validation(this.form, rules);
-        if (checkRes) {
-          this.$msg(checkRes);
-          return false;
-        }
-        uni.showModal({
-          title: "提示",
-          content: "确认打印订单?",
-          cancelText: "不需要",
-          confirmText: "打印",
-          confirmColor: '#39B54A',
-          cancelColor: '#777777',
-          success: function (res) {
-            if (res.confirm) {
-              self.form.needPrint = 1
-              self.formSubmit();
-            }else{
-              self.form.needPrint = 2
-              self.formSubmit();
-            }
-          },
-        });
-
-    },
-    // 表单验证
-    async formSubmit () {
-      try {
-        // 进行表单检查
-        this.form;
-        let formData = this.form;
-        let price = 0;
-        const product = this.selectList.map((ele) => {
-          price += ele.bigCount * Number(ele.bigPrice);
-          price += ele.smallCount * Number(ele.smallPrice);
-          return {
-            productId: ele.id,
-            bigNum: ele.bigCount,
-            smallNum: ele.smallCount,
-            classId: ele.classId,
-            itemId: ele.itemId,
-            price: ele.userPrice>0?ele.userPrice:price,
-          };
-        });
-        formData.product = JSON.stringify(product);
-        if (!this.getMerchantInfo) {
-          await this.initMerchantInfo();
-        }
-        formData.shopId = this.getMerchantInfo.id;
-        let checkRes = formUtil.validation(formData, []);
-        // 验证通过!
-        if (!checkRes) {
-          this.confirmFn(formData);
-        } else {
-          this.$msg(checkRes);
-        }
-      } catch (error) {
-        console.log(999999, error);
-      }
-    },
-    gobackEvent () {
-      uni.navigateBack({
-        delta: 1,
-      });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.admin-button-com {
-  margin-right: 20upx;
-}
-.affirm-page {
-  position: relative;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-
-  .affirm-view {
-    flex: 1;
-    padding: 20upx;
-    background-color: #f0f2f6;
-
-    .commodity-view {
-      display: flex;
-      flex-direction: column;
-      .commodity-list {
-        padding: 20upx;
-        .commodity-item {
-          display: flex;
-          margin-bottom: 20upx;
-          .item-icon {
-            flex-shrink: 0;
-            width: 140upx;
-            height: 140upx;
-          }
-          .item-info {
-            display: flex;
-            flex-direction: column;
-            justify-content: center;
-            flex: 1;
-            margin-left: 20upx;
-            .info-line {
-              margin-bottom: 20upx;
-              display: flex;
-              justify-content: space-between;
-              align-items: flex-end;
-              .item-name {
-                color: #666;
-                font-size: 28upx;
-              }
-              .item-price {
-                color: #333;
-                font-size: 22upx;
-                .price {
-                  font-size: 32upx;
-                  font-weight: bold;
-                }
-              }
-              .item-type {
-                color: #999;
-                font-size: 24upx;
-              }
-              .item-count {
-                color: #666;
-                font-size: 24upx;
-
-			& .open-bx {
-				display: flex;
-				align-items: center;
-				& .iconfont {
-					//margin-left: 15upx;
-					color: #3385ff;
-					font-size: 42upx;
-				}
-
-				.position{
-					display: block;
-					width: 70upx;
-					text-align: center;
-				}
-				.iconcachu {
-					margin: 0 6px 0 20upx;
-					color: #ccc;
-					&.edit {
-						color: #3385ff;
-					}
-				}
-				& > .num {
-					display: inline-block;
-					width: 120upx;
-					height:45upx;
-					text-align:center;
-					margin: 0 8upx;
-					color: #868686;
-					border-radius: 22upx;
-					background-color: #f5f5f5;
-					padding: 3px 0;
-					font-size: 25upx;
-				}
-				.change-input {
-					width: 164upx;
-					height: 60upx;
-					line-height: 60upx;
-					text-align: center;
-					background: #ffffff;
-					border: 1px solid #dddddd;
-					border-radius: 4upx;
-					font-size: 25upx;
-				}
-				.btn-box{
-					width: 100upx;
-					height: 60upx;
-					line-height: 60upx;
-					color: #ffffff;
-					background: #3385ff;
-					text-align: center;
-					border-radius: 10upx;
-				}
-			}
-
-              }
-            }
-          }
-        }
-      }
-      .summary-bar {
-        padding: 0 20upx;
-        height: 90upx;
-        display: flex;
-
-        align-items: center;
-        justify-content: space-between;
-        border-top: 1px solid #eeeeee;
-        .operate-view {
-          display: flex;
-
-          align-items: center;
-          color: #3385ff;
-          font-size: 26upx;
-          .iconfont {
-            margin-right: 20upx;
-            font-size: 40upx;
-          }
-        }
-        .describe-view {
-          display: flex;
-
-          align-items: center;
-          color: #333;
-          font-size: 24upx;
-          .price {
-            font-weight: bold;
-            font-size: 36upx;
-          }
-        }
-      }
-    }
-    .module-com {
-        background-color: #fff;
-        margin-bottom: 20upx;
-        border-radius: 10upx;
-        overflow: hidden;
-        .tab-box{
-            padding: 10upx 30upx 30upx;
-            .tab{
-                width: 49%;
-                height: 70upx;
-                color: #a2a2a2;
-                border: 1px solid #dcdcdc;
-                border-radius: 10upx;
-                font-size: 28upx;
-                font-weight: 700;
-                &.active{
-                    color: #ff4d4d;
-                    border: 1px solid #ff4d4d;
-                }
-            }
-        }
-        .member-wrap {
-            .member-det {
-                font-size: 24upx;
-                margin-left: 20upx;
-            }
-        }
-        .remark-wrap {
-            align-items: flex-start;
-            .remark {
-                height: 240upx;
-            }
-        }
-        // .tui-placeholder,
-        // .tui-input {
-        // 	padding-right: 30upx;
-        // 	width: 100%;
-        // 	text-align: right;
-        // }
-    }
-  }
-  .under-bar {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 0 20upx;
-    width: 100%;
-    height: 100upx;
-    background-color: #fff;
-    box-shadow: 0upx -1upx 6upx 0upx rgba(4, 0, 0, 0.06);
-    .price-view {
-      display: flex;
-      align-items: center;
-      font-size: 24upx;
-      .price-title {
-        color: #333;
-      }
-      .price-number {
-        margin: 0 20upx;
-        color: #ff2842;
-        .large {
-          font-size: 40upx;
-        }
-      }
-    }
-    .admin-button-com {
-      width: 200upx;
-    }
-  }
-}
-</style>

+ 3 - 0
ghsApp/src/admin/home/workbench.vue

@@ -234,6 +234,9 @@ export default {
 			})
 		},
 		skKd(){
+			console.log(this.myShopInfo.skCustomId)
+			console.log(this.skCustomId)
+			console.log(7777)
 			if((this.myShopInfo.skCustomId && this.myShopInfo.skCustomId > 0) || this.skCustomId > 0){
 				let currentId = 0;
 				if(this.skCustomId > 0){

+ 0 - 3
ghsApp/src/admin/item/components/ItemStock.vue

@@ -63,9 +63,6 @@ export default {
 		goToProduct(id) {
 			this.$emit('goToProduct', id)
 		},
-		customNum() {
-			this.$emit("customNum");
-		},
 		addEvent() {
 			this.$emit("add");
 		},

+ 0 - 3
ghsApp/src/admin/ptItem/components/Item.vue

@@ -73,9 +73,6 @@ export default {
 		selectItem(item){
 			this.$emit("selectItem",item);
 		},
-		customNum() {
-			this.$emit("customNum");
-		},
 		addEvent() {
 			this.$emit("add");
 		},

+ 12 - 4
ghsApp/src/admin/staff/add.vue

@@ -29,8 +29,19 @@
             </div>
           </tui-list-cell>
         </div>
-        <!-- 登录信息 -->
         <div class="module-com input-line-wrap">
+          <tui-list-cell class="line-cell" :hover="false">
+            <div class="tui-title">登录密码</div>
+            <input
+              v-model="form.password"
+              placeholder-class="phcolor"
+              class="tui-input"
+              name="password"
+              placeholder="请输入"
+              maxlength="50"
+              type="password"
+            />
+          </tui-list-cell>
           <tui-list-cell class="line-cell remark-wrap" :hover="false">
             <div class="tui-title">备注信息</div>
             <div class="tui-input">
@@ -210,7 +221,6 @@ export default {
     },
     // 表单验证
     formSubmit(e) {
-      // 表单规则
       let rules = [
         {
           name: "roleId",
@@ -218,10 +228,8 @@ export default {
           msg: ["请选择角色"]
         }
       ];
-      // 进行表单检查
       let formData = e.detail.value;
       let checkRes = form.validation(formData, rules);
-      // 验证通过!
       if (!checkRes) {
         this.confirmFn();
       } else {

+ 34 - 23
ghsApp/src/admin/staff/list.vue

@@ -1,6 +1,14 @@
 <template>
-	<div class="app-content">
-		<app-tabs :tabs="tabs" :isFixed="true" :currentTab="tabIndex" @change="change" itemWidth="50%" />
+	<div class="app-main app-content">
+
+    <view class="input-wrap_box">
+      <view>
+        <AppSearchModule placeholder="输字母搜索" @input="searchFn"/>
+      </view>
+    </view>
+
+    <view class="app-tabs"> <app-tabs :tabs="tabs" :isFixed="false" :top="50" :currentTab="tabIndex" :height="100" @change="change" itemWidth="50%" :isAdd="false" /> </view>
+
 		<!-- 员工列表 -->
 		<block v-if="tabIndex == 0">
 			<!-- 列表 -->
@@ -130,6 +138,7 @@ import TimeAxis from '@/admin/home/components/plugin/time-axis'
 import TimeaxisItem from '@/admin/home/components/plugin/timeaxis-item'
 import AppWrapperEmpty from '@/components/app-wrapper-empty'
 import ModalModule from '@/components/plugin/modal'
+import AppSearchModule from "@/components/module/app-search";
 import { list } from '@/mixins'
 import { mapGetters } from "vuex"
 import { getStaffList, delStaff, getRoleList, addRole, updateRole, delRole, getLogList } from '@/api/staff'
@@ -141,7 +150,8 @@ export default {
 		TimeAxis,
 		TimeaxisItem,
 		AppWrapperEmpty,
-		ModalModule
+		ModalModule,
+		AppSearchModule
 	},
 	mixins: [list],
 	data() {
@@ -187,25 +197,6 @@ export default {
 	onLoad: function() {
 	},
 	methods: {
-		getPCAddress(){
-			let self = this;
-			uni.showModal({
-				title: "PC端后台网址",
-				content: "https://shop.wixhb.com/",
-				cancelText: "取消",
-				confirmText: "复制",
-				success: function (res) {
-					if (res.confirm) {
-						uni.setClipboardData({
-							data: "https://shop.wixhb.com/",
-							success: function() {
-								self.$msg("已复制")
-							}
-						});
-					}
-				},
-			})
-		},
 		async init() {
 			this._list()
 		},
@@ -295,11 +286,31 @@ export default {
 	.app-content {
 		min-height: calc(100vh - 200px);
 		padding-top: 100upx;
-		padding-bottom: 100upx;
+		padding-bottom: 20upx;
 	}
+.app-tabs {
+    position: fixed;
+    width: 100%;
+    z-index: 9;
+  }
+  .input-wrap_box {
+    background-color: #fff;
+    position: fixed;
+    top: 0;
+    z-index: 10;
+    width: 100%;
+    height: 100upx;
+    display: flex;
+    align-items: center;
+    padding: 0 30upx;
+    & > view:nth-child(1) {
+      flex: 1;
+    }
+  }
 	// 列表公共
 	.list-wrap {
 		background-color: #fff;
+		margin-top:60upx;
 		.list {
 			@include disFlex(center, flex-start);
 			margin: 0 30upx;

+ 18 - 14
ghsApp/src/mixins/product.js

@@ -145,29 +145,34 @@ export default {
 				uni.setStorageSync('selectList'+this.pageType, this.selectList)
 			}
 		},
-		//清除记忆花材
-		removeMemory(customId){
+		//清除记忆花材
+		removeMemory(customId=0){
 			let that = this
 			uni.showModal({
 				title: '提示',
 				content: '确认清除花材?',
 				success: function (res) {
 					if (res.confirm) {
-
-						if(customId){
-							uni.removeStorageSync('selectList'+that.pageType+'_custom_'+customId);
-							//删除小菊的记忆
-							uni.removeStorageSync("xj"+customId)
-						}else{
-							uni.removeStorageSync('selectList'+that.pageType);
-						}
-						that.resetSelectInfoByType(that.pageType);
-						that.$msg('已清除')
-
+						that.removeMemoryDirect(customId)
 					}
 				}
 			});
 		},
+		//直接清除记忆花材不提示
+		removeMemoryDirect(customId=0){
+			let that = this
+			if(customId!=0){
+				uni.removeStorageSync('selectList'+that.pageType+'_custom_'+customId);
+				//删除小菊的记忆
+				uni.removeStorageSync("xj"+customId)
+			}else{
+				console.log(983)
+				uni.removeStorageSync('selectList'+that.pageType);
+			}
+			console.log('selectList'+that.pageType)
+			that.resetSelectInfoByType(that.pageType);
+			that.$msg('已清除')
+		},
 		//请求商品数据
 		async initData(extendInfo) {
 			try {
@@ -321,7 +326,6 @@ export default {
 				if (element.id == item.id && element.classId == item.classId) {
 					has = true;
 					if(this.checkStock){
-						console.log(1109988)
 						if (element.bigCount < item.bigNum) {
 							if(this.isSmallCount){
 								list[index] = { ...element, smallCount: ++element.smallCount };

+ 8 - 51
ghsApp/src/pages.json

@@ -1,7 +1,6 @@
 {
 	"pages": [
 		{"path": "admin/home/workbench","style": {"navigationBarTitleText": "","enablePullDownRefresh": true}},
-		{"path": "admin/home/pda","style": {"navigationBarTitleText": "开单","enablePullDownRefresh": false}},
 		{"path": "admin/home/result","style": {"navigationBarTitleText": "","enablePullDownRefresh": true}},
 		{"path": "admin/home/callback","style": {"navigationBarTitleText": "","enablePullDownRefresh": true}},
 		{"path": "admin/home/console","style": {"navigationBarTitleText": ""}},
@@ -206,61 +205,19 @@
 		{
 			"root": "admin/billing",
 			"pages": [
-				{
-					"path": "index",
-					"style": {
-						"navigationBarTitleText": "开单"
-					}
-				},
-				{
-					"path": "customerPlace",
-					"style": {
-						"navigationBarTitleText": "开单"
-					}
-				},
-
-				{
-					"path": "result",
-					"style": {
-						"navigationBarTitleText": "开单结果"
-					}
-				},
-				{
-					"path": "affirm",
-					"style": {
-						"navigationBarTitleText": "确认下单"
-					}
-				},
-				{
-					"path": "customerAffirm",
-					"style": {
-						"navigationBarTitleText": "确认下单"
-					}
-				},
-				{
-					"path": "confirm",
-					"style": {
-						"navigationBarTitleText": "待确认"
-					}
-				}
+				{ "path": "index", "style": { "navigationBarTitleText": "开单" } },
+				{ "path": "customerPlace", "style": { "navigationBarTitleText": "开单" } },
+				{ "path": "result", "style": { "navigationBarTitleText": "开单结果" } },
+				{ "path": "affirm", "style": { "navigationBarTitleText": "确认下单" } },
+				{ "path": "customerAffirm", "style": { "navigationBarTitleText": "确认下单" } },
+				{ "path": "confirm", "style": { "navigationBarTitleText": "待确认" } }
 			]
 		},
 		{
 			"root": "pagesStorehouse/shop/",
 			"pages": [
-				{
-					"path": "list",
-					"style": {
-						"navigationBarTitleText": "门店管理",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "update",
-					"style": {
-						"navigationBarTitleText": "门店编辑"
-					}
-				}
+				{ "path": "list", "style": { "navigationBarTitleText": "门店管理", "enablePullDownRefresh": true } },
+				{ "path": "update", "style": { "navigationBarTitleText": "门店编辑" } }
 			]
 		},
 		{

+ 3 - 3
ghsApp/src/pagesOrder/select.vue

@@ -64,14 +64,14 @@
 									:smallCount="
 										getSelectItemById(productItem.id, classItem.classId).smallCount
 									"
-									@customNum="customNum"
+									@showAddModel="showAddModel"
 									@add="addEvent"
 									@del="delEvent"
 								></Commondity>
 							</view>
 							<!-- <Commondity
 							:type="COMMODITY_TYPE.CHANGE"
-							@customNum="customNum"
+							@showAddModel="showAddModel"
 						></Commondity> -->
 						</template>
 					</view>
@@ -170,7 +170,7 @@ export default {
 
 	methods: {
 		//自定义数量
-		customNum(info) {
+		showAddModel(info) {
 			this.isModel = true;
 			this.customData = info;
 		},

+ 3 - 3
ghsApp/src/pagesPurchase/add.vue

@@ -8,7 +8,7 @@
 				<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/ptItem/itemList' })">添加花材</button>
 			</view>
 			<view style="padding:0 0rpx 0 20upx;" >
-				<button class="admin-button-com middle blue" @click="removeMemory()">清除采购</button>
+				<button class="admin-button-com middle blue" @click="removeMemory(0)">清除采购</button>
 			</view>
 		</view>
 
@@ -46,7 +46,7 @@
 								:bigCount=" getSelectItemById(productItem.id, classItem.classId).bigCount"
 								:smallCount="getSelectItemById(productItem.id, classItem.classId).smallCount"
 								:itemPrice="getSelectItemById(productItem.id, classItem.classId).itemPrice"
-								@customNum="customNum"
+								@showAddModel="showAddModel"
 								@add="addEvent"
 								@setInfoBeforeShowModel="groupInfoBeforeShowModel"
 								@del="delAllEvent"
@@ -173,7 +173,7 @@ export default {
 			this.isWeightActive=false;
 		},
 		//自定义数量
-		customNum(info) {
+		showAddModel(info) {
 			this.isModel = true;
 			this.customData = info;
 			this.isFocus = false;

+ 1 - 1
ghsApp/src/pagesPurchase/details.vue

@@ -335,7 +335,7 @@ export default {
 				const res = await createPurchaseOrderApi({...formData,modifyPrice:this.modifyPrice,cgModel:this.myShopInfo.cgModel});
 				uni.setStorageSync('flowersItemInfo', itemInfo);
 				
-				this.removeMemory()
+				this.removeMemoryDirect()
 
 				uni.reLaunch({url:'/pagesPurchase/components/pageSuccess?orderSn='+res.data.orderSn})
 			} catch (error) {}

+ 9 - 48
ghsApp/src/pagesStorehouse/allot/addExDetails.vue

@@ -13,9 +13,9 @@
 									:isShowMore="false"
 									:selectItemId.sync="form.inShopId"
 									@selectSussess="selectSussess"
-                  :typeTime="typeTimeShow"
-                  :placeholder="shopPlaceholder"
-                  :isShowTit="isShowTit"
+									:typeTime="typeTimeShow"
+									:placeholder="shopPlaceholder"
+									:isShowTit="isShowTit"
 								></DorpdownSelect>
 							</view>
 						</TuiListCell>
@@ -72,21 +72,18 @@
 				</block>
 				<view class="btn-bar">
 					<button class="admin-button-com big blue" @click="gotoSelectPage">选择花材</button>
-					<button v-if="!$util.isEmpty(selectList)" class="admin-button-com big blue" @click="removeSelectProduct" style="margin-left:30upx;">删除已选</button>
+					<button v-if="!$util.isEmpty(selectList)" class="admin-button-com big blue" @click="removeMemory(0)" style="margin-left:30upx;">清空花材</button>
 				</view>
 			</view>
 		</view>
 		<view class="bar-view" v-if="!$util.isEmpty(selectList)">
 			<view class="btn-view">
-				<!-- <button class="admin-button-com middle" @click="confirmStockOutOrder">保存</button> -->
 				<button class="admin-button-com middle" @click="createStockOutOrder" style="padding-left:30upx;padding-right:30rpx">出库</button>
 			</view>
 		</view>
 	</view>
 </template>
 <script>
-import { getMainProfile } from "@/api/statistics";
-
 import TuiListCell from "@/components/plugin/list-cell";
 import productMins from "@/mixins/product";
 import AppDatePicker from "@/components/app-date-picker";
@@ -138,30 +135,13 @@ export default {
 		console.log('拿到选择商品列表', this.selectList);
 	},
 	onLoad(){
-		// this.form.inShopId = this.getLoginInfo.shopId;
 	},
 	methods: {
 		...mapActions(["resetSelectInfoByType"]),
-		/**
-			* 清楚页面选中的商品列表  姜枫 2021.03.27
-			* */
-		clearSelectList(){
-			this.resetSelectInfoByType(this.pageType)
-		},
 		async init() {
-			// this.form.inShopId = this.userInfo.id;
-
 		},
 		gotoSelectPage() {
-			uni.navigateTo({
-				url: `/pagesStorehouse/allot/exSelect`,
-				success: result => {},
-				fail: () => {},
-				complete: () => {}
-			});
-		},
-		removeSelectProduct(){
-			this.removeMemory()
+			uni.navigateTo({ url: `/pagesStorehouse/allot/exSelect`, success: result => {}, fail: () => {}, complete: () => {} })
 		},
 		selectSussess(val) {
 			if(this.getLoginInfo.shopId == val.selectItem.id) {
@@ -177,13 +157,7 @@ export default {
 		},
 		createStockOutOrder() {
 			try {
-				let rules = [
-					{
-						name: "inShopId",
-						rule: ["required"],
-						msg: ["请选择门店"]
-					}
-				];
+				let rules = [ { name: "inShopId", rule: ["required"], msg: ["请选择门店"] } ];
 				let formData = this.form;
 				const itemInfo = this.selectList.map(ele => {
 					return {
@@ -216,13 +190,7 @@ export default {
 		},
 		confirmStockOutOrder() {
 			try {
-				let rules = [
-					{
-						name: "inShopId",
-						rule: ["required"],
-						msg: ["请选择门店"]
-					}
-				];
+				let rules = [ { name: "inShopId", rule: ["required"], msg: ["请选择门店"] } ];
 				let formData = this.form;
 				const itemInfo = this.selectList.map(ele => {
 					return {
@@ -247,8 +215,8 @@ export default {
 		},
 		async confirmStockOut(formData){
 			let { data } = await createStockOutOrderApi(formData);
-			this.$msg("确认成功");
-			this.removeMemory()
+			this.$msg("确认成功")
+			this.removeMemoryDirect()
 			this.pageTo({url:'/pagesStorehouse/allot/exDetails?orderSn=' + data.orderSn, type: 2});
 		},
 	}
@@ -272,7 +240,6 @@ export default {
 			}
 		}
 		.ex-info {
-			// padding: 0 30upx;
 			.module-com {
 				background-color: #fff;
 				margin-bottom: 20upx;
@@ -291,12 +258,6 @@ export default {
 						height: 240upx;
 					}
 				}
-				// .tui-placeholder,
-				// .tui-input {
-				// 	padding-right: 30upx;
-				// 	width: 100%;
-				// 	text-align: right;
-				// }
 			}
 		}
 		.ex-table {

+ 4 - 8
ghsApp/src/pagesStorehouse/allot/exSelect.vue

@@ -36,13 +36,9 @@
 							<Commondity v-if="classItem.isActive"
 								:key="productIndex"
 								:info="productItem"
-								:bigCount="
-									getSelectItemById(productItem.id, classItem.classId).bigCount
-								"
-								:smallCount="
-									getSelectItemById(productItem.id, classItem.classId).smallCount
-								"
-								@customNum="customNum"
+								:bigCount="getSelectItemById(productItem.id, classItem.classId).bigCount"
+								:smallCount="getSelectItemById(productItem.id, classItem.classId).smallCount"
+								@showAddModel="showAddModel"
 								@add="addEvent"
 								@setInfoBeforeShowModel="groupInfoBeforeShowModel"
 								@del="delEvent"
@@ -156,7 +152,7 @@ export default {
 	},
 	methods: {
 		//自定义数量
-		customNum(info) {
+		showAddModel(info) {
 			this.isModel = true;
 			this.customData = info;
 			this.$nextTick(()=>{

+ 0 - 3
ghsApp/src/pagesStorehouse/components/CommodityStock.vue

@@ -78,9 +78,6 @@ export default {
 				this.$util.pageTo({url: "/pagesStorehouse/stockWarn/detailed?id="+itemId})
 			}
 		},
-		customNum() {
-			this.$emit("customNum");
-		},
 		addEvent() {
 			this.$emit("add");
 		},

+ 14 - 66
ghsApp/src/pagesStorehouse/inventory/select.vue

@@ -1,18 +1,9 @@
 <template>
 	<view class="billing_box_bg">
 		<view class="input-wrap">
-			<app-search-module
-				v-model="py"
-				placeholder="请输入关键词,支持拼音首字母搜索"
-				@input="searchFn"
-			/>
+			<app-search-module v-model="py" placeholder="请输入关键词,支持拼音首字母搜索" @input="searchFn" />
 		</view>
-<!--		<app-tabs-->
-<!--			:tabs="tabs"-->
-<!--			:currentTab="tabIndex"-->
-<!--			@change="change"-->
-<!--			itemWidth="50%"-->
-<!--		/>-->
+
 		<view class="scroll-middle_bx">
 			<scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop">
 				<div v-for="(item, index) in filterProductInfo" :key="index" class="tab-bar-item" :class="[classIndex == index ? 'active' : '']" :data-current="index" @tap.stop="swichClass(index)" >
@@ -27,10 +18,8 @@
 					</text>
 				</div>
 				<view style="height: 120rpx"></view>
-				<!-- <view class="switchover-unit" @tap="isSmallCount = !isSmallCount">{{isSmallCount?'支':'扎'}}</view> -->
 			</scroll-view>
 
-<!--			<scroll-view scroll-y class="right-box" v-if="tabIndex == 0" :scroll-into-view="scrollClassId">-->
 				<scroll-view scroll-y class="right-box" v-if="tabIndex == 0" :scroll-into-view="scroll_into_view" scroll-with-animation="true"
 																	@scroll="scroll_detail"
 																	lower-threshold="100"
@@ -47,13 +36,9 @@
 								:offPrice="true"
 								:key="productIndex"
 								:info="productItem"
-								:bigCount="
-									getSelectItemById(productItem.id, classItem.classId).bigCount
-								"
-								:smallCount="
-									getSelectItemById(productItem.id, classItem.classId).smallCount
-								"
-								@customNum="customNum"
+								:bigCount="getSelectItemById(productItem.id, classItem.classId).bigCount"
+								:smallCount="getSelectItemById(productItem.id, classItem.classId).smallCount"
+								@showAddModel="showAddModel"
 								@add="addEvent"
 								@setInfoBeforeShowModel="groupInfoBeforeShowModel"
 								@del="delEvent"
@@ -62,62 +47,31 @@
 						</template>
 					</view>
 				</block>
-				<block v-else>
-					<app-wrapper-empty
-						title="暂无数据"
-						:is-empty="$util.isEmpty(filterProductInfo)"
-					/>
-				</block>
+				<block v-else> <app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(filterProductInfo)" /> </block>
 				<!--内容部分 end -->
 			</scroll-view>
 			<block v-else>
-				<view style="width:100%">
-					<AppWrapperEmpty title="敬请期待" :is-empty="true" />
-				</view>
+				<view style="width:100%"><AppWrapperEmpty title="敬请期待" :is-empty="true" /></view>
 			</block>
 		</view>
-		<!-- :maskClosable="false" -->
-		<modal-module
-			:show="isModel"
-			@cancel="modalCancel"
-			@click="affirm"
-			:title="customData.itemName"
-			color="#333"
-			:size="32"
-			padding="30rpx 30rpx"
-		>
+
+		<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"> 库存{{ customData.stock }} </view>
 					<view class="num_bx">
-						<!--<allMoreSelectInput-->
-							<!--:isActive="isActive" :isFocus="isFocus" :value="customData.bigCount"-->
-							<!--:isActiveOne="isActiveOne" :isFocusOne="isFocusOne" :valueOne="customData.smallCount"-->
-							<!--@deleteInputVal="deleteInputVal" @initAllInput="initAllInput" @moveAllInput="moveAllInput"-->
-							<!--@deleteInputValOne="deleteInputValOne" @initAllInputOne="initAllInputOne" @moveAllInputOne="moveAllInputOne">-->
-						<!--</allMoreSelectInput>-->
 						<input v-model="customData.bigCount" :focus="isFocus" type="number" />扎
 						<input v-model="customData.smallCount" type="number" style="margin-left:24upx"/>支
 					</view>
 				</view>
 			</template>
 		</modal-module>
-		<modal-module
-			:show="showSubmitModel"
-			@cancel="cancelEvent"
-			@click="submitEvent"
-			:title="confirmContent"
-			color="#333"
-			:size="32"
-			padding="30rpx 30rpx"
-		>
+
+		<modal-module :show="showSubmitModel" @cancel="cancelEvent" @click="submitEvent" :title="confirmContent" color="#333" :size="32" padding="30rpx 30rpx" >
 		</modal-module>
+
 		<FooterCart :offPrice="true" :price="allPrice" :count="allCount" @confirm="confirmSelectEvent"></FooterCart>
-<!--		<FooterCart-->
-<!--			:price="allPrice"-->
-<!--			:count="allCount"-->
-<!--			@confirm="confirmSelectEvent"-->
-<!--		></FooterCart>-->
+
 	</view>
 </template>
 
@@ -150,7 +104,6 @@ export default {
 			checkStock: false,
 			isFocus: false,
 			isSmallCount:false,//是否是小单位(支)
-			checkStock:true,
 			tabIndex: 0,
 			tabs: [
 				{
@@ -187,20 +140,15 @@ export default {
 	},
 	methods: {
 		//自定义数量
-		customNum(info) {
+		showAddModel(info) {
 			this.isModel = true;
 			this.customData = info;
 			this.isFocus = false;
-
 			this.$nextTick(()=>{
 				this.customData.smallCount = 	this.customData.smallCount==0?null:this.customData.smallCount;
 				this.customData.bigCount = 	this.customData.bigCount==0?null:this.customData.bigCount;
 				this.isFocus = true;
 			})
-
-			// this.$nextTick(()=>{
-			// 	this.initAllInput();
-			// })
 		},
 		modalCancel() {
 			this.isModel = false;

+ 5 - 10
ghsApp/src/pagesStorehouse/inventory/update.vue

@@ -82,15 +82,10 @@
 		</view>
 		<view class="bar-view" v-if="selectList.length>0">
 			<view class="btn-view">
-				<button :class="['admin-button-com', 'middle']" @click="gotoSelectPage">
-					修改花材
-				</button>
-				<button v-if="!orderSn" :class="['admin-button-com', 'middle', { disabled: allCount == 0 }]" :disabled="allCount == 0" @click="confirmPop(1)">
-					确认盘点
-				</button>
-				<button v-if="orderSn" :class="['admin-button-com', 'middle', { disabled: allCount == 0 }]" :disabled="allCount == 0" @click="confirmPop(2)">
-					确认盘点
-				</button>
+				<button class="admin-button-com middle" @click="removeMemory(0)" style="margin-left:30upx;">清空花材</button>
+				<button :class="['admin-button-com', 'middle']" @click="gotoSelectPage"> 修改花材 </button>
+				<button v-if="!orderSn" :class="['admin-button-com', 'middle', { disabled: allCount == 0 }]" :disabled="allCount == 0" @click="confirmPop(1)"> 确认盘点 </button>
+				<button v-if="orderSn" :class="['admin-button-com', 'middle', { disabled: allCount == 0 }]" :disabled="allCount == 0" @click="confirmPop(2)"> 确认盘点 </button>
 			</view>
 		</view>
 	</view>
@@ -292,7 +287,7 @@ export default {
 					await updateCheckOrderApi(params)
 				}
 				this.$msg("盘点成功");
-				this.removeMemory()
+				this.removeMemoryDirect()
 				uni.navigateBack({delta: 1});
 			} catch (error) {}
 		},