From ed15348e5828c506c460322309b899e9d500226c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Fri, 3 Jan 2025 18:06:12 +0800
Subject: [PATCH] 111

---
 manifest.json                                 |   4 +-
 pages.json                                    |   8 ++
 pages/SecondPhase/slitting/UpperShaftCut2.vue | 121 ++++++++++++++++++
 utils/getData3.js                             |  13 +-
 utils/mork2.js                                |  11 +-
 5 files changed, 153 insertions(+), 4 deletions(-)
 create mode 100644 pages/SecondPhase/slitting/UpperShaftCut2.vue

diff --git a/manifest.json b/manifest.json
index 97580c5..3f34e3c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "海亮铜箔",
     "appid" : "__UNI__3A002CD",
     "description" : "海亮铜箔二期手持系统",
-    "versionName" : "1.1.0",
-    "versionCode" : 110,
+    "versionName" : "1.1.1",
+    "versionCode" : 111,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages.json b/pages.json
index 48994f2..39a541a 100644
--- a/pages.json
+++ b/pages.json
@@ -543,6 +543,14 @@
             }
             
         }
+        ,{
+            "path" : "pages/SecondPhase/slitting/UpperShaftCut2",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/SecondPhase/slitting/UpperShaftCut2.vue b/pages/SecondPhase/slitting/UpperShaftCut2.vue
new file mode 100644
index 0000000..ef1e065
--- /dev/null
+++ b/pages/SecondPhase/slitting/UpperShaftCut2.vue
@@ -0,0 +1,121 @@
+<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">区域</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">设备</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+				<view class="msg_item">提示：{{obj.message}}</view>
+			</view>
+		</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}" @tap="toSure">确认</button>
+		</view>
+		<uni-popup ref="alertDialog" type="dialog">
+			<uni-popup-dialog type="info" cancelText="关闭" confirmText="确定" title="提示" content="确认是否创建上轴桁架任务？" @confirm="dialogConfirm"></uni-popup-dialog>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	// import {queryProductArea} from '@/utils/mork2.js'
+	import {queryProductArea} from '@/utils/getData2.js'
+	import {slitterDevices, doUpShaftToSlitterByDeviceTip, doUpShaftToSlitterByDevice} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options: [],
+				index: '',
+				options2: [],
+				index2: '',
+				obj: {message: '-'}
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._queryProductArea()
+		},
+		methods: {
+			selectChange2(e) {
+				this.index2 = e
+				if (e) {
+					this._slitterDevices(e)
+				} else {
+					this.index = ''
+				}
+			},
+			/** 生产区域下拉框查询 */
+			async _queryProductArea () {
+				let res = await queryProductArea()
+				this.options2 = [...res.data]
+			},
+			async _slitterDevices (e) {
+				let res = await slitterDevices(e)
+				this.options = [...res]
+			},
+			selectChange (e) {
+				this.index = e
+				if (e) {
+					this._doUpShaftToSlitterByDeviceTip()
+				} else {
+					this.obj = {message: '-'}
+				}
+			},
+			toSure () {
+				if (!this.index) {
+					return
+				}
+				this.$refs.alertDialog.open()
+			},
+			dialogConfirm () {
+				this._doUpShaftToSlitterByDevice()
+			},
+			async _doUpShaftToSlitterByDevice () {
+				try {
+					let res = await doUpShaftToSlitterByDevice(this.index2, this.index)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					console.log(e)
+				}
+			},
+			clearUp () {
+				this.index = ''
+				this.index2 = ''
+				this.options = []
+				this.obj = {message: '-'}
+			},
+			async _doUpShaftToSlitterByDeviceTip () {
+				try {
+					let res = await doUpShaftToSlitterByDeviceTip(this.index2, this.index)
+					this.obj = res
+				} catch (e) {
+					console.log(e)
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/utils/getData3.js b/utils/getData3.js
index 937177c..c8bf0ba 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -314,4 +314,15 @@ export const getUpShaftTip = (code) => request({
 export const doUpShaftToSlitter = (code) => request({
 	url:'api/pda/slitter/doUpShaftToSlitter',
 	data: {point_code: code}
-})
\ No newline at end of file
+})
+/**
+ * 分切上轴2
+ */
+export const doUpShaftToSlitterByDeviceTip = (area, code) => request({
+	url:'api/pda/slitter/doUpShaftToSlitterByDeviceTip',
+	data: {area: area, device_code: code}
+})
+export const doUpShaftToSlitterByDevice = (area, code) => request({
+	url:'api/pda/slitter/doUpShaftToSlitterByDevice',
+	data: {area: area, device_code: code}
+})
diff --git a/utils/mork2.js b/utils/mork2.js
index 54812d7..1b02e14 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -92,7 +92,8 @@ export const allAuthority = () => {
 				{menu_id: '8', title: '备货区管理', path: '/pages/SecondPhase/slitting/StockingArea'},
 				{menu_id: '8', title: 'AGV放行', path: '/pages/SecondPhase/slitting/AGVPass'},
 				{menu_id: '8', title: '子卷重量维护', path: '/pages/SecondPhase/slitting/SubRollWeight'},
-				{menu_id: '8', title: '分切上轴', path: '/pages/SecondPhase/slitting/UpperShaftCut'}
+				{menu_id: '8', title: '分切上轴', path: '/pages/SecondPhase/slitting/UpperShaftCut'},
+				{menu_id: '8', title: '分切上轴2', path: '/pages/SecondPhase/slitting/UpperShaftCut2'}
 			]},
 			{menu_id: '6', path: 'RF04', title: '点位管理', sonTree: [
 				{menu_id: '1', title: '点位管理', path: '/pages/SecondPhase/point/PointManage'},
@@ -185,6 +186,14 @@ export const queryProductArea = () => {
 	}
 	return res
 }
+export const slitterDevices = (area) => {
+	let res = [{text: '物料一', value: '001'}, {text: '物料a', value: '002'}, {text: '物料b', value: '003'}]
+	return res
+}
+export const doUpShaftToSlitterByDeviceTip = (area, code) => {
+	let res = {message: 'ok', status: 200}
+	return res
+}
 export const queryContainerNameBySaleOrder = () => {
 	let res = {
 		"totalElements": 1,