From 4d98f85da66a261583894af65ad9f53d8017bbf6 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期二, 10 六月 2025 16:53:14 +0800
Subject: [PATCH] 样式调整,移库增加二维码扫描功能,报工二维码扫描回显

---
 pages/wareHouse/moveWareHouse/index.vue |  619 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 323 insertions(+), 296 deletions(-)

diff --git a/pages/wareHouse/moveWareHouse/index.vue b/pages/wareHouse/moveWareHouse/index.vue
index ad765f9..f0b73df 100644
--- a/pages/wareHouse/moveWareHouse/index.vue
+++ b/pages/wareHouse/moveWareHouse/index.vue
@@ -1,317 +1,344 @@
 <template>
-	<view class="page">
-		<view class="movewarehouse-index-bg" />
-		<u-navbar title="绉诲簱" :background="background" :border-bottom="false" :title-bold="true" title-color="#000"
-			back-icon-color="#000" />
-		<view class="packing-registration-param">
-			<view class="packing-registration-param-view">
-				<view class="packing-registration-param-item param-extra">
-					<view class="packing-registration-param-item-left">
-						<text class="item-one">搴撲綅</text>
-					</view>
-					<view class="packing-registration-param-item-right">
-						<text class="item-one item-two">{{registerInfo.storageLocation}}</text>
-					</view>
-				</view>
-				<view class="packing-registration-param-item param-extra">
-					<view class="packing-registration-param-item-left">
-						<text class="item-one">{{`绉诲簱璁板綍(${registerInfo.num}鏉�)锛歚}}</text>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="wrap">
-					<scroll-view class="packing-registration-scroll-list" scroll-y="true">
-				<u-cell-group class="packing-registration-scroll-list-group" :border="false">
-					<!-- <div class="tip" style="text-align: center;" v-if="hasScanSnList.length==0">-璇锋壂鐮�-</div> -->
-					<view class="content" v-for="(item, index) in hasScanSnList" :key="index" :index="index">
-						<view class="content-header">
-							<view class="content-header-title">{{ index+1 }}</view>
-						</view>
-						<view class="content-body">
-							<view class="row-list">
-								<view class="_label">
-									<view class="_label-name">闆朵欢鍙凤細</view>
-								</view>
-								<view class="_content">
-									{{ item.value0 }}
-								</view>
-							</view>
-							<view class="row-list">
-								<view class="_label">
-									<view class="_label-name">鎵规鍙凤細</view>
-								</view>
-								<view class="_content">
-									{{ item.value1 }}
-								</view>
-							</view>
-														<view class="row-list">
-								<view class="_label">
-									<view class="_label-name">搴撲綅鍙凤細</view>
-								</view>
-								<view class="_content">
-									{{ item.value0 }}
-								</view>
-							</view>
-							<view class="row-list">
-								<view class="_label">
-									<view class="_label-name">鐩樼偣鏁伴噺锛�</view>
-								</view>
-								<view class="_content">
-									{{ item.value1 }}
-								</view>
-							</view>
-						</view>
-					</view>
-				</u-cell-group>
-			</scroll-view>
-		</view>
-		<u-modal v-model="showModal" title="" :show-cancel-button="true" :show-confirm-button="true" @confirm="confirm"
-			@cancel="cancel">
-			<view class="popup-content">
-				<view class="packing-registration-param">
-					<view class="packing-registration-param-view">
-						<view class="packing-registration-param-item param-extra">
-							<view class="packing-registration-param-item-left">
-								<text class="item-one">鎵瑰彿</text>
-							</view>
-							<view class="packing-registration-param-item-right">
-								<text class="item-one item-two">{{ 111 }}</text>
-							</view>
-						</view>
-						<view class="packing-registration-param-item param-extra">
-							<view class="packing-registration-param-item-left">
-								<text class="item-one">闆朵欢鎻忚堪</text>
-							</view>
-							<view class="packing-registration-param-item-right">
-								<text class="item-one item-two">{{ 111 }}</text>
-							</view>
-						</view>
-						<view class="packing-registration-param-item param-extra">
-							<view class="packing-registration-param-item-left">
-								<text class="item-one">WDR</text>
-							</view>
-							<view class="packing-registration-param-item-right">
-								<text class="item-one item-two">{{ 111 }}</text>
-							</view>
-						</view>
-						<view class="packing-registration-param-item param-extra">
-							<view class="packing-registration-param-item-left">
-								<text class="item-one">鐜版湁鏁伴噺</text>
-							</view>
-							<view class="packing-registration-param-item-right">
-								<text class="item-one item-two">{{ 111 }}</text>
-							</view>
-						</view>
-						<view class="packing-registration-param-item param-extra">
-							<view class="packing-registration-param-item-left">
-								<text class="item-one">褰撳墠搴撲綅</text>
-							</view>
-							<view class="packing-registration-param-item-right">
-								<text class="item-one item-two">{{ 111 }}</text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</u-modal>
-	</view>
+  <view class="page">
+    <view class="movewarehouse-index-bg" />
+    <u-navbar
+      title="绉诲簱"
+      :background="background"
+      :border-bottom="false"
+      :title-bold="true"
+      title-color="#000"
+      back-icon-color="#000"
+    />
+    <view class="packing-registration-param">
+      <view class="packing-registration-param-view">
+        <view class="packing-registration-param-item param-extra">
+          <view class="packing-registration-param-item-left">
+            <text class="item-one">搴撲綅</text>
+          </view>
+          <view class="packing-registration-param-item-right">
+            <text class="item-one item-two">{{ registerInfo.storageLocation == '' ? "璇锋壂鎻忓簱浣�" : registerInfo.storageLocation }}</text>
+          </view>
+        </view>
+        <view class="packing-registration-param-item param-extra">
+          <view class="packing-registration-param-item-left">
+            <text class="item-one">{{
+              `绉诲簱璁板綍(${registerInfo.num}鏉�)锛歚
+            }}</text>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="wrap">
+      <scroll-view class="packing-registration-scroll-list" scroll-y="true">
+        <u-cell-group
+          class="packing-registration-scroll-list-group"
+          :border="false"
+        >
+          <!-- <div class="tip" style="text-align: center;" v-if="hasScanSnList.length==0">-璇锋壂鐮�-</div> -->
+          <view
+            class="content"
+            v-for="(item, index) in hasScanSnList"
+            :key="index"
+            :index="index"
+          >
+            <view class="content-header">
+              <view class="content-header-title">{{ index + 1 }}</view>
+            </view>
+            <view class="content-body">
+              <view class="row-list">
+                <view class="_label">
+                  <view class="_label-name">闆朵欢鍙凤細</view>
+                </view>
+                <view class="_content">
+                  {{ item.value0 }}
+                </view>
+              </view>
+              <view class="row-list">
+                <view class="_label">
+                  <view class="_label-name">鎵规鍙凤細</view>
+                </view>
+                <view class="_content">
+                  {{ item.value1 }}
+                </view>
+              </view>
+              <view class="row-list">
+                <view class="_label">
+                  <view class="_label-name">搴撲綅鍙凤細</view>
+                </view>
+                <view class="_content">
+                  {{ item.value0 }}
+                </view>
+              </view>
+              <view class="row-list">
+                <view class="_label">
+                  <view class="_label-name">鐩樼偣鏁伴噺锛�</view>
+                </view>
+                <view class="_content">
+                  {{ item.value1 }}
+                </view>
+              </view>
+            </view>
+          </view>
+        </u-cell-group>
+      </scroll-view>
+    </view>
+    <u-modal
+      v-model="showModal"
+      title=""
+      :show-cancel-button="true"
+      :show-confirm-button="true"
+      @confirm="confirm"
+      @cancel="cancel"
+    >
+      <view class="popup-content">
+        <view class="packing-registration-param">
+          <view class="packing-registration-param-view">
+            <view class="packing-registration-param-item param-extra">
+              <view class="packing-registration-param-item-left">
+                <text class="item-one">鎵瑰彿</text>
+              </view>
+              <view class="packing-registration-param-item-right">
+                <text class="item-one item-two">{{ 111 }}</text>
+              </view>
+            </view>
+            <view class="packing-registration-param-item param-extra">
+              <view class="packing-registration-param-item-left">
+                <text class="item-one">闆朵欢鎻忚堪</text>
+              </view>
+              <view class="packing-registration-param-item-right">
+                <text class="item-one item-two">{{ 111 }}</text>
+              </view>
+            </view>
+            <view class="packing-registration-param-item param-extra">
+              <view class="packing-registration-param-item-left">
+                <text class="item-one">WDR</text>
+              </view>
+              <view class="packing-registration-param-item-right">
+                <text class="item-one item-two">{{ 111 }}</text>
+              </view>
+            </view>
+            <view class="packing-registration-param-item param-extra">
+              <view class="packing-registration-param-item-left">
+                <text class="item-one">鐜版湁鏁伴噺</text>
+              </view>
+              <view class="packing-registration-param-item-right">
+                <text class="item-one item-two">{{ 111 }}</text>
+              </view>
+            </view>
+            <view class="packing-registration-param-item param-extra">
+              <view class="packing-registration-param-item-left">
+                <text class="item-one">褰撳墠搴撲綅</text>
+              </view>
+              <view class="packing-registration-param-item-right">
+                <text class="item-one item-two">{{ 111 }}</text>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </u-modal>
+    <scan></scan>
+  </view>
 </template>
 <script>
