Parcourir la source

git链接切换

asd26269546 il y a 2 ans
Parent
commit
f7a626be98
3 fichiers modifiés avec 23 ajouts et 15 suppressions
  1. 1 1
      src/api/integrated.js
  2. 4 10
      src/views/check-modal.vue
  3. 18 4
      src/views/store-out.vue

+ 1 - 1
src/api/integrated.js

@@ -202,7 +202,7 @@ export const GetV3PlanData = (data = {}) => {
 // 获取V3常用物料2
 export const GetV3PlanData2 = (data = {}) => {
   return axios.request({
-    url: '/javaApi/getV3PlanData',
+    url: 'http://120.79.80.64:8055/javaApi/getV3PlanData',
     data,
     method: 'post'
   })

+ 4 - 10
src/views/check-modal.vue

@@ -1,11 +1,6 @@
 <template>
-	<Modal
-		v-model="modal"
-		width="80%"
-		class-name="vertical-center-modal"
-		:footer-hide="true"
-	>
-		<div class="container" :style="{ backgroundImage: `url(${bg})` }">
+	
+		<div class="container2" :style="{ backgroundImage: `url(${bg})` }">
 			<div class="tracking-wrap">
 				<img class="border" :src="border" alt="" />
 				<div
@@ -71,7 +66,6 @@
 				</div>
 			</div>
 		</div>
-	</Modal>
 </template>
 
 <script>
@@ -127,7 +121,7 @@ export default {
 	watch: {
 		value: {
 			handler(n) {
-				this.modal = n
+				this.$emit('input', this.value)
 			},
 			immediate: true,
 		},
@@ -331,7 +325,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.container {
+.container2 {
 	position: relative;
 	width: 100vw;
 	height: 80vh;

+ 18 - 4
src/views/store-out.vue

@@ -202,7 +202,7 @@
 						@click="pass(0)"
 						>重新扫描</Button
 					>
-					<Button type="success" size="large" @click="show = true"
+					<Button type="success" size="large" @click.native="copyData()"
 						>仓管校验</Button
 					>
 				</div>
@@ -280,7 +280,15 @@
 			<div v-else style="padding: 10px 0; color: #ffffff">暂无数据</div>
 		</Modal>
 		<!-- 仓管人脸校验 -->
-		<check-modal v-model="show" @face-check="faceCheck"></check-modal>
+		<Modal
+			v-model="show"
+			width="80%"
+			class-name="vertical-center-modal"
+			:footer-hide="true"
+		>
+			<check-modal  @face-check="faceCheck"></check-modal>
+		</Modal>
+		
 	</div>
 </template>
 
@@ -317,6 +325,7 @@ export default {
 			reading: false,
 			remarkShow: false,
 			remark: '',
+			rfidTagItemsCopy:[],
 		}
 	},
 	components: {
@@ -324,6 +333,10 @@ export default {
 		CheckModal,
 	},
 	methods: {
+		copyData(){
+			this.show = true
+			this.rfidTagItemsCopy = JSON.parse(JSON.stringify(this.scanData.rfidTagItems))
+		},
 		add(item) {
 			item.totalQuantity = item.qty
 			item.quantity = item.qty
@@ -351,7 +364,7 @@ export default {
 				inOutStorageNo: '',
 				storageDoor: sessionStorage.getItem('door'),
 				plcStationCode: sessionStorage.getItem('plcCode'),
-				rfidList: this.scanData.rfidTagItems.map(
+				rfidList: this.rfidTagItemsCopy.map(
 					(item) => item.rfidCode
 				),
 				remark: this.remark,
@@ -377,7 +390,7 @@ export default {
 					if (res.code === 0) {
 						this.$Message.info('删除成功!')
 						this.tempDelData.push(item)
-						this.getScanList()
+						this.getList()
 					}
 				})
 			}
@@ -463,6 +476,7 @@ export default {
 						})
 					})
 				}
+				
 			})
 		},
 		/* 左侧列表 */