Skip to content

C
car-database-web
Commit bb608aa1 authored by 高滢's avatar 高滢
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/router/index.js
#	src/views/review/wait/index.vue
parents be9fe9ca 34c90699
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 578 additions and 239 deletions
src/components/Page/chapterOption.vue
View file @ bb608aa1
...@@ -212,8 +212,7 @@ export default { ...@@ -212,8 +212,7 @@ export default {
}, },
async loadData() { async loadData() {
this.loading = true this.loading = true
await getStandardListNew().then(res => {
getStandardListNew().then(res => {
this.tableData = res.data this.tableData = res.data
this.tableData = this.normalizeTreeData(this.tableData) this.tableData = this.normalizeTreeData(this.tableData)
forEach(this.tableData, (t1, index) => { forEach(this.tableData, (t1, index) => {
...@@ -261,12 +260,13 @@ export default { ...@@ -261,12 +260,13 @@ export default {
type: this.tableData[0].children[0].value, type: this.tableData[0].children[0].value,
name:'', name:'',
chapter: '', chapter: '',
standardNo: '' standardNo: this.tableData[0].standardNo
} }
this.$store.dispatch('standard/setInitStandard', standard) this.$store.dispatch('standard/setInitStandard', standard)
this.$store.dispatch('standard/setStandardObj', standardObj) this.$store.dispatch('standard/setStandardObj', standardObj)
this.standard = standard this.standard = standard
}) })
this.loading = false
}) })
//console.log(this.standardList) //console.log(this.standardList)
// for(let i = 0; i < this.standardList.length ; i++ ){ // for(let i = 0; i < this.standardList.length ; i++ ){
......
src/views/plan/list/index.vue
View file @ bb608aa1
...@@ -221,9 +221,10 @@ export default { ...@@ -221,9 +221,10 @@ export default {
this.queryParams.isAsc = 'desc' this.queryParams.isAsc = 'desc'
this.queryParams.orderByColumn = 'createTime' this.queryParams.orderByColumn = 'createTime'
this.view = this.$route.query.view this.view = this.$route.query.view
this.buttonDisabled = true
setTimeout(()=>{ setTimeout(()=>{
this.buttonDisabled = false this.buttonDisabled = false
},2000) },1000)
}, },
methods: { methods: {
download(url) { download(url) {
...@@ -252,14 +253,14 @@ export default { ...@@ -252,14 +253,14 @@ export default {
this.buttonDisabled = true this.buttonDisabled = true
setTimeout(()=>{ setTimeout(()=>{
this.buttonDisabled = false this.buttonDisabled = false
},2000) },1000)
this.loadData() this.loadData()
}, },
resetQuery() { resetQuery() {
this.buttonDisabled = true this.buttonDisabled = true
setTimeout(()=>{ setTimeout(()=>{
this.buttonDisabled = false this.buttonDisabled = false
},2000) },1000)
this.queryParams = { this.queryParams = {
pageNum: this.queryParams.pageNum, pageNum: this.queryParams.pageNum,
pageSize: this.queryParams.pageSize, pageSize: this.queryParams.pageSize,
......
src/views/review/already/index.vue
View file @ bb608aa1
...@@ -288,6 +288,10 @@ export default { ...@@ -288,6 +288,10 @@ export default {
} }
}, },
created(){ created(){
this.buttonDisabled = true
setTimeout(()=>{
this.buttonDisabled = false
},1000)
this.gainDictDataList() this.gainDictDataList()
}, },
methods: { methods: {
...@@ -391,7 +395,7 @@ export default { ...@@ -391,7 +395,7 @@ export default {
/*查看按钮页面跳转 */ /*查看按钮页面跳转 */
handleDetail (row){ handleDetail (row){
this.$router.push({ this.$router.push({
path: `/review/view`, path: `/review/views`,
query: { id: row.id }, query: { id: row.id },
// params:{ }, // params:{ },
}) })
...@@ -405,7 +409,7 @@ export default { ...@@ -405,7 +409,7 @@ export default {
this.buttonDisabled = true this.buttonDisabled = true
setTimeout(()=>{ setTimeout(()=>{
this.buttonDisabled = false this.buttonDisabled = false
},2000) },1000)
this.queryParams.page = 1 this.queryParams.page = 1
this.getList() this.getList()
}, },
...@@ -413,7 +417,7 @@ export default { ...@@ -413,7 +417,7 @@ export default {
this.buttonDisabled = true this.buttonDisabled = true
setTimeout(()=>{ setTimeout(()=>{
this.buttonDisabled = false this.buttonDisabled = false
},2000) },1000)
this.getList() this.getList()
}, },
getList(){ getList(){
......
src/views/review/createReview/deleteReviewDetails/index.vue
View file @ bb608aa1
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">确认</el-button> <el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleKeypoints = false" <el-button type="primary" plain @click="dialogVisibleKeypoints = false"
>确认</el-button >确认</el-button
> >
</div> </div>
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleDetails = false" <el-button type="primary" plain @click="dialogVisibleDetails = false"
>确认</el-button >确认</el-button
> >
</div> </div>
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
<el-col :span="18"> <el-col :span="18">
<el-form-item label=""> <el-form-item label="">
<div class="assessor-text"> <div class="assessor-text">
评审人员: <!-- 评审人员: -->
<div class="review-members"> <div class="review-members">
<span <span
v-for="(reviewer, index) in receivedReviewer" v-for="(reviewer, index) in receivedReviewer"
...@@ -579,10 +579,10 @@ export default { ...@@ -579,10 +579,10 @@ export default {
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转') this.$message.success('提交成功')
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' }) this.$router.push({ path: '/review/initiatedReview' })
}, 5000) }, 200)
} else { } else {
this.$message({ this.$message({
message: '提交失败', message: '提交失败',
......
src/views/review/createReview/deleteReviewKeypoints/index.vue
View file @ bb608aa1
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">确认</el-button> <el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleKeypoints = false" <el-button type="primary" plain @click="dialogVisibleKeypoints = false"
>确认</el-button >确认</el-button
> >
</div> </div>
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
<el-col :span="18"> <el-col :span="18">
<el-form-item label=""> <el-form-item label="">
<div class="assessor-text"> <div class="assessor-text">
评审人员: <!-- 评审人员: -->
<div class="review-members"> <div class="review-members">
<span <span
v-for="(reviewer, index) in receivedReviewer" v-for="(reviewer, index) in receivedReviewer"
...@@ -538,10 +538,10 @@ export default { ...@@ -538,10 +538,10 @@ export default {
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转') this.$message.success('提交成功')
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' }) this.$router.push({ path: '/review/initiatedReview' })
}, 5000) }, 200)
} else { } else {
this.$message({ this.$message({
message: '提交失败', message: '提交失败',
......
src/views/review/createReview/deleteReviewScene/index.vue
View file @ bb608aa1
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">确认</el-button> <el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleKeypoints = false" <el-button type="primary" plain @click="dialogVisibleKeypoints = false"
>确认</el-button >确认</el-button
> >
</div> </div>
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleDetails = false" <el-button type="primary" plain @click="dialogVisibleDetails = false"
>确认</el-button >确认</el-button
> >
</div> </div>
...@@ -263,7 +263,7 @@ ...@@ -263,7 +263,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleScene = false" <el-button type="primary" plain @click="dialogVisibleScene = false"
>确认</el-button >确认</el-button
> >
</div> </div>
...@@ -279,7 +279,7 @@ ...@@ -279,7 +279,7 @@
<el-col :span="18"> <el-col :span="18">
<el-form-item label=""> <el-form-item label="">
<div class="assessor-text"> <div class="assessor-text">
评审人员: <!-- 评审人员: -->
<div class="review-members"> <div class="review-members">
<span <span
v-for="(reviewer, index) in receivedReviewer" v-for="(reviewer, index) in receivedReviewer"
...@@ -674,10 +674,10 @@ export default { ...@@ -674,10 +674,10 @@ export default {
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转') this.$message.success('提交成功')
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' }) this.$router.push({ path: '/review/initiatedReview' })
}, 5000) }, 200)
} else { } else {
this.$message({ this.$message({
message: '提交失败', message: '提交失败',
......
src/views/review/createReview/deleteUseCase/index.vue
View file @ bb608aa1
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
</collapse> </collapse>
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleUseCase = false" <el-button type="primary" plain @click="dialogVisibleUseCase = false"
>确认</el-button >确认</el-button
> >
</div> </div>
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
<el-col :span="18"> <el-col :span="18">
<el-form-item label=""> <el-form-item label="">
<div class="assessor-text"> <div class="assessor-text">
评审人员: <!-- 评审人员: -->
<div class="review-members"> <div class="review-members">
<span <span
v-for="(reviewer, index) in receivedReviewer" v-for="(reviewer, index) in receivedReviewer"
...@@ -552,10 +552,10 @@ export default { ...@@ -552,10 +552,10 @@ export default {
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转') this.$message.success('提交成功')
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' }) this.$router.push({ path: '/review/initiatedReview' })
}, 5000) }, 200)
} else { } else {
this.$message({ this.$message({
message: '提交失败', message: '提交失败',
......
src/views/review/createReview/index.vue
View file @ bb608aa1
...@@ -2,9 +2,7 @@ ...@@ -2,9 +2,7 @@
<page-standard class="create-review"> <page-standard class="create-review">
<div slot="tab"> <div slot="tab">
<el-row class="vif0"> <el-row class="vif0">
<el-col :span="3"> <el-col :span="3"> </el-col>
</el-col>
<el-col :span="21"> <el-col :span="21">
<div v-if="pageIndex === 0" class="create-review-content"> <div v-if="pageIndex === 0" class="create-review-content">
<div class="center-tip"> <div class="center-tip">
...@@ -21,47 +19,44 @@ ...@@ -21,47 +19,44 @@
<div style="font-size: 18px">只能选择一种类型</div> <div style="font-size: 18px">只能选择一种类型</div>
</div> </div>
<el-form <el-form
v-if="pageIndex === 0" v-if="pageIndex === 0"
ref="queryForm" ref="queryForm"
class="tab-form" class="tab-form"
:model="formModel" :model="formModel"
size="small" size="small"
:inline="true" :inline="true"
> >
<el-form-item label="选择标准" v-bind="standardList" <el-form-item
:style=" { margin: '30px', label="选择标准"
'margin-left': '-100px', v-bind="standardList"
}"> :style="{ margin: '30px', 'margin-left': '-100px' }"
<el-select
placeholder="请选择标准"
v-model="selected"
filterable
clearable
size="medium"
@change="handleSelectStandard(selected)"
> >
<el-option <el-select
v-for="(item, indexS) in standardList" placeholder="请选择标准"
:key="indexS" v-model="selected"
:label="item.standardNo" filterable
:value="item.standardNo" clearable
>{{ item.standardNo }} size="medium"
</el-option> @change="handleSelectStandard(selected)"
</el-select> >
</el-form-item> <el-option
v-for="(item, indexS) in standardList"
</el-form> :key="indexS"
<div class="bg-transparent"> :label="item.standardNo"
<p :style="{ color:'transparent', :value="item.id"
UserSelect: 'none', >{{ item.standardNo }}
}">sss</p> </el-option>
</el-select>
</div> </el-form-item>
</el-form>
<div class="bg-transparent">
<p :style="{ color: 'transparent', UserSelect: 'none' }">sss</p>
</div>
<div <div
v-for="(reviewType, typeIndex) in dict.type.create_review_type" v-for="(reviewType, typeIndex) in dict.type.create_review_type"
:key="reviewType.value" :key="reviewType.value"
:class="['review-type-content', { 'third-row': typeIndex === 2 }]" :class="['review-type-content', { 'third-row': typeIndex === 2 }]"
:style="typeIndex === 2 ? { marginLeft: '-270px' } : {}" :style="typeIndex === 2 ? { marginLeft: '-270px' } : {}"
> >
<span>{{ reviewType.label }}：</span> <span>{{ reviewType.label }}：</span>
<el-button <el-button
...@@ -366,7 +361,8 @@ export default { ...@@ -366,7 +361,8 @@ export default {
standardNo: '', standardNo: '',
name: '', name: '',
id: '', id: '',
operationSort: '' operationSort: '',
inspectStandardId:''
}, },
selectedItem: { selectedItem: {
name: '', name: '',
...@@ -412,36 +408,65 @@ export default { ...@@ -412,36 +408,65 @@ export default {
created() { created() {
this.getStandardList() this.getStandardList()
}, },
mounted() {}, mounted() {
},
methods: { methods: {
getStandardList() { getStandardList() {
testInitatereview(this.standardData) testInitatereview(this.standardData)
.then(response => { .then(response => {
this.standardList = response.rows this.standardList = response.rows
console.log(response, '1111') this.selected = this.standardList[0].standardNo
this.pageIndexSec.inspectStandardId = this.standardList[0].id
this.pageIndexSec.standardNo = this.standardList[0].standardNo
// console.log(response, '1111')
}) })
.catch(error => { .catch(error => {
console.error('testInitatereview接口出错', error) console.error('testInitatereview接口出错', error)
}) })
}, },
// vif0 下拉框选择标准 // vif0 下拉框选择标准
// handleSelectStandard(selected) {
// this.selectedItem = this.standardList.find(
// item => item.id === selected
// )
// if (this.selectedItem) {
// // 将 item.name 赋值给 this.pageIndexSec.name
// this.pageIndexSec.name = this.selectedItem.name
// this.pageIndexSec.inspectStandardId = this.selectedItem.id
// this.pageIndexSec.standardNo = this.selectedItem.standardNo
// } else {
// console.log('赋值给 this.pageIndexSec.name时出现问题')
// }
// },
handleSelectStandard(selected) { handleSelectStandard(selected) {
this.selectedItem = this.standardList.find( console.log(selected, "handleSelectStandard selected");
item => item.standardNo === selected
) // 查找选中的项
if (this.selectedItem) { const selectedItem = this.standardList.find(
// 将 item.name 赋值给 this.pageIndexSec.name item => item.id === selected
this.pageIndexSec.name = this.selectedItem.name );
this.pageIndexSec.id = this.selectedItem.id
if (selectedItem) {
// 将选中的项的属性赋值给 pageIndexSec
this.pageIndexSec.name = selectedItem.name;
this.pageIndexSec.inspectStandardId = selectedItem.id;
this.pageIndexSec.standardNo = selectedItem.standardNo;
} else { } else {
console.log('赋值给 this.pageIndexSec.name时出现问题') console.error("赋值给 this.pageIndexSec 时出现问题");
} }
}, },
// 按钮-选择类型 // 按钮-选择类型
handleSelectType(reviewType, reviewSubtype) { handleSelectType(reviewType, reviewSubtype) {
console.log('评审类型 = ', reviewType) // console.log('评审类型 = ', reviewType)
console.log('评审子类型 = ', reviewSubtype) // console.log('评审子类型 = ', reviewSubtype)
this.formModel.reviewType = reviewType this.formModel.reviewType = reviewType
this.formModel.reviewSubtype = reviewSubtype this.formModel.reviewSubtype = reviewSubtype
console.log(this.formModel) console.log(this.formModel)
...@@ -472,9 +497,14 @@ export default { ...@@ -472,9 +497,14 @@ export default {
) { ) {
this.pageIndexSec.reviewSubtype = this.formModel.reviewSubtype this.pageIndexSec.reviewSubtype = this.formModel.reviewSubtype
this.pageIndexSec.reviewType = this.formModel.reviewType this.pageIndexSec.reviewType = this.formModel.reviewType
this.pageIndexSec.standardNo = this.selected
this.pageIndexSec.operationSort = 'ADD_KEYPOINT'
this.pageIndexSec.id = this.selectedItem.id this.pageIndexSec.id = this.selectedItem.id
this.pageIndexSec.operationSort = 'ADD_KEYPOINT'
// if(this.selectedItem){
// this.pageIndexSec.inspectStandardId = this.selectedItem.id
// }else if(!this.selectedItem){
// this.pageIndexSec.inspectStandardId = '1'
// }
// this.pageIndexSec.name = this.postData.name // this.pageIndexSec.name = this.postData.name
this.pageIndex = 1 this.pageIndex = 1
} else if ( } else if (
......
src/views/review/createReview/newReviewDetails/index.vue
View file @ bb608aa1
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">确认</el-button> <el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleKeypoints = false" <el-button type="primary" plain @click="dialogVisibleKeypoints = false"
>确认</el-button >确认</el-button
> >
</div> </div>
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
<el-col :span="18"> <el-col :span="18">
<el-form-item label=""> <el-form-item label="">
<div class="assessor-text"> <div class="assessor-text">
评审人员: <!-- 评审人员: -->
<div class="review-members"> <div class="review-members">
<span <span
v-for="(reviewer, index) in receivedReviewer" v-for="(reviewer, index) in receivedReviewer"
...@@ -530,10 +530,10 @@ ...@@ -530,10 +530,10 @@
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转') this.$message.success('提交成功')
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' }) this.$router.push({ path: '/review/initiatedReview' })
}, 5000) }, 200)
} else { } else {
this.$message({ this.$message({
message: '提交失败', message: '提交失败',
......
src/views/review/createReview/newReviewKeypoints/index.vue
View file @ bb608aa1
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">确认</el-button> <el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
<el-col :span="18"> <el-col :span="18">
<el-form-item label=""> <el-form-item label="">
<div class="assessor-text"> <div class="assessor-text">
评审人员: <!-- 评审人员: -->
<div class="review-members"> <div class="review-members">
<span <span
v-for="(reviewer, index) in receivedReviewer" v-for="(reviewer, index) in receivedReviewer"
...@@ -389,8 +389,10 @@ export default { ...@@ -389,8 +389,10 @@ export default {
//根据 inspectStandardId => standard/findStandardList 的id //根据 inspectStandardId => standard/findStandardList 的id
// inspectStandardNo => standard/findStandardList 的standardNo // inspectStandardNo => standard/findStandardList 的standardNo
//operationSort => 这个在点击下一步的界面 通过选择新增场景时就已经设置好了 为新增 ADD_SENCE 或删除 //operationSort => 这个在点击下一步的界面 通过选择新增场景时就已经设置好了 为新增 ADD_SENCE 或删除
this.newResDataAdd.inspectStandardId = this.pageIndexSec.id this.newResDataAdd.inspectStandardId = this.pageIndexSec.inspectStandardId
console.log(this.pageIndexSec.id,'submitRequirement id')
this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
console.log(this.pageIndexSec.standardNo,'submitRequirement no')
this.newResDataAdd.operationSort = this.pageIndexSec.operationSort this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
console.log(this.newResData, '选择标准要求弹窗确认newResData') console.log(this.newResData, '选择标准要求弹窗确认newResData')
console.log(this.newResDataAdd, '选择标准要求弹窗确认newResDataAdd') console.log(this.newResDataAdd, '选择标准要求弹窗确认newResDataAdd')
...@@ -414,7 +416,7 @@ export default { ...@@ -414,7 +416,7 @@ export default {
.then(response => { .then(response => {
this.receivedRequirements = response this.receivedRequirements = response
this.newResDataAdd.inspectStandardId = this.pageIndexSec.id this.newResDataAdd.inspectStandardId = this.pageIndexSec.inspectStandardId
this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
this.newResDataAdd.operationSort = this.pageIndexSec.operationSort this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
...@@ -487,7 +489,8 @@ export default { ...@@ -487,7 +489,8 @@ export default {
this.newResDataAdd.remark = this.newReviewSceneRemark this.newResDataAdd.remark = this.newReviewSceneRemark
// this.newResDataAdd.inspectStandardId = this.pageIndexSec.id this.newResDataAdd.inspectStandardId = this.pageIndexSec.inspectStandardId
console.log(this.pageIndexSec)
console.log(this.newResDataAdd.inspectStandardId, '提交之前') console.log(this.newResDataAdd.inspectStandardId, '提交之前')
this.$refs.formItemName.validate(valid =>{ this.$refs.formItemName.validate(valid =>{
...@@ -496,10 +499,10 @@ export default { ...@@ -496,10 +499,10 @@ export default {
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转') this.$message.success('提交成功')
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' }) this.$router.push({ path: '/review/initiatedReview' })
}, 5000) }, 200)
} else { } else {
this.$message({ this.$message({
message: '提交失败', message: '提交失败',
......
src/views/review/createReview/newReviewScene/index.vue
View file @ bb608aa1
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">确认</el-button> <el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleKeypoints = false" <el-button type="primary" plain @click="dialogVisibleKeypoints = false"
>确认</el-button >确认</el-button
> >
</div> </div>
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleDetails = false" <el-button type="primary" plain @click="dialogVisibleDetails = false"
>确认</el-button >确认</el-button
> >
</div> </div>
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
<el-row> <el-row>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
<el-col :span="8"> <el-col :span="18">
<el-form-item label="审查场景" prop="shenchachangjing" v-model="formModel.shenchachangjing"> <el-form-item label="审查场景" prop="shenchachangjing" v-model="formModel.shenchachangjing">
<el-input <el-input
v-model="formModel.shenchachangjing" v-model="formModel.shenchachangjing"
...@@ -212,7 +212,7 @@ ...@@ -212,7 +212,7 @@
> >
</el-input> </el-input>
</el-form-item> </el-col </el-form-item> </el-col
><el-col :span="10"><p></p></el-col> ><el-col :span="3"><p></p></el-col>
</el-row> </el-row>
<div class="subtitle">评审成员</div> <div class="subtitle">评审成员</div>
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
<el-col :span="18"> <el-col :span="18">
<el-form-item label=""> <el-form-item label="">
<div class="assessor-text"> <div class="assessor-text">
评审人员: <!-- 评审人员: -->
<div class="review-members"> <div class="review-members">
<span <span
v-for="(reviewer, index) in receivedReviewer" v-for="(reviewer, index) in receivedReviewer"
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
<div class="subtitle">备注信息</div> <div class="subtitle">备注信息</div>
<el-row> <el-row>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
<el-col :span="8"> <el-col :span="18">
<el-form-item label=""> <el-form-item label="">
<el-input <el-input
v-model="formModel.beizhuxinxi" v-model="formModel.beizhuxinxi"
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-col :span="10"><p></p></el-col> <el-col :span="3"><p></p></el-col>
</el-col> </el-col>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
</el-row> </el-row>
...@@ -473,7 +473,7 @@ export default { ...@@ -473,7 +473,7 @@ export default {
//根据 inspectStandardId => standard/findStandardList 的id //根据 inspectStandardId => standard/findStandardList 的id
// inspectStandardNo => standard/findStandardList 的standardNo // inspectStandardNo => standard/findStandardList 的standardNo
//operationSort => 这个在点击下一步的界面 通过选择新增场景时就已经设置好了 为新增 ADD_SENCE 或删除 //operationSort => 这个在点击下一步的界面 通过选择新增场景时就已经设置好了 为新增 ADD_SENCE 或删除
this.newResDataAdd.inspectStandardId = this.pageIndexSec.id this.newResDataAdd.inspectStandardId = this.pageIndexSec.inspectStandardId
this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
this.newResDataAdd.operationSort = this.pageIndexSec.operationSort this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
console.log(this.newResData, '选择标准要求弹窗确认newResData') console.log(this.newResData, '选择标准要求弹窗确认newResData')
...@@ -498,7 +498,7 @@ export default { ...@@ -498,7 +498,7 @@ export default {
.then(response => { .then(response => {
this.receivedRequirements = response this.receivedRequirements = response
this.newResDataAdd.inspectStandardId = this.pageIndexSec.id this.newResDataAdd.inspectStandardId = this.pageIndexSec.
this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
this.newResDataAdd.operationSort = this.pageIndexSec.operationSort this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
...@@ -585,10 +585,10 @@ export default { ...@@ -585,10 +585,10 @@ export default {
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转') this.$message.success('提交成功')
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' }) this.$router.push({ path: '/review/initiatedReview' })
}, 5000) }, 200)
} else { } else {
this.$message({ this.$message({
message: '提交失败', message: '提交失败',
......
src/views/review/createReview/newUseCase/index.vue
View file @ bb608aa1
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">确认</el-button> <el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<el-col :span="18"> <el-col :span="18">
<el-form-item label=""> <el-form-item label="">
<div class="assessor-text"> <div class="assessor-text">
评审人员: <!-- 评审人员: -->
<div class="review-members"> <div class="review-members">
<span <span
v-for="(reviewer, index) in receivedReviewer" v-for="(reviewer, index) in receivedReviewer"
...@@ -509,10 +509,10 @@ export default { ...@@ -509,10 +509,10 @@ export default {
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转') this.$message.success('提交成功')
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' }) this.$router.push({ path: '/review/initiatedReview' })
}, 5000) }, 200)
} else { } else {
this.$message({ this.$message({
message: '提交失败', message: '提交失败',
......
src/views/review/createReview/reviewData/index.vue
View file @ bb608aa1
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="标准条款" prop="biaozhuntiuaokuan"> <el-form-item label="标准条款" prop="biaozhuntiuaokuan">
<el-button type="primary" plain @click="handleReSelect" <el-button type="success" plain @click="handleReSelect"
>重新选择标准条款</el-button >重新选择标准条款</el-button
> >
<div style="display: flex"> <div style="display: flex">
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="create-review-footer"> <div class="create-review-footer">
<el-button type="primary" class="next-button" @click="handleConfirm" <el-button type="success" class="next-button" @click="handleConfirm"
><span ><span
class="el-icon-check" class="el-icon-check"
style="margin-right: 6px" style="margin-right: 6px"
......
src/views/review/createReview/updateUseCase/index.vue
View file @ bb608aa1
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
</collapse> </collapse>
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="handleSelectedUseCase()" <el-button type="primary" plain @click="handleSelectedUseCase()"
>确认</el-button >确认</el-button
> >
</div> </div>
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
<el-col :span="18"> <el-col :span="18">
<el-form-item label=""> <el-form-item label="">
<div class="assessor-text"> <div class="assessor-text">
评审人员: <!-- 评审人员: -->
<div class="review-members"> <div class="review-members">
<span <span
v-for="(reviewer, index) in receivedReviewer" v-for="(reviewer, index) in receivedReviewer"
...@@ -614,10 +614,10 @@ export default { ...@@ -614,10 +614,10 @@ export default {
.then(response => { .then(response => {
const aa = response const aa = response
if (aa) { if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转') this.$message.success('提交成功')
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' }) this.$router.push({ path: '/review/initiatedReview' })
}, 5000) }, 200)
} else { } else {
this.$message({ this.$message({
message: '提交失败', message: '提交失败',
......
src/views/review/initiatedReview/index.vue
View file @ bb608aa1
...@@ -37,11 +37,11 @@ ...@@ -37,11 +37,11 @@
<el-form-item prop="type"> <el-form-item prop="type">
<el-select <el-select
v-model="queryParams.type" v-model="queryParams.type"
placeholder="标准要求分类" placeholder="检验类型"
clearable clearable
> >
<el-option <el-option
v-for="dict in dict.type.type" v-for="dict in dict.type.scene_type"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="标准要求分类" label="检验类型"
width="150" width="150"
sortable sortable
align="left" align="left"
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
:formatter="formatOperationSort" :formatter="formatOperationSort"
> >
</el-table-column> </el-table-column>
<el-table-column label="场景内容" width="200" align="left" prop="newText"> <el-table-column label="评审内容" width="200" align="left" prop="newText">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="评审人员" label="评审人员"
...@@ -243,7 +243,7 @@ import { listTest } from '@/api/task/test' ...@@ -243,7 +243,7 @@ import { listTest } from '@/api/task/test'
export default { export default {
name: 'Index', name: 'Index',
mixins: [page], mixins: [page],
dicts: ['review_status', 'review_type', 'type'], dicts: ['review_status', 'review_type', 'scene_type'],
data() { data() {
return { return {
...@@ -271,20 +271,24 @@ export default { ...@@ -271,20 +271,24 @@ export default {
} }
}, },
created() { created() {
this.buttonDisabled = true
setTimeout(()=>{
this.buttonDisabled = false
},1000)
this.gainDictDataList() this.gainDictDataList()
}, },
mounted() {}, mounted() {},
methods: { methods: {
gainDictDataList() { gainDictDataList() {
const obj = 'type' const obj = 'scene_type'
const obj1 = 'review_type' const obj1 = 'review_type'
// 获取 review_type 字典数据 // 获取 review_type 字典数据
getDicts('review_type').then(response => { getDicts('review_type').then(response => {
this.reviewTypeList = response.data || [] this.reviewTypeList = response.data || []
}) })
// 获取 type 字典数据 // 获取 scene_type 字典数据
getDicts('type').then(response => { getDicts('scene_type').then(response => {
this.typeList = response.data || [] this.typeList = response.data || []
}) })
}, },
...@@ -352,6 +356,10 @@ export default { ...@@ -352,6 +356,10 @@ export default {
}, },
// 列表-查询 // 列表-查询
handleQuery() { handleQuery() {
this.buttonDisabled = true
setTimeout(()=>{
this.buttonDisabled = false
},1000)
this.queryParams.page = 1 this.queryParams.page = 1
this.getList() this.getList()
}, },
...@@ -370,7 +378,7 @@ export default { ...@@ -370,7 +378,7 @@ export default {
this.buttonDisabled = true this.buttonDisabled = true
setTimeout(()=>{ setTimeout(()=>{
this.buttonDisabled = false this.buttonDisabled = false
},2000) },1000)
this.loadData() this.loadData()
}, },
// 列表-重置 // 列表-重置
...@@ -378,7 +386,7 @@ export default { ...@@ -378,7 +386,7 @@ export default {
this.buttonDisabled = true this.buttonDisabled = true
setTimeout(()=>{ setTimeout(()=>{
this.buttonDisabled = false this.buttonDisabled = false
},2000) },1000)
this.queryParams = { this.queryParams = {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
......
src/views/setting/company/index.vue
View file @ bb608aa1
...@@ -234,20 +234,24 @@ export default { ...@@ -234,20 +234,24 @@ export default {
this.queryParams.isAsc = 'desc' this.queryParams.isAsc = 'desc'
this.queryParams.orderByColumn = 'createTime' this.queryParams.orderByColumn = 'createTime'
this.view = this.$route.query.view this.view = this.$route.query.view
this.buttonDisabled = true
setTimeout(()=>{
this.buttonDisabled = false
},1000)
}, },
methods: { methods: {
handleQuery(){ handleQuery(){
this.buttonDisabled = true this.buttonDisabled = true
setTimeout(()=>{ setTimeout(()=>{
this.buttonDisabled = false this.buttonDisabled = false
},2000) },1000)
this.loadData() this.loadData()
}, },
resetQuery() { resetQuery() {
this.buttonDisabled = true this.buttonDisabled = true
setTimeout(()=>{ setTimeout(()=>{
this.buttonDisabled = false this.buttonDisabled = false
},2000) },1000)
this.queryParams = { this.queryParams = {
pageNum: this.queryParams.pageNum, pageNum: this.queryParams.pageNum,
pageSize: this.queryParams.pageSize, pageSize: this.queryParams.pageSize,
......
src/views/setting/standard/index.vue
View file @ bb608aa1
...@@ -251,6 +251,10 @@ export default { ...@@ -251,6 +251,10 @@ export default {
}) })
}, },
created() { created() {
this.buttonDisibled = true
setTimeout(()=>{
this.buttonDisibled = false
},1000)
this.queryParams.isAsc = 'desc' this.queryParams.isAsc = 'desc'
this.queryParams.orderByColumn = 'releaseDate' this.queryParams.orderByColumn = 'releaseDate'
}, },
...@@ -266,14 +270,14 @@ export default { ...@@ -266,14 +270,14 @@ export default {
this.loadData() this.loadData()
setTimeout(() => { setTimeout(() => {
this.buttonDisibled = false this.buttonDisibled = false
}, 2000) }, 1000)
}, },
handleQuery(){ handleQuery(){
this.buttonDisibled = true this.buttonDisibled = true
this.loadData() this.loadData()
setTimeout(() => { setTimeout(() => {
this.buttonDisibled = false this.buttonDisibled = false
}, 2000) }, 1000)
}, },
sort_change(column, prop, order) { sort_change(column, prop, order) {
......
src/views/setting/standardTerms/components/caseModel.vue 0 → 100644
View file @ bb608aa1
<template>
<el-dialog
title="检验内容"
:visible.sync="dialogManger.dialogVisible"
width="60%"
>
<el-form class="form" :model="dialogManger">
<el-form-item class="title">
<span style="width: 500px">标准信息</span>
</el-form-item>
<el-form-item label="标准号" :label-width="formLabelWidth">
<el-input
class="input"
disabled
v-model="dialogManger.source.standard.standardNo"
autocomplete="off"
></el-input>
</el-form-item>
<el-form-item label="标准名称" :label-width="formLabelWidth">
<el-input
class="input"
disabled
v-model="dialogManger.source.standard.name"
autocomplete="off"
></el-input>
</el-form-item>
<el-form-item label="标准章节" :label-width="formLabelWidth">
<el-input
class="input"
disabled
v-model="dialogManger.source.standard.chapter"
autocomplete="off"
></el-input>
</el-form-item>
<el-form-item label="审查类型" :label-width="formLabelWidth">
<el-input
class="input"
disabled
v-model="dialogManger.source.standard.type"
autocomplete="off"
></el-input>
</el-form-item>
<el-form-item label="标准要求" :label-width="formLabelWidth">
<el-input
class="textarea"
disabled
resize="none"
:autosize="{ minRows: 4, maxRows: 6 }"
type="textarea"
v-model="dialogManger.source.standard.text"
autocomplete="off"
></el-input>
</el-form-item>
</el-form>
<el-form
class="form"
:model="dialogManger"
title="'审查信息'"
style="margin-top: 10px"
>
<el-form-item class="title">
<span style="width: 500px">检验内容</span>
</el-form-item>
<el-form-item label="测试场景" :label-width="formLabelWidth">
<el-input
class="textarea"
disabled
resize="none"
:autosize="{ minRows: 1, maxRows: 6 }"
type="textarea"
v-model="dialogManger.source.judge.content"
autocomplete="off"
>
</el-input>
</el-form-item>
<div v-for="(item, index) in dialogManger.source.judge.caseInfo">
<el-form-item label="用例编号" :label-width="formLabelWidth">
<el-input
class="textarea"
disabled
resize="none"
:autosize="{ minRows: 1, maxRows: 6 }"
type="textarea"
v-model="item.customizedID"
autocomplete="off"
>
</el-input>
</el-form-item>
<el-form-item label="用例描述" :label-width="formLabelWidth">
<el-input
class="textarea"
disabled
resize="none"
:autosize="{ minRows: 4, maxRows: 6 }"
type="textarea"
v-model="item.description"
autocomplete="off"
></el-input>
</el-form-item>
</div>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="dialogManger.dialogVisible = false"
>确 定</el-button
>
</div>
</el-dialog>
</template>
<script>
export default {
name: '',
data() {
return {
titleWidth: '500px',
formLabelWidth: '120px'
}
},
props: {
dialogManger: {
type: Object,
default: () => {
return {
dialogVisible: false,
refreshList: false,
source: {
standard: {
name: '',
standardNo:'',
chapter: '',
type:'',
text:'',
},
judge:{
caseNum:'',
reviewDetailsList:[]
}
},
dialogEditId: undefined
}
}
}
},
methods: {
cancel() {
this.dialogManger.dialogVisible = false
}
}
}
</script>
<style lang="scss" scoped>
.form .title {
width: 100%;
margin-right: 50px;
color: blue;
font-weight: bold;
border-left: blue solid 6px;
padding-left: 10px;
}
.form .input {
width: 100%;
}
.form .textarea {
width: 100%;
}
::v-deep .el-dialog__body {
height: 70vh;
overflow: auto;
}
.input ::v-deep .el-input__inner {
color: black;
}
.textarea ::v-deep .el-textarea__inner {
color: black;
}
</style>
\ No newline at end of file
src/views/setting/standardTerms/index.vue
View file @ bb608aa1
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment