From 6eaf0550980be829607795ad8d132c90ddb930c4 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期六, 20 一月 2024 16:07:55 +0800
Subject: [PATCH] fix 合箱上线
---
jcdm-ui/src/views/main/kb/engineCheck/index.vue | 212 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 153 insertions(+), 59 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/engineCheck/index.vue b/jcdm-ui/src/views/main/kb/engineCheck/index.vue
index 97aa8d3..65d5a51 100644
--- a/jcdm-ui/src/views/main/kb/engineCheck/index.vue
+++ b/jcdm-ui/src/views/main/kb/engineCheck/index.vue
@@ -5,53 +5,47 @@
<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>
</template>
</el-card>
- <el-row :gutter="5" style="margin-top: 10px">
- <el-col :span="10" >
+ <el-row :gutter="5" style="margin-top: 10px">
+ <el-col :span="10" style=" height:600px;width:800px" >
<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="remark" >
- <span slot="label">
- <span style="font-size:45px;color:black"><strong>鍙戝姩鏈哄彿</strong></span>
- </span>
- <el-input style="font-size:30px" v-model="remark" placeholder="璇疯緭鍏ュ彂鍔ㄦ満鍙�" />
+ <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-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="remark" >
- <span slot="label">
- <span style="font-size:45px;color:black"><strong>浜у搧鍨嬪彿</strong></span>
- </span>
- <el-input disabled style="font-size:30px" v-model="remark" placeholder="" />
+ <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-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="remark" >
- <span slot="label">
- <span style="font-size:45px;color:black"><strong>宸ュ崟缂栧彿</strong></span>
- </span>
- <el-input disabled style="font-size:30px" v-model="remark" placeholder="" />
+ <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-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="remark" >
- <span slot="label">
- <span style="font-size:45px;color:black"><strong>璐ㄩ噺鐘舵��</strong></span>
- </span>
- <el-input disabled style="font-size:30px" v-model="remark" placeholder="" />
+ <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.add" placeholder="" />
</el-form-item>
</el-form>
</el-descriptions-item>
@@ -59,65 +53,165 @@
<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
- icon="el-icon-thumb"
- style="width:400px;height:160px"
- v-hasPermi="['bs:formula:add']">
- <span style="font-size:45px;color:black"><strong>寮哄埗涓婄嚎</strong></span></el-button>
+ <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-col>
</el-row>
</el-card>
-
</el-col>
- <el-col :span="14">
- <el-tabs type="border-card" style="height: 600px">
- <el-col :span="8">
- <el-table>
- <el-table-column label="搴忓彿" align="center" prop="repairIdentification" width="50px"/>
- <el-table-column label="鎿嶄綔鍐呭" align="center" prop="boxCode" width="300px"/>
- </el-table>
- </el-col>
- <el-col :span="16">
- <el-image style="height: 520px;width: 100%" :src="imgSrc"></el-image>
- </el-col>
+
+ <el-col :span="14" inline style="height:600px;width:600px ">
+ <el-tabs type="border-card" >
+ <el-card>
+ <el-col :span="14"style="height: 270px;width:800px ">
+ <span style="font-size:25px"><strong>璐ㄩ噺鐘舵��</strong></span>
+ <el-divider></el-divider>
+ {{this.form.engineCheckList}}
+ </el-col>
+ </el-card>
+ <el-card style="margin-top: 10px" >
+ <el-col :span="14"style="height: 270px;width:800px ">
+ <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>
</template>
<script>
+
+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: {},
+ components: { },
+ options: [],
props: [],
data() {
return {
- imgSrc: '',
- }
+ options: [],
+ total: 0,
+ engineCheckList:[],
+ showFlag:false,
+ buttondisabled:true,
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ engineNo: null,
+ productType:null,
+ orderNo:null,
+ qualityStatus:null,
+ currentWorkstation: null,
+ add: null,
+ engineCheckList:'鏆傛棤鏁版嵁',
+ },
+ // 琛ㄥ崟鍙傛暟
+ form: {
+ engineNo: null,
+ productType:null,
+ orderNo:null,
+ qualityStatus:null,
+ currentWorkstation: null,
+ add: null,
+ engineCheckList:'鏆傛棤鏁版嵁',
+ },
+ add: null,
+ };
},
computed: {},
watch: {},
created() {},
mounted() {},
- methods: {}
-}
+ methods: {
+ reset() {
+ this.form = {
+ engineNo:null,
+ productType:null,
+ orderNo:null,
+ qualityStatus:null,
+ currentWorkstation: null,
+ add: null,
+ engineCheckList:'鏆傛棤鏁版嵁',
+ };
+ this.resetForm("form");
+ },
+ EngineNohandleChange(){
+ 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;
+ }
+ }
+ else{
+ this.reset();
+ this.buttondisabled = true
+ // this.$modal.msgError('杈撳叆鐨勫彂鍔ㄦ満鍙锋湁璇�');
+ 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.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 = '鏆傛棤鏁版嵁'
+ }
+ });
+ }
+ },
+
+
+ },
+ }
+
</script>
<style scoped>
-.bottom-card{
- height: 600px;
+::v-deep .el-input__inner{
+ height: 50px;
+ width: 450px;
}
-.circle-button{
- height: 30px;
- width: 30px;
- //background-color: #ce0b0b;
- //background-color: #00afff;
- background-color: #13ce66;
+::v-deep .el-form-item__label {
+ line-height: 50px;
}
-span{
- font-size: 15px;
-}
+/*.my-custom-modal .el-dialog__wrapper {*/
+/* width: 400px; !* 璁剧疆瀹藉害 *!*/
+/* height: 200px; !* 璁剧疆楂樺害 *!*/
+/* top: 50px; !* 璁剧疆璺濈椤甸潰椤堕儴鐨勪綅缃� *!*/
+/* left: 50px; !* 璁剧疆璺濈椤甸潰宸︿晶鐨勪綅缃� *!*/
+/*}*/
</style>
--
Gitblit v1.9.3