From c7a5e18fa52ef6faf053e584a4ae9bb5bc55943b Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期一, 22 一月 2024 08:19:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java | 9 +++
jcdm-ui/src/views/main/kb/engineCheck/index.vue | 25 +++++++-
jcdm-ui/src/api/main/bs/orderScheduling/orderScheduling.js | 8 ++
jcdm-ui/src/views/main/bs/orderScheduling/index.vue | 1
jcdm-ui/src/views/main/kb/prepareOnline/index.vue | 120 ++++++++++++++++++++++++++++-----------
5 files changed, 122 insertions(+), 41 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
index 48cd9bc..897b358 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
@@ -46,6 +46,15 @@
return getDataTable(list);
}
+ @PreAuthorize("@ss.hasPermi('bs:orderScheduling:list')")
+ @GetMapping("/list2")
+ public TableDataInfo list2(BsOrderScheduling bsOrderScheduling)
+ {
+// startPage();
+ List<BsOrderScheduling> list = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling);
+ return getDataTable(list);
+ }
+
/**
* 瀵煎嚭璁㈠崟鎺掍骇鍒楄〃
*/
diff --git a/jcdm-ui/src/api/main/bs/orderScheduling/orderScheduling.js b/jcdm-ui/src/api/main/bs/orderScheduling/orderScheduling.js
index 8727d5c..6ab9b97 100644
--- a/jcdm-ui/src/api/main/bs/orderScheduling/orderScheduling.js
+++ b/jcdm-ui/src/api/main/bs/orderScheduling/orderScheduling.js
@@ -8,7 +8,13 @@
params: query
})
}
-
+export function listOrderScheduling2(query) {
+ return request({
+ url: '/bs/orderScheduling/list2',
+ method: 'get',
+ params: query
+ })
+}
// 鏌ヨ璁㈠崟鎺掍骇璇︾粏
export function getOrderScheduling(id) {
return request({
diff --git a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
index bffea93..38f14ba 100644
--- a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
+++ b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
@@ -524,7 +524,6 @@
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
- this.$modal.msgSuccess(this.queryParams.operateTime);
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
diff --git a/jcdm-ui/src/views/main/kb/engineCheck/index.vue b/jcdm-ui/src/views/main/kb/engineCheck/index.vue
index 4346a16..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>
@@ -62,7 +62,7 @@
</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 ">
@@ -163,8 +163,18 @@
else{
this.reset();
this.buttondisabled = true
- this.$modal.msgError('杈撳叆鐨勫彂鍔ㄦ満鍙锋湁璇�');
- }
+ // 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;
@@ -192,9 +202,16 @@
<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>
diff --git a/jcdm-ui/src/views/main/kb/prepareOnline/index.vue b/jcdm-ui/src/views/main/kb/prepareOnline/index.vue
index 3ee50f3..3a4c8ac 100644
--- a/jcdm-ui/src/views/main/kb/prepareOnline/index.vue
+++ b/jcdm-ui/src/views/main/kb/prepareOnline/index.vue
@@ -1,44 +1,64 @@
<template>
<div class="app-container">
- <el-card class="box-card">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
- <el-form-item label-width="120" label="宸ヨ壓娴佺▼缂栫爜" prop="routeCode">
+ <el-card class="box-card" >
+ <el-form :model="queryParams.orderNo" ref="queryForm" :inline="true" label-width="68px" >
+ <el-form-item label-width="120" label="宸ュ崟缂栧彿:" prop="orderNo">
<el-input
- v-model="queryParams.routeCode"
- placeholder="璇疯緭鍏ュ伐鑹烘祦绋嬬紪鐮�"
+ v-model="queryParams.orderNo"
+ placeholder="璇疯緭鍏ュ伐鍗曠紪鍙�"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item style="float: right">
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-form-item style="margin-left: 20px">
+ <el-button type="primary" icon="el-icon-refresh" @click="handleQuery">鏌ヨ</el-button>
</el-form-item>
+ <el-form-item style="margin-left: 360px">
+ <el-checkbox-group v-model="queryParams.isRepairFlag">
+ <el-checkbox @change="cleanFlag" name="type"></el-checkbox>
+ </el-checkbox-group>
+ </el-form-item>
+ <el-form-item label-width="120" label="杩斾慨鍙戝姩鏈哄彿:" prop="repairEngineNo" style="margin-left: 5px">
+
+ <el-input
+ :disabled="!queryParams.isRepairFlag"
+ v-model="queryParams.repairEngineNo"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+
+
</el-form>
</el-card>
<el-row :gutter="0">
- <el-col :span="18">
- <div style="height: 490px; overflow: auto">
- <el-card style="margin-top: 10px" class="box-card">
- <el-table border v-loading="loading" :data="dataList" height="490"
+ <el-col :span="20">
+ <div style="height: 490px;">
+ <el-card style="margin-top: 10px; height: 490px; " class="box-card">
+ <el-table border v-loading="loading" :data="dataList" height="460"
style="width: 100%" v-if="dataList.length > 0">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column :show-overflow-tooltip='true' label="宸ュ崟缂栧彿" width="130" align="center" prop="orderNo">
+
+ <el-table-column :show-overflow-tooltip='true' label="宸ュ崟缂栧彿" width="230" align="center" prop="orderNo">
</el-table-column>
- <el-table-column :show-overflow-tooltip='true' label="浜у搧灏忕郴鍒�" width="130" align="center" prop="model">
+ <el-table-column :show-overflow-tooltip='true' label="浜у搧灏忕郴鍒�" width="230" align="center" prop="model">
</el-table-column>
- <el-table-column label="SN娴佹按鍙�" width="180" align="center" prop="engineNo">
+ <el-table-column :show-overflow-tooltip='true' label="SN娴佹按鍙�" width="230" align="center" prop="engineNo">
</el-table-column>
<el-table-column label="鐘舵��" width="80" align="center" prop="productionStatus">
+<!-- <template slot-scope="scope">-->
+<!-- <span v-if="scope.row.productionStatus === '1'">鏄�</span>-->
+<!-- <span v-if="scope.row.productionStatus === '0'">鍚�</span>-->
+<!-- </template>-->
<template slot-scope="scope">
- <span v-if="scope.row.whetherOrPrint === '1'">鏄�</span>
- <span v-if="scope.row.whetherOrPrint === '0'">鍚�</span>
+ <dict-tag :options="dict.type.order_scheduling_produce_status" :value="scope.row.productionStatus"/>
</template>
</el-table-column>
- <el-table-column label="鏄惁鎵撳嵃" align="center" prop="whetherOrPrint">
+ <el-table-column label="鏄惁鎵撳嵃" width="80" align="center" prop="whetherOrPrint">
+
<template slot-scope="scope">
- <span v-if="scope.row.whetherOrPrint === '1'">鏄�</span>
- <span v-if="scope.row.whetherOrPrint === '0'">鍚�</span>
+ <dict-tag :options="dict.type.print_status" :value="scope.row.whetherOrPrint"/>
</template>
+
</el-table-column>
<el-table-column label="鎵撳嵃鏃堕棿" align="center" prop="null">
</el-table-column>
@@ -50,9 +70,19 @@
</div>
</el-col>
- <el-col :span="6">
+ <el-col :span="4">
<el-card style="margin-top: 10px; min-height: 490px" class="box-card">
+ <div style="min-width: 180px;min-height: 185px">
+ <vue-qr
+ v-if="qrCode !==''"
+ ref="qrCode"
+ :text="qrCode"
+ width="180"
+ height="180"
+ ></vue-qr>
+ </div>
+ <el-button type="success" style="margin-top: 190px; margin-left: 50px; width: 100px">绯荤粺璁剧疆</el-button>
</el-card>
</el-col>
</el-row>
@@ -62,23 +92,22 @@
</template>
<script>
-import {listOrderScheduling} from "@/api/main/bs/orderScheduling/orderScheduling";
+import {listOrderScheduling2} from "@/api/main/bs/orderScheduling/orderScheduling";
import VueQr from 'vue-qr'
export default {
name: "index",
- dicts: ['sys_normal_disable'],
+ dicts: ['sys_normal_disable','order_scheduling_produce_status','print_status'],
+ components: {
+ VueQr,
+ },
data(){
return{
+ qrCode: '',
// 鏌ヨ鍙傛暟
queryParams: {
- pageNum: 1,
- pageSize: 10,
- routeCode: null,
- routeName: null,
- productCode: null,
- productName: null,
- status: null,
- dataSource: null,
+ orderNo: '',
+ isRepairFlag: '',
+ repairEngineNo: ''
},
dataList: []
}
@@ -86,22 +115,38 @@
methods:{
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
- this.queryParams.pageNum = 1;
this.getList();
},
getList(){
- listOrderScheduling(this.queryParams).then(response => {
+ listOrderScheduling2(this.queryParams).then(response => {
console.log("--------------------"+response.rows)
this.dataList = response.rows
+ if (this.queryParams.orderNo === '' || this.queryParams.orderNo === null){
+ this.qrCode = ''
+ }else {
+ if (this.dataList.length > 0){
+ this.qrCode = this.queryParams.orderNo
+ }else {
+ this.qrCode = ''
+ }
+ }
+ console.log("qrcode",this.qrCode)
+
});
},
filterTag(value, row) {
return row.tag === value;
},
+ cleanFlag(){
+ if (this.queryParams.isRepairFlag === false){
+ this.queryParams.repairEngineNo = ''
+ }
+ },
filterHandler(value, row, column) {
const property = column['property'];
return row[property] === value;
- }
+ },
+
},
mounted() {
this.getList()
@@ -110,5 +155,10 @@
</script>
<style scoped>
-
+::v-deep .el-form-item__label{
+ font-size: large;
+}
+::v-deep .el-card__body{
+ padding: 15px 20px 0px 20px;
+}
</style>
--
Gitblit v1.9.3