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

This commit is contained in:
super_liu
2022-05-15 00:02:24 +08:00
15 changed files with 169 additions and 176 deletions
+1 -1
View File
@@ -141,7 +141,7 @@ export default {
async getPhoneData() {
this.phoneForm.page = 1
this.roleList = []
this.result = []
// this.result = []
phoneUser(this.phoneForm).then(res => {
if (res.ok) {
this.roleList = res.data
@@ -429,6 +429,7 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
console.log(data);
let jsonData = JSON.parse(res.mesg)
this.jsonData = jsonData.form ? jsonData.form : jsonData
this.commentText5 = data.commentText5 || ''
@@ -449,8 +450,8 @@
newArr.push(arr[a])
}
this.tableData = newArr
this.form.hzfileId = data.form ? data.form.hzfileId : (data.hzfileId ? hzfileId : '')
this.form.hzfileName = data.form ? data.form.hzfileName : (data.hzfileName ? hzfileName : '')
this.form.hzfileId = data.form ? data.form.hzfileId : (data.hzfileId ? data.hzfileId : '')
this.form.hzfileName = data.form ? data.form.hzfileName : (data.hzfileName ? data.hzfileName : '')
this.newDocUser = data.form ? data.form.docUser : data.docUser
this.json = data || data.form
}).catch(e => {
@@ -285,41 +285,40 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
<div v-if="xgdFileMap.length>0" v-for="(value,index) in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('xgd',value.id)">
<!-- {{ value.name }} -->
{{ value.name }}
<div v-if="xgdFileMap.length>0" v-for="(value,index) in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<div v-if="fbgbjbdFileMap.length>0" v-for="(value,index) in this.fbgbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('fbgbjbd',value.id)">
{{ value.name }}
<div v-if="fbgbjbdFileMap.length>0" v-for="(value,index) in this.fbgbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
<div v-if="zbjbdFileMap.length>0" v-for="(value,index) in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd',value.id)">
{{ value.name }}
<div v-if="zbjbdFileMap.length>0" v-for="(value,index) in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
<div v-if="ssgFileMap.length>0" v-for="(value,index) in this.ssgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg',value.id)">
{{ value.name }}
<div v-if="ssgFileMap.length>0" v-for="(value,index) in this.ssgFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
<div v-if="caFileMap.length>0" v-for="(value,index) in this.caFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca',value.id)">
{{ value.name }}
<div v-if="caFileMap.length>0" v-for="(value,index) in this.caFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
@@ -328,16 +327,16 @@
</el-col>
<el-col :span="12">
<el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
<div v-if="kwjFileMap.length>0" v-for="(value,index) in this.kwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj',value.id)">
{{ value.name }}
<div v-if="kwjFileMap.length>0" v-for="(value,index) in this.kwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="修订本" prop="xdbName" class="add-form-item form-item-disabled">
<div v-if="xdbFileMap.length>0" v-for="(value,index) in this.xdbFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('xdb',value.id)">
{{ value.name }}
<div v-if="xdbFileMap.length>0" v-for="(value,index) in this.xdbFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
@@ -346,24 +345,24 @@
<!-- ************************************* 2021/11/9 "解读文件"改为"相关文件"*************************************-->
<el-form-item v-if="form.standInData === '0'" label="相关文件" prop="jdwjName" class="add-form-item form-item-disabled">
<!-- ************************************* 2021/11/9 "解读文件"改为"相关文件"*************************************-->
<div v-if="jdwjFileMap.length>0" v-for="(value,index) in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj',value.id)">
{{ value.name }}
<div v-if="jdwjFileMap.length>0" v-for="(value,index) in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
<div v-if="bpgFileMap.length>0" v-for="(value,index) in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg',value.id)">
{{ value.name }}
<div v-if="bpgFileMap.length>0" v-for="(value,index) in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
<div v-if="zqyjgFileMap.length>0" v-for="(value,index) in this.zqyjgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg',value.id)">
{{ value.name }}
<div v-if="zqyjgFileMap.length>0" v-for="(value,index) in this.zqyjgFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
@@ -537,7 +536,7 @@
</el-select>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="我司参与制标排名" prop="cyzbpm" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.cyzbpm" placeholder="请选择我司参与制标排名" clearable>
<el-select :popper-append-to-body="false" disabled v-model="form.cyzbpm" placeholder="请选择我司参与制标排名" clearable>
<el-option
v-for="item in cyzbpmOptions"
placeholder="请选择"
@@ -581,8 +580,8 @@
</el-select>
</el-form-item>
<el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
<div v-if="glwjFileMap.length>0" v-for="(value,index) in this.glwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj',value.id)">
{{ value.name }}
<div v-if="glwjFileMap.length>0" v-for="(value,index) in this.glwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
@@ -1032,6 +1031,9 @@ export default {
}
})
},
downloadFileNew(attId) {
this.$preview(attId)
},
downloadFile(fileType) {
//文件id中出现了','字符,去除掉
if (fileType === 'fbgbjbd') {
@@ -1198,7 +1200,7 @@ export default {
this.defaultCheckedKeys3 = [this.form.dybxh]
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.standYear = this.form.standYear ? this.form.standYear : ''
if (this.form.country) {
if (this.form.country && this.form.country.indexOf(",") !== -1) {
this.form.country = this.form.country.split(",");
}
this.form.prcNum = this.prcNum
@@ -257,41 +257,40 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
<div v-if="xgdFileMap.length>0" v-for="(value,index) in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('xgd',value.id)">
<!-- {{ value.name }} -->
{{value.name}}
<div v-if="xgdFileMap.length>0" v-for="(value,index) in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<div v-if="form.fbgbjbdName" v-for="(value,index) in this.fbgbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('fbgbjbd',value.id)">
{{value.name}}
<div v-if="form.fbgbjbdName" v-for="(value,index) in this.fbgbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
<div v-if="form.zbjbdName" v-for="(value,index) in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd',value.id)">
{{value.name}}
<div v-if="form.zbjbdName" v-for="(value,index) in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
<div v-if="form.ssgName" v-for="(value,index) in this.ssgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg',value.id)">
{{value.name}}
<div v-if="form.ssgName" v-for="(value,index) in this.ssgFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
<div v-if="form.caName" v-for="(value,index) in this.caFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca',value.id)">
{{value.name}}
<div v-if="form.caName" v-for="(value,index) in this.caFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
@@ -300,8 +299,8 @@
</el-col>
<el-col :span="12">
<el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
<div v-if="form.kwjName" v-for="(value,index) in this.kwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj',value.id)">
{{value.name}}
<div v-if="form.kwjName" v-for="(value,index) in this.kwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
@@ -310,24 +309,24 @@
<!-- ************************************* 2021/11/9 "解读文件"改为"相关文件"*************************************-->
<el-form-item v-if="form.standInData === '0'" label="相关文件" prop="jdwjName" class="add-form-item form-item-disabled">
<!-- ************************************* 2021/11/9 "解读文件"改为"相关文件"*************************************-->
<div v-if="form.jdwjName" v-for="(value,index) in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj',value.id)">
{{value.name}}
<div v-if="form.jdwjName" v-for="(value,index) in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
<div v-if="form.bpgName" v-for="(value,index) in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg',value.id)">
{{value.name}}
<div v-if="form.bpgName" v-for="(value,index) in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
<div v-if="form.zqyjgName" v-for="(value,index) in this.zqyjgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg',value.id)">
{{value.name}}
<div v-if="form.zqyjgName" v-for="(value,index) in this.zqyjgFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
@@ -542,8 +541,8 @@
<!-- ></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
<div v-if="form.glwjName" v-for="(value,index) in this.glwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj',value.id)">
{{value.name}}
<div v-if="form.glwjName" v-for="(value,index) in this.glwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
@@ -996,6 +995,9 @@ export default {
}
})
},
downloadFileNew(attId) {
this.$preview(attId)
},
downloadFile (fileType,fileId) {
if(fileType === 'fbgbjbd'){
window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + fileId;
@@ -285,41 +285,40 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
<div v-if="xgdFileMap.length>0" v-for="(value,index) in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('xgd',value.id)">
<!-- {{ value.name }} -->
{{ value.name }}
<div v-if="xgdFileMap.length>0" v-for="(value,index) in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<div v-if="fbgbjbdFileMap.length>0" v-for="(value,index) in this.fbgbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('fbgbjbd',value.id)">
{{ value.name }}
<div v-if="fbgbjbdFileMap.length>0" v-for="(value,index) in this.fbgbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
<div v-if="zbjbdFileMap.length>0" v-for="(value,index) in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd',value.id)">
{{ value.name }}
<div v-if="zbjbdFileMap.length>0" v-for="(value,index) in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
<div v-if="ssgFileMap.length>0" v-for="(value,index) in this.ssgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg',value.id)">
{{ value.name }}
<div v-if="ssgFileMap.length>0" v-for="(value,index) in this.ssgFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
<div v-if="caFileMap.length>0" v-for="(value,index) in this.caFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca',value.id)">
{{ value.name }}
<div v-if="caFileMap.length>0" v-for="(value,index) in this.caFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
@@ -328,16 +327,16 @@
</el-col>
<el-col :span="12">
<el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
<div v-if="kwjFileMap.length>0" v-for="(value,index) in this.kwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj',value.id)">
{{ value.name }}
<div v-if="kwjFileMap.length>0" v-for="(value,index) in this.kwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="修订本" prop="xdbName" class="add-form-item form-item-disabled">
<div v-if="xdbFileMap.length>0" v-for="(value,index) in this.xdbFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('xdb',value.id)">
{{ value.name }}
<div v-if="xdbFileMap.length>0" v-for="(value,index) in this.xdbFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
@@ -346,24 +345,24 @@
<!-- ************************************* 2021/11/9 "解读文件"改为"相关文件"*************************************-->
<el-form-item v-if="form.standInData === '0'" label="相关文件" prop="jdwjName" class="add-form-item form-item-disabled">
<!-- ************************************* 2021/11/9 "解读文件"改为"相关文件"*************************************-->
<div v-if="jdwjFileMap.length>0" v-for="(value,index) in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj',value.id)">
{{ value.name }}
<div v-if="jdwjFileMap.length>0" v-for="(value,index) in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
<div v-if="bpgFileMap.length>0" v-for="(value,index) in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg',value.id)">
{{ value.name }}
<div v-if="bpgFileMap.length>0" v-for="(value,index) in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
<div v-if="zqyjgFileMap.length>0" v-for="(value,index) in this.zqyjgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg',value.id)">
{{ value.name }}
<div v-if="zqyjgFileMap.length>0" v-for="(value,index) in this.zqyjgFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
@@ -581,8 +580,8 @@
</el-select>
</el-form-item>
<el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
<div v-if="glwjFileMap.length>0" v-for="(value,index) in this.glwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj',value.id)">
{{ value.name }}
<div v-if="glwjFileMap.length>0" v-for="(value,index) in this.glwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
@@ -1004,6 +1003,9 @@ export default {
}
})
},
downloadFileNew(attId) {
this.$preview(attId)
},
downloadFile(fileType) {
//文件id中出现了','字符,去除掉
if (fileType === 'fbgbjbd') {
@@ -1170,7 +1172,7 @@ export default {
this.defaultCheckedKeys3 = [this.form.dybxh]
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.standYear = this.form.standYear ? this.form.standYear : ''
if (this.form.country) {
if (this.form.country && this.form.country.indexOf(",") !== -1) {
this.form.country = this.form.country.split(",");
}
this.form.prcNum = this.prcNum
@@ -9,8 +9,8 @@
<el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
<el-option
v-for="item in standSortOptions"
:key="item.value"
v-for="(item, index) in standSortOptions"
:key="index"
:value="item.value"
:label="item.label"
></el-option>
@@ -9,8 +9,8 @@
<el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
<el-option
v-for="item in standSortOptions"
:key="item.value"
v-for="(item, index) in standSortOptions"
:key="index"
:value="item.value"
:label="item.label"
></el-option>
@@ -852,8 +852,8 @@
break;
default : ;
}
this.fileMadel = true;
this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.XGDFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,fileType,this.madelSubList);
this.fileMadelSub = true
this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.XGDFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadelSub,this.fileList,fileType,this.madelSubList);
},
filePreview(){
this.$preview(this.fileId)
@@ -969,7 +969,7 @@
form: {
handler: function (val) {
if(val){
this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.XGDFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,'',this.madelSubList);
this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.XGDFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadelSub,this.fileList,'',this.madelSubList);
}
},
deep: true //对象的深度验证
@@ -2185,6 +2185,7 @@
break;
default : ;
}
this.formKey++
},
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
@@ -2456,6 +2457,8 @@
this.form.approvalOpinion = this.formTongGuo.approvalOpinion
this.form.topId = this.pId
const json = JSON.stringify(this.form);
this.processCreateBuss(json)
return
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId : this.userId,
@@ -55,7 +55,7 @@
clearable
></el-input>
<van-cell-group>
<van-field v-model="form.responUserListName" readonly @click.native="choiceZRR"/>
<van-field v-model="form.responUserListName" readonly clearable @click.native="choiceZRR"/>
</van-cell-group>
</el-form-item>
</div>
@@ -120,6 +120,7 @@
commentText2: '',
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
showNodeList: [],
nodeList2: [],
type: '',
modalshowflag2: false, // drawer开关
@@ -88,17 +88,19 @@
<div class="content" v-show="active === '2'">
<Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
</div>
<ProcessFooter
show-submit
:submitLoading="isSubmit"
@submit="handleSubmit"
show-back
@back="handleSubmitNo"
show-transfer
@transfer="handleTransfer"
submitBTNText="同意"
>
</ProcessFooter>
<ProcessFooter
show-submit
show-back
approval
@back="handleSubmitNo"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
show-transfer
@transfer="handleTransfer"
@submit="handleSubmit"
submitBTNText="同意"
>
</ProcessFooter>
<phone-role
role-title="转办处理人"
:is-show-phone.sync="drawerModal"
@@ -88,17 +88,19 @@
<div class="content" v-show="active === '2'">
<Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
</div>
<ProcessFooter
show-submit
:submitLoading="isSubmit"
@submit="handleSubmit"
show-back
@back="handleSubmitNo"
show-transfer
@transfer="handleTransfer"
submitBTNText="同意"
>
</ProcessFooter>
<ProcessFooter
show-submit
show-back
approval
@back="handleSubmitNo"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
show-transfer
@transfer="handleTransfer"
@submit="handleSubmit"
submitBTNText="同意"
>
</ProcessFooter>
<phone-role
role-title="转办处理人"
:is-show-phone.sync="drawerModal"
@@ -88,19 +88,19 @@
<div class="content" v-show="active === '2'">
<Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
</div>
<ProcessFooter
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
show-back
show-transfer
@transfer="handleTransfer"
@back="handleSubmitNo"
submitBTNText="同意"
>
</ProcessFooter>
<ProcessFooter
show-submit
show-back
approval
@back="handleSubmitNo"
:submitLoading="isSubmit"
:saveLoading="saveLoading"
show-transfer
@transfer="handleTransfer"
@submit="handleSubmit"
submitBTNText="同意"
>
</ProcessFooter>
<phone-role
role-title="转办处理人"
:is-show-phone.sync="drawerModal"
@@ -161,41 +161,40 @@
<div class="prc-content-border">
<el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
<div v-if="xgdFileMap.length>0" v-for="(value,index) in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('xgd',value.id)">
<!-- {{ value.name }} -->
{{ value.name }}
<div v-if="xgdFileMap.length>0" v-for="(value,index) in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFile('xgd',value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<div v-if="fbgbjbdFileMap.length>0" v-for="(value,index) in this.fbgbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('fbgbjbd',value.id)">
{{ value.name }}
<div v-if="fbgbjbdFileMap.length>0" v-for="(value,index) in this.fbgbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFile('fbg',value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
<div v-if="zbjbdFileMap.length>0" v-for="(value,index) in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd',value.id)">
{{ value.name }}
<div v-if="zbjbdFileMap.length>0" v-for="(value,index) in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFile('zbjbd',value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
<div v-if="ssgFileMap.length>0" v-for="(value,index) in this.ssgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg',value.id)">
{{ value.name }}
<div v-if="ssgFileMap.length>0" v-for="(value,index) in this.ssgFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFile('ssg',value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
<div v-if="caFileMap.length>0" v-for="(value,index) in this.caFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca',value.id)">
{{ value.name }}
<div v-if="caFileMap.length>0" v-for="(value,index) in this.caFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFile('ca',value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
@@ -203,8 +202,8 @@
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
<div v-if="kwjFileMap.length>0" v-for="(value,index) in this.kwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj',value.id)">
{{ value.name }}
<div v-if="kwjFileMap.length>0" v-for="(value,index) in this.kwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFile('kwj',value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
@@ -213,24 +212,24 @@
<!-- ************************************* 2021/11/9 "解读文件"改为"相关文件"*************************************-->
<el-form-item v-if="form.standInData === '0'" label="相关文件" prop="jdwjName" class="add-form-item form-item-disabled">
<!-- ************************************* 2021/11/9 "解读文件"改为"相关文件"*************************************-->
<div v-if="jdwjFileMap.length>0" v-for="(value,index) in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj',value.id)">
{{ value.name }}
<div v-if="jdwjFileMap.length>0" v-for="(value,index) in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFile('jdwj',value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
<div v-if="bpgFileMap.length>0" v-for="(value,index) in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg',value.id)">
{{ value.name }}
<div v-if="bpgFileMap.length>0" v-for="(value,index) in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFile('bpg',value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
<div v-if="zqyjgFileMap.length>0" v-for="(value,index) in this.zqyjgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg',value.id)">
{{ value.name }}
<div v-if="zqyjgFileMap.length>0" v-for="(value,index) in this.zqyjgFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFile('zqyjg',value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else>
- -
@@ -354,6 +353,17 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="我司参与制标排名" prop="cyzbpm" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" disabled v-model="form.cyzbpm" placeholder="请选择我司参与制标排名" clearable>
<el-option
v-for="item in cyzbpmOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</div>
<ProcessTitle>
<template slot="title">关联信息</template>
@@ -366,8 +376,8 @@
</el-select>
</el-form-item>
<el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
<div v-if="glwjFileMap.length>0" v-for="(value,index) in this.glwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj',value.id)">
{{ value.name }}
<div v-if="glwjFileMap.length>0" v-for="(value,index) in this.glwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
<span style="" @click="downloadFile('glwj',value.id)" :title="value.name">{{ value.name }}</span>
</div>
<div v-else style="color: #323233">
- -
@@ -590,6 +600,7 @@ export default {
label: 'model'
},
countryOptions: [],//国家地区
cyzbpmOptions: [], // 我司参与制标排名
busVppsOptions: [], // 车系体系架构
modelOptions: [], // 模块体系架构
standSortOptions: [], // 标准类别
@@ -655,42 +666,8 @@ export default {
}
})
},
downloadFile(fileType) {
//文件id中出现了','字符,去除掉
if (fileType === 'fbgbjbd') {
if (this.fbgbjbdFileId.search(',')) {
this.fbgbjbdFileId = this.fbgbjbdFileId.replace(",", "");
}
let attId = this.fbgbjbdFileId
this.$preview(attId)
} else if (fileType === 'xgd') {
let attId = this.xgdFileId
this.$preview(attId)
} else if (fileType === 'bpg') {
let attId = this.bpgFileId
this.$preview(attId)
} else if (fileType === 'ssg') {
let attId = this.ssgFileId
this.$preview(attId)
} else if (fileType === 'zqyjg') {
let attId = this.zqyjgFileId
this.$preview(attId)
} else if (fileType === 'jdwj') {
let attId = this.jdwjFileId
this.$preview(attId)
} else if (fileType === 'kwj') {
let attId = this.kwjFileId
this.$preview(attId)
} else if (fileType === 'glwj') {
let attId = this.glwjFileId
this.$preview(attId)
} else if (fileType === 'ca') {
let attId = this.caFileId
this.$preview(attId)
} else if (fileType === 'zbjbd') {
let attId = this.zbjbdFileId
this.$preview(attId)
}
downloadFile(fileType,attId) {
this.$preview(attId)
},
getRule() {
if (this.formTongGuo.approvalOpinion === 0) {
@@ -836,7 +813,7 @@ export default {
this.defaultCheckedKeys3 = [this.form.dybxh]
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.standYear = this.form.standYear ? this.form.standYear : ''
if (this.form.country) {
if (this.form.country && this.form.country.indexOf(",") !== -1) {
this.form.country = this.form.country.split(",");
}
this.form.prcNum = this.prcNum
@@ -979,6 +956,7 @@ export default {
this.standStateOptions = res.data.WBZTCLASS // 文本状态
this.setMap(this.standStateOptions)
this.standSystemOptions = res.data.BZTXCLASS // 标准体系
this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名
this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
this.categoryOptions = res.data.NYLXCLASS // 能源类型
this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
@@ -9,8 +9,8 @@
<el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
<el-option
v-for="item in standSortOptions"
:key="item.value"
v-for="(item, index) in standSortOptions"
:key="index"
:value="item.value"
:label="item.label"
></el-option>