From 923c8d5baa419e24b5804ddae603f906e09678d3 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Fri, 6 Jan 2023 15:05:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=AE=A1=E7=90=86=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                         |  6 ++
 pages/WarehouseManage/CheckDtl.vue | 66 +++++++++++++-------
 pages/WarehouseManage/Details.vue  | 98 ++++++++++++++++++++++++++++++
 utils/getData1.js                  | 25 +++++++-
 vuex/modules/user.js               |  2 +-
 5 files changed, 174 insertions(+), 23 deletions(-)
 create mode 100644 pages/WarehouseManage/Details.vue

diff --git a/pages.json b/pages.json
index 58e5c2d..a550ed3 100644
--- a/pages.json
+++ b/pages.json
@@ -176,6 +176,12 @@
 		    	"navigationStyle": "custom"
 		    }   
 		}
+		,{
+		    "path" : "pages/WarehouseManage/Details",
+		    "style": {
+		    	"navigationStyle": "custom"
+		    }   
+		}
     ,{
             "path" : "pages/ProductManage/EmptyPipeOutStore",
             "style" :                                                                                    
diff --git a/pages/WarehouseManage/CheckDtl.vue b/pages/WarehouseManage/CheckDtl.vue
index 13bedd1..b1a3536 100644
--- a/pages/WarehouseManage/CheckDtl.vue
+++ b/pages/WarehouseManage/CheckDtl.vue
@@ -7,36 +7,38 @@
 					<table>
 						<thead>
 							<tr>
-								<th>单据号</th>
+								<th>选择</th>
+								<th>箱号</th>
 								<th>状态</th>
-								<th>数量</th>
-								<th>盘点数量</th>
+								<!-- <th>数量</th>
+								<th>盘点数量</th> -->
 								<th>盘点库区</th>
 								<th>盘点货位</th>
-								<th>箱号</th>
 								<th>物料编码</th>
 								<th>物料名称</th>
-								<th>单位</th>
+								<th>备注</th>
 								<th>盘点结果</th>
 								<th>盘点人</th>
 								<th>盘点时间</th>
+								<th>单据号</th>
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="(el, i) in dataList" :key="i">
-								<td>{{el.check_code}}</td>
+							<tr v-for="(el, i) in dataList" :key="i" :class="{'checked': el.checked}">
+								<td><span class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}" @tap="toCheck(e)">&#xe66b;</span></td>
+								<td @tap="toXq(el.storagevehicle_code)"><a>{{el.storagevehicle_code}}</a></td>
 								<td>{{el.status}}</td>
-								<td>{{el.base_qty}}</td>
-								<td><input type="number" class="sin_input" :min="0" v-model="el.fac_qty" @blur="e => {if (e.target.value === '') {el.fac_qty=0}}" v-enter-number></td>
+								<!-- <td>{{el.base_qty}}</td>
+								<td><input type="number" class="sin_input" :min="0" v-model="el.fac_qty" @blur="e => {if (e.target.value === '') {el.fac_qty=0}}" v-enter-number></td> -->
 								<td>{{el.sect_name}}</td>
 								<td>{{el.struct_name}}</td>
-								<td>{{el.storagevehicle_code}}</td>
 								<td>{{el.material_code}}</td>
 								<td>{{el.material_name}}</td>
-								<td>{{el.qty_unit_name}}</td>
+								<td><input type="text" class="sin_input" v-model="el.remark"></td>
 								<td>{{el.check_result}}</td>
 								<td>{{el.check_optname}}</td>
 								<td>{{el.check_time}}</td>
+								<td>{{el.check_code}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -44,15 +46,17 @@
 			</view>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !dataList.length}" :disabled="disabled1" @tap="_saveCheck">保存</button>
