From 831cfa4c439c6d073d706a82d2a439f8b1818498 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 18 十一月 2025 16:59:50 +0800
Subject: [PATCH] Merge branch 'new' of http://www.beijingsoft.cn:9090/r/smart-web into new
---
src/views/mdc/first-workpiece.vue | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/views/mdc/first-workpiece.vue b/src/views/mdc/first-workpiece.vue
index e62a563..aec3104 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-12-06 11:25:26
+ * @LastEditTime: 2024-12-20 15:10:08
* @FilePath: /smart-web/src/views/mdc/status-record.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -33,18 +33,18 @@
<el-radio-button label="璁惧缁撴瀯鏍�"></el-radio-button>
<el-radio-button label="闆朵欢缁撴瀯鏍�"></el-radio-button>
</el-radio-group>
- <MYTree v-model="treeChecked" show-checkbox class="MYTree-content"></MYTree>
+ <!-- <MYTree v-model="treeChecked" show-checkbox class="MYTree-content"></MYTree> -->
</el-main>
</el-aside>
<el-container>
<el-main>
<el-table :data="tableData" border @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="index" label="搴忓彿" width="60"></el-table-column>
- <el-table-column prop="partNo" label="闆朵欢鍙�" width="80"></el-table-column>
+ <el-table-column type="selection" width="55" fixed></el-table-column>
+ <el-table-column prop="index" label="搴忓彿" width="60" fixed></el-table-column>
+ <el-table-column prop="partNo" label="闆朵欢鍙�" width="80" fixed></el-table-column>
<el-table-column prop="processNo" label="宸ュ簭鍙�" width="80"></el-table-column>
<el-table-column prop="version" label="鐗堟" width="60"></el-table-column>
- <el-table-column prop="workstationName" label="鏈哄簥" width="100"></el-table-column>
+ <el-table-column prop="workstationName" label="宸ヤ綅" width="100"></el-table-column>
<el-table-column prop="startTime" label="寮�濮嬫椂闂�" width="145"></el-table-column>
<el-table-column prop="endTime" label="缁撴潫鏃堕棿" width="145"></el-table-column>
<el-table-column prop="occupancySecs" label="鍗犳満鏃堕棿" width="100">
@@ -88,12 +88,16 @@
</template>
</el-table-column>
<el-table-column prop="amount" label="鏁伴噺" width="60"></el-table-column>
+ <el-table-column label="鎿嶄綔" width="100">
+ <template #default="scope">
+ <el-button type="primary" @click="exportBtn(scope)">杈撳嚭</el-button>
+ </template>
+ </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>
- <el-button type="primary">杈撳嚭</el-button>
</el-footer>
</el-container>
</el-container>
@@ -141,6 +145,13 @@
this.getTableData();
},
methods: {
+ exportBtn(scope) {
+ this.$HTTP.get(`/api/workinghour/export?id=${scope.row.id}`).then(res => {
+ if (res.code == 200) {
+ this.$TOOL.downFile(res.data.link,res.data.originalName);
+ }
+ })
+ },
setDate() {
var date = new Date();
var threeDaysInMilliseconds = 3 * 24 * 60 * 60 * 1000;
--
Gitblit v1.9.3