修改BUG

20231126-yw
yuanwei 1 year ago
parent 308daccbba
commit fffd7e32ac

@ -20,7 +20,7 @@
<!-- </el-row>--> <!-- </el-row>-->
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList" > <template v-for="(item, index) in queryList" >
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id"> <el-form-item :style="item.style?item.style:item.width?'width:'+(item.width)+'px':''" v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
@ -249,7 +249,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="item.columnName == 'failCout'" label="生产企业证书" prop="auditStatus" width="120"> <el-table-column v-if="item.columnName == 'failCout'" :label="item.columnDesc" prop="auditStatus" :width="item.width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0"> <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">
@ -264,7 +264,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="item.columnName == 'productFailCout'" label="配送产品证书" prop="auditStatus" width="120"> <el-table-column v-if="item.columnName == 'productFailCout'" :label="item.columnDesc" prop="auditStatus" :width="item.width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag type="danger" v-if="scope.row.productFailCout==0 && scope.row.prouctPassCout==0"> <el-tag type="danger" v-if="scope.row.productFailCout==0 && scope.row.prouctPassCout==0">
未添加证书 未添加证书
@ -537,7 +537,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="item.columnName == 'failCout'" label="配送产品证书" prop="auditStatus" width="120"> <el-table-column v-if="item.columnName == 'failCout'" :label="item.columnDesc" prop="auditStatus" :width="item.width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0"> <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">

@ -461,13 +461,28 @@ export default {
.catch(() => { .catch(() => {
}) })
}, },
detailDialog(_this,row, type) { detailDialog(_this,row) {
if (type == 1) { _this.title = "产品信息详情"
_this.title = "产品信息详情" if (row.type == 1) {
let query = {devKey: row.deviceRecordKey}
getDiProductDetail(query).then((res) => {
if (res.code === 20000) {
_this.thisData = res.data
_this.editDate = row
_this.thisData.isAudit = type
_this.thrProductsDiDetailVisible = true
} else {
_this.$message.error('参数错误')
}
})
} else { } else {
_this.title = "物资入院审核" _this.thisDetail = row;
_this.thisDetail.isAudit = type
_this.thrProductsDetailVisible = true;
} }
},
auditDialog(_this,row) {
_this.title = "物资入院审核"
if (row.type == 1) { if (row.type == 1) {
let query = {devKey: row.deviceRecordKey} let query = {devKey: row.deviceRecordKey}
getDiProductDetail(query).then((res) => { getDiProductDetail(query).then((res) => {

@ -414,6 +414,27 @@
this.subData.configId = this.info.configId, this.subData.configId = this.info.configId,
this.subData.type = this.type; this.subData.type = this.type;
this.formVisible = true; this.formVisible = true;
if("add" == formName){
this.conditionForm = {
lableList: [{
name: '',
value: ''
}],
colorList: [{
type: '',
value: '',
color: ''
}],
buttonList: [{
type: '',
size: '',
style: '',
name: '',
clickFuc: '',
hasPermi:'',
}]
}
}
if("edit" == formName){ if("edit" == formName){
const colorRule = this.subData.colorRule; const colorRule = this.subData.colorRule;
var colorList = [{type: '', value: '', color: ''}] var colorList = [{type: '', value: '', color: ''}]

@ -415,6 +415,27 @@
this.subData.configId = this.info.configId; this.subData.configId = this.info.configId;
this.subData.type = this.type; this.subData.type = this.type;
this.formVisible = true; this.formVisible = true;
if("add" == formName){
this.conditionForm = {
lableList: [{
name: '',
value: ''
}],
colorList: [{
type: '',
value: '',
color: ''
}],
buttonList: [{
type: '',
size: '',
style: '',
name: '',
clickFuc: '',
hasPermi:'',
}]
}
}
if("edit" == formName){ if("edit" == formName){
} }

@ -338,6 +338,27 @@
this.subData.configId = this.info.configId, this.subData.configId = this.info.configId,
this.subData.type = this.type; this.subData.type = this.type;
this.formVisible = true; this.formVisible = true;
if("add" == formName){
this.conditionForm = {
lableList: [{
name: '',
value: ''
}],
colorList: [{
type: '',
value: '',
color: ''
}],
buttonList: [{
type: '',
size: '',
style: '',
name: '',
clickFuc: '',
hasPermi:'',
}]
}
}
if("edit" == formName){ if("edit" == formName){
const lableRule = this.subData.lableRule; const lableRule = this.subData.lableRule;
var lableList = [{name: '', value: ''}] var lableList = [{name: '', value: ''}]

@ -415,7 +415,7 @@
<span slot="label"> <span slot="label">
{{item.columnDesc}} {{item.columnDesc}}
</span> </span>
<el-radio-group :style="item.style" v-model="formData[item.columnName]"> <el-radio-group v-model="formData[item.columnName]">
<el-radio <el-radio
v-for="dict in item.lableRuleObj" v-for="dict in item.lableRuleObj"
:key="parseInt(dict.value)" :key="parseInt(dict.value)"

Loading…
Cancel
Save