WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_20230831_problem' into dev_20230831_problem

Browse Source
This commit is contained in:
zyx.net
2023-09-07 14:29:04 +08:00
parent 385dc80d37 353b488b98
commit 56fbbc9469
9 changed files with 423 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/projectManagement/components/nonConformance.vue
+11 -4
View File
@@ -54,6 +54,7 @@
<j-dict-select-tag class="box-input" v-model="queryParam.problemType"
:placeholder="$t('PleaseSelect')+$t('problemType')"
:type="'select'"
@changeQuery="onChange"
:triggerChange="false" :dictCode="'wen4_ti2_lei4_xing2'"/>
</div>
</a-col>
@@ -164,9 +165,9 @@
{{result.problemState ? result.problemState : ''}}
</span>
</div>
<span slot="problemType" slot-scope="text,result">
<span>{{result.flag== 'NEW'?result.problemType_dictText:result.problemType}}</span>
</span>
<!-- <span slot="problemType" slot-scope="text,result">-->
<!-- <span>{{result.flag== 'NEW'?result.problemType_dictText:result.problemType}}</span>-->
<!-- </span>-->
<span slot="operation" slot-scope="text,record">
<a class="text-operation"
@click="detil(record)">
@@ -420,8 +421,14 @@ export default {
this.orderByField = sorter.columnKey
this.getList()
},
onChange(value){
console.log(value)
this.queryParam.problemType_dictText = value
},
getList() {
console.log(this.$route.query)
if(this.queryParam.problemType_dictText){
delete this.queryParam.problemType
}
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,
jero-web/src/views/projectManagement/projectNonConformance/index.vue
+11 -3
View File
@@ -54,6 +54,7 @@
<j-dict-select-tag class="box-input" v-model="queryParam.problemType"
:placeholder="$t('PleaseSelect')+$t('problemType')"
:type="'select'"
@changeQuery="onChange"
:triggerChange="false" :dictCode="'wen4_ti2_lei4_xing2'"/>
</div>
</a-col>
@@ -164,9 +165,9 @@
{{result.problemState ? result.problemState : ''}}
</span>
</div>
<span slot="problemType" slot-scope="text,result">
<span>{{result.flag== 'NEW'?result.problemType_dictText:result.problemType}}</span>
</span>
<!-- <span slot="problemType" slot-scope="text,result">-->
<!-- <span>{{result.flag== 'NEW'?result.problemType_dictText:result.problemType}}</span>-->
<!-- </span>-->
<span slot="operation" slot-scope="text,record">
<a class="text-operation"
@click="detil(record)">
@@ -381,6 +382,10 @@
addModelForm(){
this.getList()
},
onChange(value){
console.log(value)
this.queryParam.problemType_dictText = value
},
onSelectChange(value) {
this.content = []
this.selectedRowKeys = value
@@ -421,6 +426,9 @@
this.getList()
},
getList() {
if(this.queryParam.problemType_dictText){
delete this.queryParam.problemType
}
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,