From 859dacb2b86be0dd74aed57d26c7bdea07ced7c1 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 24 十月 2023 15:51:42 +0800
Subject: [PATCH] 1.模具上机 100%
---
config/api.js | 59 +++++++++
pages/mjgl/mjdj.vue | 2
pages/mjgl/mjby.vue | 18 +-
pages/mjgl/mjsj.vue | 275 +++++++++++++++++++++++++++++++++++++++++++++
pages/mjgl/mjcx2.vue | 2
5 files changed, 344 insertions(+), 12 deletions(-)
diff --git a/config/api.js b/config/api.js
index 26c16e4..22a95d9 100644
--- a/config/api.js
+++ b/config/api.js
@@ -80,4 +80,63 @@
// 妯″叿淇℃伅鏌ヨ鏄庣粏
export const ScanMouldQrCodeMessageSubData = (data) => http.get('/MouldManager/ScanMouldQrCodeMessageSubData', {
params: data
+})
+
+// 妯″叿涓婃満,鎵弿妯″叿缂栫爜
+export const MouldUpQrCodeData = (data) => http.get('/MouldManager/MouldUpQrCodeData', {
+ params: data
+})
+
+// 妯″叿涓婃満鎻愪氦
+export const MouldUpSave = (data) => http.post('/MouldManager/MouldUpSave',
+ data)
+
+// 妯″叿涓嬫満,鎵弿妯″叿缂栫爜
+export const MouldDownQrCodeData = (data) => http.get('/MouldManager/MouldDownQrCodeData', {
+ params: data
+})
+
+// 妯″叿涓嬫満鎻愪氦
+export const MouldDownSave = (data) => http.post('/MouldManager/MouldDownSave',
+ data)
+
+// 妯″叿澶栧��,鎵弿妯″叿缂栫爜
+export const MouldLendOutQrCodeData = (data) => http.get('/MouldManager/MouldLendOutQrCodeData', {
+ params: data
+})
+
+// 妯″叿澶栧�熸彁浜�
+export const MouldLendOutSave = (data) => http.post('/MouldManager/MouldLendOutSave',
+ data)
+
+// 妯″叿褰掕繕,鎵弿妯″叿缂栫爜
+export const MouldReturnQrCodeData = (data) => http.get('/MouldManager/MouldReturnQrCodeData', {
+ params: data
+})
+
+// 妯″叿褰掕繕鎻愪氦
+export const MouldReturnSave = (data) => http.post('/MouldManager/MouldReturnSave',
+ data)
+
+// 妯″叿鍏ュ簱,鎵弿妯″叿缂栫爜
+export const MouldInWareHouseQrCodeData = (data) => http.get('/MouldManager/MouldInWareHouseQrCodeData', {
+ params: data
+})
+
+// 妯″叿鍏ュ簱鎻愪氦
+export const MouldInWareHouseSave = (data) => http.post('/MouldManager/MouldInWareHouseSave',
+ data)
+
+// 妯″叿鍑哄簱,鎵弿妯″叿缂栫爜
+export const MouldOutWareHouseQrCodeData = (data) => http.get('/MouldManager/MouldOutWareHouseQrCodeData', {
+ params: data
+})
+
+// 妯″叿鍑哄簱鎻愪氦
+export const MouldOutWareHouseSave = (data) => http.post('/MouldManager/MouldOutWareHouseSave',
+ data)
+
+// 璁惧涓嬫媺
+export const EqpPermissions = (data) => http.get('/MouldManager/MouldEqpPermissions', {
+ params: data
})
\ No newline at end of file
diff --git a/pages/mjgl/mjby.vue b/pages/mjgl/mjby.vue
index 40c9779..2cb0730 100644
--- a/pages/mjgl/mjby.vue
+++ b/pages/mjgl/mjby.vue
@@ -64,14 +64,14 @@
- <view class="marginRight20 marginBottom10" v-if='standardArr.length>0'>
- <u-button @click="show = true" type='primary' size="small" plain
- shape='circle'>璇烽�夋嫨</u-button>
- </view>
-
- <view class="marginRight20 marginBottom10" v-if='standardArr.length===0'>
- 鏆傛棤鍏宠仈鏍囧噯,璇峰厛鍏宠仈
- </view>
+ <view class="marginRight20 marginBottom10" v-if='standardArr.length>0'>
+ <u-button @click="show = true" type='primary' size="small" plain
+ shape='circle'>璇烽�夋嫨</u-button>
+ </view>
+
+ <view class="marginRight20 marginBottom10" v-if='standardArr.length===0'>
+ 鏆傛棤鍏宠仈鏍囧噯,璇峰厛鍏宠仈
+ </view>
</view>
@@ -327,7 +327,7 @@
const data = {
code: this.topContent[0].code,
name: this.topContent[0].name,
- standcode: this.selectValue,
+ standcode: this.standardArr.find(i => i.name === this.selectValue).code,
result: this.resultValue,
children
}
diff --git a/pages/mjgl/mjcx2.vue b/pages/mjgl/mjcx2.vue
index 3a76c21..f340943 100644
--- a/pages/mjgl/mjcx2.vue
+++ b/pages/mjgl/mjcx2.vue
@@ -42,7 +42,7 @@
<view>{{item.resi_life}}</view>
<view>{{item.status==='Y'?'姝ｅ父':'寮傚父'}}</view>
<view>
- {{onstateArr.find(i=>parseFloat(i.code) === parseFloat(item.usestatus)).name}}
+ {{ item.usestatus?onstateArr.find(i=>parseFloat(i.code) === parseFloat(item.usestatus)).name:'/'}}
</view>
<view>{{item.checkdate?item.checkdate:'/'}}</view>
<view>{{item.maintdate?item.maintdate:'/'}}</view>
diff --git a/pages/mjgl/mjdj.vue b/pages/mjgl/mjdj.vue
index e7241d5..a06d501 100644
--- a/pages/mjgl/mjdj.vue
+++ b/pages/mjgl/mjdj.vue
@@ -327,7 +327,7 @@
const data = {
code: this.topContent[0].code,
name: this.topContent[0].name,
- standcode: this.selectValue,
+ standcode: this.standardArr.find(i => i.name === this.selectValue).code,
result: this.resultValue,
children
}
diff --git a/pages/mjgl/mjsj.vue b/pages/mjgl/mjsj.vue
index 02409e3..fb06e51 100644
--- a/pages/mjgl/mjsj.vue
+++ b/pages/mjgl/mjsj.vue
@@ -1,8 +1,281 @@
<template>
+ <view>
+ <page-nav title="妯″叿涓婃満"></page-nav>
+
+
+ <view v-show="topContent.length===0">
+ <div class="sacnBody">
+ <div class="scanImg" @click="topScanClick"></div>
+ <div class="scanText">鎵弿妯″叿缂栫爜</div>
+ </div>
+ </view>
+
+
+ <view v-show="topContent.length!==0">
+ <view class="mainContent">
+ <view>
+ <u-gap height="10" bgColor="#eff0f1"></u-gap>
+ <view class="head" style="max-height: 370rpx;overflow:scroll;">
+ <view class="head_block">
+ <view class="head_left">
+ <view class="head_bar"></view>
+ <view class="head_title">
+ 妯″叿淇℃伅
+ </view>
+ </view>
+
+ <view class="marginRight20">
+ <u-icon name="scan" @click="topScanClick" color="red" size="24"></u-icon>
+ </view>
+
+ </view>
+
+ <view class="marginTop20 marginLeft20 marginRight20 flex_column">
+ <view class="marginBottom20 flex_between" v-for="item in topContent" :key="item.code">
+ <view style="display: flex;">
+ <view class="flex_column titleFont">
+ <view>妯″叿缂栫爜锛�</view>
+ <view>妯″叿鍚嶇О锛�</view>
+ <view>瑙勬牸鍨嬪彿锛�</view>
+ <view>棰勮瀵垮懡锛�</view>
+ <view>鍓╀綑瀵垮懡锛�</view>
+ </view>
+ <view class="flex_column contentFont">
+ <view>{{item.code}}</view>
+ <view>{{item.name}}</view>
+ <view>{{item.spec?item.spec:'/'}}</view>
+ <view>{{item.surp_life}}</view>
+ <view>{{item.resi_life}}</view>
+ </view>
+ </view>
+ </view>
+
+ </view>
+
+ </view>
+ <u-gap height="10" bgColor="#eff0f1"></u-gap>
+
+ <view class="head" style="padding-bottom: 10rpx;">
+ <view class="head_block" style="margin-bottom: 10rpx;margin-top:20rpx;">
+ <view class="head_left">
+ <view class="head_bar"></view>
+ <view class="head_title">
+ 涓婃満璁惧
+ </view>
+
+ <view class="marginLeft20">
+ {{selectValue}}
+ </view>
+
+ </view>
+
+
+
+ <view class="marginRight20 marginBottom10" v-if='eqpArr.length!==0'>
+ <u-button @click="show = true" type='primary' size="small" plain
+ shape='circle'>璇烽�夋嫨</u-button>
+ </view>
+
+ <view class="marginRight20 marginBottom10" v-if='eqpArr.length===0'>
+ 鏆傛棤绌轰綑璁惧锛岃鍏堜笅鏈�
+ </view>
+
+
+ </view>
+ </view>
+ <u-gap height="10" bgColor="#eff0f1"></u-gap>
+
+ <view class="head" style="padding-bottom: 10rpx;">
+ <view class="head_block" style="margin-bottom: 10rpx;margin-top:20rpx;">
+ <view class="head_left">
+ <view class="head_bar"></view>
+ <view class="head_title">
+ 涓婃満鎻忚堪
+ </view>
+ </view>
+ </view>
+ <view class='inputClass contentFont' style="margin: 0 20rpx; width: 95%;">
+ <u--textarea placeholder="璇疯緭鍏�" confirm-type="send" border="surround" height='80'
+ v-model="descMessage">
+ </u--textarea>
+ </view>
+
+
+
+
+ </view>
+
+ </view>
+ </view>
+
+
+ <view class="footer">
+ <u-button size="large" :loading="isDisabledSubmitButton" loadingText="姝ｅ湪鎻愪氦,璇风◢绛�..." type="primary"
+ @click="submit" :disabled="selectValue.toString().length===0" text="纭鎻愪氦">
+ </u-button>
+ </view>
+
+ </view>
+
+
+
+ <u-action-sheet :actions="eqpArr" @select="selectClick" round='20' :closeOnClickOverlay='true'
+ @close="show=false" :closeOnClickAction="true" :safeAreaInsetBottom='true' :show="show"></u-action-sheet>
+
+
+
+
+ </view>
</template>
<script>
+ import {
+ MouldUpQrCodeData,
+ EqpPermissions,
+ MouldUpSave
+ } from '../../config/api.js'
+ export default {
+ onLoad(option) {
+ // const _this = this
+ // uni.$off('scancodedate') // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
+ // uni.$on('scancodedate', function(content) {
+ // console.log("鎵弿鍒扮殑鍐呭涓�:", content)
+ // _this.getMouldUpQrCodeData(content)
+ // })
+ },
+ onPullDownRefresh() {
+ setTimeout(() => {
+ this.init(() => {
+ uni.stopPullDownRefresh();
+ })
+ }, 1000);
+ },
+ data() {
+ return {
+ topRightMessageCount: 0,
+
+ isDisabledSubmitButton: false,
+
+ topContent: [],
+
+ scanContent: '',
+
+
+ selectValue: '',
+
+ descMessage: '',
+
+ show: false,
+ eqpArr: []
+ }
+ },
+ created() {
+ // this.getMouldUpQrCodeData('002')
+
+ },
+ mounted() {
+ this.init()
+
+ this.getEqpPermissions()
+ },
+ methods: {
+
+ init() {
+ uni.stopPullDownRefresh();
+ },
+ async getEqpPermissions() {
+ const {
+ data: res
+ } = await EqpPermissions()
+ this.eqpArr = res
+ },
+
+ selectClick(val) {
+ console.log(val)
+ this.selectValue = val.name
+ },
+ // 鎵爜宸ヤ綅 鐨勬壂鐮佹鐐瑰嚮
+ topScanClick() {
+ // if (this.topContent.length > 0) {
+ // return uni.$u.toast('璇峰厛鎻愪氦姝ょ淮淇敵璇凤紒')
+ // }
+
+ let that = this;
+ uni.scanCode({
+ onlyFromCamera: true,
+ // scanType: ['barCode', 'qrCode'],
+ scanType: ['qrCode'],
+ success: function(res) {
+ console.log('鏉＄爜绫诲瀷锛�' + res.scanType);
+ console.log('鏉＄爜鍐呭锛�' + res.result);
+ that.scanContent = res.result;
+ let flag = false
+ that.topContent.forEach(item => {
+ if (item.code === res.result) {
+ flag = true
+ }
+ })
+ if (flag) {
+ that.$u.toast('姝ゆ潯鐮佸凡鎵弿锛屽凡鍦ㄥ垪琛ㄤ腑锛�')
+ } else {
+ //澶勭悊鎵爜浜嬩欢
+ that.getMouldUpQrCodeData(that.scanContent);
+ }
+ },
+ complete: function(res) {
+
+ },
+ fail: function(res) {
+ console.log('鏉＄爜绫诲瀷锛�' + res.scanType);
+ console.log('鏉＄爜鍐呭锛�' + res.result);
+ }
+
+ });
+ },
+
+ // 鑾峰彇缁翠慨宸ヤ綅
+ async getMouldUpQrCodeData(val) {
+ const data = {
+ mouldcode: val
+ }
+
+ const res = await MouldUpQrCodeData(data)
+ if (res.code === '200') {
+ this.topContent = []
+ this.topContent.unshift(res.data[0])
+ }
+ },
+
+ // 纭鎻愪氦鎸夐挳
+ async submit() {
+ const data = {
+ mouldcode: this.topContent[0].code,
+ eqp_code: this.eqpArr.find(i => i.name === this.selectValue).code,
+ description: this.descMessage
+ }
+
+ // console.log(JSON.stringify(data))
+
+ this.isDisabledSubmitButton = true
+ const res = await MouldUpSave(data)
+ if (res.code === '200') {
+ uni.$u.toast('鎻愪氦鎴愬姛锛�')
+ this.getEqpPermissions()
+ this.isDisabledSubmitButton = false
+ this.topContent = []
+ this.selectValue = ''
+ this.descMessage = ''
+ }
+
+ },
+ }
+ }
</script>
-<style>
+<style lang="scss" scoped>
+ @import url('@/style/global.css');
+
+ ::v-deep .uicon-arrow-left>span {
+ display: block;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3