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

Merge branch 'develop' into 'FOTON'

Browse Source 
Develop

See merge request LAWS/laws-system-front-FOTON!268
This commit is contained in:
王夏晖
2021-12-30 16:31:26 +08:00
parent 75923c59e3 b79ca92f03
commit 83bb2d7783
13 changed files with 44 additions and 30 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 { .phoneBox {
width: 100%; width: 100%;
height: 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 { .headerTabs {
height: 52px; height: 52px;
display: flex; display: flex;
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+6 -2
View File
@@ -250,6 +250,7 @@
name: "bzdyStep3", name: "bzdyStep3",
data() { data() {
return { return {
newDocUser: '',
drawerModal: false, drawerModal: false,
foldFormFlag: false, foldFormFlag: false,
histortData: [], histortData: [],
@@ -397,6 +398,7 @@
handleSave() { handleSave() {
this.saveLoading = true this.saveLoading = true
let _formData = new FormData() let _formData = new FormData()
this.form.docUser = this.newDocUser
_formData.append('taskIds', this.taskIds) _formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
form: this.form, form: this.form,
@@ -431,6 +433,7 @@
// json.commentText = this.commentText // json.commentText = this.commentText
json.fileId = this.form.fileId json.fileId = this.form.fileId
json.fileName = this.form.fileName json.fileName = this.form.fileName
json.docUser = this.newDocUser
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
@@ -468,11 +471,12 @@
this.json = data || data.form this.json = data || data.form
this.form.fjList = data.fjList || data.form.fjList this.form.fjList = data.fjList || data.form.fjList
this.form.modelList = data.modelList || data.form.modelList this.form.modelList = data.modelList || data.form.modelList
this.form.responUserList = data.form.responUserList this.form.responUserList = data.form ? data.form.responUserList : data.responUserList
this.form.responUserListName = data.form.responUserListName this.form.responUserListName = data.form ? data.form.responUserListName : data.responUserListName
this.form.fileName = data.form? data.form.fileName : '' this.form.fileName = data.form? data.form.fileName : ''
this.form.fileId = data.form ? data.form.fileId : '' this.form.fileId = data.form ? data.form.fileId : ''
this.form.dyhz = data.form ? data.form.dyhz : '' this.form.dyhz = data.form ? data.form.dyhz : ''
this.newDocUser = data.form ? data.form.docUser : data.docUser
}).catch(e => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+2 -2
View File
@@ -201,7 +201,6 @@
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit" @submit="handleSubmit"
show-back show-back
@back="handleSubmitNo" @back="handleSubmitNo"
@@ -231,6 +230,7 @@
name: "bzdyStep4", name: "bzdyStep4",
data() { data() {
return { return {
newDocUser: '',
drawerModal: false, drawerModal: false,
foldFormFlag: false, foldFormFlag: false,
histortData: [], histortData: [],
@@ -329,7 +329,6 @@
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
}, },
handleSave() {},
handleSubmit() { // 同意 handleSubmit() { // 同意
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
@@ -384,6 +383,7 @@
this.form.fileId = data.form ? data.form.fileId : data.fileId this.form.fileId = data.form ? data.form.fileId : data.fileId
this.form.modelList = data.form ? data.form.modelList : data.modelList this.form.modelList = data.form ? data.form.modelList : data.modelList
this.form.fjList = data.fjList || data.form.fjList this.form.fjList = data.fjList || data.form.fjList
this.newDocUser = data.form ? data.form.docUser : data.docUser
}).catch(e => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+4
View File
@@ -237,6 +237,7 @@
name: "bzdyStep5", name: "bzdyStep5",
data() { data() {
return { return {
newDocUser: '',
drawerModal: false, drawerModal: false,
foldFormFlag: false, foldFormFlag: false,
histortData: [], histortData: [],
@@ -367,6 +368,7 @@
this.saveLoading = true this.saveLoading = true
let json = this.form let json = this.form
json.responUserList = this.tableData json.responUserList = this.tableData
this.form.docUser = this.newDocUser
let _formData = new FormData() let _formData = new FormData()
_formData.append('taskIds', this.taskIds) _formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
@@ -388,6 +390,7 @@
json.commentText = this.commentText json.commentText = this.commentText
json.hzfileId = this.form.hzfileId json.hzfileId = this.form.hzfileId
json.hzfileName = this.form.hzfileName json.hzfileName = this.form.hzfileName
json.docUser = this.newDocUser
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
@@ -415,6 +418,7 @@
this.tableData = data.responUserList || data.form.responUserList this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileId = data.hzfileId || data.form.hzfileId this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName this.form.hzfileName = data.hzfileName || data.form.hzfileName
this.newDocUser = data.form ? data.form.docUser : data.docUser
}).catch(e => { }).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'"> :size="PLmodalType === 1 && form.itemsNum1 ? '1200px' : '800px'">
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<div style="display: flex; height: 100%;"> <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-if="BDtext" style="width: 100%; height: 100%;display: flex; align-items: center; justify-content: center;">无相似文本</div>
<div v-else style="height: 100%;"> <div v-else style="height: 100%;">
<div style="margin: 10px 5px;">比对条款: {{ plForm.itemsNum }}</div> <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 show-overflow-tooltip
align="center"> align="center">
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -497,7 +497,7 @@
complianceState: '', // 合规性分析 complianceState: '', // 合规性分析
newData: '', // 新车型实施日期 newData: '', // 新车型实施日期
onlineData: '', // 在产车实施日期 onlineData: '', // 在产车实施日期
applyArctic: '', // 适用车型 applyArctic: [], // 适用车型
}, },
editForm: { editForm: {
itemsNum: '', itemsNum: '',
@@ -507,7 +507,7 @@
complianceState: '', // 合规性分析 complianceState: '', // 合规性分析
newData: '', // 新车型实施日期 newData: '', // 新车型实施日期
onlineData: '', // 在产车实施日期 onlineData: '', // 在产车实施日期
applyArctic: '', // 适用车型 applyArctic: [], // 适用车型
itemsId: '', itemsId: '',
}, },
modalshowflag: false, modalshowflag: false,
@@ -887,11 +887,6 @@
item.changePoint = item.changePoint || '' item.changePoint = item.changePoint || ''
item.technicalRequir = item.technicalRequir || '' item.technicalRequir = item.technicalRequir || ''
item.itemsTitle = item.itermsConditions item.itemsTitle = item.itermsConditions
if (typeof (item.applyArctic) === 'string') {
item.applyArctic = JSON.parse(item.applyArctic) || []
} else {
item.applyArctic = item.applyArctic || []
}
}) })
this.getBDList() this.getBDList()
this.itemList = itemList this.itemList = itemList
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+2 -2
View File
@@ -145,7 +145,7 @@
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -436,12 +436,12 @@
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
}, },
handleSave() {},
handleSubmit() { handleSubmit() {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.resolveFlag = 1 json.resolveFlag = 1
json.commentText = this.commentText json.commentText = this.commentText
json.AOLIGEI = this.AOLIGEI
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+1 -3
View File
@@ -145,7 +145,7 @@
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -263,7 +263,6 @@
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit" @submit="handleSubmit"
show-transfer show-transfer
@transfer="handleTransfer" @transfer="handleTransfer"
@@ -424,7 +423,6 @@
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
}, },
handleSave() {},
handleSubmit() { handleSubmit() {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+1 -3
View File
@@ -145,7 +145,7 @@
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -263,7 +263,6 @@
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit" @submit="handleSubmit"
show-transfer show-transfer
@transfer="handleTransfer" @transfer="handleTransfer"
@@ -422,7 +421,6 @@
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
}, },
handleSave() {},
handleSubmit() { handleSubmit() {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
src/pages/processCenter/pages/phone/bzdy/step4.vue
+6 -6
View File
@@ -84,7 +84,7 @@
</ProcessTitle> </ProcessTitle>
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <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"> <el-form-item label="调研结果" prop="fileName" class="add-form-item form-item-disabled">
<div v-if="form.file" class="fileClass"> <div v-if="form.file" class="fileClass">
<div style="display: flex;align-items: center;"> <div style="display: flex;align-items: center;">
@@ -315,14 +315,14 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) 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.title = data.title || data.form.title
this.form.date = data.date || data.form.date this.form.date = data.date || data.form.date
this.json = data || data.form this.json = data || data.form
this.form.file = data.form ? data.form.fileId : '' this.form.file = data.form ? data.form.fileId : data.fileId
this.form.fileName = data.form ? data.form.fileName : '' this.form.fileName = data.form ? data.form.fileName : data.fileName
this.form.fileId = data.form ? data.form.fileId : '' this.form.fileId = data.form ? data.form.fileId : data.fileId
this.form.modelList = data.form ? data.form.modelList : [] this.form.modelList = data.form ? data.form.modelList : data.modelList
this.form.fjList = data.fjList || data.form.fjList this.form.fjList = data.fjList || data.form.fjList
}).catch(e => { }).catch(e => {
}) })
src/pages/processCenter/pages/phone/bzdy/step7.vue
+1 -1
View File
@@ -23,7 +23,7 @@
<el-collapse-transition> <el-collapse-transition>
<div class="prc-content-border" v-if="foldFormFlag === false"> <div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24"> <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-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
src/pages/processCenter/pages/phone/bzdy/step8.vue
+1 -1
View File
@@ -23,7 +23,7 @@
<el-collapse-transition> <el-collapse-transition>
<div class="prc-content-border" v-if="foldFormFlag === false"> <div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24"> <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-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
src/pages/processCenter/pages/phone/bzdy/step9.vue
+1 -1
View File
@@ -23,7 +23,7 @@
<el-collapse-transition> <el-collapse-transition>
<div class="prc-content-border" v-if="foldFormFlag === false"> <div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24"> <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-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled