分切下料2加功能

2025-08-22 13:38:21 +08:00
parent fb69bce080
commit ccfb7956f4
3 changed files with 104 additions and 18 deletions
--- a/pages/SecondPhase/slitting/SlittingCutting2.vue
+++ b/pages/SecondPhase/slitting/SlittingCutting2.vue
@@ -43,25 +43,29 @@
 						</view>
 					</view>
 					<view class="zd-col-4">
-						<button class="mini-btn" size="mini" style="display: block;" type="primary" @tap="handleAdd">添加</button>
+						<button class="mini-btn" size="mini" style="display: block;" type="primary" :disabled="disabled1" @tap="_getTubeLength">添加</button>
 					</view>
 				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new slide">
+				<view class="slide_new">
 					<table>
 						<thead>
 							<tr>
-								<th width="60%">子卷号</th>
-								<th width="20%">轴位置</th>
-								<th width="20%">操作</th>
+								<th>子卷号</th>
+								<th>壁厚</th>
+								<th>管芯长度</th>
+								<th>轴位置</th>
+								<th>操作</th>
 							</tr>
 						</thead>
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i">
 								<td>{{e.container_name}}</td>
+								<td>{{e.bh}}</td>
+								<td>{{e.length}}</td>
 								<td>{{ options1 | findByValue(e.site)}}</td>
-								<td><button class="mini-btn" size="mini" type="primary" @tap="handleDelete(i)">删除</button></td>
+								<td><button class="mini-btn" style="display: block;" size="mini" type="primary" @tap="handleDelete(i)">删除</button></td>
 							</tr>
 						</tbody>
 					</table>
@@ -70,8 +74,20 @@
 		</view>
 		<view class="zd-row submitbar">
 			<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">清空</button>
-			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !index || !dataList.length}" :disabled="disabled" @tap="_downRolls2">确认</button>
+			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !index || !dataList.length}" @tap="downRolls2Confirm">确认</button>
 		</view>
+		<view class="msg_modal" :class="modalShow ? 'popshow1' : 'pophide1'">
+			<view class="msg_tip">提示</view>
+			<view class="zd_content pdt26">
+				<view class="msg_p1" v-for="(e, i) in htmlContent1" :key="'content_1' + i">{{i+1}}.{{e}}</view>
+				<view class="msg_p2"v-for="(e, i) in htmlContent2" :key="'content_2' + i">{{e}}</view>
+			</view>
+			<view class="zd-row submitbar">
+				<button class="zd-col-6 btn-submit btn-success letter-30" @tap.stop="modalShow = false">取消</button>
+				<button class="zd-col-15 btn-submit btn-success letter-30" :disabled="disabled" @tap="modalSure">确定</button>
+			</view>
+		</view>
+		<view v-if="modalShow" class="msg_mask msg_mask_1"></view>
 	</view>
 </template>

@@ -79,7 +95,7 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import {queryProductArea} from '@/utils/getData2.js'
-	import {slitterDevices, downRolls2} from '@/utils/getData3.js'
+	import {getTubeLength, slitterDevices, downRolls2} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -97,7 +113,11 @@
 				current: 0,
 				val1: '',
 				dataList: [],
