From bec563ee992d1b8a2efb8eb332c8c9b36a92234e Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 24 十月 2023 16:53:19 +0800
Subject: [PATCH] 1.模具下机 100%
---
pages/login/index.vue | 3
pages/mjgl/mjxj.vue | 286 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 285 insertions(+), 4 deletions(-)
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 331a9d8..2a9bc3e 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -72,10 +72,7 @@
userpassword: '123',
isView: false, //瀵嗙爜鏄惁鍙
-
-
isDisabledSubmitButton: false, //鎻愪氦鎸夐挳鏄惁澶勪簬鍔犺浇涓�
-
isShowCancelButton: false,
isShow: false,
diff --git a/pages/mjgl/mjxj.vue b/pages/mjgl/mjxj.vue
index 02409e3..6e7ad66 100644
--- a/pages/mjgl/mjxj.vue
+++ b/pages/mjgl/mjxj.vue
@@ -1,8 +1,292 @@
<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: 410rpx;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>
+ </view>
+ <view class="flex_column contentFont">
+ <view>{{item.mould_code}}</view>
+ <view>{{item.mould_name}}</view>
+ <view>{{item.mould_spec?item.mould_spec:'/'}}</view>
+ <view>{{item.surp_life}}</view>
+ <view>{{item.resi_life}}</view>
+ <view>{{item.eqp_name}}</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" style="align-items: center;">
+ <view class="head_bar" style="margin-top: 0rpx;"></view>
+ <view class="head_title">
+ 鏈浣跨敤
+ </view>
+
+ <view class="marginLeft20">
+
+ <view class='inputClass'>
+ <u--input placeholder="璇疯緭鍏�" type='number' border="surround"
+ v-model="selectValue"></u--input>
+ </view>
+
+ </view>
+
+ <view style="margin-left: 20rpx;">
+ 娆�
+ </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" 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 {
+ MouldDownQrCodeData,
+
+ MouldDownSave
+ } from '../../config/api.js'
+ export default {
+ onLoad(option) {
+ // const _this = this
+ // uni.$off('scancodedate') // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
+ // uni.$on('scancodedate', function(content) {
+ // console.log("鎵弿鍒扮殑鍐呭涓�:", content)
+ // _this.getMouldDownQrCodeData(content)
+ // })
+ },
+ onPullDownRefresh() {
+ setTimeout(() => {
+ this.init(() => {
+ uni.stopPullDownRefresh();
+ })
+ }, 1000);
+ },
+ data() {
+ return {
+ topRightMessageCount: 0,
+
+ isDisabledSubmitButton: false,
+
+ topContent: [],
+
+ scanContent: '',
+
+
+ selectValue: '',
+
+ descMessage: '',
+
+ show: false,
+ eqpArr: []
+ }
+ },
+ created() {
+ // this.getMouldDownQrCodeData('001')
+
+ },
+ mounted() {
+ this.init()
+
+
+ },
+ methods: {
+
+ init() {
+ uni.stopPullDownRefresh();
+ },
+
+
+ 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.getMouldDownQrCodeData(that.scanContent);
+ }
+ },
+ complete: function(res) {
+
+ },
+ fail: function(res) {
+ console.log('鏉＄爜绫诲瀷锛�' + res.scanType);
+ console.log('鏉＄爜鍐呭锛�' + res.result);
+ }
+
+ });
+ },
+
+ // 鑾峰彇缁翠慨宸ヤ綅
+ async getMouldDownQrCodeData(val) {
+ const data = {
+ mouldcode: val
+ }
+
+ const res = await MouldDownQrCodeData(data)
+ if (res.code === '200') {
+ this.topContent = []
+ this.topContent.unshift(res.data[0])
+ }
+ },
+
+ // 纭鎻愪氦鎸夐挳
+ async submit() {
+
+ // if (parseFloat(this.topContent[0].resi_life) < parseFloat(this.selectValue)) {
+ // uni.$u.toast('鏈浣跨敤娆℃暟涓嶈兘澶т簬鍓╀綑瀵垮懡娆℃暟锛�')
+ // }
+
+ const data = {
+ mouldcode: this.topContent[0].mould_code,
+ eqp_code: this.topContent[0].eqp_code,
+ usecount_life: this.selectValue.length === 0 ? 0 : this.selectValue,
+ description: this.descMessage
+ }
+
+ console.log(JSON.stringify(data))
+
+ this.isDisabledSubmitButton = true
+ const res = await MouldDownSave(data)
+ if (res.code === '200') {
+ uni.$u.toast('鎻愪氦鎴愬姛锛�')
+ 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