From c70e37453d06f8eb6eddeddb3085548541cd34b5 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 14:33:10 +0800
Subject: [PATCH] 修改人员
---
src/components/do/a6-personnel-training/AddInDetail.vue | 5 +++++
src/components/do/a6-personnel/training-record.vue | 10 ++++++----
src/components/do/a6-facilities-environment/facilities-environmental-conditions/illuminance-recording.vue | 2 +-
src/components/do/a6-personnel-training/index.vue | 6 ++++--
src/components/view/a6-standard-material-requisition.vue | 2 +-
src/components/view/a7-contract-review.vue | 5 ++---
src/components/caorui/Department/components/Plan/index.vue | 13 +++++--------
src/components/do/a6-facilities-environment/facilities-environmental-conditions/power-supply-stability.vue | 2 +-
8 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/src/components/caorui/Department/components/Plan/index.vue b/src/components/caorui/Department/components/Plan/index.vue
index d593a63..518316c 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: {
@@ -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 瀵硅薄杞崲鎴愬瓧绗︿覆
diff --git a/src/components/do/a6-facilities-environment/facilities-environmental-conditions/illuminance-recording.vue b/src/components/do/a6-facilities-environment/facilities-environmental-conditions/illuminance-recording.vue
index 36f763c..6b428c9 100644
--- a/src/components/do/a6-facilities-environment/facilities-environmental-conditions/illuminance-recording.vue
+++ b/src/components/do/a6-facilities-environment/facilities-environmental-conditions/illuminance-recording.vue
@@ -289,7 +289,7 @@
},
openDialog() {
this.$axios.get(this.$api.deviceScope.treeDevice).then(res => {
- this.cascaderList = res.data;
+ this.cascaderList = res.data
});
this.$nextTick(() => {
this.$refs['form'].clearValidate()
diff --git a/src/components/do/a6-facilities-environment/facilities-environmental-conditions/power-supply-stability.vue b/src/components/do/a6-facilities-environment/facilities-environmental-conditions/power-supply-stability.vue
index c28e752..857a47c 100644
--- a/src/components/do/a6-facilities-environment/facilities-environmental-conditions/power-supply-stability.vue
+++ b/src/components/do/a6-facilities-environment/facilities-environmental-conditions/power-supply-stability.vue
@@ -255,7 +255,7 @@
// 鐢垫簮绋冲畾鎬�-鎵撳紑寮规璋冪敤璁惧鎺ュ彛锛屾煡璇娇鐢ㄧ殑璁惧
openDialog() {
this.$axios.get(this.$api.deviceScope.treeDevice).then(res => {
- this.cascaderList = res.data;
+ this.cascaderList = res.data
});
this.$nextTick(() => {
this.$refs['form'].clearValidate()
diff --git a/src/components/do/a6-personnel-training/AddInDetail.vue b/src/components/do/a6-personnel-training/AddInDetail.vue
index 5a98e66..9c15f82 100644
--- a/src/components/do/a6-personnel-training/AddInDetail.vue
+++ b/src/components/do/a6-personnel-training/AddInDetail.vue
@@ -73,6 +73,11 @@
<el-input v-model="trainingPlan.holdingDepartment" placeholder="璇疯緭鍏�" size="small"></el-input>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="澶囨敞:">
+ <el-input v-model="trainingPlan.remarks" placeholder="璇疯緭鍏�" size="small"></el-input>
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
</div>
diff --git a/src/components/do/a6-personnel-training/index.vue b/src/components/do/a6-personnel-training/index.vue
index 8c96312..1d81a9f 100644
--- a/src/components/do/a6-personnel-training/index.vue
+++ b/src/components/do/a6-personnel-training/index.vue
@@ -401,11 +401,13 @@
label: '璇炬椂',
prop: 'classHour',
width: '100px',
- }, {
+ },
+ {
label: '澶囨敞',
prop: 'remarks',
width: '100px',
- }, {
+ },
+ {
dataType: 'action',
width: '180',
label: '鎿嶄綔',
diff --git a/src/components/do/a6-personnel/training-record.vue b/src/components/do/a6-personnel/training-record.vue
index ffafce3..cfc5c2f 100644
--- a/src/components/do/a6-personnel/training-record.vue
+++ b/src/components/do/a6-personnel/training-record.vue
@@ -164,10 +164,12 @@
}, {
label: '鍩硅鍐呭',
prop: 'trainingContent'
- }, {
- label: '鍩硅璇炬椂',
- prop: 'educationBackground'
- }, {
+ },
+ // {
+ // label: '鍩硅璇炬椂',
+ // prop: 'educationBackground'
+ // },
+ {
label: '璇炬椂',
prop: 'classHour'
}, {
diff --git a/src/components/view/a6-standard-material-requisition.vue b/src/components/view/a6-standard-material-requisition.vue
index 773a9a8..ae6498e 100644
--- a/src/components/view/a6-standard-material-requisition.vue
+++ b/src/components/view/a6-standard-material-requisition.vue
@@ -54,7 +54,7 @@
return {
searchForm: {
name: '',
- factoryManufacturer: '',
+ model: '',
},
tableColumn: [
{
diff --git a/src/components/view/a7-contract-review.vue b/src/components/view/a7-contract-review.vue
index e254023..8ab4cdf 100644
--- a/src/components/view/a7-contract-review.vue
+++ b/src/components/view/a7-contract-review.vue
@@ -44,11 +44,10 @@
:visible.sync="addDialogVisible"
width="400px">
<el-row>
- <el-col :span="24" style="margin-bottom: 16px;">
+ <!-- <el-col :span="24" style="margin-bottom: 16px;">
<div class="search_thing">
<div class="search_label">鍒ゅ畾瑙勫垯锛�</div>
<div class="search_input" style="display: flex;align-items: center;">
- <!-- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addInfo.rule"></el-input> -->
<el-radio-group v-model="addInfo.rule" size="small" style="width: 60%;">
<el-radio label="涓嶈�冭檻涓嶇‘瀹氬害">涓嶈�冭檻涓嶇‘瀹氬害</el-radio>
<el-radio label="鑰冭檻涓嶇‘瀹氬害">鑰冭檻涓嶇‘瀹氬害</el-radio>
@@ -57,7 +56,7 @@
<span v-if="addInfo.rule=='鑰冭檻涓嶇‘瀹氬害'"> %</span>
</div>
</div>
- </el-col>
+ </el-col> -->
<el-col :span="24" style="margin-bottom: 16px;">
<div class="search_thing">
<div class="search_label">缁煎悎瀹ょ鍚嶄汉锛�</div>
--
Gitblit v1.9.3