FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
super_liu
2021-12-30 16:45:03 +08:00
parent cd9a47e60d b79ca92f03
commit 4d0d9c76e9
15 changed files with 46 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/styles/phone.less
+15
View File
@@ -1,6 +1,21 @@
.phoneBox {
width: 100%;
height: 100%;
.form-item-disabled {
color: #666 !important;
/deep/.el-form-item__label {
color: #666 !important;
}
/deep/.el-form-item__content {
color: #666 !important;
/deep/.el-input {
color: #666 !important;
/deep/.el-input__inner {
color: #666 !important;
}
}
}
}
.headerTabs {
height: 52px;
display: flex;
src/pages/details/otherStandardDetails/index.vue
+2 -2
View File
@@ -90,7 +90,7 @@
</span>
<!-- 多个文件时-->
<span v-else-if="child.value && child.value.length > 0">
<span style="margin-left: 19%">
<div style="margin-left: 15%;margin-top: -60px;line-height: 90px">
<a style="font-size: 16px;color: #409EFF;cursor: pointer"
@click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
:title="file.oldFileName">{{ file.oldFileName }}</a>
@@ -106,7 +106,7 @@
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/>
</span>
</div>
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</span>
<el-button
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+6 -2
View File
@@ -250,6 +250,7 @@
name: "bzdyStep3",
data() {
return {
newDocUser: '',
drawerModal: false,
foldFormFlag: false,
histortData: [],
@@ -397,6 +398,7 @@
handleSave() {
this.saveLoading = true
let _formData = new FormData()
this.form.docUser = this.newDocUser
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
form: this.form,
@@ -431,6 +433,7 @@
// json.commentText = this.commentText
json.fileId = this.form.fileId
json.fileName = this.form.fileName
json.docUser = this.newDocUser
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -468,11 +471,12 @@
this.json = data || data.form
this.form.fjList = data.fjList || data.form.fjList
this.form.modelList = data.modelList || data.form.modelList
this.form.responUserList = data.form.responUserList
this.form.responUserListName = data.form.responUserListName
this.form.responUserList = data.form ? data.form.responUserList : data.responUserList
this.form.responUserListName = data.form ? data.form.responUserListName : data.responUserListName
this.form.fileName = data.form? data.form.fileName : ''
this.form.fileId = data.form ? data.form.fileId : ''
this.form.dyhz = data.form ? data.form.dyhz : ''
this.newDocUser = data.form ? data.form.docUser : data.docUser
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+2 -2
View File
@@ -201,7 +201,6 @@
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
show-back
@back="handleSubmitNo"
@@ -231,6 +230,7 @@
name: "bzdyStep4",
data() {
return {
newDocUser: '',
drawerModal: false,
foldFormFlag: false,
histortData: [],
@@ -329,7 +329,6 @@
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSubmit() { // 同意
this.isSubmit = true
var json = this.json
@@ -384,6 +383,7 @@
this.form.fileId = data.form ? data.form.fileId : data.fileId
this.form.modelList = data.form ? data.form.modelList : data.modelList
this.form.fjList = data.fjList || data.form.fjList
this.newDocUser = data.form ? data.form.docUser : data.docUser
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+4
View File
@@ -237,6 +237,7 @@
name: "bzdyStep5",
data() {
return {
newDocUser: '',
drawerModal: false,
foldFormFlag: false,
histortData: [],
@@ -367,6 +368,7 @@
this.saveLoading = true
let json = this.form
json.responUserList = this.tableData
this.form.docUser = this.newDocUser
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
@@ -388,6 +390,7 @@
json.commentText = this.commentText
json.hzfileId = this.form.hzfileId
json.hzfileName = this.form.hzfileName
json.docUser = this.newDocUser
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -415,6 +418,7 @@
this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName
this.newDocUser = data.form ? data.form.docUser : data.docUser
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+1 -1
View File
@@ -401,7 +401,7 @@
:size="PLmodalType === 1 && form.itemsNum1 ? '1200px' : '800px'">
<div class="demo-drawer-content">
<div style="display: flex; height: 100%;">
<div style="width: 600px; border-right: 1px solid #ccc;" v-if="form.itemsNum1">
<div style="width: 600px; border-right: 1px solid #ccc;" v-if="form.itemsNum1 && PLmodalType === 1 ">
<div v-if="BDtext" style="width: 100%; height: 100%;display: flex; align-items: center; justify-content: center;">无相似文本</div>
<div v-else style="height: 100%;">
<div style="margin: 10px 5px;">比对条款: {{ plForm.itemsNum }}</div>
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+3 -8
View File
@@ -151,7 +151,7 @@
show-overflow-tooltip
align="center">
<template slot-scope="scope">
{{ JSON.parse(scope.row.applyArctic).join(',') }}
{{ typeof (scope.row.applyArctic) === 'string' ? JSON.parse(scope.row.applyArctic).join(',') : scope.row.applyArctic.join(',') }}
</template>
</el-table-column>
<el-table-column
@@ -497,7 +497,7 @@
complianceState: '', // 合规性分析
newData: '', // 新车型实施日期
onlineData: '', // 在产车实施日期
applyArctic: '', // 适用车型
applyArctic: [], // 适用车型
},
editForm: {
itemsNum: '',
@@ -507,7 +507,7 @@
complianceState: '', // 合规性分析
newData: '', // 新车型实施日期
onlineData: '', // 在产车实施日期
applyArctic: '', // 适用车型
applyArctic: [], // 适用车型
itemsId: '',
},
modalshowflag: false,
@@ -887,11 +887,6 @@
item.changePoint = item.changePoint || ''
item.technicalRequir = item.technicalRequir || ''
item.itemsTitle = item.itermsConditions
if (typeof (item.applyArctic) === 'string') {
item.applyArctic = JSON.parse(item.applyArctic) || []
} else {
item.applyArctic = item.applyArctic || []
}
})
this.getBDList()
this.itemList = itemList
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+2 -2
View File
@@ -145,7 +145,7 @@
show-overflow-tooltip
align="center">
<template slot-scope="scope">
{{ JSON.parse(scope.row.applyArctic).join(',') }}
{{ typeof (scope.row.applyArctic) === 'string' ? JSON.parse(scope.row.applyArctic).join(',') : scope.row.applyArctic.join(',') }}
</template>
</el-table-column>
<el-table-column
@@ -436,12 +436,12 @@
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSubmit() {
this.isSubmit = true
var json = this.json
json.resolveFlag = 1
json.commentText = this.commentText
json.AOLIGEI = this.AOLIGEI
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+1 -3
View File
@@ -145,7 +145,7 @@
show-overflow-tooltip
align="center">
<template slot-scope="scope">
{{ JSON.parse(scope.row.applyArctic).join(',') }}
{{ typeof (scope.row.applyArctic) === 'string' ? JSON.parse(scope.row.applyArctic).join(',') : scope.row.applyArctic.join(',') }}
</template>
</el-table-column>
<el-table-column
@@ -263,7 +263,6 @@
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
show-transfer
@transfer="handleTransfer"
@@ -424,7 +423,6 @@
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSubmit() {
this.isSubmit = true
var json = this.json
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+1 -3
View File
@@ -145,7 +145,7 @@
show-overflow-tooltip
align="center">
<template slot-scope="scope">
{{ JSON.parse(scope.row.applyArctic).join(',') }}
{{ typeof (scope.row.applyArctic) === 'string' ? JSON.parse(scope.row.applyArctic).join(',') : scope.row.applyArctic.join(',') }}
</template>
</el-table-column>
<el-table-column
@@ -263,7 +263,6 @@
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
show-transfer
@transfer="handleTransfer"
@@ -422,7 +421,6 @@
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSubmit() {
this.isSubmit = true
var json = this.json
src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
-1
View File
@@ -66,7 +66,6 @@
<div class="content" v-show="active === '3'">
<div class="flow-list">
<el-table
height="100%"
ref="selection"
:data="detailData"
tooltip-effect="dark"
src/pages/processCenter/pages/phone/bzdy/step4.vue
+6 -6
View File
@@ -84,7 +84,7 @@
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-col :span="24">
<el-form-item label="调研结果" prop="fileName" class="add-form-item form-item-disabled">
<div v-if="form.file" class="fileClass">
<div style="display: flex;align-items: center;">
@@ -315,14 +315,14 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.dyhz = data.form ? data.form.dyhz : ''
this.form.dyhz = data.form ? data.form.dyhz : data.dyhz
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.form.file = data.form ? data.form.fileId : ''
this.form.fileName = data.form ? data.form.fileName : ''
this.form.fileId = data.form ? data.form.fileId : ''
this.form.modelList = data.form ? data.form.modelList : []
this.form.file = data.form ? data.form.fileId : data.fileId
this.form.fileName = data.form ? data.form.fileName : data.fileName
this.form.fileId = data.form ? data.form.fileId : data.fileId
this.form.modelList = data.form ? data.form.modelList : data.modelList
this.form.fjList = data.fjList || data.form.fjList
}).catch(e => {
})
src/pages/processCenter/pages/phone/bzdy/step7.vue
+1 -1
View File
@@ -23,7 +23,7 @@
<el-collapse-transition>
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="12">
<el-col :span="24">
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
disabled
src/pages/processCenter/pages/phone/bzdy/step8.vue
+1 -1
View File
@@ -23,7 +23,7 @@
<el-collapse-transition>
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="12">
<el-col :span="24">
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
disabled
src/pages/processCenter/pages/phone/bzdy/step9.vue
+1 -1
View File
@@ -23,7 +23,7 @@
<el-collapse-transition>
<div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="12">
<el-col :span="24">
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input
disabled