shish %!s(int64=4) %!d(string=hai) anos
pai
achega
57da0ed248

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

@@ -1,7 +1,7 @@
 <template>
 <view class="product">
 	<view class="item-cmd_bx" >
-		<view class="img_bx">
+		<view class="img_bx" @click="pageTo({url: '/admin/item/detail',query: {id: info.id}})">
 			<view v-if="info.status == 2" class="sold-out">
 				<view class="sold-out-xj">已下架</view>
 			</view>
@@ -20,10 +20,10 @@
 			</view>
 		</view>
 	</view>
-	<text class="bottom-button" @click.stop="doPrintLabel(info.id)">打标签</text>
+	<text class="bottom-button" @click.stop="moreToDo(info)">更多</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>
+	<text class="bottom-button" @click.stop="doPrintLabel(info.id)">打标签</text>
 </view>
 </template>
 <script>
@@ -101,7 +101,7 @@ export default {
 		left: 0upx;
 		top: 0upx;
 		.sold-out{
-			z-index:99999;
+			z-index:10;
 			width:160upx;
 			height:160upx;
 			background-color:black;

+ 35 - 8
ghsApp/src/admin/item/detail.vue

@@ -134,10 +134,24 @@
 
     </form>
 
-    <uni-popup ref="inputDialog" type="dialog">
+    <!--<uni-popup ref="inputDialog" type="dialog">
 			<uni-popup-dialog ref="inputClose"  mode="input" title="标签数量" value=""
 				placeholder="请输入标签数量" @confirm="dialogPrintLabelConfirm"></uni-popup-dialog>
-		</uni-popup>
+		</uni-popup>-->
+
+		<modal-module :show="printLabelShow" @click="dialogInputConfirm" :maskClosable="true" title="打印数量" padding="30rpx 30rpx" >
+		<template v-slot:content>
+			<div class="app-modal-input-wrap">
+			<div class="inp-list-line">
+				<div class="line-input">
+				<input type="number" style="width:200upx;text-align:center;" :focus="printFocus" v-model="printNum" :adjust-position="false" class="inp-input" />
+				</div>
+			</div>
+			</div>
+		</template>
+		</modal-module>
+
+
   </view>
 </template>
 
@@ -151,11 +165,13 @@ import { getPtItemDetail } from "@/api/pt-item";
 import { mapGetters } from "vuex"
 //图片上传插件来源:https://ext.dcloud.net.cn/plugin?id=2922 已改造,不能再升级 shish 20211228
 import htzImageUpload from './components/htz-image-upload/htz-image-upload.vue'
+import ModalModule from "@/components/plugin/modal"
 export default {
   name: "item-detail",
   components: {
     TuiListCell,
-    htzImageUpload
+    htzImageUpload,
+    ModalModule
   },
   data() {
     return {
@@ -192,7 +208,10 @@ export default {
       productData:{id:0},
       headers:{token:''},
       cost:0,
-      printItemId:0
+      printItemId:0,
+      printNum:'',
+      printLabelShow:false,
+      printFocus:false
     };
   },
 	computed:{
@@ -219,13 +238,21 @@ export default {
   methods: {
     doPrintLabel(id){
 			this.printItemId = id
-			this.$refs.inputDialog.open()
+      this.printLabelShow = true
+      this.printFocus = true
+			//this.$refs.inputDialog.open()
 		},
-		dialogPrintLabelConfirm(count) {
+		dialogInputConfirm(val) {
 			let that=this;
-			this.$refs.inputDialog.close()
+      console.log(val)
+			if (val.index == 0) {
+				this.printLabelShow = false
+        this.printFocus = false
+				return
+			}
+			//this.$refs.inputDialog.close()
 
-			let currentNum = Number(count)
+			let currentNum = Number(this.printNum)
 			let itemId = this.printItemId
 			if (currentNum <= 0) {
 				that.$msg('打印数量不能小于等于0')

+ 33 - 8
ghsApp/src/admin/item/list.vue

@@ -45,11 +45,24 @@
 			</view>
 		</view>
 
-		<!-- 输入框示例 -->
-		<uni-popup ref="inputDialog" type="dialog" style="position:absolute; z-index: 999999;">
+		<!--<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>
+		</uni-popup>-->
+
+		<modal-module :show="printLabelShow" @click="dialogInputConfirm" :maskClosable="true" title="打印数量" padding="30rpx 30rpx" >
+		<template v-slot:content>
+			<div class="app-modal-input-wrap">
+			<div class="inp-list-line">
+				<div class="line-input">
+				<input type="number" style="width:200upx;text-align:center;" :focus="printFocus" v-model="printNum" :adjust-position="false" class="inp-input" />
+				</div>
+			</div>
+			</div>
+		</template>
+		</modal-module>
+
+
 	</view>
 </template>
 <script>
@@ -62,13 +75,15 @@ import { getWeixinId } from "@/api/invite/index";
 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'
+import ModalModule from "@/components/plugin/modal"
 export default {
 	name: "item_list",
 	components: {
 		AppSearchModule,
 		AppWrapperEmpty,
 		ItemStock,
-		uniPopup
+		uniPopup,
+		ModalModule
 	},
 	mixins: [productMins],
 	data() {
@@ -80,6 +95,9 @@ export default {
 			status:0,
 			delStatus:0,
 			printItemId:0,
+			printLabelShow:false,
+			printNum:'',
+			printFocus:false
 		};
 	},
 	computed:{
@@ -104,13 +122,20 @@ export default {
 	methods: {
 		doPrintLabel(id){
 			this.printItemId = id
-			this.$refs.inputDialog.open()
+			//this.$refs.inputDialog.open()
+			this.printLabelShow = true
+			this.printFocus = true
 		},
-		dialogInputConfirm(count) {
+		dialogInputConfirm(val) {
 			let that=this;
-			this.$refs.inputDialog.close()
+			if (val.index == 0) {
+				this.printLabelShow = false
+				this.printFocus = true
+				return
+			} 
+			//this.$refs.inputDialog.close()
 
-			let currentNum = Number(count)
+			let currentNum = Number(this.printNum)
 			let itemId = this.printItemId
 			if (currentNum <= 0) {
 				that.$msg('打印数量不能小于等于0')