From eb61b0a4640f75f3f395d40d252aedc05cbc8828 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期一, 07 七月 2025 14:16:41 +0800
Subject: [PATCH] 车间订单下发

---
 pages/product/WorkshopOrderIssued/index.vue         |  916 ++++++++++++++++-------------
 pages/product/WorkshopOrderIssued/WorkOrderList.vue |  305 +++++++++
 pages/product/WorkshopOrderIssued/comp.vue          |  618 +++++++++----------
 3 files changed, 1,107 insertions(+), 732 deletions(-)

diff --git a/pages/product/WorkshopOrderIssued/WorkOrderList.vue b/pages/product/WorkshopOrderIssued/WorkOrderList.vue
new file mode 100644
index 0000000..8cd16a4
--- /dev/null
+++ b/pages/product/WorkshopOrderIssued/WorkOrderList.vue
@@ -0,0 +1,305 @@
+<template>
+	<view class="page">
+		<view class="finishProductIn-locno-bg" />
+		<u-navbar title="宸ュ崟鍒楄〃" :background="background" :border-bottom="false" :title-bold="true" title-color="#000"
+			back-icon-color="#000" />
+		<view class="finishProductIn-locno-search">
+			<u-search v-model="keywords" shape="square" bg-color="rgba(250,252,255,0.36)" :show-action="false"
+				placeholder="璇疯緭鍏ュ伐鍗曞彿" @clear="search" @custom="search" @search="search" @input="search">
+			</u-search>
+		</view>
+		<view class="wrap">
+			<scroll-view class="finishProductIn-locno-scroll-list" scroll-y="true" @scrolltolower="getmoreList()">
+				<u-cell-group class="finishProductIn-locno-scroll-list-group" :border="false">
+					<view class="content" v-for="(item, index) in list" :key="item.locNo" :index="index"
+						@click="selectNo(item)">
+						<view class="content-header">
+							<view class="content-header-title">{{ item.index }}</view>
+						</view>
+						<view class="content-body">
+							<view class="row-list">
+								<view class="_label">
+									<view class="_label-icon-1"> </view>
+									<view class="_label-name">宸ュ崟鍙凤細</view>
+								</view>
+								<view class="_content">
+									{{ item.optaskNo }}
+								</view>
+							</view>
+							<view class="row-list">
+								<view class="_label">
+									<view class="_label-icon-2"> </view>
+									<view class="_label-name">鏁伴噺锛�</view>
+								</view>
+								<view class="_content">
+									{{ item.plannedQuantity }}
+								</view>
+							</view>
+							<view class="row-list">
+								<view class="_label">
+									<view class="_label-icon-2"> </view>
+									<view class="_label-name">寮�濮嬫棩鏈燂細</view>
+								</view>
+								<view class="_content">
+									{{ item.plannedStartDate }}
+								</view>
+							</view>
+							<view class="row-list">
+								<view class="_label">
+									<view class="_label-icon-3"> </view>
+									<view class="_label-name">缁撴潫鏃ユ湡锛�</view>
+								</view>
+								<view class="_content">
+									{{ item.plannedFinishDate }}
+								</view>
+							</view>
+						</view>
+					</view>
+				</u-cell-group>
+				<view class="loadmore" @click="getmoreList()">
+					<u-loadmore :status="status" :load-text="loadText" @loadmore="getmoreList()" />
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+<script>
+	import content_bg from "@/static/custom/finishProductIn/locNoBg.png";
+	export default {
+		data() {
+			return {
+				background: {
+					backgroundImage: `url(${content_bg})`,
+					backgroundAttachment: "fixed",
+					backgroundSize: "100% auto",
+					backgroundRepeat: "no-repeat",
+				},
+				keywords: "",
+				list: [],
+				total: 0,
+				pageNum: 1,
+				pageSize: 10,
+				status: "loading",
+				loadText: {
+					loadmore: "鍔犺浇鏇村...",
+					loading: "鍔姏鍔犺浇涓�...",
+					nomore: "娌℃湁鏇村浜�",
+				},
+				id: ''
+			};
+		},
+		onLoad(options) {
+			console.log('22@@', options);
+			this.id = Number(JSON.parse(decodeURIComponent(options.id)))
+			this.getlist();
+			
+		},
+		methods: {
+			getmoreList() {
+				if (this.pageSize >= this.total) {
+					this.status = "nomore";
+					return;
+				}
+				this.status = "loading";
+				setTimeout(() => {
+					this.pageSize += this.pageSize;
+					this.getlist();
+				}, 1000);
+			},
+			getlist() {
+				this.$u.api.WorkshopOrderIssued.getOperationTaskLisByMoId({
+					current: this.pageNum,
+					size: this.pageSize,
+					moId: this.id
+				}).then((res) => {
+					console.log("res", res);
+					this.list = res.data.records;
+					this.total =  res.data.total;
+					if (this.pageSize >= this.total) {
+						this.status = "nomore";
+					} else {
+						this.status = "loadmore";
+					}
+				});
+			},
+			search(value) {
+				console.log("111", value);
+				if (value) {
+					this.list = [];
+					this.pageSize = 10;
+					this.$u.api.WorkshopOrderIssued
+						.getOperationTaskLisByMoId({
+							current: this.pageNum,
+							size: this.pageSize,
+							optaskNo: value,
+								moId: this.id
+						})
+						.then((res) => {
+							console.log("res", res);
+							this.list = res.data.records;
+							this.total = res.data.total;
+							if (this.pageSize >= this.total) {
+								this.status = "nomore";
+							} else {
+								this.status = "loadmore";
+							}
+						});
+				} else {
+					this.getlist();
+				}
+			},
+			selectNo(no) {
+				this.refreshLastPage(no);
+			},
+
+			//鍒锋柊涓婁竴涓〉闈�
+			refreshLastPage(no) {
+				// 鍛婄煡 A.vue 鏇存柊鏁版嵁
+				// 鑾峰彇椤甸潰鏍�
+				let pages = getCurrentPages();
+
+				// 鑾峰彇涓婁竴椤垫爤
+				let prevPage = pages[pages.length - 2];
+
+				// 瑙﹀彂涓婁竴椤� upData 鍑芥暟(骞舵惡甯﹀弬鏁�)
+				prevPage.$vm.workNo(no);
+
+				// 杩斿洖涓婁竴椤�
+				uni.navigateBack({
+					delta: 1,
+				});
+			},
+		},
+	};
+</script>
+<style lang="scss" scoped>
+	.finishProductIn-locno-bg {
+		background-color: #f6f9ff;
+		background-image: url("~@/static/custom/finishProductIn/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;
+	}
+
+	.finishProductIn-locno-search {
+		padding: 40rpx 30rpx 20rpx 30rpx;
+	}
+
+	.wrap .finishProductIn-locno-scroll-list {
+		height: calc(100vh - var(--window-top) - var(--window-bottom) - 242rpx);
+		width: 100%;
+	}
+
+	.finishProductIn-locno-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;
+			background-color: #ffffff;
+			box-sizing: border-box;
+			border-radius: 10rpx;
+			margin: 0rpx 0rpx 16rpx;
+			padding: 20rpx 8rpx;
+			box-shadow: none;
+			display: flex;
+			align-items: center;
+
+			.content-header {
+				width: 40rpx;
+				height: 90rpx;
+				display: flex;
+				align-items: center;
+
+				.content-header-icon {
+					background-image: url("~@/static/custom/moveWareHouse/header_icon.png");
+					background-size: 100% auto;
+					background-repeat: no-repeat;
+					height: 28rpx;
+					width: 28rpx;
+				}
+
+				.content-header-title {
+					margin-left: 11rpx;
+					font-size: 26rpx;
+					font-weight: bold;
+					color: #333333;
+				}
+			}
+
+			.content-body {
+				flex: 1;
+				background: #f5f9ff;
+				border-radius: 10rpx;
+				padding: 0rpx 23rpx;
+
+				.row-list {
+					height: 60rpx;
+					display: flex;
+					flex-direction: row;
+					padding: 0px;
+					align-items: center;
+				}
+
+				.row-list ._label {
+					display: flex;
+					flex: 0.8;
+					color: #909399;
+					align-items: center;
+
+					._label-icon-1 {
+						background-image: url("~@/static/custom/moveWareHouse/label-icon-1.png");
+						background-size: 100% auto;
+						background-repeat: no-repeat;
+						height: 26rpx;
+						width: 26rpx;
+					}
+
+					._label-icon-2 {
+						background-image: url("~@/static/custom/moveWareHouse/label-icon-2.png");
+						background-size: 100% auto;
+						background-repeat: no-repeat;
+						height: 26rpx;
+						width: 26rpx;
+					}
+
+					._label-icon-3 {
+						background-image: url("~@/static/custom/moveWareHouse/label-icon-3.png");
+						background-size: 100% auto;
+						background-repeat: no-repeat;
+						height: 26rpx;
+						width: 26rpx;
+					}
+
+					._label-name {
+						width: 80px;
+						margin-left: 11rpx;
+						font-size: 26rpx;
+						font-weight: 500;
+						color: #666666;
+					}
+				}
+
+				.row-list ._content {
+					flex: 1.5;
+					text-align: right;
+					color: #909399;
+					font-size: 24rpx;
+				}
+
+				.row-list .s1 {
+					color: #d35651;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/product/WorkshopOrderIssued/comp.vue b/pages/product/WorkshopOrderIssued/comp.vue
index 02a23b7..2df7ab7 100644
--- a/pages/product/WorkshopOrderIssued/comp.vue
+++ b/pages/product/WorkshopOrderIssued/comp.vue
@@ -1,351 +1,321 @@
 <template>
-  <view class="page">
-    <view class="finishProductIn-locno-bg" />
-    <u-navbar
-      title="杞﹂棿璁㈠崟鐗╂枡"
-      :background="background"
-      :border-bottom="false"
-      :title-bold="true"
-      title-color="#000"
-      back-icon-color="#000"
-    />
-    <view class="finishProductIn-locno-search">
-      <u-search
-        v-model="keywords"
-        shape="square"
-        bg-color="rgba(250,252,255,0.36)"
-        :show-action="false"
-        placeholder="璇疯緭鍏ラ浂浠跺彿"
-        @clear="search"
-        @custom="search"
-        @search="search"
-      >
-      </u-search>
-    </view>
-    <view class="wrap">
-      <scroll-view
-        class="finishProductIn-locno-scroll-list"
-        scroll-y="true"
-        @scrolltolower="getmoreList()"
-      >
-        <u-cell-group
-          class="finishProductIn-locno-scroll-list-group"
-          :border="false"
-        >
-          <view
-            class="content"
-            v-for="(item, index) in list"
-            :key="item.locNo"
-            :index="index"
-            @click="selectNo(item)"
-          >
-            <view class="content-header">
-              <view class="content-header-title">{{ item.index }}</view>
-            </view>
-            <view class="content-body">
-              <view class="row-list">
-                <view class="_label">
-                  <view class="_label-icon-1"> </view>
-                  <view class="_label-name">琛屽彿锛�</view>
-                </view>
-                <view class="_content">
-                  {{ item.value0 }}
-                </view>
-              </view>
-              <view class="row-list">
-                <view class="_label">
-                  <view class="_label-icon-2"> </view>
-                  <view class="_label-name">涓嬪彂鑷冲簱浣嶏細</view>
-                </view>
-                <view class="_content">
-                  {{ item.value1 }}
-                </view>
-              </view>
-              <view class="row-list">
-                <view class="_label">
-                  <view class="_label-icon-1"> </view>
-                  <view class="_label-name">闆朵欢鍙凤細</view>
-                </view>
-                <view class="_content">
-                  {{ item.partNo }}
-                </view>
-              </view>
-              <view class="row-list">
-                <view class="_label">
-                  <view class="_label-icon-3"> </view>
-                  <view class="_label-name">闆朵欢鎻忚堪锛�</view>
-                </view>
-                <view class="_content">
-                  {{ item.partName }}
-                </view>
-              </view>
-              <view class="row-list">
-                <view class="_label">
-                  <view class="_label-icon-2"> </view>
-                  <view class="_label-name">闆朵欢涓嬪彂鏁伴噺锛�</view>
-                </view>
-                <view class="_content">
-                  {{ item.qpa }}
-                </view>
-              </view>
-              <view class="row-list">
-                <view class="_label">
-                  <view class="_label-icon-3"> </view>
-                  <view class="_label-name">鐗╂枡琛岀姸鎬侊細</view>
-                </view>
-                <view class="_content">
-                  {{ item.value5 }}
-                </view>
-              </view>
-            </view>
-          </view>
-        </u-cell-group>
-        <view class="loadmore" @click="getmoreList()">
-          <u-loadmore
-            :status="status"
-            :load-text="loadText"
-            @loadmore="getmoreList()"
-          />
-        </view>
-      </scroll-view>
-    </view>
-  </view>
+	<view class="page">
+		<view class="finishProductIn-locno-bg" />
+		<u-navbar title="杞﹂棿璁㈠崟鐗╂枡" :background="background" :border-bottom="false" :title-bold="true" title-color="#000"
+			back-icon-color="#000" />
+		<view class="finishProductIn-locno-search">
+			<u-search v-model="keywords" shape="square" bg-color="rgba(250,252,255,0.36)" :show-action="false"
+				placeholder="璇疯緭鍏ラ浂浠跺彿" @clear="search" @custom="search" @search="search" @input="search">
+			</u-search>
+		</view>
+		<view class="wrap">
+			<scroll-view class="finishProductIn-locno-scroll-list" scroll-y="true" @scrolltolower="getmoreList()">
+				<u-cell-group class="finishProductIn-locno-scroll-list-group" :border="false">
+					<view class="content" v-for="(item, index) in list" :key="item.locNo" :index="index"
+						@click="selectNo(item)">
+						<view class="content-header">
+							<view class="content-header-title">{{ item.index }}</view>
+						</view>
+						<view class="content-body">
+							<view class="row-list">
+								<view class="_label">
+									<view class="_label-icon-1"> </view>
+									<view class="_label-name">琛屽彿锛�</view>
+								</view>
+								<view class="_content">
+									{{ item.value0 }}
+								</view>
+							</view>
+							<view class="row-list">
+								<view class="_label">
+									<view class="_label-icon-2"> </view>
+									<view class="_label-name">涓嬪彂鑷冲簱浣嶏細</view>
+								</view>
+								<view class="_content">
+									{{ item.value1 }}
+								</view>
+							</view>
+							<view class="row-list">
+								<view class="_label">
+									<view class="_label-icon-1"> </view>
+									<view class="_label-name">闆朵欢鍙凤細</view>
+								</view>
+								<view class="_content">
+									{{ item.partNo }}
+								</view>
+							</view>
+							<view class="row-list">
+								<view class="_label">
+									<view class="_label-icon-3"> </view>
+									<view class="_label-name">闆朵欢鎻忚堪锛�</view>
+								</view>
+								<view class="_content">
+									{{ item.partName }}
+								</view>
+							</view>
+							<view class="row-list">
+								<view class="_label">
+									<view class="_label-icon-2"> </view>
+									<view class="_label-name">闆朵欢涓嬪彂鏁伴噺锛�</view>
+								</view>
+								<view class="_content">
+									{{ item.qpa }}
+								</view>
+							</view>
+							<view class="row-list">
+								<view class="_label">
+									<view class="_label-icon-3"> </view>
+									<view class="_label-name">鐗╂枡琛岀姸鎬侊細</view>
+								</view>
+								<view class="_content">
+									{{ item.value5 }}
+								</view>
+							</view>
+						</view>
+					</view>
+				</u-cell-group>
+				<view class="loadmore" @click="getmoreList()">
+					<u-loadmore :status="status" :load-text="loadText" @loadmore="getmoreList()" />
+				</view>
+			</scroll-view>
+		</view>
+	</view>
 </template>
 <script>
-import content_bg from "@/static/custom/finishProductIn/locNoBg.png";
-export default {
-  data() {
-    return {
-      background: {
-        backgroundImage: `url(${content_bg})`,
-        backgroundAttachment: "fixed",
-        backgroundSize: "100% auto",
-        backgroundRepeat: "no-repeat",
-      },
-      keywords: "",
-      list: [],
-      total: 0,
-      pageNum: 1,
-      pageSize: 10,
-      status: "loading",
-      loadText: {
-        loadmore: "鍔犺浇鏇村...",
-        loading: "鍔姏鍔犺浇涓�...",
-        nomore: "娌℃湁鏇村浜�",
+	import content_bg from "@/static/custom/finishProductIn/locNoBg.png";
+	export default {
+		data() {
+			return {
+				background: {
+					backgroundImage: `url(${content_bg})`,
+					backgroundAttachment: "fixed",
+					backgroundSize: "100% auto",
+					backgroundRepeat: "no-repeat",
+				},
+				keywords: "",
+				list: [],
+				total: 0,
+				pageNum: 1,
+				pageSize: 10,
+				status: "loading",
+				loadText: {
+					loadmore: "鍔犺浇鏇村...",
+					loading: "鍔姏鍔犺浇涓�...",
+					nomore: "娌℃湁鏇村浜�",
+				},
+				operationTaskId: ''
+			};
 		},
-	  id:''
-    };
-  },
-  onLoad(options) {
-	  console.log('22@@', options);
-this.id = JSON.parse(decodeURIComponent(options.id))
-    this.getlist();
-	},
-  methods: {
-    getmoreList() {
-      if (this.pageSize >= this.total) {
-        this.status = "nomore";
-        return;
-      }
-      this.status = "loading";
-      setTimeout(() => {
-        this.pageSize += this.pageSize;
-        this.getlist();
-      }, 1000);
-    },
-    getlist() {
-      this.$u.api.WorkshopOrderIssued.manufacturingOrder({
-        current: this.pageNum,
-		  size: this.pageSize, 
-		id:this.id
-      }).then((res) => {
-        console.log("res", res);
-        this.list = res.data.bomRoot.children;
-        this.total = res.data.bomRoot.children.length + 1;
-        if (this.pageSize >= this.total) {
-          this.status = "nomore";
-        } else {
-          this.status = "loadmore";
-        }
-      });
-    },
-    search(value) {
-      console.log("111", value);
-      if (value) {
-        this.list = [];
-        this.pageSize = 10;
-        this.$u.api.workReporting
-          ._({
-            current: this.pageNum,
-            size: this.pageSize,
-            moNo: value,
-          })
-          .then((res) => {
-            console.log("res", res);
-            this.list = res.data.records;
-            this.total = res.data.total;
-            if (this.pageSize >= this.total) {
-              this.status = "nomore";
-            } else {
-              this.status = "loadmore";
-            }
-          });
-      } else {
-        this.getlist();
-      }
-    },
-    selectNo(no) {
-      this.refreshLastPage(no);
-    },
+		onLoad(options) {
+			this.operationTaskId = JSON.parse(decodeURIComponent(options.operationTaskId))
+			this.getlist();
+		},
+		methods: {
+			getmoreList() {
+				if (this.pageSize >= this.total) {
+					this.status = "nomore";
+					return;
+				}
+				this.status = "loading";
+				setTimeout(() => {
+					this.pageSize += this.pageSize;
+					this.getlist();
+				}, 1000);
+			},
+			getlist() {
+				this.$u.api.WorkshopOrderIssued.getMoMaterial({
+					current: this.pageNum,
+					size: this.pageSize,
+					operationTaskId: this.operationTaskId
+				}).then((res) => {
+					console.log("res", res);
+					this.list = res.data;
+					this.total = res.data.length + 1;
+					if (this.pageSize >= this.total) {
+						this.status = "nomore";
+					} else {
+						this.status = "loadmore";
+					}
+				});
+			},
+			search(value) {
+				console.log("111", value);
+				if (value) {
+					this.list = [];
+					this.pageSize = 10;
+					this.$u.api.WorkshopOrderIssued
+						.getMoMaterial({
+							current: this.pageNum,
+							size: this.pageSize,
+							partNo: value,
+							operationTaskId: this.operationTaskId
+						})
+						.then((res) => {
+							console.log("res", res);
+							this.list = res.data;
+							this.total = res.data.total;
+							if (this.pageSize >= this.total) {
+								this.status = "nomore";
+							} else {
+								this.status = "loadmore";
+							}
+						});
+				} else {
+					this.getlist();
+				}
+			},
+			selectNo(no) {
+				this.refreshLastPage(no);
+			},
 
-    //鍒锋柊涓婁竴涓〉闈�
-    refreshLastPage(no) {
-      // 鍛婄煡 A.vue 鏇存柊鏁版嵁
-      // 鑾峰彇椤甸潰鏍�
-      let pages = getCurrentPages();
+			//鍒锋柊涓婁竴涓〉闈�
+			refreshLastPage(no) {
+				// 鍛婄煡 A.vue 鏇存柊鏁版嵁
+				// 鑾峰彇椤甸潰鏍�
+				let pages = getCurrentPages();
 
-      // 鑾峰彇涓婁竴椤垫爤
-      let prevPage = pages[pages.length - 2];
+				// 鑾峰彇涓婁竴椤垫爤
+				let prevPage = pages[pages.length - 2];
 
-      // 瑙﹀彂涓婁竴椤� upData 鍑芥暟(骞舵惡甯﹀弬鏁�)
-      prevPage.$vm.compNo(no);
+				// 瑙﹀彂涓婁竴椤� upData 鍑芥暟(骞舵惡甯﹀弬鏁�)
+				prevPage.$vm.compNo(no);
 
-      // 杩斿洖涓婁竴椤�
-      uni.navigateBack({
-        delta: 1,
-      });
-    },
-  },
-};
+				// 杩斿洖涓婁竴椤�
+				uni.navigateBack({
+					delta: 1,
+				});
+			},
+		},
+	};
 </script>
 <style lang="scss" scoped>
-.finishProductIn-locno-bg {
-  background-color: #f6f9ff;
-  background-image: url("~@/static/custom/finishProductIn/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;
-}
+	.finishProductIn-locno-bg {
+		background-color: #f6f9ff;
+		background-image: url("~@/static/custom/finishProductIn/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;
+	}
 
-.finishProductIn-locno-search {
-  padding: 40rpx 30rpx 20rpx 30rpx;
-}
+	.finishProductIn-locno-search {
+		padding: 40rpx 30rpx 20rpx 30rpx;
+	}
 
-.wrap .finishProductIn-locno-scroll-list {
-  height: calc(100vh - var(--window-top) - var(--window-bottom) - 242rpx);
-  width: 100%;
-}
+	.wrap .finishProductIn-locno-scroll-list {
+		height: calc(100vh - var(--window-top) - var(--window-bottom) - 242rpx);
+		width: 100%;
+	}
 
-.finishProductIn-locno-scroll-list-group {
-  ::v-deep .u-cell-item-box {
-    background-color: rgba(250, 252, 255, 0.36) !important;
-    padding: 0rpx 30rpx;
-  }
+	.finishProductIn-locno-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;
-    background-color: #ffffff;
-    box-sizing: border-box;
-    border-radius: 10rpx;
-    margin: 0rpx 0rpx 16rpx;
-    padding: 20rpx 8rpx;
-    box-shadow: none;
-    display: flex;
-    align-items: center;
+		.content {
+			font-size: 12px;
+			background-color: #ffffff;
+			box-sizing: border-box;
+			border-radius: 10rpx;
+			margin: 0rpx 0rpx 16rpx;
+			padding: 20rpx 8rpx;
+			box-shadow: none;
+			display: flex;
+			align-items: center;
 
-    .content-header {
-      width: 40rpx;
-      height: 90rpx;
-      display: flex;
-      align-items: center;
+			.content-header {
+				width: 40rpx;
+				height: 90rpx;
+				display: flex;
+				align-items: center;
 
-      .content-header-icon {
-        background-image: url("~@/static/custom/moveWareHouse/header_icon.png");
-        background-size: 100% auto;
-        background-repeat: no-repeat;
-        height: 28rpx;
-        width: 28rpx;
-      }
+				.content-header-icon {
+					background-image: url("~@/static/custom/moveWareHouse/header_icon.png");
+					background-size: 100% auto;
+					background-repeat: no-repeat;
+					height: 28rpx;
+					width: 28rpx;
+				}
 
-      .content-header-title {
-        margin-left: 11rpx;
-        font-size: 26rpx;
-        font-weight: bold;
-        color: #333333;
-      }
-    }
+				.content-header-title {
+					margin-left: 11rpx;
+					font-size: 26rpx;
+					font-weight: bold;
+					color: #333333;
+				}
+			}
 
-    .content-body {
-      flex: 1;
-      background: #f5f9ff;
-      border-radius: 10rpx;
-      padding: 0rpx 23rpx;
+			.content-body {
+				flex: 1;
+				background: #f5f9ff;
+				border-radius: 10rpx;
+				padding: 0rpx 23rpx;
 
-      .row-list {
-        height: 60rpx;
-        display: flex;
-        flex-direction: row;
-        padding: 0px;
-        align-items: center;
-      }
+				.row-list {
+					height: 60rpx;
+					display: flex;
+					flex-direction: row;
+					padding: 0px;
+					align-items: center;
+				}
 
-      .row-list ._label {
-        display: flex;
-        flex: 0.8;
-        color: #909399;
-        align-items: center;
+				.row-list ._label {
+					display: flex;
+					flex: 0.8;
+					color: #909399;
+					align-items: center;
 
-        ._label-icon-1 {
-          background-image: url("~@/static/custom/moveWareHouse/label-icon-1.png");
-          background-size: 100% auto;
-          background-repeat: no-repeat;
-          height: 26rpx;
-          width: 26rpx;
-        }
+					._label-icon-1 {
+						background-image: url("~@/static/custom/moveWareHouse/label-icon-1.png");
+						background-size: 100% auto;
+						background-repeat: no-repeat;
+						height: 26rpx;
+						width: 26rpx;
+					}
 
-        ._label-icon-2 {
-          background-image: url("~@/static/custom/moveWareHouse/label-icon-2.png");
-          background-size: 100% auto;
-          background-repeat: no-repeat;
-          height: 26rpx;
-          width: 26rpx;
-        }
+					._label-icon-2 {
+						background-image: url("~@/static/custom/moveWareHouse/label-icon-2.png");
+						background-size: 100% auto;
+						background-repeat: no-repeat;
+						height: 26rpx;
+						width: 26rpx;
+					}
 
-        ._label-icon-3 {
-          background-image: url("~@/static/custom/moveWareHouse/label-icon-3.png");
-          background-size: 100% auto;
-          background-repeat: no-repeat;
-          height: 26rpx;
-          width: 26rpx;
-        }
+					._label-icon-3 {
+						background-image: url("~@/static/custom/moveWareHouse/label-icon-3.png");
+						background-size: 100% auto;
+						background-repeat: no-repeat;
+						height: 26rpx;
+						width: 26rpx;
+					}
 
-        ._label-name {
-          width: 80px;
-          margin-left: 11rpx;
-          font-size: 26rpx;
-          font-weight: 500;
-          color: #666666;
-        }
-      }
+					._label-name {
+						width: 80px;
+						margin-left: 11rpx;
+						font-size: 26rpx;
+						font-weight: 500;
+						color: #666666;
+					}
+				}
 
-      .row-list ._content {
-        flex: 1.5;
-        text-align: right;
-        color: #909399;
-        font-size: 24rpx;
-      }
+				.row-list ._content {
+					flex: 1.5;
+					text-align: right;
+					color: #909399;
+					font-size: 24rpx;
+				}
 
-      .row-list .s1 {
-        color: #d35651;
-      }
-    }
-  }
-}
+				.row-list .s1 {
+					color: #d35651;
+				}
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/pages/product/WorkshopOrderIssued/index.vue b/pages/product/WorkshopOrderIssued/index.vue
index bfed593..ef9e2e2 100644
--- a/pages/product/WorkshopOrderIssued/index.vue
+++ b/pages/product/WorkshopOrderIssued/index.vue
@@ -1,350 +1,450 @@
 // 杞﹂棿璁㈠崟涓嬪彂
 <template>
-  <view class="page">
-    <view class="packing-registration-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" @click="seachPersonnelNo()">{{
+	<view class="page">
+		<view class="packing-registration-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" @click="seachPersonnelNo()">{{
               registerInfo.moNo == "" ? "鐐瑰嚮閫夋嫨" : registerInfo.moNo
             }}</text>
-            <u-icon
-              name="arrow-right"
-              color="#687792"
-              size="28"
-              @click="seachPersonnelNo()"
-              v-show="registerInfo.moNo == ''"
-            ></u-icon>
-          </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" @click="seachComp()">{{
+						<u-icon name="arrow-right" color="#687792" size="28" @click="seachPersonnelNo()"
+							v-show="registerInfo.moNo == ''"></u-icon>
+					</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" @click="seachWork()">{{
+              registerInfo.optaskNo == "" ? "鐐瑰嚮閫夋嫨" : registerInfo.optaskNo
+            }}</text>
+						<u-icon name="arrow-right" color="#687792" size="28" @click="seachWork()"
+							v-show="registerInfo.optaskNo == ''"></u-icon>
+					</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">
+						<picker class="item-one item-two" style="width: 100%; text-align: right"
+							@change="machineChange($event, machineList)" :value="machineIndex" :range="machineList"
+							range-key="label">
+							<view>
+								<text :style="{ color: machineIndex == null ? '#a5abb4' : '#a5abb4' }">{{
+                machineIndex == null
+                  ? "鐐瑰嚮閫夋嫨"
+                  : machineList[machineIndex].label
+              }}</text>
+							</view>
+						</picker>
+						<u-icon v-if="machineIndex == null" name="arrow-right" color="#687792" size="28"></u-icon>
+					</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" @click="seachComp()">{{
               registerInfo.partNo == "" ? "鐐瑰嚮閫夋嫨" : registerInfo.partNo
             }}</text>
-            <u-icon
-              name="arrow-right"
-              color="#687792"
-              size="28"
-              @click="seachComp()"
-              v-show="registerInfo.partNo == ''"
-            ></u-icon>
-          </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">{{ registerInfo.partName }}</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>
-      </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.outBatchNo }}
-                </view>
-              </view>
-              <view class="row-list">
-                <view class="_label">
-                  <view class="_label-name">涓嬪彂鏁伴噺锛�</view>
-                </view>
-                <view class="_content">
-                  {{ item.qpa }}
-                </view>
-              </view>
-            </view>
-          </view>
-        </u-cell-group>
-      </scroll-view>
-      <scan></scan>
-    </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">{{
+						<u-icon name="arrow-right" color="#687792" size="28" @click="seachComp()"
+							v-show="registerInfo.partNo == ''"></u-icon>
+					</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">{{ registerInfo.partName }}</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>
+			</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.outBatchNo }}
+								</view>
+							</view>
+							<view class="row-list">
+								<view class="_label">
+									<view class="_label-name">涓嬪彂鏁伴噺锛�</view>
+								</view>
+								<view class="_content">
+									{{ item.suppliedQuantity }}
+								</view>
+							</view>
+						</view>
+					</view>
+				</u-cell-group>
+			</scroll-view>
+			<scan></scan>
+		</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">{{
                   modalList.outBatchNo
                 }}</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">
