shish 3 年之前
父节点
当前提交
5ba335fddf

+ 4 - 47
hdApp/src/admin/billing/goods.vue

@@ -9,7 +9,6 @@
 			<app-search-module v-model="py" placeholder="请输入关键词,支持拼音首字母搜索" @input="suitSearchFn" />
 		</view>
 		<view class="scroll-middle_bx">
-			<!--商品-->
 			<scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop" v-show="tabIndex == 0">
 				<div v-for="(item, index) in suitFilterProductInfo" :key="index" class="tab-bar-item" :class="[suitClassIndex == index ? 'active' : '']" :data-current="index" @tap.stop="suitSwichClass(index)">
 					<text>{{ item.className || "" }}</text>
@@ -20,7 +19,6 @@
 					</text>
 				</div>
 			</scroll-view>
-
 				<scroll-view scroll-y class="right-box" v-show="tabIndex == 0" :scroll-into-view="suit_scroll_into_view" scroll-with-animation="true"
 																	@scroll="suit_scroll_detail"
 																	lower-threshold="100"
@@ -39,19 +37,13 @@
 									@del="delGoodsEvent"
 								></GoodsCommondity>
 							</view>
-							<!-- <Commondity
-							:type="COMMODITY_TYPE.CHANGE"
-							@customNum="customNum"
-						></Commondity> -->
 						</template>
 					</view>
 				</block>
 				<block v-else>
 					<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(filterProductInfo)" />
 				</block>
-				<!--内容部分 end -->
 			</scroll-view>
-			<!--花材-->
 			<scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop" v-show="tabIndex == 1">
 				<div v-for="(item, index) in filterProductInfo" :key="index" class="tab-bar-item" :class="[classIndex == index ? 'active' : '']" :data-current="index" @tap.stop="swichClass(index)">
 					<text>{{ item.className || "" }}</text>
@@ -64,14 +56,11 @@
 					</text>
 				</div>
 				<view style="height: 120upx"></view>
-				<!-- <view class="switchover-unit" @tap="isSmallCount = !isSmallCount">{{isSmallCount?'支':'扎'}}</view> -->
 			</scroll-view>
-<!--			<scroll-view scroll-y class="right-box" v-if="tabIndex == 1" :scroll-into-view="scrollClassId">-->
 				<scroll-view scroll-y class="right-box" v-show="tabIndex == 1" :scroll-into-view="scroll_into_view" scroll-with-animation="true"
 																	@scroll="scroll_detail"
 																	lower-threshold="100"
 																	@scrolltolower="scroll_bottom">
-				<!--内容部分 start -->
 				<block v-if="!$util.isEmpty(filterProductInfo)">
 					<view class="item_list_bx selectAll" v-for="(classItem, classIndex) in filterProductInfo" :key="classIndex" :id="`class_${classIndex}`">
 						<view class="item_list_title">
@@ -82,12 +71,8 @@
 								<Commondity v-if="classItem.isActive"
 																				:offVerifyRepertory = 'true'
 									:info="productItem"
-									:bigCount="
-										getSelectItemById(productItem.id, classItem.classId).bigCount
-									"
-									:smallCount="
-										getSelectItemById(productItem.id, classItem.classId).smallCount
-									"
+									:bigCount="getSelectItemById(productItem.id, classItem.classId).bigCount"
+									:smallCount="getSelectItemById(productItem.id, classItem.classId).smallCount"
 									@customNum="customNum"
 									@add="addEvent"
 									@addOneEvent="addCustomNumEvent"
@@ -95,23 +80,13 @@
 									@showBigCover="showBigCover"
 								></Commondity>
 							</view>
-							<!-- <Commondity
-							:type="COMMODITY_TYPE.CHANGE"
-							@customNum="customNum"
-						></Commondity> -->
 						</template>
 					</view>
 				</block>
 				<block v-else>
-					<app-wrapper-empty
-						title="暂无数据"
-						:is-empty="$util.isEmpty(filterProductInfo)"
-					/>
+					<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(filterProductInfo)" />
 				</block>
-				<!--内容部分 end -->
 			</scroll-view>
-
-			<!-- 课程 -->
 			<scroll-view scroll-y scroll-with-animation v-show="tabIndex == 2" class="PxClass-box">
 				<block v-if="!$util.isEmpty(pxClassInfo)">
 					<PxClassCommondity  :info="pxClassInfo"></PxClassCommondity>
@@ -121,40 +96,22 @@
 				</block>
 			</scroll-view>
 		</view>
-		<!-- :maskClosable="false" -->
 		<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 :price="allGoodsPrice" :count="allGoodsCount" @confirm="confirmSelectGoodsEvent" v-if="tabIndex == 0"></FooterCart>-->
 		<FooterCart :price="allGoodsPrice" :countNumber="allGoodsCount" @confirm="confirmSelectGoodsEvent" v-if="tabIndex == 0"></FooterCart>
 		<FooterCart :price="allPrice" :count="allCount" @confirm="confirmSelectEvent" v-if="tabIndex == 1"></FooterCart>
-
    		<sel-popup :show="popupShow" :info="infoData" @close="hidePopup" />
