分切暂存下料\分切暂存清除

pages.json

@@ -431,6 +431,22 @@
             }
             
         }
+        ,{
+            "path" : "pages/SecondPhase/slitting/CacheCut",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/SecondPhase/slitting/CacheClean",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",

pages/SecondPhase/slitting/CacheClean.vue

@@ -0,0 +1,68 @@
+<template>
+	<view class="zd_container">
+		<nav-bar 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="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">清空</button>
+			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !index}" :disabled="disabled" @tap="_toCleanCutCacheInventory">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import {getCutCacheAgvPoints, toCleanCutCacheInventory} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar
+		},
+		data() {
+			return {
+				options: [],
+				index: '',
+				disabled: false
+			};
+		},
+		created () {
+			this._getCutCacheAgvPoints()
+		},
+		methods: {
+			selectChange (e) {
+				this.index = e
+			},
+			async _getCutCacheAgvPoints () {
+				let res = await getCutCacheAgvPoints()
+				this.options = [...res]
+			},
+			async _toCleanCutCacheInventory () {
+				this.disabled = true
+				if (!this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await toCleanCutCacheInventory(this.index)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.index = ''
+			}
+		}
+	}
+</script>

pages/SecondPhase/slitting/CacheCut.vue

@@ -0,0 +1,68 @@
+<template>
+	<view class="zd_container">
+		<nav-bar 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="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submitbar">
+			<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">清空</button>
+			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !index}" :disabled="disabled" @tap="_sendSubVolumeToNBJ">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import {getCutCacheAgvPoints, sendSubVolumeToNBJ} from '@/utils/getData3.js'
+	export default {
+		components: {
+			NavBar
+		},
+		data() {
+			return {
+				options: [],
+				index: '',
+				disabled: false
+			};
+		},
+		created () {
+			this._getCutCacheAgvPoints()
+		},
+		methods: {
+			selectChange (e) {
+				this.index = e
+			},
+			async _getCutCacheAgvPoints () {
+				let res = await getCutCacheAgvPoints()
+				this.options = [...res]
+			},
+			async _sendSubVolumeToNBJ () {
+				this.disabled = true
+				if (!this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await sendSubVolumeToNBJ(this.index)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.index = ''
+			}
+		}
+	}
+</script>

pages/home/home.vue

@@ -232,7 +232,7 @@
 .menu-name_inner
 	_wh(100%, 100%)
 	_fj(center)
-	_font(28rpx, 30rpx, #fff,,center)
+	_font(28rpx, 30rpx, #fff, 700, center)
 	border-radius 10rpx
 	padding 10rpx
 	overflow hidden
@@ -245,22 +245,16 @@
 	padding 20rpx 0
 	overflow hidden
 	border-bottom 1px solid #c5c6c7
-.bgc_1
+.bgc_1, .bgc_6
 	background linear-gradient(to right, rgba(73,102,255,0.8) 0%, rgba(117,142,255,0.8) 100%)
-.bgc_2
+.bgc_2, .bgc_7
 	background linear-gradient(to right, rgba(254, 168, 20,0.8) 0%, rgba(255, 177, 1,0.8) 100%)
-.bgc_3
+.bgc_3, .bgc_8
 	background linear-gradient(to right, rgba(0, 228, 153,0.8) 0%, rgba(0, 241, 197,0.8) 100%)
-.bgc_4
+.bgc_4, .bgc_9
 	background linear-gradient(to right, rgba(162, 86, 171,0.8) 0%, rgba(183,120,190,0.8) 100%)
-.bgc_5
+.bgc_5, .bgc_10
 	background linear-gradient(to right, rgba(146, 94, 52,0.8) 0%, rgba(162, 116, 79,0.8) 100%)
-.bgc_6
-	background linear-gradient(to right, rgba(83, 191, 194,0.8) 0%, rgba(119, 198, 201,0.8) 100%)
-.bgc_7
-	background linear-gradient(to right, rgba(244, 97, 61,0.8) 0%, rgba(245, 130, 102,0.8) 100%)
-.bgc_8
-	background linear-gradient(to right, rgba(207, 24, 24, .8) 0%, rgba(245, 102, 102, .8) 100%)
 .tabs_wrap
 	border-radius 20rpx 20rpx 0 0
 	background-color #ecedef

utils/getData3.js

@@ -161,3 +161,18 @@ export const operateIvt = (type, vcode, num, code) => request({
 	url:'api/bstIvtStockingivt/operateIvt',
 	data: {type: type, vehicle_code: vcode, row_num: num, material_code: code}
 })
+/**
+ * 分切暂存下料
+ */
+export const getCutCacheAgvPoints = () => request({
+	url:'api/pda/slitter/getCutCacheAgvPoints',
+	data: {}
+})
+export const sendSubVolumeToNBJ = (code) => request({
+	url:'api/pda/slitter/sendSubVolumeToNBJ',
+	data: {point_code: code}
+})
+export const toCleanCutCacheInventory = (code) => request({
+	url:'api/pda/slitter/toCleanCutCacheInventory',
+	data: {point_code: code}
+})

utils/mork2.js

@@ -81,7 +81,9 @@ export const authority = () => {
 				{menu_id: '4', title: '空轴进站', path: '/pages/SecondPhase/slitting/ZjInStore'},
 				{menu_id: '5', title: '子卷出站', path: '/pages/SecondPhase/slitting/ZjOutStore'},
 				{menu_id: '7', title: '穿拔轴初始化', path: '/pages/SecondPhase/slitting/DoInitShaft'},
-				{menu_id: '8', title: '纸管绑定', path: '/pages/SecondPhase/slitting/PaperBind'}
+				{menu_id: '8', title: '纸管绑定', path: '/pages/SecondPhase/slitting/PaperBind'},
+				{menu_id: '8', title: '分切暂存下料', path: '/pages/SecondPhase/slitting/CacheCut'},
+				{menu_id: '8', title: '分切暂存清除', path: '/pages/SecondPhase/slitting/CacheClean'}
 			]},
 			{menu_id: '6', path: 'RF04', title: '点位管理', sonTree: [
 				{menu_id: '1', title: '点位管理', path: '/pages/SecondPhase/point/PointManage'},
@@ -124,3 +126,7 @@ export const queryPaperMaterial = () => {
 	}
 	return res
 }
+export const getCutCacheAgvPoints = () => {
+	let res = [{"text":"B2_FQZC01","value":"B2分切缓存位01"},{"text":"B2_FQZC02","value":"B2分切缓存位02"},{"text":"B2_FQZC03","value":"B2分切缓存位03"},{"text":"B2_FQZC04","value":"B2分切缓存位04"},{"text":"B2_FQZC05","value":"B2分切缓存位05"},{"text":"B2_FQZC06","value":"B2分切缓存位06"},{"text":"B2_FQZC07","value":"B2分切缓存位07"},{"text":"B2_FQZC08","value":"B2分切缓存位08"},{"text":"B2_FQZC09","value":"B2分切缓存位09"},{"text":"B2_FQZC10","value":"B2分切缓存位10"}]
+	return res
+}