-	import scan from "@/components/scan/scan.vue";
-	import content_bg from "@/static/custom/moveWareHouse/locNoBg.png";
-	export default {
-		components: {
-			scan,
-		},
+import scan from "@/components/scan/scan.vue";
+import content_bg from "@/static/custom/moveWareHouse/locNoBg.png";
+export default {
+  components: {
+    scan,
+  },
 
-		data() {
-			return {
-				background: {
-					backgroundImage: `url(${content_bg})`,
-					backgroundAttachment: "fixed",
-					backgroundSize: "100% auto",
-					backgroundRepeat: "no-repeat",
-				},
-				registerInfo: {
-					storageLocation: "LG001",
-					num: 0,
-				},
-				showModal: true, // 鎺у埗寮圭獥鏄剧ず闅愯棌鐨勫彉閲�
-				hasScanSnList: [
-					{
-						value0: '11111111111111111111111',
-						value1: '111',
-						value2: '111',
-						value3: '111',
-					},
-					{
-						value0: '111',
-						value1: '111',
-						value2: '111',
-						value3: '111',
-					},
-					{
-						value0: '111',
-						value1: '111',
-						value2: '111',
-						value3: '111',
-					},
-					{
-						value0: '111',
-						value1: '111',
-						value2: '111',
-						value3: '111',
-					},
-					{
-						value0: '111',
-						value1: '111',
-						value2: '111',
-						value3: '111',
-					},
-				],
-			};
-		},
-		onLoad() {},
-		onShow() {
-			let that = this;
-
-			uni.$off("scan"); // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
-			uni.$on("scan", function(data) {
-				console.log("onscan");
-				//鎵爜鎴愬姛鍚庣殑鍥炶皟锛屼綘鍙互鍐欒嚜宸辩殑閫昏緫浠g爜鍦ㄨ繖閲�
-				console.log("鎵爜缁撴灉锛�", data.code);
-			});
-		},
-		onNavigationBarButtonTap(e) {
-			uni.scanCode({
-				success: (res) => {
-					try {
-						const result = JSON.parse(res.result);
-					} catch (e) {}
-				},
-			});
-		},
-		methods: {
-			confirm() {
-				// 澶勭悊纭閫昏緫
-				this.show = false;
-			},
-			cancel() {
-				this.show = false; // 鍏抽棴寮圭獥
-			},
-		},
-	};
+  data() {
+    return {
+      background: {
+        backgroundImage: `url(${content_bg})`,
+        backgroundAttachment: "fixed",
+        backgroundSize: "100% auto",
+        backgroundRepeat: "no-repeat",
+      },
+      registerInfo: {
+        storageLocation: "",
+        num: 0,
+      },
+      showModal: true, // 鎺у埗寮圭獥鏄剧ず闅愯棌鐨勫彉閲�
+      hasScanSnList: [
+        {
+          value0: "11111111111111111111111",
+          value1: "111",
+          value2: "111",
+          value3: "111",
+        },
+        {
+          value0: "111",
+          value1: "111",
+          value2: "111",
+          value3: "111",
+        },
+        {
+          value0: "111",
+          value1: "111",
+          value2: "111",
+          value3: "111",
+        },
+        {
+          value0: "111",
+          value1: "111",
+          value2: "111",
+          value3: "111",
+        },
+        {
+          value0: "111",
+          value1: "111",
+          value2: "111",
+          value3: "111",
+        },
+      ],
+    };
+  },
+  onLoad() {},
+  onShow() {
+    let that = this;
+    uni.$off("scan"); // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
+    uni.$on("scan", function (data) {
+      console.log("onscan");
+      //鎵爜鎴愬姛鍚庣殑鍥炶皟锛屼綘鍙互鍐欒嚜宸辩殑閫昏緫浠g爜鍦ㄨ繖閲�
+      console.log("椤甸潰鎵爜缁撴灉锛�", data.code);
+      if (data.code) {
+        let codeInfo = JSON.parse(data.code);
+        if (codeInfo.WorkNo) {
+          // 鎵弿鎶ュ伐鍗曚簩缁寸爜
+          that.saveForm(codeInfo);
+        }
+      }
+    });
+  },
+  methods: {
+    confirm() {
+      // 澶勭悊纭閫昏緫
+      this.show = false;
+    },
+    cancel() {
+      this.show = false; // 鍏抽棴寮圭獥
+    },
+        // 鍥炴樉鎵爜鐨勪俊鎭�-鎶ュ伐鍗�
+    saveForm(val) {
+      let { WorkNo, ProcessName, ORDER_NO } = val
+      this.form.value1 = WorkNo
+      this.form.value2 = ProcessName
+      this.form.value3 = ORDER_NO
+    }
+  },
+};
 </script>
 <style lang="scss" scoped>
