From a36d141236c0e06af4da16e8247d30915b197e32 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期三, 24 一月 2024 13:53:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/kb/engineCheck/index.vue | 192 ++++++++++++++++++++++++++---------------------
1 files changed, 106 insertions(+), 86 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/engineCheck/index.vue b/jcdm-ui/src/views/main/kb/engineCheck/index.vue
index d9e49a3..a3b2be1 100644
--- a/jcdm-ui/src/views/main/kb/engineCheck/index.vue
+++ b/jcdm-ui/src/views/main/kb/engineCheck/index.vue
@@ -1,60 +1,51 @@
<template>
<div class="app-container">
- <el-card style="height: 70px;margin-bottom: 10px" class="box-card" >
+ <el-card class="box-card" style="height: 60px" >
<template>
- <div class="container">
- <el-row type="flex" justify="center" style="text-align: center" >
- <el-col :span="12">
- <span style="fontSize:35px;color:black"><strong>鍙戝姩鏈烘暟鎹鏌�</strong></span>
- </el-col>
- </el-row>
+ <div class="container" type="flex" justify="center" style="text-align:center">
+<!-- <el-row type="flex" justify="center" style="text-align:center;height: 12px" >-->
+<!-- <el-col type="flex" justify="center" :span="14" style="text-align:center">-->
+ <el-divider><span style="font-size:22px;color:black"><strong>鍙戝姩鏈烘暟鎹鏌�</strong></span></el-divider>
+<!-- </el-col>-->
+<!-- </el-row>-->
</div>
</template>
</el-card>
- <el-row :gutter="5" style="margin-top: 10px">
- <el-col :span="10" >
- <el-card class="bottom-card">
- <el-descriptions :column="1" >
- <el-descriptions-item>
- <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="璇疯緭鍏ュ彂鍔ㄦ満鍙�" clearable @keyup.enter.native="EngineNohandleChange" >
+ <el-row :gutter="0" >
+ <el-col :span="14">
+ <el-card class="box-card" style="margin-top: 5px" >
+ <el-form ref="form" :model="form" label-width="25%" >
+ <el-form-item prop="engineNo" style="margin-top: 16px">
+ <span slot="label" style="font-size:22px;color:black;"><strong>鍙戝姩鏈哄彿</strong></span>
+ <el-input style="font-size:20px" 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>
- </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="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="" />
+ <el-form ref="form" :model="form" label-width="25%" >
+ <el-form-item prop="productType"style="margin-top: 30px" >
+ <span slot="label" style="font-size:22px;color:black"><strong>鏈哄瀷</strong></span>
+ <el-input disabled style="font-size:20px" value="form.productType" v-model="form.productType" placeholder="" />
</el-form-item>
</el-form>
- </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="orderNo" >
- <span slot="label" style="font-size:45px;color:black"><strong>宸ュ崟缂栧彿</strong></span>
- <el-input disabled style="font-size:30px" v-model="form.orderNo" placeholder="" />
+ <el-form ref="form" :model="form" label-width="25%" >
+ <el-form-item prop="orderNo" style="margin-top: 30px">
+ <span slot="label" style="font-size:22px;color:black"><strong>宸ュ崟缂栧彿</strong></span>
+ <el-input disabled style="font-size:20px" v-model="form.orderNo" placeholder="" />
</el-form-item>
</el-form>
- </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="currentWorkstation" >
- <span slot="label" style="font-size:45px;color:black"><strong>璐ㄩ噺鐘舵��</strong></span>
- <el-input disabled style="font-size:30px" v-model:value="form.currentWorkstation+form.qualityStatus" placeholder="" />
+ <el-form ref="form" :model="form" label-width="25%" >
+ <el-form-item prop="currentWorkstation" style="margin-top: 30px">
+ <span slot="label" style="font-size:22px;color:black"><strong>璐ㄩ噺鐘舵��</strong></span>
+ <el-input disabled style="font-size:20px" v-model:value="form.add" placeholder="" />
</el-form-item>
</el-form>
- </el-descriptions-item>
- </el-descriptions>
<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 :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 class="el-icon-thumb" style="font-size:40px;color:black"></span>
<span style="font-size:45px;color:black"><strong>寮哄埗涓婄嚎</strong></span>
</el-button>
</el-col>
@@ -62,24 +53,21 @@
</el-card>
</el-col>
-
- <el-col :span="14" inline style="height:600px;width:850px ">
- <el-tabs type="border-card" >
- <el-card>
- <el-col :span="14"style="height: 270px;width:800px ">
+ <el-col :span="10" inline style="margin-top: 5px">
+ <el-card class="custom-content" style="height: 264px">
+ <el-col :span="14">
<span style="font-size:25px"><strong>璐ㄩ噺鐘舵��</strong></span>
<el-divider></el-divider>
- {{queryParams.productType}}
+ {{this.form.engineCheckList}}
</el-col>
</el-card>
- <el-card style="margin-top: 10px" >
- <el-col :span="14"style="height: 270px;width:800px ">
+ <el-card class="custom-content" style="height: 264px" >
+ <el-col :span="14"style=" ">
<span style="font-size:25px"><strong>鏈�缁堢粨鏋�</strong></span>
<el-divider></el-divider>
{{queryParams.productType}}
</el-col>
</el-card>
- </el-tabs>
</el-col>
</el-row>
</div>
@@ -97,7 +85,6 @@
data() {
return {
options: [],
- loading: true,
total: 0,
engineCheckList:[],
showFlag:false,
@@ -111,8 +98,9 @@
orderNo:null,
qualityStatus:null,
currentWorkstation: null,
+ add: null,
+ engineCheckList:'鏆傛棤鏁版嵁',
},
-
// 琛ㄥ崟鍙傛暟
form: {
engineNo: null,
@@ -120,67 +108,99 @@
orderNo:null,
qualityStatus:null,
currentWorkstation: null,
+ add: null,
+ engineCheckList:'鏆傛棤鏁版嵁',
},
+ add: null,
};
},
-
computed: {},
watch: {},
- created() {
-
- },
-
+ created() {},
mounted() {},
methods: {
-
- reset(){
- this.form= {
- pageNum: 1,
- pageSize: 10,
- engineNo: null,
+ reset() {
+ this.form = {
+ engineNo:null,
productType:null,
orderNo:null,
qualityStatus:null,
currentWorkstation: null,
- },
- this.resetForm("form");
- },
+ add: null,
+ engineCheckList:'鏆傛棤鏁版嵁',
+ };
+ this.resetForm("form");
+ },
EngineNohandleChange(){
- this.loading = true;
if(this.form.engineNo !== null && this.form.engineNo !== undefined){
- let OrderSchedulingParam = {
- engineNo: null
- }
- let PassingStationCollectionParam = {
- sfcCode: null
- }
+ let OrderSchedulingParam = {engineNo: 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;
+ if(response.total === 1 ){
+ 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.form.add= response.rows[0].currentWorkstation+ response.rows[0].qualityStatus
+ if(this.form.qualityStatus ==='涓嶅悎鏍�'){
+ this.buttondisabled = false;
+ }
+ else{
+ this.buttondisabled = true;
+ }
+ }
+ else{
+ this.reset();
+ this.buttondisabled = true
+ const h = this.$createElement;
+ this.$message({
+ message: h('p',null, [
+ h('span', null, '璀﹀憡 '),
+ h('i', { style: 'color: black' }, '杈撳叆鐨勫彂鍔ㄦ満鍙锋湁璇�'),
+ h()]),
+ type: 'error',
+ center: true,
+ offset:300
+ });
+ }
});
+ let PassingStationCollectionParam = {sfcCode: null}
+ PassingStationCollectionParam.sfcCode = this.form.engineNo;
listPassingStationCollection(PassingStationCollectionParam).then(ponse =>{
- this.engineCheckList = ponse.rows;
- this.total = ponse.total;
- console.log(ponse.rows)
- this.loading = false;
+ this.engineCheckList = ponse.rows.locationCode ;
+ if(ponse.rows.length >= 1 && this.form.engineNo !== undefined){
+ this.form.engineCheckList = ''
+ for (let i = 0; i < ponse.rows.length; i++) {
+ this.form.engineCheckList += ' 宸ヤ綅:'+ ponse.rows[i].locationCode+'['+ponse.rows[i].outRsSign+']'
+ }
+ }
+ else{
+ this.form.engineCheckList = '鏆傛棤鏁版嵁'
+ }
});
- // this.reset();
}
},
- // initOrderScheduling(){
- // listOrderScheduling(this.queryParams).then(response => {
- // this.options = response.rows;
- // });
- // },
+
},
}
</script>
-
+<style scoped>
+::v-deep .el-input__inner{
+ height: 40px;
+}
+::v-deep .el-form-item__label {
+ line-height: 40px;
+}
+.custom-content {
+ height: 50%; /* 璁剧疆楂樺害涓�50% */
+}
+/*.my-custom-modal .el-dialog__wrapper {*/
+/* width: 400px; !* 璁剧疆瀹藉害 *!*/
+/* height: 200px; !* 璁剧疆楂樺害 *!*/
+/* top: 50px; !* 璁剧疆璺濈椤甸潰椤堕儴鐨勪綅缃� *!*/
+/* left: 50px; !* 璁剧疆璺濈椤甸潰宸︿晶鐨勪綅缃� *!*/
+/*}*/
+</style>
--
Gitblit v1.9.3