-                <u-input
-                  class="item-one item-two"
-                  v-model="modalList.suppliedQuantity"
-                />
-              </view>
-            </view>
-          </view>
-        </view>
-      </view>
-    </u-modal>
-  </view>
+							</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">{{
+                  modalList.locationNo
+                }}</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">
+								<u-input class="item-one item-two" v-model="modalList.suppliedQuantity" />
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</u-modal>
+	</view>
 </template>
 <script>
-import scan from "@/components/scan/scan.vue";
-import content_bg from "@/static/custom/packing/backBg.png";
-export default {
-  components: {
-    scan,
-  },
+	import scan from "@/components/scan/scan.vue";
+	import content_bg from "@/static/custom/packing/backBg.png";
+	export default {
+		components: {
+			scan,
+		},
 
-  data() {
-    return {
-      background: {
-        backgroundImage: `url(${content_bg})`,
-        backgroundAttachment: "fixed",
-        backgroundSize: "100% auto",
-        backgroundRepeat: "no-repeat",
-      },
-      labelStyle: {
-        fontSize: "32rpx",
-        whiteSpace: "nowrap",
-      },
-      // 寮圭獥鍒楄〃
-      modalList: {
-        operationTaskId: "",
-        partNo: "",
-        moNo: "",
-      },
-      //   涓婚〉闈㈠垪琛�
-      registerInfo: {
-        id: "",
-        moNo: "",
-        partNo: "",
-        partName: "",
-      },
-      //   涓嬪彂璁板綍鍒楄〃
-      hasScanSnList: [],
-      codeInfoId: "",
-      showModal: false,
-    };
-  },
-  onShow() {
-    let that = this;
-    uni.$off("scan"); // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
-    uni.$on("scan", function (data) {
-      console.log("onscan");
-      if (that.registerInfo.partNo == "") {
-        uni.showToast({
-          icon: "none",
-          title: "璇峰厛閫夋嫨瀛愪欢锛�",
-          duration: 2 * 1000,
-        });
-        return;
-      }
-      if (data.code) {
-        //鎵爜鎴愬姛鍚庣殑鍥炶皟锛屼綘鍙互鍐欒嚜宸辩殑閫昏緫浠g爜鍦ㄨ繖閲�
-        console.log("鎵爜缁撴灉锛�", data.code);
-        let codeInfo = JSON.parse(data.code);
-        that.codeInfoId = codeInfo.id;
-        if (codeInfo.partNo) {
-          // 鎵弿鎶ュ伐鍗曚簩缁寸爜
-          that.scanHandle(data.code);
-          that.$forceUpdate();
-          that.getHandelList();
-        }
-      }
-    });
-  },
-  methods: {
-    getHandelList() {
-      this.$u.api.workReporting
-        .getProductMainV1({
-          current: 1,
-          size: -1,
-          id: this.codeInfoId,
-        })
-        .then((res) => {
-          this.hasScanSnList = res.data.productOutputList;
-        });
-    },
-    // 鐐瑰嚮纭鍚庤幏鍙栦笅鍙戣褰�
-    confirm() {
-      // 澶勭悊纭閫昏緫
-      this.$u.api.WorkshopOrderIssued.checkRawPart(this.modalList).then(
-        (res) => {
-          console.log("res", res);
-          if (res.data.code === 0) {
-          this.confirmList();
-          }
-        }
-      );
-    },
-    // 璁㈠崟涓嬪彂
-    confirmList() {
-      this.$u.api.WorkshopOrderIssued.checkRawPart(this.modalList).then(
-        (res) => {
-          console.log("res", res);
-          if (res.data.code === 0) {
-            this.showModal = false;
-          }
-        }
-      );
-    },
-    // 妯℃�佹鍙栨秷
-    cancel() {
-      this.showModal = false; // 鍏抽棴寮圭獥
-    },
-    // 瀛愪欢鍥炴樉
-    compNo(val) {
-      this.registerInfo.partNo = val.partNo;
-      this.registerInfo.partName = val.partName;
-    },
-    // 璁㈠崟鍙峰洖鏄�
-    setNo(val) {
-      console.log("11111", val);
-      this.registerInfo.moNo = val.moNo;
-      // this.registerInfo.value2 = val.value2;
-      this.registerInfo.id = val.id;
-    },
-    //璁㈠崟鍙�
-    seachPersonnelNo() {
-      console.log("杞﹂棿璁㈠崟鍙�");
-      uni.navigateTo({
-        url: "/pages/product/report/orderList",
-      });
-    },
-    //瀛愪欢
-    seachComp() {
-      if (this.registerInfo.moNo == "") {
-        this.$u.toast("璇烽�夋嫨璁㈠崟鍙�");
-        return;
-      }
-      console.log("瀛愪欢");
-      // 浣跨敤uni.navigateTo鏂规硶璺宠浆锛屽苟閫氳繃queryParams浼犻�掑弬鏁�
-      uni.navigateTo({
-        url:
-          "/pages/product/WorkshopOrderIssued/comp?id=" +
-          encodeURIComponent(JSON.stringify(this.registerInfo.id)),
-      });
-    },
-    // 鎵爜鍚庢暟鎹洖鏄�
-    scanHandle(val) {
-      this.modalList = val;
-      this.showModal = true;
-    },
-  },
-};
+		data() {
+			return {
+				background: {
+					backgroundImage: `url(${content_bg})`,
+					backgroundAttachment: "fixed",
+					backgroundSize: "100% auto",
+					backgroundRepeat: "no-repeat",
+				},
+				labelStyle: {
+					fontSize: "32rpx",
+					whiteSpace: "nowrap",
+				},
+				// 寮圭獥鍒楄〃
+				modalList: {},
+				//   涓婚〉闈㈠垪琛�
+				registerInfo: {
+					operationTaskId: '',
+					id: "",
+					moNo: "",
+					partNo: "",
+					partName: "",
+					optaskNo: "",
+					workstationId: ''
+				},
+				//   涓嬪彂璁板綍鍒楄〃
+				hasScanSnList: [],
+				codeInfoId: "",
+				showModal: false,
+				machineIndex: null,
+				machineList: [],
+
+			};
+		},
+		onShow() {
+			let that = this;
+			uni.$off("scan"); // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
+			uni.$on("scan", function(data) {
+				console.log("onscan");
+				if (that.registerInfo.partNo == "") {
+					uni.showToast({
+						icon: "none",
+						title: "璇峰厛閫夋嫨瀛愪欢锛�",
+						duration: 2 * 1000,
+					});
+					return;
+				}
+				if (that.registerInfo.workstationId == "") {
+					uni.showToast({
+						icon: "none",
+						title: "璇峰厛閫夋嫨鏈哄彴锛�",
+						duration: 2 * 1000,
+					});
+					return;
+				}
+				if (data.code) {
+					//鎵爜鎴愬姛鍚庣殑鍥炶皟锛屼綘鍙互鍐欒嚜宸辩殑閫昏緫浠g爜鍦ㄨ繖閲�
+					console.log("鎵爜缁撴灉锛�", data.code);
+					let codeInfo = JSON.parse(data.code);
+					that.codeInfoId = codeInfo.id;
+					if (codeInfo.partNo) {
+						if (that.registerInfo.partNo != codeInfo.partNo) {
+							this.$u.toast("褰撳墠瀛愪欢鍜屾壂鐮佸瓙浠朵笉涓�鑷达紒");
+							return;
+						}
+						// 鎵弿鎶ュ伐鍗曚簩缁寸爜
+						that.scanHandle(codeInfo);
+						that.$forceUpdate();
+						// that.getHandelList();
+					}
+				}
+			});
+		},
+		methods: {
+			//鏈哄彴
+			machineChange(e, storage, code) {
+				this.hasScanSnList = []
+				if (storage.length <= 0) {
+					this.machineIndex = null;
+					return;
+				}
+				this.machineIndex = e.target.value;
+				this.registerInfo.workstationId = storage[this.machineIndex].value;
+			},
+			// getHandelList() {
+			//   this.$u.api.workReporting
+			//     .getProductMainV1({
+			//       current: 1,
+			//       size: -1,
+			//       id: this.codeInfoId,
+			//     })
+			//     .then((res) => {
+			//       this.hasScanSnList = res.data.productOutputList;
+			//     });
+			// },
+			// 鐐瑰嚮纭鍚庤幏鍙栦笅鍙戣褰�
+			confirm() {
+				// 澶勭悊纭閫昏緫
+				this.$u.api.WorkshopOrderIssued.feeding({
+					feedingFrom: "stocker",
+					operationTaskId: this.registerInfo.operationTaskId,
+					feeds: [{
+						...this.modalList
+					}]
+				}).then(
+					(res) => {
+						console.log("res", res);
+						if (res.code === 0) {
+							this.$u.toast("鎻愪氦鎴愬姛");
+							this.showModal = false;
+							const obj = {
+								suppliedQuantity: this.modalList.suppliedQuantity,
+								outBatchNo: this.modalList.outBatchNo,
+							}
+							this.hasScanSnList.push(obj)
+						}
+					}
+				);
+			},
+			// 妯℃�佹鍙栨秷
+			cancel() {
+				this.showModal = false; // 鍏抽棴寮圭獥
+			},
+			// 宸ュ崟鍥炴樉
+			workNo(val) {
+				this.machineList = []
+				this.machineIndex = null
+				this.registerInfo.workstationId = ''
+				this.registerInfo.partName = ''
+				this.registerInfo.partNo = ''
+				this.$u.api.WorkshopOrderIssued
+					.selWorkStation(val)
+					.then((res) => {
+						console.log('111', res)
+						if (res.code === 0 && res.data.length > 0) {
+							res.data.forEach(i => {
+								const obj = Object.assign({
+									label: i.name,
+									value: i.id,
+								})
+								this.machineList.push(obj)
+							})
+						}
+					});
+				this.registerInfo.optaskNo = val.optaskNo;
+				this.registerInfo.operationTaskId = val.id;
+				this.hasScanSnList = []
+			},
+			// 瀛愪欢鍥炴樉
+			compNo(val) {
+				this.registerInfo.partNo = val.partNo;
+				this.registerInfo.partName = val.partName;
+			},
+			// 璁㈠崟鍙峰洖鏄�
+			setNo(val) {
+				console.log("11111", val);
+				this.registerInfo = {
+						operationTaskId: '',
+						id: val.id,
+						moNo: val.moNo,
+						partNo: "",
+						partName: "",
+						optaskNo: "",
+						workstationId: ''
+					},
+					this.machineList = []
+				this.machineIndex = null
+				this.hasScanSnList = []
+			},
+			//璁㈠崟鍙�
+			seachPersonnelNo() {
+				console.log("杞﹂棿璁㈠崟鍙�");
+				uni.navigateTo({
+					url: "/pages/product/report/orderList",
+				});
+			},
+			//瀛愪欢
+			seachComp() {
+				if (this.registerInfo.optaskNo == "") {
+					this.$u.toast("璇烽�夋嫨宸ュ崟鍙�");
+					return;
+				}
+				console.log("瀛愪欢");
+				// 浣跨敤uni.navigateTo鏂规硶璺宠浆锛屽苟閫氳繃queryParams浼犻�掑弬鏁�
+				uni.navigateTo({
+					url: "/pages/product/WorkshopOrderIssued/comp?operationTaskId=" +
+						encodeURIComponent(JSON.stringify(this.registerInfo.operationTaskId)),
+				});
+			},
+			//宸ュ崟
+			seachWork() {
+				if (this.registerInfo.moNo == "") {
+					this.$u.toast("璇烽�夋嫨璁㈠崟鍙�");
+					return;
+				}
+				console.log("瀛愪欢");
+				// 浣跨敤uni.navigateTo鏂规硶璺宠浆锛屽苟閫氳繃queryParams浼犻�掑弬鏁�
+				uni.navigateTo({
+					url: "/pages/product/WorkshopOrderIssued/WorkOrderList?id=" +
+						encodeURIComponent(JSON.stringify(this.registerInfo.id)),
+				});
+			},
+			// 鎵爜鍚庢暟鎹洖鏄�
+			scanHandle(val) {
+				const {
+					outBatchNo
+				} = val
+				const {
+					workstationId,
+					operationTaskId
+				} = this.registerInfo
+				const obj = {
+					outBatchNo: outBatchNo,
+					workstationId: workstationId,
+					operationTaskId: operationTaskId,
+				}
+				this.$u.api.WorkshopOrderIssued.checkRawPartPDA(obj).then(
+					(res) => {
+						console.log("res", res);
+						if (res.code === 0) {
+							res.data.workstationId = workstationId,
+								this.modalList = res.data;
+							this.showModal = true;
+						}
+					}
+				);
+			},
+		},
+	};
 </script>
 <style lang="scss" scoped>
