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!231
This commit is contained in:
王夏晖
2021-12-15 11:33:00 +08:00
parent e87a6815f6 7324a82385
commit c5a33c6952
16 changed files with 303 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/process.js
+8
View File
@@ -681,3 +681,11 @@ export function getStandInfoById (data) {
params: data params: data
}) })
} }
// 标准法规工作组接口
export function workGroup(data) {
return axios({
url: 'api/wg_work_group/researchData',
method: 'get',
params: data
})
}
src/pages/details/otherStandardDetails/index.vue
+35 -35
View File
@@ -3235,41 +3235,41 @@ export default {
}, { }, {
_this: this _this: this
}, res => { }, res => {
displayLocation.map(item => { // displayLocation.map(item => {
if (item.value === '2URVBGR2Y4UG77KZ5YPL') { // if (item.value === '2URVBGR2Y4UG77KZ5YPL') {
item.child.forEach(items =>{ // item.child.forEach(items =>{
let accessCountry = JSON.parse(sessionStorage.getItem("accessCountry")); // let accessCountry = JSON.parse(sessionStorage.getItem("accessCountry"));
if (accessCountry.country === undefined) { // if (accessCountry.country === undefined) {
accessCountry.country = '文本' // accessCountry.country = '文本'
} // }
if(items.attrField === 'SSRQ') { // if(items.attrField === 'SSRQ') {
items.attrName = '实施日期' + '(' + accessCountry.country + ')' + ':' // items.attrName = '实施日期' + '(' + accessCountry.country + ')' + ':'
if (accessCountry.ssrq !== undefined) { // if (accessCountry.ssrq !== undefined) {
item.value = accessCountry.ssrq // item.value = accessCountry.ssrq
} // }
} else if (items.attrField === 'ZCCSSRQ') { // } else if (items.attrField === 'ZCCSSRQ') {
items.attrName = '在产车实施日期' + '(' + accessCountry.country + ')' + ':' // items.attrName = '在产车实施日期' + '(' + accessCountry.country + ')' + ':'
if (accessCountry.zccssrqgj !== undefined) { // if (accessCountry.zccssrqgj !== undefined) {
item.value = accessCountry.zccssrqgj // item.value = accessCountry.zccssrqgj
} // }
} else if(items.attrField === 'XCXSSRQ') { // } else if(items.attrField === 'XCXSSRQ') {
items.attrName = '新车型实施日期' + '(' + accessCountry.country + ')' + ':' // items.attrName = '新车型实施日期' + '(' + accessCountry.country + ')' + ':'
if (accessCountry.xcxssrqgj !== undefined) { // if (accessCountry.xcxssrqgj !== undefined) {
item.value = accessCountry.xcxssrqgj // item.value = accessCountry.xcxssrqgj
} // }
//
} // }
}) // })
for (let key in res.data) { // for (let key in res.data) {
item.one.push({ // item.one.push({
attrName: key, // attrName: key,
value: res.data[key].join(','), // value: res.data[key].join(','),
isShowImp: '0', // isShowImp: '0',
id: key // id: key
}) // })
} // }
} // }
}) // })
this.dynamicFormField = displayLocation this.dynamicFormField = displayLocation
}) })
sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation)) sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+2 -2
View File
@@ -236,7 +236,7 @@
:action="fileUrl" :action="fileUrl"
ref="importfile" ref="importfile"
name="file" name="file"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
:before-upload="beginImportFile" :before-upload="beginImportFile"
:on-success="importFileSuccess2" :on-success="importFileSuccess2"
:on-remove="importFileRemove2" :on-remove="importFileRemove2"
@@ -442,7 +442,7 @@
var fileSuffix = filename.substring(index1, index2) var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名 // const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式 // 判断上传文件格式
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
return true return true
} else { } else {
this.spinShow = false this.spinShow = false
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+3 -3
View File
@@ -237,7 +237,7 @@
:action="fileUrl" :action="fileUrl"
ref="importfile" ref="importfile"
name="file" name="file"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
:before-upload="beginImportFile" :before-upload="beginImportFile"
:on-success="importFileSuccess2" :on-success="importFileSuccess2"
:on-remove="importFileRemove2" :on-remove="importFileRemove2"
@@ -434,10 +434,10 @@ export default {
var fileSuffix = filename.substring(index1, index2) var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名 // const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式 // 判断上传文件格式
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX') { if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
return true return true
} else { } else {
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件')
return false return false
} }
// 判断文件上传大小 // 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+3 -3
View File
@@ -230,7 +230,7 @@
:action="fileUrl" :action="fileUrl"
ref="importfile" ref="importfile"
name="file" name="file"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
:before-upload="beginImportFile" :before-upload="beginImportFile"
:on-success="importFileSuccess" :on-success="importFileSuccess"
:show-file-list="true" :show-file-list="true"
@@ -408,11 +408,11 @@
var fileSuffix = filename.substring(index1, index2) var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名 // const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式 // 判断上传文件格式
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
return true return true
} else { } else {
this.spinShow = false this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件')
return false return false
} }
// 判断文件上传大小 // 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+3 -3
View File
@@ -209,7 +209,7 @@
:action="fileUrl" :action="fileUrl"
ref="importfile" ref="importfile"
name="file" name="file"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
:before-upload="beginImportFile" :before-upload="beginImportFile"
:on-success="importFileSuccess" :on-success="importFileSuccess"
:show-file-list="true" :show-file-list="true"
@@ -320,11 +320,11 @@
var fileSuffix = filename.substring(index1, index2) var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名 // const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式 // 判断上传文件格式
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
return true return true
} else { } else {
this.spinShow = false this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件')
return false return false
} }
// 判断文件上传大小 // 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+3 -3
View File
@@ -199,7 +199,7 @@
:action="fileUrl" :action="fileUrl"
ref="importfile" ref="importfile"
name="file" name="file"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
:before-upload="beginImportFile" :before-upload="beginImportFile"
:on-success="importFileSuccess" :on-success="importFileSuccess"
:show-file-list="false" :show-file-list="false"
@@ -311,11 +311,11 @@
var fileSuffix = filename.substring(index1, index2) var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名 // const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式 // 判断上传文件格式
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
return true return true
} else { } else {
this.spinShow = false this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件')
return false return false
} }
// 判断文件上传大小 // 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+3 -3
View File
@@ -199,7 +199,7 @@
:action="fileUrl" :action="fileUrl"
ref="importfile" ref="importfile"
name="file" name="file"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
:before-upload="beginImportFile" :before-upload="beginImportFile"
:on-success="importFileSuccess" :on-success="importFileSuccess"
:show-file-list="false" :show-file-list="false"
@@ -311,11 +311,11 @@
var fileSuffix = filename.substring(index1, index2) var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名 // const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式 // 判断上传文件格式
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
return true return true
} else { } else {
this.spinShow = false this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件')
return false return false
} }
// 判断文件上传大小 // 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+3 -3
View File
@@ -199,7 +199,7 @@
:action="fileUrl" :action="fileUrl"
ref="importfile" ref="importfile"
name="file" name="file"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
:before-upload="beginImportFile" :before-upload="beginImportFile"
:on-success="importFileSuccess" :on-success="importFileSuccess"
:show-file-list="false" :show-file-list="false"
@@ -311,11 +311,11 @@
var fileSuffix = filename.substring(index1, index2) var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名 // const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式 // 判断上传文件格式
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
return true return true
} else { } else {
this.spinShow = false this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件')
return false return false
} }
// 判断文件上传大小 // 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+3 -3
View File
@@ -199,7 +199,7 @@
:action="fileUrl" :action="fileUrl"
ref="importfile" ref="importfile"
name="file" name="file"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
:before-upload="beginImportFile" :before-upload="beginImportFile"
:on-success="importFileSuccess" :on-success="importFileSuccess"
:show-file-list="false" :show-file-list="false"
@@ -311,11 +311,11 @@
var fileSuffix = filename.substring(index1, index2) var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名 // const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式 // 判断上传文件格式
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
return true return true
} else { } else {
this.spinShow = false this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件')
return false return false
} }
// 判断文件上传大小 // 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+124 -56
View File
@@ -704,6 +704,14 @@
<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="12">
<!--责任部门-->
<template>
<custom-select-array
:key="zrbmOptions.options"
:config="zrbmOptions"
v-model="form['zrbm']"
></custom-select-array>
</template>
<!-- <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled"> <!-- <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple> <el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple>
<el-option <el-option
@@ -715,28 +723,44 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item>--> </el-form-item>-->
<el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled"> <!--适用车型-->
<el-select v-model="form.cllx" placeholder="请选择适用车型" multiple> <template>
<el-option <custom-select-array
v-for="item in applyArcticOptions" :key="applyArcticOptions.options"
placeholder="请选择" :config="applyArcticOptions"
:key="item.value" v-model="form['cllx']"
:value="item.value" ></custom-select-array>
:label="item.label" </template>
></el-option> <!--能源类型-->
</el-select> <template>
</el-form-item> <custom-select-array
<el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled"> :key="categoryOptions.options"
<el-select v-model="form.nylx" placeholder="请选择能源类型" multiple> :config="categoryOptions"
<el-option v-model="form['nylx']"
v-for="item in categoryOptions" ></custom-select-array>
placeholder="请选择" </template>
:key="item.value" <!-- <el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">-->
:value="item.value" <!-- <el-select v-model="form.cllx" placeholder="请选择适用车型" multiple>-->
:label="item.label" <!-- <el-option-->
></el-option> <!-- v-for="item in applyArcticOptions"-->
</el-select> <!-- placeholder="请选择"-->
</el-form-item> <!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">-->
<!-- <el-select v-model="form.nylx" placeholder="请选择能源类型" multiple>-->
<!-- <el-option-->
<!-- v-for="item in categoryOptions"-->
<!-- placeholder="请选择"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled"> <el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
<el-input v-model="form.cycvppsbm" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', form.cycvppsbm)"></el-input> <el-input v-model="form.cycvppsbm" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', form.cycvppsbm)"></el-input>
<tree-select-new <tree-select-new
@@ -816,28 +840,52 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled"> <!--适用产品线-->
<el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple> <template>
<el-option <custom-select-array
v-for="item in sycpxOptions" :key="sycpxOptions.options"
placeholder="请选择" :config="sycpxOptions"
:key="item.value" v-model="form['sycpx']"
:value="item.value" ></custom-select-array>
:label="item.label" </template>
></el-option> <!-- <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">-->
</el-select> <!-- <el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple>-->
</el-form-item> <!-- <el-option-->
<el-form-item label="适用认证" prop="syrz" class="add-form-item form-item-disabled"> <!-- v-for="item in sycpxOptions"-->
<el-select v-model="form.syrz" placeholder="请选择适用认证" multiple> <!-- placeholder="请选择"-->
<el-option <!-- :key="item.value"-->
v-for="item in applyAuthOptions" <!-- :value="item.value"-->
placeholder="请选择" <!-- :label="item.label"-->
:key="item.value" <!-- ></el-option>-->
:value="item.value" <!-- </el-select>-->
:label="item.label" <!-- </el-form-item>-->
></el-option> <!--适用认证-->
</el-select> <template>
</el-form-item> <custom-select-array
:key="applyAuthOptions.options"
:config="applyAuthOptions"
v-model="form['syrz']"
></custom-select-array>
</template>
<!-- <el-form-item label="适用认证" prop="syrz" class="add-form-item form-item-disabled">-->
<!-- <el-select v-model="form.syrz" placeholder="请选择适用认证" multiple>-->
<!-- <el-option-->
<!-- v-for="item in applyAuthOptions"-->
<!-- placeholder="请选择"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--责任工程师-->
<template>
<custom-select-array
:key="zrgcsOptions.options"
:config="zrgcsOptions"
v-model="form['zrgcs']"
></custom-select-array>
</template>
<!-- <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled"> <!-- <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple> <el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple>
<el-option <el-option
@@ -1310,6 +1358,7 @@
<script> <script>
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import CustomSelectArray from '@/components/CustomFormComponents/SelectArray'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import { import {
inboundLiaisonDetail, inboundLiaisonDetail,
@@ -1332,6 +1381,7 @@ export default {
TreeSelectModule, TreeSelectModule,
ProcessHeader, ProcessHeader,
ProcessFooter, ProcessFooter,
CustomSelectArray,
ProcessTitle, ProcessTitle,
TreeSelect, TreeSelect,
TreeSelectNew TreeSelectNew
@@ -1546,17 +1596,35 @@ export default {
standSystemOptions: [], // 标准体系 standSystemOptions: [], // 标准体系
busVppsOptions: [], // 车系体系架构 busVppsOptions: [], // 车系体系架构
modelOptions: [], // 模块体系架构 modelOptions: [], // 模块体系架构
applyArcticOptions: [], // 适用车型 applyArcticOptions: {
categoryOptions: [], // 能源类型 attrName: '适用车型',
options:[]
}, // 适用车型
categoryOptions: {
attrName: '能源类型',
options:[]
}, // 能源类型
gkglbmOptions: [], // 归口管理部门 gkglbmOptions: [], // 归口管理部门
cbcdOptions: [], // 采标程度 cbcdOptions: [], // 采标程度
applyAuthOptions: [], // 适用认证 applyAuthOptions: {
attrName: '适用认证',
options:[]
}, // 适用认证
cysdOptions: [], // 我司参与深度 cysdOptions: [], // 我司参与深度
wssmrOptions: [], // 我司署名人 wssmrOptions: [], // 我司署名人
qcdwOptions: [], // 起草单位 qcdwOptions: [], // 起草单位
sycpxOptions: [], // 适用产品线 sycpxOptions: {
zrbmOptions: [], // 责任部门 attrName: '适用产品线',
zrgcsOptions: [], // 责任工程师 options:[]
}, // 适用产品线
zrbmOptions: {
attrName: '责任部门',
options:[]
}, // 责任部门
zrgcsOptions: {
attrName: '责任工程师',
options:[]
}, // 责任工程师
txlbOptions: [], // 体系类别 txlbOptions: [], // 体系类别
data: [], // 标准列表数据 data: [], // 标准列表数据
ListForm: {}, // 新增数据 ListForm: {}, // 新增数据
@@ -2495,15 +2563,15 @@ export default {
this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standNatureOptions = res.data.SARPROPERTY // 标准性质
this.standStateOptions = res.data.WBZTCLASS // 文本状态 this.standStateOptions = res.data.WBZTCLASS // 文本状态
this.standSystemOptions = res.data.BZTXCLASS // 标准体系 this.standSystemOptions = res.data.BZTXCLASS // 标准体系
this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 this.applyArcticOptions.options = res.data.ENERGYTYPES // 适用车型
this.categoryOptions = res.data.NYLXCLASS // 能源类型 this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证
this.cysdOptions = res.data.WSCYSD // 我司参与深度 this.cysdOptions = res.data.WSCYSD // 我司参与深度
this.wssmrOptions = res.data.WSSMR // 我司署名人 this.wssmrOptions = res.data.WSSMR // 我司署名人
this.qcdwOptions = res.data.QCDW // 起草单位 this.qcdwOptions = res.data.QCDW // 起草单位
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 this.sycpxOptions.options = res.data.SYCPXCLASS // 适用产品线
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrbmOptions.options = res.data.ZRBMCLASS // 责任部门
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrgcsOptions.options = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别 this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度 this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+2 -2
View File
@@ -51,7 +51,7 @@
style="display: none;" style="display: none;"
></el-input> ></el-input>
<div style="display: flex;"> <div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index"> <div class="fileClass" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }} {{ item.fileName }}
</div> </div>
</div> </div>
@@ -557,7 +557,7 @@ export default {
updataFj(item) { updataFj(item) {
let id let id
let type = item.fileName.split('.') let type = item.fileName.split('.')
if (type[1] === 'pdf') { if (type[1] === 'pdf' || type[1] === 'PDF') {
id = item.attId id = item.attId
} else { } else {
id = item.oriAttId id = item.oriAttId
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
-1
View File
@@ -481,7 +481,6 @@ export default {
this.form.cid = data.cid || data.form.cid; this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime; this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname; this.form.cname = data.cname || data.form.cname;
this.oldData = JSON.parse(JSON.stringify(data.info)) this.oldData = JSON.parse(JSON.stringify(data.info))
var arr = [] var arr = []
data.info.forEach(item => { data.info.forEach(item => {
src/pages/processCenter/pages/newProcess/index.vue
+31 -31
View File
@@ -109,6 +109,21 @@
</div> </div>
</el-card> </el-card>
</div> </div>
<div class="process-name">
<el-card shadow="hover" v-btn-permission="'7751d25f72d0a6515e4110ae41837db8'">
<div class="card-box" @click="handleCreateProcess('10')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">项目合规评估流程-项目</div>
<div class="card-top-right-line"></div>
</div>
</div>
</div>
</el-card>
</div>
<div class="process-name"> <div class="process-name">
<el-card shadow="hover" v-btn-permission="'90c7bae6308595f053c6f6f90167e493'"> <el-card shadow="hover" v-btn-permission="'90c7bae6308595f053c6f6f90167e493'">
<div class="card-box" @click="handleCreateProcess('13')"> <div class="card-box" @click="handleCreateProcess('13')">
@@ -125,7 +140,22 @@
</el-card> </el-card>
</div> </div>
<div class="process-name"> <div class="process-name">
<el-card shadow="hover" v-btn-permission="''"> <el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('11')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">项目清单确认流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
</div>
</el-card>
</div>
<div class="process-name">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('laws1')"> <div class="card-box" @click="handleCreateProcess('laws1')">
<div class="card-top"> <div class="card-top">
<div class="card-top-left"> <div class="card-top-left">
@@ -255,36 +285,6 @@
</div> </div>
</el-card> </el-card>
</div> </div>
<div class="process-name">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('laws1')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">政策入库流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
</div>
</el-card>
</div>
<div class="process-name">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('12')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">政策征求意见流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
</div>
</el-card>
</div>
<div class="process-name"> <div class="process-name">
<el-card shadow="hover"> <el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('20')"> <div class="card-box" @click="handleCreateProcess('20')">
src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
+40 -4
View File
@@ -156,7 +156,7 @@
width="150"> width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.netId" style="display: none;"></el-input> <el-input v-model="scope.row.netId" style="display: none;"></el-input>
<el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" @click.native="checkRole('选择联络人', scope.$index, scope.row.netId)" v-model="scope.row.name"></el-input> <el-input :disabled="DrawerType === 'see'" readonly style="margin: 10px 0;" @click.native="checkRole('选择联络人', scope.$index, scope.row.netId)" v-model="scope.row.name"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -235,7 +235,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.deptPeopleId" style="display: none;"></el-input> <el-input v-model="scope.row.deptPeopleId" style="display: none;"></el-input>
<el-input v-if="DrawerType === 'see'" :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.name"></el-input> <el-input v-if="DrawerType === 'see'" :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.name"></el-input>
<el-input v-else style="margin: 10px 0;" @click.native="checkRole('选择我司人员', scope.$index, scope.row.deptPeopleId)" v-model="scope.row.name"></el-input> <el-input v-else readonly style="margin: 10px 0;" @click.native="checkRole('选择我司人员', scope.$index, scope.row.deptPeopleId)" v-model="scope.row.name"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -504,7 +504,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-input v-model="scope.row.meetingPeople" style="display: none;"></el-input>--> <!-- <el-input v-model="scope.row.meetingPeople" style="display: none;"></el-input>-->
<el-input v-if="DrawerType === 'see'" :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.meetingPeopleName"></el-input> <el-input v-if="DrawerType === 'see'" :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.meetingPeopleName"></el-input>
<el-input v-else style="margin: 10px 0;" @click.native="checkRoles(scope.$index, scope.row.meetingPeople)" v-model="scope.row.meetingPeopleName"></el-input> <el-input v-else readonly style="margin: 10px 0;" @click.native="checkRoles(scope.$index, scope.row.meetingPeople)" v-model="scope.row.meetingPeopleName"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -847,10 +847,14 @@
standerArea: '', // 标准化工作领域 standerArea: '', // 标准化工作领域
mark: '', // 备注 mark: '', // 备注
wgNetInfos: [], // 秘书联系方式 wgNetInfos: [], // 秘书联系方式
wgNetInfosDel: '',
wgMeetingInfos: [], // 参会记录 wgMeetingInfos: [], // 参会记录
wgMeetingInfosDel: '',
wgDepts: [], // 集团参与 wgDepts: [], // 集团参与
wgStandorpolicyInfos: [], // 标准政策 wgDeptsDel: '',
wgPayInfos: [], // 支付信息 wgPayInfos: [], // 支付信息
wgPayInfosDel: '',
wgStandorpolicyInfos: [], // 标准政策
}, },
addFormRules: { addFormRules: {
number: [ number: [
@@ -1235,6 +1239,14 @@
confirmButtonClass: 'common-button-primary', confirmButtonClass: 'common-button-primary',
roundButton: true roundButton: true
}).then(() => { }).then(() => {
for (let s = 0; s < this.delNetInfos.length; s++) {
if (this.addForm.wgNetInfosDel) {
this.addForm.wgNetInfosDel += ','
this.addForm.wgNetInfosDel += this.delNetInfos[s].id
} else {
this.addForm.wgNetInfosDel = this.delNetInfos[s].id
}
}
for (let a = 0; a < this.addForm.wgNetInfos.length; a++) { for (let a = 0; a < this.addForm.wgNetInfos.length; a++) {
this.delNetInfos.forEach(item => { this.delNetInfos.forEach(item => {
if (this.addForm.wgNetInfos[a].joinId === item.joinId) { if (this.addForm.wgNetInfos[a].joinId === item.joinId) {
@@ -1256,6 +1268,14 @@
confirmButtonClass: 'common-button-primary', confirmButtonClass: 'common-button-primary',
roundButton: true roundButton: true
}).then(() => { }).then(() => {
for (let s = 0; s < this.delDepts.length; s++) {
if (this.addForm.wgDeptsDel) {
this.addForm.wgDeptsDel += ','
this.addForm.wgDeptsDel += this.delDepts[s].id
} else {
this.addForm.wgDeptsDel = this.delDepts[s].id
}
}
for (let a = 0; a < this.addForm.wgDepts.length; a++) { for (let a = 0; a < this.addForm.wgDepts.length; a++) {
this.delDepts.forEach(item => { this.delDepts.forEach(item => {
if (this.addForm.wgDepts[a].joinId === item.joinId) { if (this.addForm.wgDepts[a].joinId === item.joinId) {
@@ -1277,6 +1297,14 @@
confirmButtonClass: 'common-button-primary', confirmButtonClass: 'common-button-primary',
roundButton: true roundButton: true
}).then(() => { }).then(() => {
for (let s = 0; s < this.delPayInfos.length; s++) {
if (this.addForm.wgPayInfosDel) {
this.addForm.wgPayInfosDel += ','
this.addForm.wgPayInfosDel += this.delPayInfos[s].id
} else {
this.addForm.wgPayInfosDel = this.delPayInfos[s].id
}
}
for (let a = 0; a < this.addForm.wgPayInfos.length; a++) { for (let a = 0; a < this.addForm.wgPayInfos.length; a++) {
this.delPayInfos.forEach(item => { this.delPayInfos.forEach(item => {
if (this.addForm.wgPayInfos[a].joinId === item.joinId) { if (this.addForm.wgPayInfos[a].joinId === item.joinId) {
@@ -1298,6 +1326,14 @@
confirmButtonClass: 'common-button-primary', confirmButtonClass: 'common-button-primary',
roundButton: true roundButton: true
}).then(() => { }).then(() => {
for (let s = 0; s < this.delMeetingInfos.length; s++) {
if (this.addForm.wgMeetingInfosDel) {
this.addForm.wgMeetingInfosDel += ','
this.addForm.wgMeetingInfosDel += this.delMeetingInfos[s].id
} else {
this.addForm.wgMeetingInfosDel = this.delMeetingInfos[s].id
}
}
for (let a = 0; a < this.addForm.wgMeetingInfos.length; a++) { for (let a = 0; a < this.addForm.wgMeetingInfos.length; a++) {
this.delMeetingInfos.forEach(item => { this.delMeetingInfos.forEach(item => {
if (this.addForm.wgMeetingInfos[a].joinId === item.joinId) { if (this.addForm.wgMeetingInfos[a].joinId === item.joinId) {
src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue
+40 -4
View File
@@ -156,7 +156,7 @@
width="150"> width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.netId" style="display: none;"></el-input> <el-input v-model="scope.row.netId" style="display: none;"></el-input>
<el-input :disabled="DrawerType === 'see'" style="margin: 10px 0;" @click.native="checkRole('选择联络人', scope.$index, scope.row.netId)" v-model="scope.row.name"></el-input> <el-input :disabled="DrawerType === 'see'" readonly style="margin: 10px 0;" @click.native="checkRole('选择联络人', scope.$index, scope.row.netId)" v-model="scope.row.name"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -235,7 +235,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.deptPeopleId" style="display: none;"></el-input> <el-input v-model="scope.row.deptPeopleId" style="display: none;"></el-input>
<el-input v-if="DrawerType === 'see'" :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.name"></el-input> <el-input v-if="DrawerType === 'see'" :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.name"></el-input>
<el-input v-else style="margin: 10px 0;" @click.native="checkRole('选择我司人员', scope.$index, scope.row.deptPeopleId)" v-model="scope.row.name"></el-input> <el-input v-else style="margin: 10px 0;" readonly @click.native="checkRole('选择我司人员', scope.$index, scope.row.deptPeopleId)" v-model="scope.row.name"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -504,7 +504,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-input v-model="scope.row.meetingPeople" style="display: none;"></el-input>--> <!-- <el-input v-model="scope.row.meetingPeople" style="display: none;"></el-input>-->
<el-input v-if="DrawerType === 'see'" :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.meetingPeopleName"></el-input> <el-input v-if="DrawerType === 'see'" :disabled="DrawerType === 'see'" style="margin: 10px 0;" v-model="scope.row.meetingPeopleName"></el-input>
<el-input v-else style="margin: 10px 0;" @click.native="checkRoles(scope.$index, scope.row.meetingPeople)" v-model="scope.row.meetingPeopleName"></el-input> <el-input v-else style="margin: 10px 0;" readonly @click.native="checkRoles(scope.$index, scope.row.meetingPeople)" v-model="scope.row.meetingPeopleName"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -767,10 +767,14 @@
standerArea: '', // 标准化工作领域 standerArea: '', // 标准化工作领域
mark: '', // 备注 mark: '', // 备注
wgNetInfos: [], // 秘书联系方式 wgNetInfos: [], // 秘书联系方式
wgNetInfosDel: '',
wgMeetingInfos: [], // 参会记录 wgMeetingInfos: [], // 参会记录
wgMeetingInfosDel: '',
wgDepts: [], // 集团参与 wgDepts: [], // 集团参与
wgStandorpolicyInfos: [], // 标准政策 wgDeptsDel: '',
wgPayInfos: [], // 支付信息 wgPayInfos: [], // 支付信息
wgPayInfosDel: '',
wgStandorpolicyInfos: [], // 标准政策
}, },
addFormRules: { addFormRules: {
number: [ number: [
@@ -1112,6 +1116,14 @@
confirmButtonClass: 'common-button-primary', confirmButtonClass: 'common-button-primary',
roundButton: true roundButton: true
}).then(() => { }).then(() => {
for (let s = 0; s < this.delNetInfos.length; s++) {
if (this.addForm.wgNetInfosDel) {
this.addForm.wgNetInfosDel += ','
this.addForm.wgNetInfosDel += this.delNetInfos[s].id
} else {
this.addForm.wgNetInfosDel = this.delNetInfos[s].id
}
}
for (let a = 0; a < this.addForm.wgNetInfos.length; a++) { for (let a = 0; a < this.addForm.wgNetInfos.length; a++) {
this.delNetInfos.forEach(item => { this.delNetInfos.forEach(item => {
if (this.addForm.wgNetInfos[a].joinId === item.joinId) { if (this.addForm.wgNetInfos[a].joinId === item.joinId) {
@@ -1133,6 +1145,14 @@
confirmButtonClass: 'common-button-primary', confirmButtonClass: 'common-button-primary',
roundButton: true roundButton: true
}).then(() => { }).then(() => {
for (let s = 0; s < this.delDepts.length; s++) {
if (this.addForm.wgDeptsDel) {
this.addForm.wgDeptsDel += ','
this.addForm.wgDeptsDel += this.delDepts[s].id
} else {
this.addForm.wgDeptsDel = this.delDepts[s].id
}
}
for (let a = 0; a < this.addForm.wgDepts.length; a++) { for (let a = 0; a < this.addForm.wgDepts.length; a++) {
this.delDepts.forEach(item => { this.delDepts.forEach(item => {
if (this.addForm.wgDepts[a].joinId === item.joinId) { if (this.addForm.wgDepts[a].joinId === item.joinId) {
@@ -1154,6 +1174,14 @@
confirmButtonClass: 'common-button-primary', confirmButtonClass: 'common-button-primary',
roundButton: true roundButton: true
}).then(() => { }).then(() => {
for (let s = 0; s < this.delPayInfos.length; s++) {
if (this.addForm.wgPayInfosDel) {
this.addForm.wgPayInfosDel += ','
this.addForm.wgPayInfosDel += this.delPayInfos[s].id
} else {
this.addForm.wgPayInfosDel = this.delPayInfos[s].id
}
}
for (let a = 0; a < this.addForm.wgPayInfos.length; a++) { for (let a = 0; a < this.addForm.wgPayInfos.length; a++) {
this.delPayInfos.forEach(item => { this.delPayInfos.forEach(item => {
if (this.addForm.wgPayInfos[a].joinId === item.joinId) { if (this.addForm.wgPayInfos[a].joinId === item.joinId) {
@@ -1175,6 +1203,14 @@
confirmButtonClass: 'common-button-primary', confirmButtonClass: 'common-button-primary',
roundButton: true roundButton: true
}).then(() => { }).then(() => {
for (let s = 0; s < this.delMeetingInfos.length; s++) {
if (this.addForm.wgMeetingInfosDel) {
this.addForm.wgMeetingInfosDel += ','
this.addForm.wgMeetingInfosDel += this.delMeetingInfos[s].id
} else {
this.addForm.wgMeetingInfosDel = this.delMeetingInfos[s].id
}
}
for (let a = 0; a < this.addForm.wgMeetingInfos.length; a++) { for (let a = 0; a < this.addForm.wgMeetingInfos.length; a++) {
this.delMeetingInfos.forEach(item => { this.delMeetingInfos.forEach(item => {
if (this.addForm.wgMeetingInfos[a].joinId === item.joinId) { if (this.addForm.wgMeetingInfos[a].joinId === item.joinId) {