From 06c4496d3117bf14ea431f02558ad7d74dee774d Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 14:33:09 +0800
Subject: [PATCH] 人员测试联调
---
src/components/view/a7-standard-novelty-retrieval.vue | 16 ++++++++++++++++
src/components/do/a6-personnel-training/Edit.vue | 9 +++++++++
2 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/src/components/do/a6-personnel-training/Edit.vue b/src/components/do/a6-personnel-training/Edit.vue
index 0c041cc..bf3b969 100644
--- a/src/components/do/a6-personnel-training/Edit.vue
+++ b/src/components/do/a6-personnel-training/Edit.vue
@@ -54,6 +54,14 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="璇勪环鏃堕棿">
+ <el-date-picker v-model="trainingForm.assessmentDate" :disabled="currentRow.state === 1" style="width:40%"
+ type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" size="small"
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
</el-form>
</el-row>
</div>
@@ -339,6 +347,7 @@
comprehensiveAssessment: this.trainingForm.comprehensiveAssessment,
trainingDetailedId: this.trainingForm.id,
assessmentUserId: this.trainingForm.assessmentUserId,
+ assessmentDate: this.trainingForm.assessmentDate,
state: state
}
const {code} = await this.$axios({
diff --git a/src/components/view/a7-standard-novelty-retrieval.vue b/src/components/view/a7-standard-novelty-retrieval.vue
index 09667a1..f3d3b24 100644
--- a/src/components/view/a7-standard-novelty-retrieval.vue
+++ b/src/components/view/a7-standard-novelty-retrieval.vue
@@ -91,10 +91,22 @@
<el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</span>
+ <span>缂栧埗鏃ユ湡锛�
+ <el-date-picker v-model="ratifyInfo.writeDate" style="width:100%"
+ type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" size="small"
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
+ </span>
<span>鎵瑰噯浜猴細
<el-select v-model="ratifyInfo.ratifyUserId" placeholder="璇烽�夋嫨" size="small" style="width: 100%">
<el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
+ </span>
+ <span>鎵瑰噯鏃ユ湡锛�
+ <el-date-picker v-model="ratifyInfo.ratifyDate" style="width:100%"
+ type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" size="small"
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
</span>
<span slot="footer" class="dialog-footer">
<el-button @click="ratifyDialog = false">鍙� 娑�</el-button>
@@ -384,6 +396,8 @@
ratifyInfo: {
writeUserId: '',
ratifyUserId: '',
+ writeDate: '',
+ ratifyDate: '',
},
userList: []
};
@@ -512,6 +526,8 @@
endDate: endDate,
writeUserId: this.ratifyInfo.writeUserId,
ratifyUserId: this.ratifyInfo.ratifyUserId,
+ writeDate: this.ratifyInfo.writeDate,
+ ratifyDate: this.ratifyInfo.ratifyDate,
}
this.outLoading = true
this.$axios.post(this.$api.processMethodSearchNew.exportMethodSearchNew,{
--
Gitblit v1.9.3