-			<button class="submit-button" :class="{'btn-disabled': !dataList.length}" :disabled="disabled1" @tap="_confirmCheck">确认</button>
+			<!-- <button class="submit-button" :class="{'btn-disabled': !dataList.length}" :disabled="disabled1" @tap="_saveCheck">保存</button> -->
+			<!-- <button class="submit-button" :class="{'btn-disabled': !dataList.length}" :disabled="disabled1" @tap="_confirmCheck">确认</button> -->
+			<button class="submit-button" :class="{'btn-disabled': !dataList.length}" :disabled="disabled1" @tap="_checkexception">异常</button>
+			<button class="submit-button" :class="{'btn-disabled': !dataList.length}" :disabled="disabled1" @tap="_checknormal">正常</button>
 		</view>
 	</view>
 </template>
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
-	import {checkQueryDtl, saveCheck, confirmCheck} from '@/utils/getData1.js'
+	import {checkQueryDtl, checkexception, checknormal} from '@/utils/getData1.js'
 	export default {
 		components: {
 			NavBar,
@@ -62,6 +66,7 @@
 				value: '1',
 				checkCode: '',
 				dataList: [],
+				checkArr: [],
 				disabled1: false
 			};
 		},
@@ -80,16 +85,29 @@
 			handleChange (e) {
 				// console.log(e)
 			},
+			toXq (code) {
+				uni.navigateTo({
+					url: '/pages/WarehouseManage/Details?storagevehicle_code=' + code
+				})
+			},
+			toCheck (e) {
+				e.checked = !e.checked
+				this.checkArr = this.dataList.filter(i => { return i.checked === true })
+			},
 			/** 初始化查询 */
 			async _checkQueryDtl () {
 				let res = await checkQueryDtl(this.checkCode)
+				res.data.map(el => {
+					this.$set(el, 'checked', false)
+				})
 				this.dataList = [...res.data]
 			},
