From b87075597989e9a7de543967d54be4780be27de7 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 19 二月 2025 10:15:51 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-before
---
src/components/caorui/Department/components/Plan/index.vue | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/components/caorui/Department/components/Plan/index.vue b/src/components/caorui/Department/components/Plan/index.vue
index d593a63..bb439d8 100644
--- a/src/components/caorui/Department/components/Plan/index.vue
+++ b/src/components/caorui/Department/components/Plan/index.vue
@@ -46,8 +46,8 @@
<el-date-picker v-model="yearDetailForm.date" class="date_box" format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
size="small" type="date" value-format="yyyy-MM-dd">
</el-date-picker>
- <span>鐩戠潱椤圭洰</span>
- <el-input v-model="yearDetailForm.project" class="search" placeholder="璇疯緭鍏�" size="small"></el-input>
+ <!-- <span>鐩戠潱椤圭洰</span> -->
+ <!-- <el-input v-model="yearDetailForm.superviseDes" class="search" placeholder="璇疯緭鍏�" size="small"></el-input> -->
<el-button size="small" type="primary" @click="getYearDetailPlanList">鏌ヨ</el-button>
<el-button size="small" @click="clearDetail">娓呯┖</el-button>
</div>
@@ -193,8 +193,7 @@
}],
yearLoading: false,
yearDetailForm: {
- date: undefined,
- project: undefined
+ date: undefined
},
yearDetailTableData: [], // 骞存槑缁嗚〃
yearDeatilPage: {
@@ -216,8 +215,8 @@
label: '澶囨敞',
prop: 'remarks'
}, {
- label: '鍩硅鏃ユ湡',
- prop: 'trainDate'
+ label: '鐩戠潱椤圭洰',
+ prop: 'superviseProject'
}, {
label: '鍒涘缓',
prop: 'createBy'
@@ -310,7 +309,6 @@
// 娓呴櫎鏄庣粏
clearDetail() {
this.yearDetailForm.date = undefined
- this.yearDetailForm.project = undefined
this.getYearDetailPlanList()
},
@@ -326,8 +324,7 @@
planId: this.planId,
current: this.yearDeatilPage.curent,
size: this.yearDeatilPage.pageSize,
- date: this.yearDetailForm.date,
- project: this.yearDetailForm.project
+ date: this.yearDetailForm.date
}
})
if (code == 200) {
@@ -412,7 +409,7 @@
},
// 骞村害璁″垝琛�-涓嬭浇
downLoadPost(row) {
- this.$axios.get(exportSuperVisePlanApi + '?id=' + row.id,{responseType: "blob"}).then(res => {
+ this.$axios.post(exportSuperVisePlanApi ,{id:row.id},{responseType: "blob"}).then(res => {
this.outLoading = false
const blob = new Blob([res],{ type: 'application/msword' });
//灏咮lob 瀵硅薄杞崲鎴愬瓧绗︿覆
--
Gitblit v1.9.3