shish пре 5 година
родитељ
комит
df645231e2
1 измењених фајлова са 4 додато и 51 уклоњено
  1. 4 51
      ghsApp/src/pagesStorehouse/inventory/update.vue

+ 4 - 51
ghsApp/src/pagesStorehouse/inventory/update.vue

@@ -14,7 +14,7 @@
 								v-model="remark"
 								v-model="remark"
 								placeholder-class="phcolor"
 								placeholder-class="phcolor"
 								class="tui-input"
 								class="tui-input"
-								placeholder="请填写"
+								placeholder="选填"
 								maxlength="50"
 								maxlength="50"
 								type="text"
 								type="text"
 							/>
 							/>
@@ -24,39 +24,6 @@
 			</view>
 			</view>
 			<view class="space-view ex-table">
 			<view class="space-view ex-table">
 				<block v-if="!$util.isEmpty(selectList)">
 				<block v-if="!$util.isEmpty(selectList)">
-					<!-- <Tabel
-						:dataList="selectList"
-						:columns="columns"
-						:parentData="{
-							getSelectItemProfitPrice: getSelectItemProfitPrice
-						}"
-					>
-						<template v-slot="{ row, column }">
-							<view v-if="column.custom == 'icon'" class="list-icon">
-								<image class="icon-image" :src="row.cover" alt="商品图" />
-								<view class="icon-info">
-									<view class="info-name">
-										{{ row.itemName }}
-									</view>
-									<view class="info-type">
-										B级
-									</view>
-								</view>
-							</view>
-							<view v-else-if="column.custom == 'stock'">
-								<text v-if="row.bigNum > 0">{{ `${row.bigNum}/` }}</text>
-								<text>{{ row.smallNum }}</text>
-							</view>
-							<view v-else-if="column.custom == 'inventory'">
-								<text v-if="row.bigCount > 0">{{ `${row.bigCount}/` }}</text>
-								<text>{{ row.smallCount }}</text>
-							</view>
-
-							<view v-else-if="column.custom == 'profit'">
-								<text>{{ getSelectItemProfitPrice }}</text>
-							</view>
-						</template>
-					</Tabel> -->
 
 
 					<view class="table-view">
 					<view class="table-view">
 						<view
 						<view
@@ -68,9 +35,7 @@
 									textAlign: item.align || 'left',
 									textAlign: item.align || 'left',
 									fontSzie: `${headerFontSize}rpx`,
 									fontSzie: `${headerFontSize}rpx`,
 									margin: `0 ${gutter}rpx`}">
 									margin: `0 ${gutter}rpx`}">
-								<!-- <slot :name="item.dataIndex" > -->
 								{{ item.name || "" }}
 								{{ item.name || "" }}
-								<!-- </slot> -->
 							</view>
 							</view>
 						</view>
 						</view>
 						<view class="table-tr" v-for="(item, index) in selectList" :key="index">
 						<view class="table-tr" v-for="(item, index) in selectList" :key="index">
@@ -79,8 +44,6 @@
 									textAlign: column.align || 'left',
 									textAlign: column.align || 'left',
 									fontSzie: `${fontSize}rpx`,
 									fontSzie: `${fontSize}rpx`,
 									margin: `0 ${gutter}rpx`}">
 									margin: `0 ${gutter}rpx`}">
-								<!-- {{ item[column.dataIndex] || "" }} -->
-
 								<view v-if="column.custom == 'icon'" class="list-icon">
 								<view v-if="column.custom == 'icon'" class="list-icon">
 									<image class="icon-image" :src="item.cover" alt="商品图" />
 									<image class="icon-image" :src="item.cover" alt="商品图" />
 									<view class="icon-info">
 									<view class="icon-info">
@@ -101,10 +64,7 @@
 								</view>
 								</view>
 
 
 								<view v-else-if="column.custom == 'profit'">
 								<view v-else-if="column.custom == 'profit'">
-									<!--<text v-if="item.bigNumProfitLoss">{{ item.bigNumProfitLoss?item.bigNumProfitLoss:0.00 }}/{{item.smallNumProfitLoss?item.smallNumProfitLoss:0.00}}</text>-->
-									<!--<text v-else>{{ getSelectItemProfitPrice(item) }}</text>-->
 									<text>{{ getSelectItemProfitPrice(item) }}</text>
 									<text>{{ getSelectItemProfitPrice(item) }}</text>
-
 								</view>
 								</view>
 								<text v-else :class="[column.color || '']">
 								<text v-else :class="[column.color || '']">
 									{{ (column.dataIndex && item[column.dataIndex]) || "" }}
 									{{ (column.dataIndex && item[column.dataIndex]) || "" }}
@@ -115,9 +75,7 @@
 				</block>
 				</block>
 				<template v-if="selectList.length == 0">
 				<template v-if="selectList.length == 0">
 					<view class="empty-view">
 					<view class="empty-view">
-						<button class="admin-button-com blue big" @click="gotoSelectPage">
-							开始盘点
-						</button>
+						<button class="admin-button-com blue big" @click="gotoSelectPage">选择花材</button>
 					</view>
 					</view>
 				</template>
 				</template>
 			</view>
 			</view>
@@ -127,9 +85,6 @@
 				<button :class="['admin-button-com', 'middle']" @click="gotoSelectPage">
 				<button :class="['admin-button-com', 'middle']" @click="gotoSelectPage">
 					修改花材
 					修改花材
 				</button>
 				</button>
-				<button :class="['admin-button-com','middle',{ disabled: allCount == 0 }]" :disabled="allCount == 0" @click="saveToDraft">
-					保存草稿
-				</button>
 				<button v-if="!orderSn" :class="['admin-button-com', 'middle', { disabled: allCount == 0 }]" :disabled="allCount == 0" @click="confirmPop(1)">
 				<button v-if="!orderSn" :class="['admin-button-com', 'middle', { disabled: allCount == 0 }]" :disabled="allCount == 0" @click="confirmPop(1)">
 					确认盘点
 					确认盘点
 				</button>
 				</button>
@@ -337,10 +292,8 @@ export default {
 					await updateCheckOrderApi(params)
 					await updateCheckOrderApi(params)
 				}
 				}
 				this.$msg("盘点成功");
 				this.$msg("盘点成功");
-				this.resetSelectInfoByType(this.pageType);
-				uni.navigateBack({
-					delta: 1
-				});
+				this.removeMemory()
+				uni.navigateBack({delta: 1});
 			} catch (error) {}
 			} catch (error) {}
 		},
 		},
 	}
 	}