-.popup-content {
-  width: 600rpx;
-  height: 250rpx;
-  background-color: #fff;
-  border-radius: 8px;
-  z-index: 10;
-  /* 纭繚鍐呭鍦ㄨ挋鐗堜箣涓� */
-}
-.packing-registration-bg {
-  background-color: #f6f9ff;
-  background-image: url("~@/static/custom/packing/backBg.png");
-  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;
-}
+	.popup-content {
+		width: 600rpx;
+		height: 350rpx;
+		background-color: #fff;
+		border-radius: 8px;
+		z-index: 10;
+		/* 纭繚鍐呭鍦ㄨ挋鐗堜箣涓� */
+	}
 
-.packing-registration-param {
-  padding: 40rpx 30rpx 10rpx 30rpx;
+	.packing-registration-bg {
+		background-color: #f6f9ff;
+		background-image: url("~@/static/custom/packing/backBg.png");
+		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-title {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    margin-bottom: 30rpx;
+	.packing-registration-param {
+		padding: 40rpx 30rpx 10rpx 30rpx;
 
-    .title-label {
-      margin-left: 14rpx;
-      font-size: 34rpx;
-      font-weight: bold;
-      color: #283e65;
-    }
-  }
+		.packing-registration-param-title {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			margin-bottom: 30rpx;
 
-  .packing-registration-param-view {
-    height: 345rpx;
-    background-color: #fff;
-    border-radius: 10rpx;
-    padding: 0rpx 23rpx;
-    margin-bottom: 30rpx;
+			.title-label {
+				margin-left: 14rpx;
+				font-size: 34rpx;
+				font-weight: bold;
+				color: #283E65;
+			}
+		}
 
-    .packing-registration-param-item {
-      height: 90rpx;
-      border: 1px solid #adc8e4;
-      line-height: 90rpx;
-      display: flex;
-      justify-content: space-between;
-      border: none;
+		.packing-registration-param-view {
+			height: 550rpx;
+			background-color: #fff;
+			border-radius: 10rpx;
+			padding: 0rpx 23rpx;
+			margin-bottom: 30rpx;
 
-      .packing-registration-param-item-left {
-        .item-one {
-          font-size: 30rpx;
-          color: #666666;
-        }
-      }
+			.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-right {
         display: flex;
@@ -352,7 +452,7 @@
 
         .item-one {
           font-size: 30rpx;
-          color: #333333;
+          color: #060505;
           margin-right: 6rpx;
         }
 
@@ -370,95 +470,95 @@
       }
     }
 
-    .param-extra {
-      border-bottom: 1px solid #ededed;
-    }
-  }
-}
+			.param-extra {
+				border-bottom: 1px solid #EDEDED;
+			}
+		}
+	}
 
-.wrap .packing-registration-scroll-list {
-  height: calc(100vh - var(--window-top) - var(--window-bottom) - 550rpx);
-  width: 100%;
-}
+	.wrap .packing-registration-scroll-list {
+		height: calc(100vh - var(--window-top) - var(--window-bottom) - 550rpx);
+		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;
-    background-color: #ffffff;
-    box-sizing: border-box;
-    border-radius: 10rpx;
-    margin: 0rpx 0rpx 16rpx;
-    padding: 20rpx 8rpx;
-    box-shadow: none;
-    display: flex;
-    align-items: center;
+		.content {
+			font-size: 12px;
+			background-color: #ffffff;
+			box-sizing: border-box;
+			border-radius: 10rpx;
+			margin: 0rpx 0rpx 16rpx;
+			padding: 20rpx 8rpx;
+			box-shadow: none;
+			display: flex;
+			align-items: center;
 
-    .content-header {
-      width: 40rpx;
-      height: 90rpx;
-      display: flex;
-      align-items: center;
+			.content-header {
+				width: 40rpx;
+				height: 90rpx;
+				display: flex;
+				align-items: center;
 
-      .content-header-icon {
-        background-image: url("~@/static/custom/moveWareHouse/header_icon.png");
-        background-size: 100% auto;
-        background-repeat: no-repeat;
-        height: 28rpx;
-        width: 28rpx;
-      }
+				.content-header-icon {
+					background-image: url("~@/static/custom/moveWareHouse/header_icon.png");
+					background-size: 100% auto;
+					background-repeat: no-repeat;
+					height: 28rpx;
+					width: 28rpx;
+				}
 
-      .content-header-title {
-        margin-left: 11rpx;
-        font-size: 26rpx;
-        font-weight: bold;
-        color: #626369;
-      }
-    }
+				.content-header-title {
+					margin-left: 11rpx;
+					font-size: 26rpx;
+					font-weight: bold;
+					color: #626369;
+				}
+			}
 
-    .content-body {
-      flex: 1;
-      background-color: #ffffff;
-      border-radius: 10rpx;
-      padding: 0rpx 23rpx;
+			.content-body {
+				flex: 1;
+				background-color: #ffffff;
+				border-radius: 10rpx;
+				padding: 0rpx 23rpx;
 
-      .row-list {
-        height: 60rpx;
-        display: flex;
-        flex-direction: row;
-        padding: 0px;
-        align-items: center;
-      }
+				.row-list {
+					height: 60rpx;
+					display: flex;
+					flex-direction: row;
+					padding: 0px;
+					align-items: center;
+				}
 
-      .row-list ._label {
-        display: flex;
-        flex: 0.8;
-        color: #909399;
-        align-items: center;
+				.row-list ._label {
+					display: flex;
+					flex: 0.8;
+					color: #909399;
+					align-items: center;
 
-        ._label-name {
-          margin-left: 11rpx;
-          font-size: 26rpx;
-          font-weight: 500;
-          color: #666666;
-        }
-      }
+					._label-name {
+						margin-left: 11rpx;
+						font-size: 26rpx;
+						font-weight: 500;
+						color: #666666;
+					}
+				}
 
-      .row-list ._content {
-        flex: 1.5;
-        text-align: right;
-        color: #909399;
-        font-size: 24rpx;
-      }
+				.row-list ._content {
+					flex: 1.5;
+					text-align: right;
+					color: #909399;
+					font-size: 24rpx;
+				}
 
-      .row-list .s1 {
-        color: #d35651;
-      }
-    }
-  }
-}
+				.row-list .s1 {
+					color: #d35651;
+				}
+			}
+		}
+	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3