From 379fe8ec11a6349bab88f3c767e7a862f36d66b5 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期六, 20 一月 2024 15:53:20 +0800
Subject: [PATCH] fix 合箱上线
---
jcdm-ui/src/views/main/kb/engineCheck/index.vue | 119 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 75 insertions(+), 44 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..65d5a51 100644
--- a/jcdm-ui/src/views/main/kb/engineCheck/index.vue
+++ b/jcdm-ui/src/views/main/kb/engineCheck/index.vue
@@ -12,7 +12,7 @@
</template>
</el-card>
<el-row :gutter="5" style="margin-top: 10px">
- <el-col :span="10" >
+ <el-col :span="10" style=" height:600px;width:800px" >
<el-card class="bottom-card">
<el-descriptions :column="1" >
<el-descriptions-item>
@@ -45,7 +45,7 @@
<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-input disabled style="font-size:30px" v-model:value="form.add" placeholder="" />
</el-form-item>
</el-form>
</el-descriptions-item>
@@ -62,14 +62,13 @@
</el-card>
</el-col>
-
- <el-col :span="14" inline style="height:600px;width:850px ">
+ <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>
- {{queryParams.productType}}
+ {{this.form.engineCheckList}}
</el-col>
</el-card>
<el-card style="margin-top: 10px" >
@@ -97,7 +96,6 @@
data() {
return {
options: [],
- loading: true,
total: 0,
engineCheckList:[],
showFlag:false,
@@ -111,8 +109,9 @@
orderNo:null,
qualityStatus:null,
currentWorkstation: null,
+ add: null,
+ engineCheckList:'鏆傛棤鏁版嵁',
},
-
// 琛ㄥ崟鍙傛暟
form: {
engineNo: null,
@@ -120,67 +119,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
+ // 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;
- 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: 50px;
+ width: 450px;
+}
+::v-deep .el-form-item__label {
+ line-height: 50px;
+}
+/*.my-custom-modal .el-dialog__wrapper {*/
+/* width: 400px; !* 璁剧疆瀹藉害 *!*/
+/* height: 200px; !* 璁剧疆楂樺害 *!*/
+/* top: 50px; !* 璁剧疆璺濈椤甸潰椤堕儴鐨勪綅缃� *!*/
+/* left: 50px; !* 璁剧疆璺濈椤甸潰宸︿晶鐨勪綅缃� *!*/
+/*}*/
+</style>
--
Gitblit v1.9.3