-
 	</view>
 </template>
 

+ 14 - 1
hdApp/src/admin/goods/add.vue

@@ -2,19 +2,23 @@
   <view class="app-content">
     <form @submit="commitForm">
       <view class="module-com input-line-wrap">
+
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title required">名称</view>
           <input v-model="form.name" placeholder-class="phcolor" class="tui-input" name="name" placeholder="请输入" maxlength="50" type="text" />
         </tui-list-cell>
+
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title required">价格</view>
           <input v-model="form.price" placeholder-class="phcolor" class="tui-input" name="price" placeholder="请输入" maxlength="50" type="digit" />
         </tui-list-cell>
+
         <tui-list-cell class="line-cell" :hover="true" :arrow="true">
           <view class="tui-title required">种类</view>
           <view v-if="!$util.isEmpty(form.kindName)" style="width:480upx" @click.stop="changeKind()">{{form.kindName}}</view>
           <view v-else style="color:#CCCCCC;width:480upx" @click.stop="changeKind()">请选择</view>
         </tui-list-cell>
+
         <tui-list-cell class="line-cell category-wrap" :hover="false">
           <view class="tui-title">商城分类</view>
           <view class="tui-input">
@@ -24,14 +28,22 @@
             </block>
           </view>
         </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">库存</view>
+          <input v-model="form.stock" placeholder-class="phcolor" @focus="form.stock=''" class="tui-input" name="stock" placeholder="留空表示库存充足" maxlength="50" type="number" />
+        </tui-list-cell>
+
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">主花支数</view>
           <input v-model="form.flowerNum" placeholder-class="phcolor" class="tui-input" name="flowerNum" placeholder="用于判断花束大小" maxlength="50" type="number" />
         </tui-list-cell>
+
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">顺序</view>
           <input v-model="form.inTurn" placeholder-class="phcolor" @focus="form.inTurn=''" class="tui-input" name="inTurn" placeholder="值越大越靠前" maxlength="50" type="number" />
         </tui-list-cell>
+
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">节日涨价</view>
           <label for="autoPrice" class="tui-input" @click="autoRiseChange(form.autoRise)">
@@ -136,7 +148,8 @@ export default {
         setItemNum:0,
         kindId:0,
         kindName:'',
-        inTurn:0
+        inTurn:0,
+        stock:0
       },
       categoryData:[],
       currentImgData:[]

+ 10 - 6
hdApp/src/admin/goods/detail.vue

@@ -29,12 +29,9 @@
         </tui-list-cell>
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">库存</view>
-          <view style="color:#CCCCCC;">{{goodsInfo.stock?goodsInfo.stock:0}}</view>
-        </tui-list-cell>
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">顺序</view>
-          <input v-model="form.inTurn" placeholder-class="phcolor" @focus="form.inTurn=''" class="tui-input" name="inTurn" placeholder="值越大越靠前" maxlength="50" type="number" />
+          <input v-model="form.stock" placeholder-class="phcolor" @focus="form.stock=''" class="tui-input" name="stock" placeholder="留空表示库存充足" maxlength="50" type="number" />
         </tui-list-cell>
+
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">节日涨价</view>
           <label for="autoPrice" class="tui-input" @click="autoRiseChange(form.autoRise)">
@@ -75,6 +72,12 @@
           <view class="tui-title">主花支数</view>
           <input v-model="form.flowerNum" @focus="form.flowerNum=''" placeholder-class="phcolor" class="tui-input" name="flowerNum" placeholder="支数" maxlength="50" type="number" />
         </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">顺序</view>
+          <input v-model="form.inTurn" placeholder-class="phcolor" @focus="form.inTurn=''" class="tui-input" name="inTurn" placeholder="值越大越靠前" maxlength="50" type="number" />
+        </tui-list-cell>
+
       </view>
 
       <view class="module-com input-line-wrap goods-wrap">
@@ -146,7 +149,8 @@ export default {
         setItemNum:0,
         inTurn:0,
         kindId:0,
-        kindName:''
+        kindName:'',
+        stock:0
       },
       categoryData:[],
       categoryIds:[]

+ 2 - 2
hdApp/src/admin/home/apply.vue