-	.person-btn-view {
-		display: flex;
-		justify-content: space-between;
-		margin-top: 300rpx;
-	}
+.person-btn-view {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 300rpx;
+}
 
-	.popup-content {
-		width: 600rpx;
-		height: 500rpx;
-		background-color: #fff;
-		border-radius: 8px;
-		z-index: 10;
-		/* 纭繚鍐呭鍦ㄨ挋鐗堜箣涓� */
-	}
+.popup-content {
+  width: 600rpx;
+  height: 500rpx;
+  background-color: #fff;
+  border-radius: 8px;
+  z-index: 10;
+  /* 纭繚鍐呭鍦ㄨ挋鐗堜箣涓� */
+}
 
-	.movewarehouse-index-bg {
-		background-color: #f6f9ff;
-		background-image: url("~@/static/custom/moveWareHouse/locNoBg.png");
-		// background: linear-gradient(180deg,rgba(206,227,254,1),rgba(206,227,254,1) 20%,rgba(206,227,254,0.5) 40%,rgba(206,227,254,0.25) 60%,rgba(206,227,254,0.08) 80%,rgba(206,227,254,0));
-		padding: 0 20rpx;
-		background-attachment: fixed;
-		background-size: 100% auto;
-		background-repeat: no-repeat;
-		position: fixed;
-		top: 0;
-		bottom: 0;
-		width: 100%;
-		z-index: -1;
-	}
+.movewarehouse-index-bg {
+  background-color: #f6f9ff;
+  background-image: url("~@/static/custom/moveWareHouse/locNoBg.png");
+  // background: linear-gradient(180deg,rgba(206,227,254,1),rgba(206,227,254,1) 20%,rgba(206,227,254,0.5) 40%,rgba(206,227,254,0.25) 60%,rgba(206,227,254,0.08) 80%,rgba(206,227,254,0));
+  padding: 0 20rpx;
+  background-attachment: fixed;
+  background-size: 100% auto;
+  background-repeat: no-repeat;
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  width: 100%;
+  z-index: -1;
+}
 
