shish %!s(int64=4) %!d(string=hai) anos
pai
achega
0cee794c66

+ 27 - 14
ghsApp/src/pagesStorehouse/allot/addExDetails.vue

@@ -17,14 +17,7 @@
 						</TuiListCell>
 						<TuiListCell class="line-cell" :hover="false" :arrow="false">
 							<view class="tui-title ">备注</view>
-							<input
-								v-model="form.remark"
-								placeholder-class="phcolor"
-								class="tui-input"
-								placeholder="请输入"
-								maxlength="50"
-								type="text"
-							/>
+							<input v-model="form.remark" placeholder-class="phcolor" class="tui-input" placeholder="请输入" maxlength="50" type="text" />
 						</TuiListCell>
 					</view>
 				</form>
@@ -40,17 +33,17 @@
 						<t-tr v-for="(item, index) in selectList" :key="index">
 							<t-td v-for="(column, colIndex) in columns" :key="colIndex" :align="column.align" :color="column.color">
 								<view v-if="column.custom == 'icon'" class="list-icon">
-									<image class="icon-image" :src="item.cover" alt="商品图" />
+									<image class="icon-image" :src="item.cover" />
 									<view class="icon-info">
 										<view class="info-name">
 											{{ item.itemName }}
 										</view>
-										<view class="info-type"> {{ item.rank }}级 </view>
+										<view class="info-type"></view>
 									</view>
 								</view>
-								<view v-else-if="column.custom == 'excount'">
-									<text v-if="item.bigCount > 0">{{`${item.bigCount}`}}</text>
-									<text v-if="item.smallCount > 0">{{`${item.smallCount}`}}</text>
+								<view v-else-if="column.custom == 'excount'" style="font-size:32upx;color:#333333;">
+									<text v-if="item.bigCount > 0">{{`${item.bigCount}`}}{{item.bigUnit}}</text>
+									<text v-if="item.smallCount > 0">{{`${item.smallCount}`}}{{item.smallUnit}}</text>
 								</view>
 								<view v-else>
 									{{ item[column.dataIndex] || "" }}
@@ -60,8 +53,13 @@
 					</t-table>
 				</block>
 				<view class="btn-bar">
+					<template v-if="isScanEnv">
+						<button class="admin-button-com middle blue">请扫码</button>
+					</template>
+					<template v-else>
 					<button class="admin-button-com middle blue" v-if="!$util.isEmpty(selectList)" @click="gotoSelectPage">修改花材</button>
 					<button class="admin-button-com middle blue" v-else @click="gotoSelectPage">选择花材</button>
+					</template>
 				</view>
 			</view>
 		</view>
@@ -69,6 +67,10 @@
 			<button v-if="!$util.isEmpty(selectList)" class="admin-button-com middle default" @click="removeFromSave()">清空花材</button>
 			<button @click="stockOutFn()" class="admin-button-com middle blue">确认出库</button>
 		</view>
+
+		<view v-if="isScanEnv" @click="changeGet" style="width:125upx;height:125upx;display:flex;justify-content:center;align-items:center;font-size:60upx;
+		background:#3385ff;color:white;z-index:9999;position:fixed;bottom:160upx;right:40upx;border-radius:60upx;">{{calc=='add'?'+':'-'}}</view>
+
 	</view>
 </view>
 </template>
@@ -101,15 +103,26 @@ export default {
 				{ name: "库存", dataIndex: "stock", width: 120, align: "center" }, 
 				{ name: "出库数量", custom: "excount", width: 120, align: "center" }
 			],
