shish il y a 3 ans
Parent
commit
453481c1bf

+ 2 - 2
ghsApp/src/admin/item/add.vue

@@ -241,8 +241,8 @@ export default {
     notModify(){
     notModify(){
       this.$msg('不可修改')
       this.$msg('不可修改')
     },
     },
-    goStockDetail(id){
-				this.$util.pageTo({url: "/pagesStorehouse/stockWarn/detailed?id="+id})
+    goStockDetail(item){
+				this.$util.pageTo({url: "/pagesStorehouse/stockWarn/detailed?id="+item.id+'&name='+item.name})
 		},
 		},
     varietyChange(e){
     varietyChange(e){
       this.form.variety = e.detail.value ? 1 : 0;
       this.form.variety = e.detail.value ? 1 : 0;

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

@@ -29,7 +29,7 @@
 		</view>
 		</view>
 	</view>
 	</view>
 	<text class="bottom-button" @click.stop="moreAction(info)">更多</text>
 	<text class="bottom-button" @click.stop="moreAction(info)">更多</text>
-	<text class="bottom-button" @click.stop="goToStockDetail(info.id)">库存明细</text>
+	<text class="bottom-button" @click.stop="goToStockDetail(info)">库存明细</text>
 	<text class="bottom-button" @click.stop="breakSingleItem(info)">拆 1 {{info.bigUnit}}</text>
 	<text class="bottom-button" @click.stop="breakSingleItem(info)">拆 1 {{info.bigUnit}}</text>
 	<text class="bottom-button" @click.stop="doPrintLabel(info.id)">打标签</text>
 	<text class="bottom-button" @click.stop="doPrintLabel(info.id)">打标签</text>
 </view>
 </view>
@@ -55,8 +55,8 @@ export default {
 		doPrintLabel(item){
 		doPrintLabel(item){
 			this.$emit('doPrintLabel', item)
 			this.$emit('doPrintLabel', item)
 		},
 		},
-		goToStockDetail(id){
-			this.$util.pageTo({url: "/pagesStorehouse/stockWarn/detailed?id="+id})
+		goToStockDetail(item){
+			this.$util.pageTo({url: "/pagesStorehouse/stockWarn/detailed?id="+item.id+'&name='+item.name})
 		},
 		},
 		breakSingleItem(item) {
 		breakSingleItem(item) {
 			this.$emit('breakSingleItem', item)
 			this.$emit('breakSingleItem', item)

+ 3 - 3
ghsApp/src/admin/item/copy.vue

@@ -32,7 +32,7 @@
         <tui-list-cell class="line-cell" :hover="false">
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">库存</view>
           <view class="tui-title">库存</view>
           <input v-model="form.stock" style="width:260upx;" placeholder-class="phcolor" @focus="form.stock=''" @input="changeStock($event)" class="tui-input" name="stock" placeholder="请输入" type="digit"/>
           <input v-model="form.stock" style="width:260upx;" placeholder-class="phcolor" @focus="form.stock=''" @input="changeStock($event)" class="tui-input" name="stock" placeholder="请输入" type="digit"/>
-          <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="goStockDetail(productData.id)">库存变动记录</button>
+          <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="goStockDetail(productData)">库存变动记录</button>
         </tui-list-cell>
         </tui-list-cell>
 
 
         <tui-list-cell class="line-cell" :arrow="true">
         <tui-list-cell class="line-cell" :arrow="true">
@@ -240,8 +240,8 @@ export default {
     notModify(){
     notModify(){
       this.$msg('不可修改')
       this.$msg('不可修改')
     },
     },
-    goStockDetail(id){
-				this.$util.pageTo({url: "/pagesStorehouse/stockWarn/detailed?id="+id})
+    goStockDetail(item){
+				this.$util.pageTo({url: "/pagesStorehouse/stockWarn/detailed?id="+item.id+'&name='+item.name})
 		},
 		},
     varietyChange(e){
     varietyChange(e){
       this.form.variety = e.detail.value ? 1 : 0;
       this.form.variety = e.detail.value ? 1 : 0;

+ 3 - 3
ghsApp/src/admin/item/detail.vue

@@ -32,7 +32,7 @@
         <tui-list-cell class="line-cell" :hover="false">
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">库存</view>
           <view class="tui-title">库存</view>
           <input v-model="form.stock" style="width:260upx;" placeholder-class="phcolor" @focus="form.stock=''" @input="changeStock($event)" class="tui-input" name="stock" placeholder="请输入" type="digit"/>
           <input v-model="form.stock" style="width:260upx;" placeholder-class="phcolor" @focus="form.stock=''" @input="changeStock($event)" class="tui-input" name="stock" placeholder="请输入" type="digit"/>
-          <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="goStockDetail(productData.id)">库存变动记录</button>
+          <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="goStockDetail(productData)">库存变动记录</button>
         </tui-list-cell>
         </tui-list-cell>
 
 
         <tui-list-cell class="line-cell" :arrow="true">
         <tui-list-cell class="line-cell" :arrow="true">
@@ -329,8 +329,8 @@ export default {
     notModify(){
     notModify(){
       this.$msg('不可修改')
       this.$msg('不可修改')
     },
     },
-    goStockDetail(id){
-				this.$util.pageTo({url: "/pagesStorehouse/stockWarn/detailed?id="+id})
+    goStockDetail(item){
+				this.$util.pageTo({url: "/pagesStorehouse/stockWarn/detailed?id="+item.id+'&name='+item.name})
 		},
 		},
     varietyChange(e){
     varietyChange(e){
       this.form.variety = e.detail.value ? 1 : 0;
       this.form.variety = e.detail.value ? 1 : 0;

+ 7 - 7
ghsApp/src/pagesStorehouse/inventory/details.vue

@@ -32,29 +32,29 @@
 				<t-tr v-for="(item, index) in dataInfo.itemInfo || []" :key="index">
 				<t-tr v-for="(item, index) in dataInfo.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" style="width:245upx;"  @click.stop="goToStockDetail(item.id)">
+					<view v-if="column.custom == 'icon'" class="list-icon" style="width:245upx;"  @click.stop="goToStockDetail(item)">
 						<image class="icon-image" :src="item.itemCover" />
 						<image class="icon-image" :src="item.itemCover" />
 						<view class="icon-info">
 						<view class="icon-info">
 							<view class="info-name"> {{ item.itemName }} </view>
 							<view class="info-name"> {{ item.itemName }} </view>
 							<view class="info-type"></view>
 							<view class="info-type"></view>
 						</view>
 						</view>
 					</view>
 					</view>
-					<view v-else-if="column.custom == 'stock'" @click.stop="goToStockDetail(item.id)" 
+					<view v-else-if="column.custom == 'stock'" @click.stop="goToStockDetail(item)" 
 					:class="[ item.bigNumProfitLoss == 0 ? 'normal-show' : 'error-show']">
 					:class="[ item.bigNumProfitLoss == 0 ? 'normal-show' : 'error-show']">
 						<text>{{ item.bigNumStock }}扎</text>
 						<text>{{ item.bigNumStock }}扎</text>
 						<text v-if="Number(item.smallNumStock)>0">{{ item.smallNumStock }}支</text>
 						<text v-if="Number(item.smallNumStock)>0">{{ item.smallNumStock }}支</text>
 					</view>
 					</view>
-					<view v-else-if="column.custom == 'inventory'" @click.stop="goToStockDetail(item.id)" 
+					<view v-else-if="column.custom == 'inventory'" @click.stop="goToStockDetail(item)" 
 					:class="[ item.bigNumProfitLoss == 0 ? 'normal-show' : 'error-show']">
 					:class="[ item.bigNumProfitLoss == 0 ? 'normal-show' : 'error-show']">
 						<text>{{ item.bigNum }}扎</text>
 						<text>{{ item.bigNum }}扎</text>
 						<text v-if="Number(item.smallNum)>0">{{ item.smallNum }}支</text>
 						<text v-if="Number(item.smallNum)>0">{{ item.smallNum }}支</text>
 					</view>
 					</view>
-					<view v-else-if="column.custom == 'profit'" @click.stop="goToStockDetail(item.id)" 
+					<view v-else-if="column.custom == 'profit'" @click.stop="goToStockDetail(item)" 
 					:class="[ item.bigNumProfitLoss == 0 ? 'normal-show' : 'error-show']">
 					:class="[ item.bigNumProfitLoss == 0 ? 'normal-show' : 'error-show']">
 						<text>{{ item.bigNumProfitLoss }}扎</text>
 						<text>{{ item.bigNumProfitLoss }}扎</text>
 						<text v-if="Number(item.smallNumProfitLoss)>0">{{ item.smallNumProfitLoss }}支</text>
 						<text v-if="Number(item.smallNumProfitLoss)>0">{{ item.smallNumProfitLoss }}支</text>
 					</view>
 					</view>
-					<view v-else @click.stop="goToStockDetail(item.id)" style="color: #333333;">{{ item[column.dataIndex] || "" }}</view>
+					<view v-else @click.stop="goToStockDetail(item)" style="color: #333333;">{{ item[column.dataIndex] || "" }}</view>
 				</t-td>
 				</t-td>
 
 
 				</t-tr>
 				</t-tr>
@@ -158,8 +158,8 @@ export default {
 		}
 		}
 	},
 	},
 	methods: {
 	methods: {
-		goToStockDetail(id){
-			this.$util.pageTo({url: "/pagesStorehouse/stockWarn/detailed?id="+id})
+		goToStockDetail(item){
+			this.$util.pageTo({url: "/pagesStorehouse/stockWarn/detailed?id="+item.id+'&name='+item.itemName})
 		},
 		},
 		async initData() {
 		async initData() {
 			try {
 			try {

+ 9 - 32
ghsApp/src/pagesStorehouse/stockWarn/detailed.vue

@@ -65,34 +65,6 @@ export default {
 			selectTimeId:'',
 			selectTimeId:'',
 			shopId:'',
 			shopId:'',
 			itemId:'',
 			itemId:'',
-			selectListData: [
-				{
-					title: "时间",
-					key: "time",
-					default: "1",
-					data: [
-						{
-							name: "下午",
-							value: "1"
-						}
-					]
-				},
-				{
-					title: "全部",
-					key: "shopId",
-					default: "01",
-					data: [
-						{
-							name: "瑞景店",
-							value: "01"
-						},
-						{
-							name: "加州店",
-							value: "02"
-						}
-					]
-				}
-			],
 			nowTime: "",
 			nowTime: "",
 			showTimeDropdown: false,
 			showTimeDropdown: false,
 			nowShop: "",
 			nowShop: "",
@@ -109,7 +81,7 @@ export default {
 	},
 	},
 	onPullDownRefresh() {
 	onPullDownRefresh() {
 		this.resetList();
 		this.resetList();
-		this._list().then(res => {
+		this.getStockList().then(res => {
 			uni.stopPullDownRefresh();
 			uni.stopPullDownRefresh();
 		});
 		});
 	},
 	},
@@ -125,10 +97,15 @@ export default {
 			this.menuTimeObj = {title:'今天',titleChild:'时间',list: dateDefaultOption}
 			this.menuTimeObj = {title:'今天',titleChild:'时间',list: dateDefaultOption}
 		}
 		}
 		this.shopId = this.getLoginInfo.shopId;
 		this.shopId = this.getLoginInfo.shopId;
+
+		if(this.option.name){
+			uni.setNavigationBarTitle({ title: this.option.name })
+		}
+
 	},
 	},
 	onReachBottom() {
 	onReachBottom() {
 		if (!this.list.finished) {
 		if (!this.list.finished) {
-			this._list().then((res) => {
+			this.getStockList().then((res) => {
 				uni.stopPullDownRefresh();
 				uni.stopPullDownRefresh();
 			});
 			});
 		} else {
 		} else {
@@ -138,9 +115,9 @@ export default {
 	methods: {
 	methods: {
 		...mapActions(['setUserShopAll']),
 		...mapActions(['setUserShopAll']),
 		async init() {
 		async init() {
-			this._list();
+			this.getStockList();
 		},
 		},
-		_list() {
+		getStockList() {
 			return getStockDetailApi({...this.params,page: this.list.page,}).then(res => {
 			return getStockDetailApi({...this.params,page: this.list.page,}).then(res => {
 				this.completes(res);
 				this.completes(res);
 			});
 			});