-				disabled: false
+				disabled: false,
+				disabled1: false,
+				modalShow: false,
+				htmlContent1: [],
+				htmlContent2: []
 			};
 		},
 		onLoad (options) {
@@ -130,26 +150,78 @@
 			radioChange (e) {
 				this.index1 = e.detail.value
 			},
-			handleAdd () {
+			async _getTubeLength () {
+				this.disabled1 = true
 				if (!this.val1.trim()) {
+					this.disabled1 = false
 					return
 				}
-				const index = this.dataList.findIndex(item => item === this.val1)
-				if (index !== -1) {
-					this.dataList.splice(index, 1)
+				try {
+					let res = await getTubeLength(this.val1)
+					if (res.status === 200) {
+						const index = this.dataList.findIndex(item => item.container_name === this.val1)
+						if (index !== -1) {
+							this.dataList.splice(index, 1)
+						}
+						this.dataList.push({container_name: this.val1, site: this.index1, bh: res.data.bh, length: res.data.length})
+						this.val1 = ''
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+					this.disabled1 = false
+				} catch (e) {
+					this.disabled1 = false
 				}
-				this.dataList.push({container_name: this.val1, site: this.index1})
-				this.val1 = ''
 			},
 			handleDelete (index) {
 				this.dataList.splice(index, 1)
 			},
-			async _downRolls2 () {
-				this.disabled = true
+			downRolls2Confirm () {
+				this.htmlContent1 = []
+				this.htmlContent2 = []
 				if (!this.index || !this.dataList.length) {
-					this.disabled = false
 					return
 				}
+				if (this.dataList.length === 1) {
+					if (Number(this.dataList[0].length) >= 350 && Number(this.dataList[0].length) < 1600) {
+						this.htmlContent1 = ['两个轴承端面到管芯端面到轴断面>=160mm', '三个轴承端面到管芯端面距离>=140mm', '管芯端面到缠绕膜边缘距离>=25mm']
+						this.htmlContent2 = [`${this.dataList[0].container_name}:${this.dataList[0].bh}#${this.dataList[0].length}`]
+					} else if (Number(this.dataList[0].length) >= 1600 && Number(this.dataList[0].length) <= 1700) {
+						this.htmlContent1 = ['85mm<=两个轴承端面到管芯端面距离<=120mm', '管芯端面到缠绕膜边缘距离>=25mm']
+						this.htmlContent2 = [`${this.dataList[0].container_name}:${this.dataList[0].bh}#${this.dataList[0].length}`]
+					}
+				} else if (this.dataList.length === 2) {
+					if (this.dataList[0].site === this.dataList[1].site) {
+						this.htmlContent1 = ['两个轴承端面到管芯端面到轴断面>=160mm', '三个轴承端面到管芯端面距离>=140mm', '管芯端面到缠绕膜边缘距离>=25mm', '管芯到管芯的间距>=50mm']
+						this.dataList.map(e => {
+							this.htmlContent2.push(`${e.container_name}:${e.bh}#${e.length}`)
+						})
+					} else {
+						if (Number(this.dataList[0].length) >= 350 && Number(this.dataList[0].length) < 1600) {
+							this.htmlContent1 = ['两个轴承端面到管芯端面到轴断面>=160mm', '三个轴承端面到管芯端面距离>=140mm', '管芯端面到缠绕膜边缘距离>=25mm']
+							this.htmlContent2 = [`${this.dataList[0].container_name}:${this.dataList[0].bh}#${this.dataList[0].length}`]
+						} else if (Number(this.dataList[0].length) >= 1600 && Number(this.dataList[0].length) <= 1700) {
+							this.htmlContent1 = ['85mm<=两个轴承端面到管芯端面距离<=120mm', '管芯端面到缠绕膜边缘距离>=25mm']
+							this.htmlContent2 = [`${this.dataList[0].container_name}:${this.dataList[0].bh}#${this.dataList[0].length}`]
+						}
+					}
+					
+				} else if (this.dataList.length > 2) {
+					this.htmlContent1 = ['两个轴承端面到管芯端面到轴断面>=160mm', '三个轴承端面到管芯端面距离>=140mm', '管芯端面到缠绕膜边缘距离>=25mm', '管芯到管芯的间距>=50mm']
+					this.dataList.map(e => {
+						this.htmlContent2.push(`${e.container_name}:${e.bh}#${e.length}`)
+					})
+				}
+				this.modalShow = true
+			},
+			modalSure () {
+				this._downRolls2()
+			},
+			async _downRolls2 () {
+				this.disabled = true
 				try {
 					let res = await downRolls2(this.index, this.dataList)
 					if (res) {
@@ -160,8 +232,10 @@
 						this.dataList = []
 					}
 					this.disabled = false
+					this.modalShow = false
 				} catch (e) {
 					this.disabled = false
+					this.modalShow = false
 				}
 			},
 			clearUp () {
@@ -170,6 +244,8 @@
 				this.options = []
 				this.val1 = ''
 				this.dataList = []
+				this.disabled = false
+				this.disabled1 = false
 			}
 		}
 	}
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -481,6 +481,12 @@ export const remainShaftBack = (code, size, ge, flag) => request({
 /**
 * 分切下料2(二期分切管理)
 */
+export const getTubeLength = (code) => request({
+	url:'api/pda/slitter/getTubeLength',
+	data: {
+		container_name: code
+	}
+})
 export const downRolls2 = (device, code) => request({
 	url:'api/pda/slitter/downRolls2',
 	data: {
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -290,4 +290,8 @@ export const showManualView = (code) => {
 export const doCallTubeShaftShow = () => {
 	let res = [{"workorder_id":"1850909252072378369","resource_name":"B50FQ00001","container_name":"BB3X2410280807A2","parent_container_name":"BB3X24102809","split_group":"A","up_or_down":"2","status":"0","qzz_size":"6","tube":"玻璃纤维及其制品|FRP管|6英寸|15|1700|阶梯","qzz_generation":"4","start_time":"","is_paper_ok":"1","qzzno":"","manufacture_sort":"P1"}]
 	return res
+}
+export const getTubeLength = (code) => {
+	let res = {"data":{"bh":"15","length":"1700"},"message":"获取信息成功!","status":200}
+	return res
 }