Просмотр исходного кода

Merge branch 'szq-tag' into szq-fixBug

shizhongqi 4 лет назад
Родитель
Сommit
7943fca670

+ 6 - 1
ghsApp/src/admin/billing/affirm.vue

@@ -45,6 +45,9 @@
               <view class="operate-view" v-else @click="gobackEvent"><text class="iconfont icongouwuche"></text>重选花材</view>
               <view class="describe-view">共{{ selectList.length }}种,合计 ¥<text class="price">{{ allPrice }}</text></view>
             </view>
+            <view class="summary-bar">
+              <view class="operate-view" v-if="isScanEnv" @click="pageToItemList()"> <text class="iconfont iconzeng"></text>手动添加花材 </view>
+            </view>
           </view>
         </view>
 
@@ -289,7 +292,6 @@ export default {
 	  //#endif
 
     this.listenScanItem()
-
   },
 	onShow(){
 		if(!this.$util.isEmpty(uni.getStorageSync("newClient"))){
@@ -454,6 +456,9 @@ export default {
     },
     gobackEvent () {
       this.$util.pageTo({url: '/admin/billing/index',type:2,query: {customId: this.option.customId}})
+    },
+    pageToItemList() {
+      this.$util.pageTo({url: '/admin/billing/index',type:2,query: {customId: this.option.customId}})
     }
   }
 };

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

@@ -20,7 +20,7 @@
 			</view>
 		</view>
 	</view>
-	<text class="bottom-button" @click.stop="goToOrderDetail(info.id)">销售记录</text>
+	<text class="bottom-button" @click.stop="doPrintLabel(info.id)">打标签</text>
 	<text class="bottom-button" @click.stop="goToStockDetail(info.id)">库存明细</text>
 	<text class="bottom-button" @click.stop="goToProduct(info.id)">分享</text>
 	<text class="bottom-button" @click.stop="moreToDo(info)">更多</text>