@@ -33,7 +33,8 @@ export default {
             list:[
                 {name: "花材",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/list",pf:1},
                 {name: "花材分类",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/itemClass/list",pf:1},
-                {name: "停用花材",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/list?delStatus=1",pf:1}
+                {name: "停用花材",img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/item/list?delStatus=1",pf:1},
+                { name: "盘点", img: `${this.$constant.imgUrl}/ghs/home/pandian.png`, url: "/pagesStorehouse/inventory/list",pf:1}
             ]
         },
         {
@@ -61,7 +62,6 @@ export default {
             { name: "调拨出库", img: `${this.$constant.imgUrl}/ghs/home/dbck.png`, url: "/pagesStorehouse/allot/allotEx",pf:0},
             { name: "调拨入库", img: `${this.$constant.imgUrl}/ghs/home/dbrk.png`, url: "/pagesStorehouse/allot/allotPut",pf:0},
             { name: "库存预警", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/pagesStorehouse/stockWarn/manage",pf:1},
-            { name: "盘点", img: `${this.$constant.imgUrl}/ghs/home/pandian.png`, url: "/pagesStorehouse/inventory/list",pf:0},
             { name: "员工", img: `${this.$constant.imgUrl}/ghs/home/yggl.png`, url: "/admin/staff/list",pf:0},
             { name: "员工业绩", img: `${this.$constant.imgUrl}/ghs/home/icon_ygyj.png`, url: "/admin/staff/achieve",pf:1},
             { name: "供货商", img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`, url: "/pagesPurchase/order",pf:1},

+ 13 - 53
hdApp/src/pagesStorehouse/inventory/list.vue

@@ -1,44 +1,22 @@
 <template>
 	<view class="allot-ex-page">
 		<view class="tabs">
-			<Tabs
-				:tabs="tabs"
-				:currentTab="tabIndex"
-				@change="changeTabEvent"
-				@add="addEvent"
-				:itemWidth="'33.33%'"
-			></Tabs>
+			<Tabs :tabs="tabs" :currentTab="tabIndex" @change="changeTabEvent" @add="addEvent" :itemWidth="'33.33%'" ></Tabs>
 		</view>
 		<scroll-view scroll-y class="allot-list">
 			<block v-if="!$util.isEmpty(list.data)">
-				<view
-					class="allot-item"
-					v-for="(item, index) in list.data"
-					:key="index"
-					@click="gotoDetailsEvent(item)"
-				>
+				<view class="allot-item" v-for="(item, index) in list.data" :key="index" @click="gotoDetailsEvent(item)" >
 					<view class="info">
 						<view class="info-order">{{ item.orderSn }}</view>
 						<view class="info-name">{{ item.remark }}</view>
 						<view>
 							<text class="info-time">{{ item.updateTime }}</text>
 							<text v-if="item.bigNum >= 0">{{ `${item.bigNum}/` }}</text>
-							<text>{{ item.smallNum }}</text>
-							件
+							<text>{{ item.smallNum }}</text>件
 						</view>
 					</view>
-					<view
-						:class="[
-							'status',
-							item.status == INVENTORY_STATUS.DRAFT ? 'primary' : 'gray'
-						]"
-					>
-						<view
-							:class="[
-								'iconfont',
-								item.status == INVENTORY_STATUS.DONE ? 'iconxuanzhong' : 'iconbianji'
-							]"
-						></view>
+					<view :class="[ 'status', item.status == INVENTORY_STATUS.DRAFT ? 'primary' : 'gray' ]" >
+						<view :class="[ 'iconfont', item.status == INVENTORY_STATUS.DONE ? 'iconxuanzhong' : 'iconbianji' ]" ></view>
 					</view>
 				</view>
 			</block>
@@ -56,10 +34,9 @@ import Tabs from "@/components/plugin/tabs";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import { INVENTORY_STATUS } from "@/utils/declare";
 import { getCheckOrderListApi } from "@/api/inventory/index";
-
 import { list } from "@/mixins";
 export default {
-	name: "panDian",
+	name: "list",
 	components: { Tabs, AppWrapperEmpty },
 	mixins: [list],
 	data() {
@@ -91,15 +68,15 @@ export default {
 	},
 	onPullDownRefresh() {
 		this.resetList();
-		this._list().then(res => {
+		this.getPdList().then(res => {
 			uni.stopPullDownRefresh();
 		});
 	},
 	methods: {
 		async init() {
-			this._list();
+			this.getPdList();
 		},
-		_list() {
+		getPdList() {
 			this.listLoading = true;
 			return getCheckOrderListApi(this.tabs[this.tabIndex].key)
 				.then(res => {
@@ -117,7 +94,7 @@ export default {
 			} else {
 				this.tabIndex = index;
 				this.resetList();
-				this._list();
+				this.getPdList();
 			}
 		},
 		getItemStatusName(status) {
@@ -136,30 +113,13 @@ export default {
 			return name;
 		},
 		addEvent() {
-			this.$msg('开发中')
-			return false
-			uni.navigateTo({
-				url: `/pagesStorehouse/inventory/update`,
-				success: result => {},
-				fail: () => {},
-				complete: () => {}
-			});
+			uni.navigateTo({url:'/pagesStorehouse/inventory/update'})
 		},
 		gotoDetailsEvent(item) {
 			if (item.status == INVENTORY_STATUS.DONE) {
-				uni.navigateTo({
-					url: `/pagesStorehouse/inventory/details?orderSn=${item.orderSn}`,
-					success: result => {},
-					fail: () => {},
-					complete: () => {}
-				});
+				uni.navigateTo({url: `/pagesStorehouse/inventory/details?orderSn=${item.orderSn}`})
 			} else {
-				uni.navigateTo({
-					url: `/pagesStorehouse/inventory/update?orderSn=${item.orderSn}`,
-					success: result => {},
-					fail: () => {},
-					complete: () => {}
-				});
+				uni.navigateTo({url: `/pagesStorehouse/inventory/update?orderSn=${item.orderSn}`})
 			}
 		}
 	}