From 95fb19190af7556343dbc086b5043fd4868d3522 Mon Sep 17 00:00:00 2001 From: hdy <1105738590@qq.com> Date: 星期五, 19 一月 2024 13:35:19 +0800 Subject: [PATCH] 发动机数据检查页面跟新 --- jcdm-ui/src/views/main/kb/engineCheck/index.vue | 86 +++++++++++++++++++++++++++++++++---------- 1 files changed, 66 insertions(+), 20 deletions(-) diff --git a/jcdm-ui/src/views/main/kb/engineCheck/index.vue b/jcdm-ui/src/views/main/kb/engineCheck/index.vue index 67deef1..d9e49a3 100644 --- a/jcdm-ui/src/views/main/kb/engineCheck/index.vue +++ b/jcdm-ui/src/views/main/kb/engineCheck/index.vue @@ -5,7 +5,7 @@ <div class="container"> <el-row type="flex" justify="center" style="text-align: center" > <el-col :span="12"> - <span style="fontSize:30px;color:black">--------------------鍙戝姩鏈烘暟鎹鏌�--------------------</span> + <span style="fontSize:35px;color:black"><strong>鍙戝姩鏈烘暟鎹鏌�</strong></span> </el-col> </el-row> </div> @@ -19,8 +19,8 @@ <el-form ref="form" :model="form" label-width="200px" style="height: 60px;margin-top: 20px" > <el-form-item prop="engineNo" > <span slot="label" style="font-size:45px;color:black"><strong>鍙戝姩鏈哄彿</strong></span> - <el-input style="font-size:30px" v-model="form.engineNo" placeholder="璇疯緭鍏ュ彂鍔ㄦ満鍙�" > - <el-button slot="append" @click="EngineNohandleChange" icon="el-icon-search"></el-button> + <el-input style="font-size:30px" v-model="form.engineNo" placeholder="璇疯緭鍏ュ彂鍔ㄦ満鍙�" clearable @keyup.enter.native="EngineNohandleChange" > + <el-button slot="append" plain type="info" @click="EngineNohandleChange(form.engineNo)" icon="el-icon-search"></el-button> </el-input> </el-form-item> </el-form> @@ -28,8 +28,8 @@ <el-descriptions-item> <el-form ref="form" :model="form" label-width="200px" style="height: 60px;margin-top: 20px" > <el-form-item prop="productType" > - <span slot="label" style="font-size:45px;color:black"><strong>鏈哄瀷</strong></span> - <el-input disabled style="font-size:30px" value="form.productType" v-model="form.productType" placeholder="" /> + <span slot="label" style="font-size:45px;color:black"><strong>鏈哄瀷</strong></span> + <el-input disabled style="font-size:30px" value="form.productType" v-model="form.productType" placeholder="" /> </el-form-item> </el-form> </el-descriptions-item> @@ -43,9 +43,9 @@ </el-descriptions-item> <el-descriptions-item> <el-form ref="form" :model="form" label-width="200px" style="height: 60px;margin-top: 20px" > - <el-form-item prop="qualityStatus" > + <el-form-item prop="currentWorkstation" > <span slot="label" style="font-size:45px;color:black"><strong>璐ㄩ噺鐘舵��</strong></span> - <el-input disabled style="font-size:30px" v-model="form.qualityStatus" placeholder="" /> + <el-input disabled style="font-size:30px" v-model:value="form.currentWorkstation+form.qualityStatus" placeholder="" /> </el-form-item> </el-form> </el-descriptions-item> @@ -53,12 +53,10 @@ <el-divider></el-divider> <el-row :gutter="10" class="mb8" type="flex" justify="center" style="text-align: center"> <el-col :span="1.5"> - <el-button plain style="width:400px;height:160px" v-hasPermi="['bs:formula:add']"> + <el-button plain :disabled="buttondisabled" type="primary" style="width:400px;height:160px" v-hasPermi="['bs:formula:add']" @click="forceOnline"> <span class="el-icon-thumb" style="font-size:45px;color:black"></span> <span style="font-size:45px;color:black"><strong>寮哄埗涓婄嚎</strong></span> </el-button> - <el-button @click="scanCompleted" style="float: right" type="primary">鎵爜瀹屾垚</el-button> - </el-col> </el-row> </el-card> @@ -88,7 +86,9 @@ </template> <script> -import {listOrderScheduling} from "@/api/main/bs/orderScheduling/orderScheduling"; +import { listOrderScheduling, getOrderScheduling, delOrderScheduling, addOrderScheduling, updateOrderScheduling } from "@/api/main/bs/orderScheduling/orderScheduling"; +import { listPassingStationCollection, getPassingStationCollection, delPassingStationCollection, addPassingStationCollection, updatePassingStationCollection } from "@/api/main/da/passingStationCollection/passingStationCollection"; +import {listLineInfo} from "@/api/main/bs/lineInfo/lineInfo"; export default { components: { }, @@ -96,43 +96,89 @@ props: [], data() { return { + options: [], + loading: true, + total: 0, + engineCheckList:[], showFlag:false, + buttondisabled:true, // 鏌ヨ鍙傛暟 queryParams: { pageNum: 1, pageSize: 10, engineNo: null, + productType:null, + orderNo:null, + qualityStatus:null, + currentWorkstation: null, }, // 琛ㄥ崟鍙傛暟 - form: {}, + form: { + engineNo: null, + productType:null, + orderNo:null, + qualityStatus:null, + currentWorkstation: null, + }, }; }, computed: {}, watch: {}, created() { + }, + mounted() {}, methods: { - scanCompleted(){ - }, + reset(){ + this.form= { + pageNum: 1, + pageSize: 10, + engineNo: null, + productType:null, + orderNo:null, + qualityStatus:null, + currentWorkstation: null, + }, + this.resetForm("form"); + }, EngineNohandleChange(){ + this.loading = true; if(this.form.engineNo !== null && this.form.engineNo !== undefined){ - this.queryParams.engineNo = this.form.engineNo; - listOrderScheduling(this.queryParams).then(response => { - this.$message('鎵爜瀹屾垚'+response.rows[0].model); - console.log("--------------------"+response.rows[0]) + let OrderSchedulingParam = { + engineNo: null + } + let PassingStationCollectionParam = { + sfcCode: null + } + OrderSchedulingParam.engineNo = this.form.engineNo; + PassingStationCollectionParam.sfcCode = this.form.engineNo; + listOrderScheduling(OrderSchedulingParam).then(response => { this.form.productType = response.rows[0].model this.form.orderNo = response.rows[0].orderNo this.form.qualityStatus = response.rows[0].qualityStatus + this.form.currentWorkstation = response.rows[0].currentWorkstation + this.buttondisabled = false; }); + listPassingStationCollection(PassingStationCollectionParam).then(ponse =>{ + this.engineCheckList = ponse.rows; + this.total = ponse.total; + console.log(ponse.rows) + this.loading = false; + }); + // this.reset(); } }, + // initOrderScheduling(){ + // listOrderScheduling(this.queryParams).then(response => { + // this.options = response.rows; + // }); + // }, + }, - - } -- Gitblit v1.9.3