From faf1d3cc35a3a5f83558946c8056537a4d77fa1f Mon Sep 17 00:00:00 2001
From: liuleilei <234@qq.com>
Date: 星期一, 11 九月 2023 09:34:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
minipro_standard/pages/inspectComplete/inspectComplete.vue | 289 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 289 insertions(+), 0 deletions(-)
diff --git a/minipro_standard/pages/inspectComplete/inspectComplete.vue b/minipro_standard/pages/inspectComplete/inspectComplete.vue
new file mode 100644
index 0000000..f38b8c4
--- /dev/null
+++ b/minipro_standard/pages/inspectComplete/inspectComplete.vue
@@ -0,0 +1,289 @@
+<template>
+ <view class="inspection">
+ <div class="inspection_list">
+ <div class="inspection_list_item">
+ <span>妫�楠岀被鍨�</span>
+ <div class="right">
+ <div class="right_item active">瀹屽伐妫�</div>
+ <!-- <div class="right_item active" v-if="form.status == '1'">宸℃</div>
+ <div class="right_item active" v-if="form.status == '2'">瀹屽伐妫�</div> -->
+ </div>
+ </div>
+ </div>
+ <div class="x"></div>
+ <div class="inspection_list">
+ <div class="inspection_list_item" @click="jumpGD">
+ <span>妫�楠屽伐鍗�</span>
+ <div class="right1">
+ <span :style="form.gdmc ? 'color: #000;' : ''">{{ form.gdmc ? form.gdmc : '鐐瑰嚮閫夋嫨妫�楠屽伐鍗�'}}</span>
+ <u-icon name="arrow-right" color="#999999" size="18" />
+ </div>
+ </div>
+ <div class="inspection_list_item" v-if="form.gdmc">
+ <span>璁″垝鏁伴噺</span>
+ <div class="right1">
+ <span style="color: black;">{{info.planNum}}{{info.umodel ? info.umodel.name : ''}}</span>
+ </div>
+ </div>
+ </div>
+ <div class="x"></div>
+ <div class="inspection_list">
+ <div class="inspection_list_item">
+ <span>鑹搧鏁�</span>
+ <div class="right1">
+ <input type="number" v-model="form.hgsl" placeholder="0" />
+ <span class="dw" v-if="info.umodel">{{info.umodel.name}}</span>
+ </div>
+ </div>
+ <div class="inspection_list_item">
+ <span>涓嶈壇鏁伴噺</span>
+ <div class="right1">
+ <input type="number" v-model="form.blsl" placeholder="0" />
+ <span class="dw" v-if="info.umodel">{{info.umodel.name}}</span>
+ </div>
+ </div>
+ <div class="inspection_list_item" @click="selectBad" v-show="form.blsl > 0">
+ <span>涓嶈壇璇存槑</span>
+ <div class="right1">
+ <span :style="form.blsm ? 'color: #000;' : ''">{{ form.blsm ? form.blsm : '鐐瑰嚮閫夋嫨涓嶈壇鍘熷洜'}}</span>
+ <u-icon name="arrow-right" color="#999999" size="18" />
+ </div>
+ </div>
+ </div>
+ <div class="inspection_footer">
+ <button class="inspection_footer_sub" @click="submit" v-preventReClick>鎻愪氦</button>
+ </div>
+ <u-picker :show="show1" title="璇烽�夋嫨涓嶈壇璇存槑" :columns="columns" keyName="name" @cancel="show1=false"
+ @confirm="badConfirm">
+ </u-picker>
+ </view>
+</template>
+
+<script>
+ import {
+ createStandard
+ } from '@/util/api/QualityAPI'
+ import {
+ checkAllList
+ } from "@/util/api/WorkOrderAPI"
+ import { REGULAR } from '@/util/utils'
+ export default {
+ data() {
+ return {
+ info: {},
+ show1: false,
+ columns: [],
+ form: {
+ status: '2',
+ gdid: '',
+ gdmc: '',
+ jygz: '',
+ jygzmc: '',
+ hgsl: 0,
+ blsl: 0,
+ blgz: '',
+ blgzmc: '',
+ blsm: '',
+ dw: ''
+ }
+ };
+ },
+ onLoad() {
+ checkAllList({
+ bmodelCateType: '3'
+ })
+ .then(res => {
+ let bad = res.data.map(item => {
+ return {
+ name: item.combinationName,
+ id: item.id
+ }
+ })
+ this.columns = [bad]
+ })
+ uni.$on('workOrder', (data) => {
+ this.form.gdmc = data.mmodel.name + '-' + data.pgmodel.name
+ this.form.gdid = data.id
+ this.info = data
+
+ })
+ },
+ methods: {
+ jumpGD() {
+ uni.navigateTo({
+ url: '/pages/selectWorkOrder/selectWorkOrder?type=2'
+ })
+ },
+ selectBad() {
+ this.show1 = true
+ },
+ badConfirm({
+ value
+ }) {
+ this.form.blsm = value[0].name
+ this.show1 = false
+ },
+ submit() {
+ if (!this.form.gdid) return uni.$u.toast('宸ュ崟涓嶈兘涓虹┖')
+
+ if (this.form.hgsl || this.form.blsl) {
+ if (this.form.hgsl) {
+ if (this.form.dw == '0') { // 鏁存暟
+ if (!REGULAR.positiveInteger.test(this.form.hgsl)) return uni.$u.toast('鑹搧鏁伴噺鍙兘涓烘鏁存暟')
+ } else if (this.form.dw == '1') { // 灏忔暟
+ if (!REGULAR.number.test(this.form.hgsl)) uni.$u.toast('鑹搧鏁伴噺鍙兘涓烘鏁存暟鎴栧洓浣嶅皬鏁�')
+ }
+ }
+ if (this.form.blsl) {
+ if (this.form.dw == '0') { // 鏁存暟
+ if (!REGULAR.positiveInteger.test(this.form.blsl)) return uni.$u.toast('涓嶈壇鏁伴噺鍙兘涓烘鏁存暟')
+ } else if (this.form.dw == '1') { // 灏忔暟
+ if (!REGULAR.number.test(this.form.blsl)) {
+ return uni.$u.toast('涓嶈壇鏁伴噺鍙兘涓烘鏁存暟鎴栧洓浣嶅皬鏁�')
+ }
+ }
+ }
+ } else {
+ return uni.$u.toast('鑹搧鍜屼笉鑹笉鑳藉悓鏃朵负绌�')
+ }
+ let total = (this.form.hgsl ? Number(this.form.hgsl) : 0) + (this.form.blsl ? Number(this.form.blsl) : 0)
+ if (total > this.info.planNum) {
+ return uni.$u.toast('鍚堟牸涓嶈壇鐩稿姞涓嶈兘瓒呰繃璁″垝鏁伴噺')
+ }
+ if (Number(this.form.blsl) > 0) {
+ if (!this.form.blsm) return uni.$u.toast('涓嶈壇璇存槑涓嶈兘涓虹┖')
+ }
+ createStandard({
+ workorderId: this.form.gdid,
+ qualifiedNum: this.form.hgsl ? this.form.hgsl : 0,
+ unqualifiedNum: this.form.blsl ? this.form.blsl : 0,
+ checkInfo: this.form.blsm,
+ checkType: this.form.status
+ }).then(res => {
+ if (res.code === 200) {
+ uni.$u.toast('妫�楠屾垚鍔�')
+ uni.navigateBack()
+ }
+ })
+ }
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .inspection {
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ background: #F7F7F7;
+
+ .x {
+ height: 20rpx;
+ }
+
+ .inspection_list {
+ padding: 0 30rpx;
+ background: white;
+
+ .inspection_list_item {
+ height: 98rpx;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ border-bottom: 1rpx solid #E5E5E5;
+
+ &:last-child {
+ border: none;
+ }
+
+ span {
+ font-size: 30rpx;
+ font-weight: 400;
+ color: #222222;
+ }
+
+ .right1 {
+ display: flex;
+ align-items: center;
+
+ span {
+ font-size: 28rpx;
+ font-weight: 400;
+ color: #999999;
+ margin-right: 10rpx;
+ }
+
+ input {
+ width: 180rpx;
+ height: 60rpx;
+ border-radius: 8rpx;
+ border: 1rpx solid #CCCCCC;
+ margin-right: 10rpx;
+ padding: 0 30rpx;
+ box-sizing: border-box;
+ font-size: 28rpx;
+ }
+
+ input::-webkit-input-placeholder {
+ font-size: 28rpx;
+ font-weight: 400;
+ color: #999999;
+ }
+
+ .dw {
+ font-size: 28rpx;
+ font-weight: 400;
+ color: #666666;
+ }
+ }
+
+ .right {
+ display: flex;
+ align-items: center;
+
+ .active {
+ background: $nav-color !important;
+ color: #ffffff !important;
+ }
+
+ .right_item {
+ padding: 18rpx 32rpx;
+ background: #F2F2F2;
+ border-radius: 8rpx;
+ font-size: 26rpx;
+ font-weight: 400;
+ color: #333333;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-left: 20rpx;
+ }
+ }
+ }
+ }
+
+ .inspection_footer {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ width: calc(100% - 60rpx);
+ padding: 30rpx 30rpx 68rpx 30rpx;
+ background: #F7F7F7;
+
+ .inspection_footer_sub {
+ width: 100%;
+ height: 88rpx;
+ background: #4275FC;
+ box-shadow: 0 0 12rpx 0 rgba(0, 0, 0, 0.0800);
+ border-radius: 8rpx;
+ font-size: 30rpx;
+ font-weight: 500;
+ color: #FFFFFF;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border: none;
+ }
+ }
+ }
+</style>
--
Gitblit v1.9.3