-			typeTimeShow: true
+			typeTimeShow: true,
+			isScanEnv:false,
+      		calc:'add'
 		};
 	},
 	onShow() {
 	},
 	onLoad(){
+		// #ifdef APP-PLUS
+		if(this.$util.isScanEnv()){
+			this.isScanEnv = true
+		}
+		// #endif
+		this.listenScanItem()
 	},
 	methods: {
 		...mapActions(["reSetSelectInfo"]),
+		changeGet(){
+			this.calc = this.calc == 'add' ? 'sub' : 'add'
+		},
 		gotoSelectPage() {
 			uni.navigateTo({ url: `/pagesStorehouse/allot/exSelect`, success: result => {}, fail: () => {}, complete: () => {} })
 		},

+ 8 - 34
ghsApp/src/pagesStorehouse/allot/allotEx.vue

@@ -2,45 +2,19 @@
 <view class="app-content">
 	<view class="allot-ex-page">
 		<view class="tabs">
-			<Tabs
-				:tabs="tabs"
-				:currentTab="tabIndex"
-				@change="changeTabEvent"
-				@add="addEvent"
-				:addText="'新增'"
-				:isAdd="false"
-			></Tabs>
+			<Tabs :tabs="tabs" :currentTab="tabIndex" @change="changeTabEvent" @add="addEvent" :addText="'新增'" :isAdd="false" ></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="gotoDetails(item)"
-				>
+				<view class="allot-item" v-for="(item, index) in list.data" :key="index" @click="gotoDetails(item)" >
 					<view class="info">
-            <view class="info-order">{{ item.orderSn }}</view>
-						<view class="info-name">门店:{{ item.inShopName }}</view>
-						<view class="info-name">数量:{{ item.bigNum || "-" }}/{{ item.smallNum || "-" }}</view>
-            <view class="info-name">时间:{{ item.updateTime }}</view>
+						<view class="info-order">{{ item.orderSn }}</view>
+							<view class="info-name">门店:{{ item.inShopName }}</view>
+							<view class="info-name">数量:<text v-if="Number(item.bigNum)>0">{{ item.bigNum }}扎</text><text v-if="Number(item.smallNum)>0">{{ item.smallNum }}支</text></view>
+						<view class="info-name">时间:{{ item.updateTime?item.updateTime.substr(5,11):'' }}</view>
 					</view>
-					<view
-						:class="[
-							'status',
-							item.status == OUT_STATUS.DONE
-								? 'primary'
-								: item.status == OUT_STATUS.CONFIRM
-								? 'warn'
-								: 'gray'
-						]"
-					>
-						<view
-							:class="[
-								'iconfont',
-								item.status == OUT_STATUS.CANCEL ? 'iconcaozuojihuo' : 'icondairuku'
-							]"
-						></view>
+					<view :class="[ 'status', item.status == OUT_STATUS.DONE ? 'primary' : item.status == OUT_STATUS.CONFIRM ? 'warn' : 'gray' ]" >
+						<view :class="[ 'iconfont', item.status == OUT_STATUS.CANCEL ? 'iconcaozuojihuo' : 'icondairuku' ]" ></view>
 						<view :class="['status-name']">{{ item.statusName }}</view>
 					</view>
 				</view>

+ 10 - 23
ghsApp/src/pagesStorehouse/allot/exDetails.vue

@@ -9,7 +9,7 @@
 				</view>
 				<view class="info-cell">
 					<view class="cell-label"> 日期</view>
-					<view class="cell-value"> {{ outData.updateTime || "" }}</view>
+					<view class="cell-value"> {{ outData.updateTime?outData.updateTime.substr(5,11):'' }}</view>
 				</view>
 				<view class="info-cell">
 					<view class="cell-label"> 制单人</view>
@@ -17,8 +17,7 @@
 				</view>
 				<view class="info-cell">
 					<view class="cell-label"> 状态</view>
-					<view :class="[ 'cell-value', { warning: outData.status == OUT_STATUS.CONFIRM }, { success: outData.status == OUT_STATUS.DONE } ]" >
-						{{ getItemStatusName(outData.status) || "" }}</view>
+					<view :class="['cell-value',{warning:outData.status == OUT_STATUS.CONFIRM},{success:outData.status == OUT_STATUS.DONE}]">{{getItemStatusName(outData.status) || ""}}</view>
 				</view>
 				<view class="info-cell">
 					<view class="cell-label"> 备注</view>
@@ -36,32 +35,23 @@
 							</t-th>
 						</t-tr>
 						<t-tr v-for="(item, index) in outData.itemInfo" :key="index">
-							<t-td
-								v-for="(column, colIndex) in columns"
-								:key="colIndex"
-								:align="column.align"
-								:color="column.color"
-							>
+							<t-td v-for="(column, colIndex) in columns" :key="colIndex" :align="column.align" :color="column.color" >
 								<view v-if="column.custom == 'icon'" class="list-icon">
-									<image class="icon-image" :src="item.itemCover" alt="商品图" />
+									<image class="icon-image" :src="item.itemCover" />
 									<view class="icon-info">
 										<view class="info-name">
 											{{ item.itemName }}
 										</view>
-										<view class="info-type"> {{ item.rank }}级 </view>
+										<view class="info-type"></view>
 									</view>
 								</view>
 								<view v-else-if="column.custom == 'stock'">
-									<text > {{ item.bigNumStock }}/ </text>
-									<text>
-										{{ item.smallNumStock }}
-									</text>
+									<text v-if="Number(item.bigNumStock)>0"> {{ item.bigNumStock }}扎</text>
+									<text v-if="Number(item.smallNumStock)>0">{{ item.smallNumStock }}支</text>
 								</view>
 								<view v-else-if="column.custom == 'put'">
-									<text > {{ item.bigNum }}/ </text>
-									<text>
-										{{ item.smallNum }}
-									</text>
+									<text v-if="Number(item.bigNum)>0"> {{ item.bigNum }}扎</text>
+									<text v-if="Number(item.smallNum)>0">{{ item.smallNum }}支</text>
 								</view>
 								<view v-else>
 									{{ item[column.dataIndex] || "" }}
@@ -71,10 +61,7 @@
 					</t-table>
 				</block>
 				<block v-else>
-					<AppWrapperEmpty
-						title="暂无数据"
-						:is-empty="$util.isEmpty(outData.itemInfo)"
-					/>
+					<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(outData.itemInfo)" />
 				</block>
 			</view>
 		</view>