-			async _saveCheck () {
+			async _checkexception () {
 				this.disabled1 = true
 				try {
-					let res = await saveCheck(this.dataList, this.checkCode)
+					let res = await checkexception(this.dataList, this.checkCode)
 					this.disabled1 = false
+					this.checkArr = []
 					this._checkQueryDtl()
 					uni.showToast({
 						title: res.message,
@@ -99,11 +117,12 @@
 					this.disabled1 = false
 				}
 			},
-			async _confirmCheck () {
+			async _checknormal () {
 				this.disabled1 = true
 				try {
-					let res = await confirmCheck(this.dataList, this.checkCode)
+					let res = await checknormal(this.dataList, this.checkCode)
 					this.disabled1 = false
+					this.checkArr = []
 					this._checkQueryDtl()
 					uni.showToast({
 						title: res.message,
@@ -120,8 +139,13 @@
 <style lang="stylus">
 	.zd_content
 		padding-bottom 77rpx
-	.slide_new table td:nth-child(1), .slide_new table th:nth-child(1)
+	// .slide_new table td:nth-child(1), .slide_new table th:nth-child(1)
+	// 	box-shadow 1px 0 2px rgba(0,0,0,.12)
+	.slide_new table td:first-child, .slide_new table th:first-child
+		width 92rpx
+	.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
+		position sticky
+		left 89rpx
+		z-index 102
 		box-shadow 1px 0 2px rgba(0,0,0,.12)
-	.bgyellow td
-		background-color #E9B451
 </style>
diff --git a/pages/WarehouseManage/Details.vue b/pages/WarehouseManage/Details.vue
new file mode 100644
index 0000000..f54fe6c
--- /dev/null
+++ b/pages/WarehouseManage/Details.vue
@@ -0,0 +1,98 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :inner2="true" @goIn="goIn" title="详情信息"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>子卷号</th>
+								<th>sap批次</th>
+								<th>净重</th>
+								<th>状态</th>
+								<th>订单号</th>
+								<th>客户编码</th>
+								<th>客户名称</th>
+								<th>幅宽</th>
+								<th>厚度</th>
+								<th>长度</th>
+								<th>客户要求幅宽</th>
+								<th>物料标准厚度</th>
+								<th>保质期</th>
+								<th>制造完成日期</th>
+								<th>入库日期</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(el, i) in dataList" :key="i">
+								<td>{{el.container_name}}</td>
+								<td>{{el.sap_pcsn}}</td>
+								<td>{{el.net_weight}}</td>
+								<td>{{el.status}}</td>
+								<td>{{el.sale_order_name}}</td>
+								<td>{{el.customer_name}}</td>
+								<td>{{el.customer_description}}</td>
+								<td>{{el.width}}</td>
+								<td>{{el.thickness}}</td>
+								<td>{{el.length}}</td>
+								<td>{{el.width_standard}}</td>
+								<td>{{el.thickness_request}}</td>
+								<td>{{el.quality_guaran_period}}</td>
+								<td>{{el.date_of_production}}</td>
+								<td>{{el.date_of_FG_inbound}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<!-- <button class="submit-button" :class="{'btn-disabled': !dataList.length}" :disabled="disabled1" @tap="_saveCheck">保存</button> -->
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import {checkQueryDetails} from '@/utils/getData1.js'
+	export default {
+		components: {
+			NavBar,
+		},
+		data() {
+			return {
+				storagevehicleCode: '',
+				dataList: [],
+				disabled1: false
+			};
+		},
+		created () {
+		},
+		onLoad (option) {
+			this.storagevehicleCode = option.storagevehicle_code
+			this._checkQueryDetails()
+		},
+		methods: {
+			goIn () {
+				uni.navigateTo({
+					url: `/pages/WarehouseManage/CheckDtl`
+				})
+			},
+			/** 初始化查询 */
+			async _checkQueryDetails () {
+				let res = await checkQueryDetails(this.storagevehicleCode)
+				this.dataList = [...res.data]
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+	.zd_content
+		padding-bottom 77rpx
+	.slide_new table td:nth-child(1), .slide_new table th:nth-child(1)
+		box-shadow 1px 0 2px rgba(0,0,0,.12)
+	.bgyellow td
+		background-color #E9B451
+</style>
diff --git a/utils/getData1.js b/utils/getData1.js
index 7bdc5f1..c3ef6f6 100644
--- a/utils/getData1.js
+++ b/utils/getData1.js
@@ -265,4 +265,27 @@ export const confirmCheck = (crows, ccode) => request({
 export const checkgetStor = (crows, ccode) => request({
 	url: 'api/pda/check/getStor',
 	data: {}
-})
\ No newline at end of file
+})
+// 1.6详情信息
+export const checkQueryDetails = (scode) => request({
+	url: 'api/pda/check/checkQueryDetails',
+	data: {
+		storagevehicle_code: scode
+	}
+})
+// 1.7异常（盘点单明细查询页面按钮）备注：可多选
+export const checkexception = (crows, ccode) => request({
+	url: 'api/pda/check/exception',
+	data: {
+		check_rows: crows,
+		check_code: ccode
+	}
+})
+// 1.8正常（盘点单明细查询页面按钮）备注：可多选
+export const checknormal = (crows, ccode) => request({
+	url: 'api/pda/check/normal',
+	data: {
+		check_rows: crows,
+		check_code: ccode
+	}
+})
diff --git a/vuex/modules/user.js b/vuex/modules/user.js
index 09c22a9..0e7ef54 100644
--- a/vuex/modules/user.js
+++ b/vuex/modules/user.js
@@ -1,6 +1,6 @@
 import * as types from '../types'
 
-const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.198:8010' : 'http://localhost:8010'
+const baseUrl = process.env.NODE_ENV === 'development' ? 'http://10.1.3.90:8010' : 'http://localhost:8010'
 const state = {
 	baseUrl: uni.getStorageSync('baseUrl') || baseUrl,
 	setTime: uni.getStorageSync('setTime') || 5000,