From 7839a9681bcc8482a91a2023a4eafa992d2ec942 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 25 十一月 2024 14:29:51 +0800
Subject: [PATCH] 1
---
src/views/mdc/first-workpiece-detail.vue | 9 +++++++--
src/views/mdc/first-workpiece.vue | 34 +++++++++++++++++++++++++++-------
2 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/src/views/mdc/first-workpiece-detail.vue b/src/views/mdc/first-workpiece-detail.vue
index c5b634e..3b27fbd 100644
--- a/src/views/mdc/first-workpiece-detail.vue
+++ b/src/views/mdc/first-workpiece-detail.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-04-26 09:36:18
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-11-22 18:45:06
+ * @LastEditTime: 2024-11-25 14:28:15
* @FilePath: /smart-web/src/views/mdc/status-record.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -68,11 +68,16 @@
},
data() {
return {
- detailModelList: [{},{}],
+ detailModelList: [],
tableData: []
}
},
created() {
+ var idList = this.$route.query.idList.split(",");
+ idList.forEach(item=> {
+ this.detailModelList.push({id: item});
+ })
+ // console.log(this.detailModelList,222);
for(var i=0;i<10;i++) {
this.tableData.push({test: 1})
}
diff --git a/src/views/mdc/first-workpiece.vue b/src/views/mdc/first-workpiece.vue
index 47776a2..d65bbce 100644
--- a/src/views/mdc/first-workpiece.vue
+++ b/src/views/mdc/first-workpiece.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-04-26 09:36:18
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-11-22 18:45:06
+ * @LastEditTime: 2024-11-25 14:24:43
* @FilePath: /smart-web/src/views/mdc/status-record.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -20,7 +20,7 @@
<el-input v-model="searchInfo.workstationName"></el-input>
</el-form-item>
<el-form-item label="寮�濮嬫椂闂�">
- <el-date-picker v-model="searchInfo.startDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD" @change="changeStartDate" type="date" placeholder="閫夋嫨鏃ユ湡"></el-date-picker>
+ <el-date-picker v-model="searchInfo.startDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD" type="date" placeholder="閫夋嫨鏃ユ湡"></el-date-picker>
</el-form-item>
<el-form-item label="缁撴潫鏃堕棿">
<el-date-picker v-model="searchInfo.endDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD" type="date" placeholder="閫夋嫨鏃ユ湡"></el-date-picker>
@@ -94,6 +94,7 @@
</el-table-column>
<el-table-column prop="amount" label="鏁伴噺" width="60"></el-table-column>
</el-table>
+ <el-pagination background layout="total, prev, pager, next" :total="total" style="margin-top: 12px;" @current-change="handleCurrentChange"></el-pagination>
</el-main>
<el-footer>
<el-button type="primary" @click="goFirstWorkDetail">璇︽儏</el-button>
@@ -127,7 +128,11 @@
},
tabPosition: "璁惧缁撴瀯鏍�",
tableData: [],
- treeChecked: []
+ treeChecked: [],
+ workstationIdList: [],
+ total: 0,
+ current: 1,
+ size: 20
}
},
created() {
@@ -140,6 +145,10 @@
//this.getTableData();
},
methods: {
+ handleCurrentChange(val) {
+ this.current = val;
+ this.getTableData();
+ },
convertSeconds(seconds) { //杞崲鏃堕棿
// 瀹氫箟鏃堕棿鍗曚綅杞崲鍏崇郴
const daysInSeconds = 24 * 60 * 60;
@@ -186,24 +195,35 @@
console.log(val,111)
},
searchBtn() {
+ if(!this.searchInfo.startDate || !this.searchInfo.endDate) {
+ this.$message.error('閫夋嫨寮�濮嬨�佺粨鏉熸椂闂存煡璇�');
+ return;
+ }
this.getTableData();
},
getTableData() {
- console.log(this.searchInfo,111)
- this.$HTTP.post('/workinghour/page?current=1&size=20', this.searchInfo).then(res => {
+ this.$HTTP.post(`/workinghour/page?current=${this.current}&size=${this.size}`, this.searchInfo).then(res => {
if (res.code === 200) {
res.data.records.forEach((item,index)=> {
item.index = index + 1;
})
this.tableData = res.data.records;
+ this.total = res.data.total;
}
})
},
goFirstWorkDetail() {
- this.$router.push({path: `/mdc/first-workpiece-detail`,query: {id:1}})
+ if(this.workstationIdList.length == 0) {
+ this.$message.error("璇峰厛閫夋嫨鏁版嵁");
+ return;
+ }
+ this.$router.push({path: `/mdc/first-workpiece-detail`,query: {idList: this.workstationIdList.join(',')}})
},
handleSelectionChange(val) {
- console.log(val);
+ this.workstationIdList = [];
+ val.forEach(item=> {
+ this.workstationIdList.push(item.workstationId);
+ })
},
query() {
--
Gitblit v1.9.3