-	.packing-registration-param {
-		padding: 40rpx 30rpx 10rpx 30rpx;
+.packing-registration-param {
+  padding: 40rpx 30rpx 10rpx 30rpx;
 
-		.packing-registration-param-title {
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			margin-bottom: 30rpx;
+  .packing-registration-param-title {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    margin-bottom: 30rpx;
 
-			.title-label {
-				margin-left: 14rpx;
-				font-size: 34rpx;
-				font-weight: bold;
-				color: #283e65;
-			}
-		}
+    .title-label {
+      margin-left: 14rpx;
+      font-size: 34rpx;
+      font-weight: bold;
+      color: #283e65;
+    }
+  }
 
-		.packing-registration-param-view {
-			height: 177rpx;
-			background-color: #fff;
-			border-radius: 10rpx;
-			padding: 0rpx 23rpx;
-			margin-bottom: 30rpx;
+  .packing-registration-param-view {
+    height: 177rpx;
+    background-color: #fff;
+    border-radius: 10rpx;
+    padding: 0rpx 23rpx;
+    margin-bottom: 30rpx;
 
-			.packing-registration-param-item {
-				height: 90rpx;
-				border: 1px solid #adc8e4;
-				line-height: 90rpx;
-				display: flex;
-				justify-content: space-between;
-				border: none;
+    .packing-registration-param-item {
+      height: 90rpx;
+      border: 1px solid #adc8e4;
+      line-height: 90rpx;
+      display: flex;
+      justify-content: space-between;
+      border: none;
 
-				.packing-registration-param-item-left {
-					.item-one {
-						font-size: 30rpx;
-						color: #666666;
-					}
-				}
+      .packing-registration-param-item-left {
+        .item-one {
+          font-size: 30rpx;
+          color: #666666;
+        }
+      }
 
-				.packing-registration-param-item-right {
-					display: flex;
-					justify-content: space-between;
+      .packing-registration-param-item-right {
+        display: flex;
+        justify-content: space-between;
 
-					.item-one {
-						font-size: 30rpx;
-						color: #333333;
-						margin-right: 6rpx;
-					}
+        .item-one {
+          font-size: 30rpx;
+          color: #333333;
+          margin-right: 6rpx;
+        }
 
-					.item-two {
-						font-size: 30rpx;
-						color: #a6b4cc;
-						margin-right: 6rpx;
-					}
+        .item-two {
+          font-size: 30rpx;
+          color: #a6b4cc;
+          margin-right: 6rpx;
+        }
 
-					.item-three {
-						font-size: 30rpx;
-						color: #214ded;
-						margin-right: 6rpx;
-					}
-				}
-			}
+        .item-three {
+          font-size: 30rpx;
+          color: #214ded;
+          margin-right: 6rpx;
+        }
+      }
+    }
 
-			.param-extra {
-				border-bottom: 1px solid #ededed;
-			}
-		}
-	}
-	.wrap .packing-registration-scroll-list {
-		height: calc(100vh - var(--window-top) - var(--window-bottom) - 360rpx);
-		width: 100%;
-	}
+    .param-extra {
+      border-bottom: 1px solid #ededed;
+    }
+  }
+}
+.wrap .packing-registration-scroll-list {
+  height: calc(100vh - var(--window-top) - var(--window-bottom) - 360rpx);
+  width: 100%;
+}
 
-	.packing-registration-scroll-list-group {
-		::v-deep .u-cell-item-box {
-			background-color: rgba(250, 252, 255, 0.36) !important;
-			padding: 0rpx 30rpx;
-		}
+.packing-registration-scroll-list-group {
+  ::v-deep .u-cell-item-box {
+    background-color: rgba(250, 252, 255, 0.36) !important;
+    padding: 0rpx 30rpx;
+  }
 
   .content {
     font-size: 12px;
@@ -355,7 +382,7 @@
       .row-list {
         height: 60rpx;
         display: flex;
-        flex-direction: row;	
+        flex-direction: row;
         padding: 0px;
         align-items: center;
       }
@@ -386,5 +413,5 @@
       }
     }
   }
-	}
+}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3