From 2d5bfe0ce8d904025844ee55082ebc08fbfee975 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期五, 19 一月 2024 15:56:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/kb/engineCheck/index.vue | 157 ++++++++++++++++++++++++++++++----------------------
1 files changed, 91 insertions(+), 66 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/engineCheck/index.vue b/jcdm-ui/src/views/main/kb/engineCheck/index.vue
index 7f0964b..4346a16 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" 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.add" placeholder="" />
</el-form-item>
</el-form>
</el-descriptions-item>
@@ -53,14 +53,14 @@
<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>
+ <span style="font-size:45px;color:black"><strong>寮哄埗涓婄嚎</strong></span>
+ </el-button>
</el-col>
</el-row>
</el-card>
</el-col>
-
<el-col :span="14" inline style="height:600px;width:850px ">
<el-tabs type="border-card" >
@@ -68,7 +68,7 @@
<el-col :span="14"style="height: 270px;width:800px ">
<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" >
@@ -86,9 +86,8 @@
<script>
import { listOrderScheduling, getOrderScheduling, delOrderScheduling, addOrderScheduling, updateOrderScheduling } from "@/api/main/bs/orderScheduling/orderScheduling";
-import {listWorkshop} from "@/api/main/bs/workshop/workshop";
-import axios from 'axios';
-
+import { listPassingStationCollection, getPassingStationCollection, delPassingStationCollection, addPassingStationCollection, updatePassingStationCollection } from "@/api/main/da/passingStationCollection/passingStationCollection";
+import {listLineInfo} from "@/api/main/bs/lineInfo/lineInfo";
export default {
components: { },
@@ -96,80 +95,106 @@
props: [],
data() {
return {
+ options: [],
+ total: 0,
+ engineCheckList:[],
showFlag:false,
+ buttondisabled:true,
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
pageSize: 10,
- orderNo: null,
engineNo: null,
- productType: '666',
- model: null,
- productionStatus: null,
- workingHours: null,
+ productType:null,
+ orderNo:null,
+ qualityStatus:null,
currentWorkstation: null,
- qualityStatus: null,
- whetherOrPrint: null,
- report10: null,
- report20: null,
- combinedBoxTime: null,
- finalAssemblyTime: null,
- operator: null,
- operateTime: null,
- status: null,
- spareField1: null,
- spareField2: null,
- spareField3: null,
- spareField4: null,
- createUser: null,
- updateUser: null,
- remarks: null
+ add: null,
+ engineCheckList:'鏆傛棤鏁版嵁',
},
-
// 琛ㄥ崟鍙傛暟
- form: {},
+ form: {
+ engineNo: null,
+ productType:null,
+ orderNo:null,
+ qualityStatus:null,
+ currentWorkstation: null,
+ add: null,
+ engineCheckList:'鏆傛棤鏁版嵁',
+ },
+ add: null,
};
},
-
computed: {},
watch: {},
- created() {
- this.initOrderScheduling();
- },
+ created() {},
mounted() {},
methods: {
-
+ reset() {
+ this.form = {
+ engineNo:null,
+ productType:null,
+ orderNo:null,
+ qualityStatus:null,
+ currentWorkstation: null,
+ add: null,
+ engineCheckList:'鏆傛棤鏁版嵁',
+ };
+ this.resetForm("form");
+ },
EngineNohandleChange(){
- axios.get('@/api/main/bs/orderScheduling/orderScheduling', {
- params: {
- engineNo: this.engineNo,
- },
- })
- .then(response => {
- const dataFromOrderScheduling = response.data;
- if (dataFromOrderScheduling.length > 0) {
- const order = dataFromOrderScheduling[0];
- this.engineNo = order.engineNo;
- this.productType = order.productType;
- this.orderNo = order.orderNo;
- } else {
- // Handle case when no data is found
+ if(this.form.engineNo !== null && this.form.engineNo !== undefined){
+ let OrderSchedulingParam = {engineNo: null}
+ OrderSchedulingParam.engineNo = this.form.engineNo;
+ listOrderScheduling(OrderSchedulingParam).then(response => {
+ 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;
+ }
}
- })
- .catch(error => {
- console.error(error);
+ else{
+ this.reset();
+ this.buttondisabled = true
+ this.$modal.msgError('杈撳叆鐨勫彂鍔ㄦ満鍙锋湁璇�');
+ }
});
+ let PassingStationCollectionParam = {sfcCode: null}
+ PassingStationCollectionParam.sfcCode = this.form.engineNo;
+ listPassingStationCollection(PassingStationCollectionParam).then(ponse =>{
+ 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 = '鏆傛棤鏁版嵁'
+ }
+ });
+ }
},
+
+
},
-
- initOrderScheduling(){
- listOrderScheduling(this.queryParams).then(response => {
- this.form.queryParams = response.rows;
-
- });
- },
}
</script>
+<style scoped>
+::v-deep .el-input__inner{
+ height: 50px;
+}
+::v-deep .el-form-item__label {
+ line-height: 50px;
+}
+</style>
--
Gitblit v1.9.3