From f368f15a99315962ffe4377b6f9860badeb52cb1 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 27 Jun 2025 10:30:01 +0800
Subject: [PATCH] =?UTF-8?q?add=E5=8C=85=E8=A3=85=E5=85=B3=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                   |   8 ++
 pages/SecondPhase/PackRelation.vue           | 142 +++++++++++++++++++
 pages/SecondPhase/production/ManmadeBake.vue |   2 +-
 pages/SecondPhase/production/MjWeight.vue    |   3 +-
 utils/getData3.js                            |  17 +++
 utils/mork2.js                               |   3 +-
 6 files changed, 172 insertions(+), 3 deletions(-)
 create mode 100644 pages/SecondPhase/PackRelation.vue

diff --git a/pages.json b/pages.json
index 274b66c..60d4c0f 100644
--- a/pages.json
+++ b/pages.json
@@ -409,6 +409,14 @@
             }
             
         }
+        ,{
+            "path" : "pages/SecondPhase/PackRelation",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/SecondPhase/PackRelation.vue b/pages/SecondPhase/PackRelation.vue
new file mode 100644
index 0000000..3647969
--- /dev/null
+++ b/pages/SecondPhase/PackRelation.vue
@@ -0,0 +1,142 @@
+<template>
+	<view class="zd_container">
+		<!-- <nav-bar title="包装关系维护"></nav-bar> -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label">销售订单号<span style="color: #D7592F;font-weight: 700;">*</span></view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input" v-model="val1">
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">{{$t('grid.sub-roll-number')}}<span style="color: #D7592F;font-weight: 700;">*</span></span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box v-model="val2" />
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">客户编号<span style="color: #D7592F;font-weight: 700;">*</span></view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input" v-model="val3">
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">{{$t('grid.customer-name')}}<span style="color: #D7592F;font-weight: 700;">*</span></view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input" v-model="val4">
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">{{$t('grid.product-code')}}<span style="color: #D7592F;font-weight: 700;">*</span></view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input" v-model="val5">
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">{{$t('grid.product-description')}}<span style="color: #D7592F;font-weight: 700;">*</span></view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input" v-model="val6">
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">{{$t('grid.net-weight')}}<span style="color: #D7592F;font-weight: 700;">*</span></view>
+					<view class="filter_input_wraper">
+						<NumberInput
+						v-model="val7"
+						input-class="filter_input"
+						mode="mixed"
+						:decimalLength="3"
+						/>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">产品厚度(mm)<span style="color: #D7592F;font-weight: 700;">*</span></view>
+					<view class="filter_input_wraper">
+						<NumberInput
+						v-model="val8"
+						input-class="filter_input"
+						mode="mixed"
+						:decimalLength="3"
+						/>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">物料类型<span style="color: #D7592F;font-weight: 700;">*</span></view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input" v-model="val9">
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
+			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1 || !val2 || !val3 || !val4 || !val5 || !val6 || !val7 || !val8 || !val9}" :disabled="disabled" @tap="_packagerelation">{{$t('button.confirm')}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import NumberInput from '@/components/NumberInput.vue'
+	import {packagerelation} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox,
+			NumberInput
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				val3: '',
+				val4: '',
+				val5: '',
+				val6: '',
+				val7: '',
+				val8: '',
+				val9: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			async _packagerelation () {
+				this.disabled = true
+				if (!this.val1 || !this.val2 || !this.val3 || !this.val4 || !this.val5 || !this.val6 || !this.val7 || !this.val8 || !this.val9) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await packagerelation(this.val1, this.val2, this.val3, this.val4, this.val5, this.val6, this.val7, this.val8, this.val9)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.val1 = ''
+				this.val2 = ''
+				this.val3 = ''
+				this.val4 = ''
+				this.val5 = ''
+				this.val6 = ''
+				this.val7 = ''
+				this.val8 = ''
+				this.val9 = ''
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/SecondPhase/production/ManmadeBake.vue b/pages/SecondPhase/production/ManmadeBake.vue
index 9122032..78c6b35 100644
--- a/pages/SecondPhase/production/ManmadeBake.vue
+++ b/pages/SecondPhase/production/ManmadeBake.vue
@@ -33,7 +33,7 @@
 					</view>
 				</view>
 				<view class="filter_item">
-					<view class="filter_label">{{$t('filter.time')}}</view>
+					<view class="filter_label">{{$t('filter.time')}}({{$t('unit.minute')}})</view>
 					<view class="filter_input_wraper">
 						<!-- <input type="text" class="filter_input" v-model="val4"> -->
 						<NumberInput
diff --git a/pages/SecondPhase/production/MjWeight.vue b/pages/SecondPhase/production/MjWeight.vue
index d04d8d9..c548c92 100644
--- a/pages/SecondPhase/production/MjWeight.vue
+++ b/pages/SecondPhase/production/MjWeight.vue
@@ -18,7 +18,8 @@
 						<NumberInput
 						v-model="val2"
 						input-class="filter_input"
-						mode="integer"
+						mode="mixed"
+						:decimalLength="3"
 						/>
 					</view>
 				</view>
diff --git a/utils/getData3.js b/utils/getData3.js
index ae33157..f32d401 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -610,4 +610,21 @@ export const confirmWeight = (cname, weight) => request({
 		container_name: cname,
 		weight: weight
 	}
+})
+/**
+ * 包装关系维护
+ */
+export const packagerelation = (sn, cname, cn, cd, product, desc, weight, think, type) => request({
+	url:'api/pdmBiSubpackagerelation/packagerelation',
+	data: {
+		sale_order_name: sn,
+		container_name: cname,
+		customer_name: cn,
+		customer_description: cd,
+		product_name: product,
+		product_description: desc,
+		net_weight: weight,
+		thickness: think,
+		material_type: type
+	}
 })
\ No newline at end of file
diff --git a/utils/mork2.js b/utils/mork2.js
index 9c51de0..e3ba340 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -55,7 +55,8 @@ export const allAuthority = () => {
 			{menu_id: '10', path: 'RF15', title: '打包间管理', sonTree: [
 				{menu_id: '1', title: '子卷包装解绑', path: '/pages/SecondPhase/SubRollPackUnbind'},
 				{menu_id: '1', title: '装箱口木箱回库', path: '/pages/SecondPhase/BoxReturn'},
-				{menu_id: '1', title: '人工点维护', path: '/pages/SecondPhase/ManMaintain'}
+				{menu_id: '1', title: '人工点维护', path: '/pages/SecondPhase/ManMaintain'},
+				{menu_id: '1', title: '包装关系维护', path: '/pages/SecondPhase/PackRelation'}
 			]},
 			{menu_id: '6', path: 'RF04', title: '点位管理', sonTree: [
 				{menu_id: '1', title: '点位管理', path: '/pages/SecondPhase/point/PointManage'},