@@ -54,8 +54,8 @@ export default {
 		moreToDo(item){
 			this.$emit('moreToDo', item)
 		},
-		goToOrderDetail(id){
-			this.$util.pageTo({url: "/admin/order/itemOrder?id="+id})
+		doPrintLabel(item){
+			this.$emit('doPrintLabel', item)
 		},
 		goToStockDetail(id){
 			this.$util.pageTo({url: "/pagesStorehouse/stockWarn/detailed?id="+id})

+ 31 - 16
ghsApp/src/admin/item/detail.vue

@@ -86,7 +86,7 @@
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">库存预警值</view>
           <input v-model="form.stockWarning" style="width:300upx;" @focus="form.stockWarning=''" placeholder-class="phcolor" class="tui-input" name="stockWarning" placeholder="请填写" maxlength="50" type="number" />
-          <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="printLabel(productData)">打标签</button>
+          <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">
@@ -133,6 +133,11 @@
       </view>
 
     </form>
+
+    <uni-popup ref="inputDialog" type="dialog">
+			<uni-popup-dialog ref="inputClose"  mode="input" title="标签数量" value=""
+				placeholder="请输入标签数量" @confirm="dialogPrintLabelConfirm"></uni-popup-dialog>
+		</uni-popup>
   </view>
 </template>
 
@@ -186,7 +191,8 @@ export default {
       hasRequest:0,
       productData:{id:0},
       headers:{token:''},
-      cost:0
+      cost:0,
+      printItemId:0
     };
   },
 	computed:{
@@ -211,23 +217,32 @@ export default {
   watch:{
   },
   methods: {
-    printLabel(item){
+    doPrintLabel(id){
+			this.printItemId = id
+			this.$refs.inputDialog.open()
+		},
+		dialogPrintLabelConfirm(count) {
 			let that=this;
-			let doList = ['打1个标签', '打2个标签','打5个标签', '打10个标签','打100个标签','打500个标签']
-			let doNum = [1,2,5,10,100,500]
-			uni.showActionSheet({
-				itemList: doList,
-				success: function (respond) {
-          let index = respond.tapIndex
-          let currentNum = Number(doNum[index])
-          print({id:item.id,num:currentNum}).then(res=>{
-            if(res.code == 1){
-              that.$msg(res.msg)
-            }
-          })
+			this.$refs.inputDialog.close()
+
+			let currentNum = Number(count)
+			let itemId = this.printItemId
+			if (currentNum <= 0) {
+				that.$msg('打印数量不能小于等于0')
+				return
+			}
+			if (itemId == 0) {
+				that.$msg('打印的花材id出错')
+				return
+			}
+			print({id:itemId,num:currentNum}).then(res=>{
+				if(res.code == 1){
+					that.$msg(res.msg)
+				} else if(res.code == 0){
+					that.$msg(res.msg)
 				}
 			})
-    },
+		},
     notModify(){
       this.$msg('不可修改')
     },

+ 83 - 45
ghsApp/src/admin/item/list.vue

@@ -1,52 +1,56 @@
 <template>
   <view class="app-content" style="background:white;">
-	<view class="billing_box_bg">
-    <view class="input-wrap">
-			<view class="search-bar">
-				<app-search-module v-model="py" placeholder="小菊输xj搜索" @input="searchFn"/>
+		<view class="billing_box_bg">
+			<view class="input-wrap">
+				<view class="search-bar">
+					<app-search-module v-model="py" placeholder="小菊输xj搜索" @input="searchFn"/>
+				</view>
+				<view style="padding:0 0upx 0 20upx;" >
+					<button class="admin-button-com middle blue" style="margin-right:8upx;" @click="downPriceTable()">价格表</button>
+					<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/ptItem/itemList' })">添花材</button>
+				</view>
 			</view>
-			<view style="padding:0 0upx 0 20upx;" >
-				<button class="admin-button-com middle blue" style="margin-right:8upx;" @click="downPriceTable()">价格表</button>
-				<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/ptItem/itemList' })">添花材</button>
-			</view>
-		</view>
-		<view class="scroll-middle_bx">
-			<scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop">
-				<div v-for="(item, index) in globalClassItemList" :key="index" class="tab-bar-item" :class="[classIndex == index ? 'active' : '']" :data-current="index" @tap.stop="swichClass(index)">
-					<text>{{ item.className || "" }}</text>
-				</div>
-			</scroll-view>
-				<scroll-view scroll-y class="right-box" :scroll-into-view="scroll_into_view" scroll-with-animation="true"
-																	@scroll="scroll_detail"
-																	lower-threshold="100"
-																	@scrolltolower="scroll_bottom">
-				<!--内容部分-->
-				<block v-if="!$util.isEmpty(globalClassItemList)">
-					<view class="item_list_bx selectAll" v-for="(classItem, classIndex) in globalClassItemList" :key="classIndex" :id="`class_${classIndex}`">
-						<view class="item_list_title"> {{ classItem.className }}</view>
-						<view v-if="classItem.child && !$util.isEmpty(classItem.child)">
-							<template v-for="(productItem, productIndex) in classItem.child">
-								<view style="height:240upx" :id="`class_${classIndex}`" :key="productIndex">
-									<ItemStock v-if="classItem.isActive" :isPrice="false" :info="productItem" @goToProduct="goToProduct" @moreToDo="moreToDo" ></ItemStock>
+			<view class="scroll-middle_bx">
+				<scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop">
+					<div v-for="(item, index) in globalClassItemList" :key="index" class="tab-bar-item" :class="[classIndex == index ? 'active' : '']" :data-current="index" @tap.stop="swichClass(index)">
+						<text>{{ item.className || "" }}</text>
+					</div>
+				</scroll-view>
+					<scroll-view scroll-y class="right-box" :scroll-into-view="scroll_into_view" scroll-with-animation="true"
+							@scroll="scroll_detail" lower-threshold="100" @scrolltolower="scroll_bottom">
+					<!--内容部分-->
+					<block v-if="!$util.isEmpty(globalClassItemList)">
+						<view class="item_list_bx selectAll" v-for="(classItem, classIndex) in globalClassItemList" :key="classIndex" :id="`class_${classIndex}`">
+							<view class="item_list_title"> {{ classItem.className }}</view>
+							<view v-if="classItem.child && !$util.isEmpty(classItem.child)">
+								<template v-for="(productItem, productIndex) in classItem.child">
+									<view style="height:240upx" :id="`class_${classIndex}`" :key="productIndex">
+										<ItemStock v-if="classItem.isActive" :isPrice="false" :info="productItem" @goToProduct="goToProduct" @moreToDo="moreToDo" @doPrintLabel="doPrintLabel" ></ItemStock>
+									</view>
+								</template>
+							</view>
+							<view v-else>
+								<view style="height:260upx;text-align:center;color:#CCCCCC;position: relative;">
+									<view style="position: absolute;margin:auto;top:130upx;left:0;right:0;bottom:0;">暂无花材</view>
 								</view>
-							</template>
-						</view>
-						<view v-else>
-							<view style="height:260upx;text-align:center;color:#CCCCCC;position: relative;">
-								<view style="position: absolute;margin:auto;top:130upx;left:0;right:0;bottom:0;">暂无花材</view>
 							</view>
 						</view>
-					</view>
-				</block>
-				<block v-else>
-					<view style="width:100%">
-						<app-wrapper-empty  title="暂无花材" :is-empty="$util.isEmpty(globalClassItemList)" />
-					</view>
-				</block>
-			</scroll-view>
+					</block>
+					<block v-else>
+						<view style="width:100%">
+							<app-wrapper-empty  title="暂无花材" :is-empty="$util.isEmpty(globalClassItemList)" />
+						</view>
+					</block>
+				</scroll-view>
+			</view>
 		</view>
+
+		<!-- 输入框示例 -->
+		<uni-popup ref="inputDialog" type="dialog" style="position:absolute; z-index: 999999;">
+			<uni-popup-dialog ref="inputClose"  mode="input" title="标签数量" value=""
+				placeholder="请输入标签数量" @confirm="dialogInputConfirm"></uni-popup-dialog>
+		</uni-popup>
 	</view>
- </view>
 </template>
 <script>
 import AppSearchModule from "@/components/module/app-search";
@@ -55,14 +59,16 @@ import ItemStock from "./components/ItemStock";
 import productMins from "@/mixins/product";
 import { mapGetters } from "vuex";
 import { getWeixinId } from "@/api/invite/index";
-import { generatePriceTable,generateBarcodeTable,print } from '@/api/product'
+import { generatePriceTable,generateBarcodeTable,print } from '@/api/product';
+import uniPopup from '@/uni_modules/uni-popup/components/uni-popup/uni-popup.vue';
 import { CURRENT_ENV } from '@/config'
 export default {
 	name: "item_list",
 	components: {
 		AppSearchModule,
 		AppWrapperEmpty,
-		ItemStock
+		ItemStock,
+		uniPopup
 	},
 	mixins: [productMins],
 	data() {
@@ -72,7 +78,8 @@ export default {
 			tabIndex: 0,
 			getAppIdList:{},
 			status:0,
-			delStatus:0
+			delStatus:0,
+			printItemId:0,
 		};
 	},
 	computed:{
@@ -95,9 +102,38 @@ export default {
 		})
 	},
 	methods: {
+		doPrintLabel(id){
+			this.printItemId = id
+			this.$refs.inputDialog.open()
+		},
+		dialogInputConfirm(count) {
+			let that=this;
+			this.$refs.inputDialog.close()
+
+			let currentNum = Number(count)
+			let itemId = this.printItemId
+			if (currentNum <= 0) {
+				that.$msg('打印数量不能小于等于0')
+				return
+			}
+			if (itemId == 0) {
+				that.$msg('打印的花材id出错')
+				return
+			}
+			print({id:itemId,num:currentNum}).then(res=>{
+				if(res.code == 1){
+					that.$msg(res.msg)
+				} else if(res.code == 0){
+					that.$msg(res.msg)
+				}
+			})
+		},
+		testFunc() {
+				console.log(1111)
+		},
 		moreToDo(item){
 			let that=this;
-			let doList = ['复制花材', '打1个标签', '打2个标签', '打10个标签','打100个标签','打500个标签']
+			let doList = ['复制花材', '销售记录']
 			let doNum = [0,1,2,10,100,500]
 			uni.showActionSheet({
 				itemList: doList,
@@ -105,6 +141,8 @@ export default {
 					let index = respond.tapIndex
 					if (index == 0) {
 						that.pageTo({url: '/admin/item/copy',query: {id: item.id}})
+					} else if (index == 1) {
+						that.pageTo({url: "/admin/order/itemOrder?id="+item.id})
 					}else{
 						let currentNum = Number(doNum[index])
 						print({id:item.id,num:currentNum}).then(res=>{