From eec41baec6003ec443129bd1ae53ea2b2e5df4f3 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期六, 20 一月 2024 13:35:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/package.json | 1
jcdm-ui/src/views/main/bs/orderScheduling/index.vue | 1
jcdm-ui/src/views/main/kb/prepareOnline/index.vue | 89 ++++++++++++++++++++++++++++++--------------
3 files changed, 62 insertions(+), 29 deletions(-)
diff --git a/jcdm-ui/package.json b/jcdm-ui/package.json
index 4656fee..89380e7 100644
--- a/jcdm-ui/package.json
+++ b/jcdm-ui/package.json
@@ -56,6 +56,7 @@
"vue-count-to": "1.0.13",
"vue-cropper": "0.5.5",
"vue-meta": "2.4.0",
+ "vue-qr": "^4.0.9",
"vue-router": "3.4.9",
"vuedraggable": "2.24.3",
"vuex": "3.6.0"
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/prepareOnline/index.vue b/jcdm-ui/src/views/main/kb/prepareOnline/index.vue
index e6328b4..3ee50f3 100644
--- a/jcdm-ui/src/views/main/kb/prepareOnline/index.vue
+++ b/jcdm-ui/src/views/main/kb/prepareOnline/index.vue
@@ -15,38 +15,55 @@
</el-form-item>
</el-form>
</el-card>
- <el-card style="margin-top: 10px" class="box-card">
- <el-table border v-loading="loading" :data="dataList" 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">
- <template slot-scope="scope">
- <router-link :to="{path: '/main/route-data/index/', query: {routeCode: scope.row.routeCode,routeId: scope.row.id} }" class="link-type">
- <span>{{ scope.row.routeCode }}</span>
- </router-link>
- </template>
- </el-table-column>
- <el-table-column :show-overflow-tooltip='true' label="浜у搧灏忕郴鍒�" width="130" align="center" prop="routeName">
- </el-table-column>
- <el-table-column label="SN娴佹按鍙�" width="130" align="center" prop="productCode">
- </el-table-column>
- <el-table-column label="鐘舵��" width="160" align="center" prop="productName">
- </el-table-column>
- <el-table-column label="鏄惁鎵撳嵃" align="center" prop="version">
- </el-table-column>
- <el-table-column label="鎵撳嵃鏃堕棿" align="center" prop="status">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
- </template>
- </el-table-column>
- </el-table>
- <el-empty v-else>
- <span slot="description">鏆傛棤鏁版嵁</span>
- </el-empty>
- </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"
+ 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>
+ <el-table-column :show-overflow-tooltip='true' label="浜у搧灏忕郴鍒�" width="130" align="center" prop="model">
+ </el-table-column>
+ <el-table-column label="SN娴佹按鍙�" width="180" 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.whetherOrPrint === '1'">鏄�</span>
+ <span v-if="scope.row.whetherOrPrint === '0'">鍚�</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏄惁鎵撳嵃" align="center" prop="whetherOrPrint">
+ <template slot-scope="scope">
+ <span v-if="scope.row.whetherOrPrint === '1'">鏄�</span>
+ <span v-if="scope.row.whetherOrPrint === '0'">鍚�</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎵撳嵃鏃堕棿" align="center" prop="null">
+ </el-table-column>
+ </el-table>
+ <el-empty v-else>
+ <span slot="description">鏆傛棤鏁版嵁</span>
+ </el-empty>
+ </el-card>
+ </div>
+
+ </el-col>
+ <el-col :span="6">
+ <el-card style="margin-top: 10px; min-height: 490px" class="box-card">
+
+ </el-card>
+ </el-col>
+ </el-row>
+
+
</div>
</template>
<script>
+import {listOrderScheduling} from "@/api/main/bs/orderScheduling/orderScheduling";
+import VueQr from 'vue-qr'
export default {
name: "index",
dicts: ['sys_normal_disable'],
@@ -72,6 +89,22 @@
this.queryParams.pageNum = 1;
this.getList();
},
+ getList(){
+ listOrderScheduling(this.queryParams).then(response => {
+ console.log("--------------------"+response.rows)
+ this.dataList = response.rows
+ });
+ },
+ filterTag(value, row) {
+ return row.tag === value;
+ },
+ filterHandler(value, row, column) {
+ const property = column['property'];
+ return row[property] === value;
+ }
+ },
+ mounted() {
+ this.getList()
}
}
</script>
--
Gitblit v1.9.3