+
{
- // this.height = $(".content").height() * 0.4;
- // };
+ this.warningTableHeight = $(window).height()*0.54
+ window.onresize = () => {
+ this.warningTableHeight = $(window).height()*0.54;
+ };
+ // alert(this.warningTableHeight)
+ this.height = $(".content").height();
+ window.onresize = () => {
+ this.height = $(".content").height();
+ };
//从数据库中查询下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", {}, {
_this: this
}, res => {
this.energyKindOptions = res.data.ENERGYTYPES; // 文本状态
+ this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
this.zrgcs = res.data.ZRGCSCLASS;
this.loading[this.field] = true
this.$http.get('sys/EarlyWarning/StandWarning', {
@@ -1015,8 +1033,11 @@ export default {
}
.more {
- margin-top: 30px;
+ display: flex;
+ align-items: center;
+
+ justify-content: center;
/deep/ .el-input__inner {
width: 185px;
}
@@ -1027,13 +1048,13 @@ export default {
}
}
- cursor: pointer;
+ //cursor: pointer;
color: #12508e;
- position: absolute;
+ //position: absolute;
top: 0;
right: 0;
z-index: 100;
- padding: 5px 10px;
+ //padding: 5px 10px;
// &:hover {
// color: #fff;
// background: #12508e;
@@ -1041,6 +1062,17 @@ export default {
// }
}
+ .content {
+ padding-bottom: 10px;
+ height: calc(~'100% - 40px');
+
+ /deep/ .el-button--mini {
+ padding: 5px 7px;
+ font-size: 8px;
+ }
+
+ }
+
.dynamic-loop-container {
position: relative;
min-height: 160px;
@@ -1120,15 +1152,7 @@ export default {
}
}
- .content {
- padding-bottom: 10px;
- height: calc(~'100% - 40px');
- /deep/ .el-button--mini {
- padding: 5px 7px;
- font-size: 8px;
- }
- }
}
::v-deep {
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 6b47933c8..4ab48c3bf 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -1629,19 +1629,6 @@ export default {
}
})
},
- getTaskId () {
- queryTaskFirst({
- bpnId: this.$route.query.bpnId
- }).then(res => {
- let mes = JSON.parse(res.mes)
- mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
- this.roleForm = mes.roleForm
- this.commentText = mes.commentText
- this.taskIds=mes.taskIds
- //表单文件处理
- this.getFormFieldList(mes.form)
- })
- },
choiceZRR1 (type, title, id) {
this.drawerTitle = title
this.modalShowFlag1 = true
@@ -2215,7 +2202,12 @@ export default {
if (res) {
const processForm = JSON.parse(res.mesg)
this.commentText = processForm.commentText
- this.getFormFieldList(processForm)
+ if (processForm.form === undefined) {
+ this.getFormFieldList(processForm)
+ } else {
+ //表单文件处理
+ this.getFormFieldList(processForm.form)
+ }
}
}).catch(e => {
console.log("错误")
@@ -2238,7 +2230,6 @@ export default {
this.form.prcName = this.prcName
this.form['id'] = item.id
- console.log("this.form",this.form);
// 遍历对象
for(const p in this.form) {
@@ -2328,22 +2319,22 @@ export default {
this.form.country=this.countryArr;
this.saveLoading = true
let _formData = new FormData()
- // _formData.append('id', this.bpnId)
- _formData.append('createUser', this.$store.getters.userInfo.userId)
- _formData.append('createUserName', this.$store.getters.userInfo.uName)
+ _formData.append('id', this.bpnId)
+ // _formData.append('createUser', this.$store.getters.userInfo.userId)
+ // _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', '1')
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText,
- taskInfo: '申请人修订',
- taskIds:this.taskIds
+ // taskInfo: '申请人修订',
+ // taskIds:this.taskIds
}))
- saveTaskFirst(_formData).then(res => {
+ saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
- // this.bpnId = res.result
+ this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
@@ -2442,7 +2433,6 @@ export default {
this.getData()
},
mounted () {
- this.getTaskId()
this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index a9f099601..bc5f1bd58 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1766,6 +1766,7 @@
:visible.sync="OCRModel"
size="900px"
custom-class="demo-drawer"
+ :before-close="OCRclose"
>
@@ -2553,10 +2562,20 @@
}
},
methods: {
+ setWBType (type) {
+ let text = ''
+ for (let a = 0; a < this.OCRoptions.length; a++) {
+ if (this.OCRoptions[a].attrField === type) {
+ text = this.OCRoptions[a].attrName
+ }
+ }
+ return text
+ },
selectOCRChange (val) {
this.OCRDatas = val
},
OCRclose () {
+ this.OCRData = []
this.OCRModel = false
},
OCRsubmit () {
@@ -2622,21 +2641,20 @@
this.$message.warning('请选择一条数据进行' + text)
} else {
this.OCRModel = true
- this.OCRLoading = false
+ this.OCRLoading = true
this.$http.get('lawss/sarStandFile/queryFileInfoNew', {
type: type,
standId: this.selectedList[0]
},{
_this: this
}, res => {
+ this.OCRLoading = false
if (res.ok) {
if (res.data.length > 0) {
this.OCRData = res.data
- this.OCRLoading = false
} else {
this.$message.warning('当前标准没有' + text + '文件')
this.this.OCRData = []
- this.OCRLoading = false
}
}
})
@@ -5302,6 +5320,7 @@
_this: this
}, res => {
this.OCRoptions = res.data
+ console.log(res.data);
})
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
@@ -1790,6 +1791,14 @@
label="文件名"
align="center">
+
+
+
{{setWBType(scope.row.standFileClassify)}}
+
+