|
|
@@ -129,7 +129,7 @@ export default {
|
|
|
const subtableTypeConfiguration = ()=> {
|
|
|
let zbTable = this.dynamicParams.formObj.formDefData.fields.find(i => i.field_name == "t_sjfxzb").field_options.columns
|
|
|
let zblbTable = zbTable.find(i => i.field_name == "leiXing").field_options.options
|
|
|
- console.log(zblbTable)
|
|
|
+ // console.log(zblbTable)
|
|
|
return zblbTable;
|
|
|
}
|
|
|
return {
|
|
|
@@ -150,7 +150,8 @@ export default {
|
|
|
],
|
|
|
bringOut:[],
|
|
|
toolbarsConsult: [{ key: 'cancel' }],
|
|
|
- dataTemplate:[]
|
|
|
+ dataTemplate:[],
|
|
|
+ nameCycle:''
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
|
@@ -174,8 +175,10 @@ export default {
|
|
|
let text = this.bringOut.find(i=>i.id_ == val)
|
|
|
if (typeof text != 'undefined') {
|
|
|
this.tyepRadio = text.lei_xing_
|
|
|
+ this.nameCycle = text.zhi_biao_ming_che
|
|
|
this.verificationMethodTextarea = text.yan_zheng_fang_fa
|
|
|
this.criteriaTextarea = text.pan_duan_biao_zhu
|
|
|
+ this.maintenanceTextarea = text.jie_guo_ping_jia_
|
|
|
}
|
|
|
|
|
|
},
|
|
|
@@ -206,7 +209,7 @@ export default {
|
|
|
queryDataTable(this.getFormatParams()).then(response => {
|
|
|
const data = response.data
|
|
|
// this.dataResult = data.dataResult || []
|
|
|
- console.log(data.dataResult,'111111111111')
|
|
|
+ // console.log(data.dataResult,'111111111111')
|
|
|
this.bringOut = data.dataResult
|
|
|
data.dataResult.forEach(element => {
|
|
|
let newVal = {val:element.id_ || '',label:element.zhi_biao_ming_che || '',yanzheng:element.yan_zheng_fang_fa || '',panduan:element.pan_duan_biao_zhu || '',leixing:element.lei_xing_ || ''}
|
|
|
@@ -232,19 +235,21 @@ export default {
|
|
|
},
|
|
|
handleConfirm(key) {
|
|
|
let a=this.dynamicParams.formObj.getData(this.templateKey)
|
|
|
-
|
|
|
- if(this.cycleValue!=''&&this.verificationMethodTextarea!=''&&this.criteriaTextarea!=''&&this.maintenanceTextarea!=''){
|
|
|
- this.afterSubButton(this.verificationMethodTextarea,this.criteriaTextarea)
|
|
|
+ this.afterSubButton(this.verificationMethodTextarea,this.criteriaTextarea)
|
|
|
+ if(this.cycleValue!=''&&this.verificationMethodTextarea!=''&&this.criteriaTextarea!=''&&this.maintenanceTextarea!=''&&this.dataStoreTextarea!=''){
|
|
|
+
|
|
|
if(this.dynamicParams.position == 'manage'){
|
|
|
- this.$set(a,this.dynamicParams.params.index,{zhiBiaoMingCheng:this.cycleValue,leiXing:this.tyepRadio,yanZhengFangFa:this.verificationMethodTextarea,panDuanBiaoZhun:this.criteriaTextarea,pingJiaJieGuo:this.maintenanceTextarea,shuJuCunChu:this.dataStoreTextarea})
|
|
|
+ this.$set(a,this.dynamicParams.params.index,{zhiBiaoMingCheng:this.nameCycle,zhiBiaoId:this.cycleValue,leiXing:this.tyepRadio,yanZhengFangFa:this.verificationMethodTextarea,panDuanBiaoZhun:this.criteriaTextarea,pingJiaJieGuo:this.maintenanceTextarea,shuJuCunChu:this.dataStoreTextarea})
|
|
|
}else{
|
|
|
- a.push({zhiBiaoMingCheng:this.cycleValue,leiXing:this.tyepRadio,yanZhengFangFa:this.verificationMethodTextarea,panDuanBiaoZhun:this.criteriaTextarea,pingJiaJieGuo:this.maintenanceTextarea,shuJuCunChu:this.dataStoreTextarea})
|
|
|
+ a.push({zhiBiaoMingCheng:this.nameCycle,zhiBiaoId:this.cycleValue,leiXing:this.tyepRadio,yanZhengFangFa:this.verificationMethodTextarea,panDuanBiaoZhun:this.criteriaTextarea,pingJiaJieGuo:this.maintenanceTextarea,shuJuCunChu:this.dataStoreTextarea})
|
|
|
}
|
|
|
// this.$nextTick(function(){
|
|
|
this.dynamicParams.formObj.setData(this.templateKey,a)
|
|
|
// })
|
|
|
|
|
|
// this.closeDialog()
|
|
|
+ }else if(this.cycleValue!=''&&this.verificationMethodTextarea!=''&&this.criteriaTextarea!=''&&this.maintenanceTextarea!=''){
|
|
|
+
|
|
|
}else{
|
|
|
this.dynamicParams.formObj.$message.warning("请保证所有信息都已填写")
|
|
|
}
|
|
|
@@ -257,7 +262,8 @@ export default {
|
|
|
loadFormData() {
|
|
|
if(this.dynamicParams.position == 'manage'){
|
|
|
let a=this.dynamicParams.formObj.getData(this.templateKey)[this.dynamicParams.params.index]
|
|
|
- this.cycleValue = a.zhiBiaoMingCheng
|
|
|
+ this.cycleValue = a.zhiBiaoId
|
|
|
+ this.nameCycle = a.zhiBiaoMingCheng
|
|
|
this.tyepRadio = a.leiXing
|
|
|
this.verificationMethodTextarea = a.yanZhengFangFa
|
|
|
this.criteriaTextarea = a.panDuanBiaoZhun
|
|
|
@@ -297,7 +303,7 @@ export default {
|
|
|
}
|
|
|
if(!parameter){
|
|
|
this.dynamicParams.formObj.$message.error('判断标准的{判断参数}未填写')
|
|
|
- return
|
|
|
+ return
|
|
|
}
|
|
|
if(!juvalue){
|
|
|
this.dynamicParams.formObj.$message.error('判断标准的{判断值}未填写')
|