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

合并分支 'fix_foton_20230103' 到 'FOTON'

Browse Source 
Fix foton 20230103

查看合并请求 laws-foton-slrs/foton-laws-system-front!17
This commit is contained in:
高嵩
2023-01-13 17:27:35 +08:00
parent 1cad6c2750 586ff3445c
commit f602bb5c81
14 changed files with 433 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList-1.vue
+7 -7
View File
@@ -29,13 +29,13 @@
:editable="false" disabled :editable="false" disabled
></el-datePicker> ></el-datePicker>
</el-form-item> </el-form-item>
<el-form-item label="企标备案日期" prop="BARQ" class="add-form-item form-item-disabled"> <!-- <el-form-item label="企标备案日期" prop="BARQ" class="add-form-item form-item-disabled">-->
<el-datePicker v-model="form.BARQ" disabled <!-- <el-datePicker v-model="form.BARQ" disabled-->
:editable="false" <!-- :editable="false"-->
placeholder="请选择企标备案日期" <!-- placeholder="请选择企标备案日期"-->
value-format="yyyy-MM-dd" <!-- value-format="yyyy-MM-dd"-->
></el-datePicker> <!-- ></el-datePicker>-->
</el-form-item> <!-- </el-form-item>-->
<!-- <el-form-item label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
<!-- <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="请选择文本状态">--> <!-- <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="请选择文本状态">-->
<!-- <el-option--> <!-- <el-option-->
src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue
+7 -7
View File
@@ -29,13 +29,13 @@
:editable="false" :editable="false"
></el-datePicker> ></el-datePicker>
</el-form-item> </el-form-item>
<el-form-item label="企标备案日期" prop="BARQ" class="add-form-item form-item-disabled"> <!-- <el-form-item label="企标备案日期" prop="BARQ" class="add-form-item form-item-disabled">-->
<el-datePicker v-model="form.BARQ" <!-- <el-datePicker v-model="form.BARQ"-->
:editable="false" <!-- :editable="false"-->
placeholder="请选择企标备案日期" <!-- placeholder="请选择企标备案日期"-->
value-format="yyyy-MM-dd" <!-- value-format="yyyy-MM-dd"-->
></el-datePicker> <!-- ></el-datePicker>-->
</el-form-item> <!-- </el-form-item>-->
<!-- <el-form-item label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
<!-- <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="请选择文本状态">--> <!-- <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="请选择文本状态">-->
<!-- <el-option--> <!-- <el-option-->
src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue
+4 -4
View File
@@ -27,10 +27,10 @@
:editable="false" :editable="false"
></el-datePicker> ></el-datePicker>
</el-form-item> </el-form-item>
<el-form-item label="企标备案日期" prop="BARQ" class="add-form-item form-item-disabled"> <!-- <el-form-item label="企标备案日期" prop="BARQ" class="add-form-item form-item-disabled">-->
<el-datePicker v-model="form.BARQ" :disabled="disabledState" <!-- <el-datePicker v-model="form.BARQ" :disabled="disabledState"-->
:editable="false"></el-datePicker> <!-- :editable="false"></el-datePicker>-->
</el-form-item> <!-- </el-form-item>-->
<!-- <el-form-item label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
<!-- <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">--> <!-- <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">-->
src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue
+4 -4
View File
@@ -27,10 +27,10 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="企标备案日期" prop="BARQ" class="add-form-item form-item-disabled"> <!-- <el-form-item label="企标备案日期" prop="BARQ" class="add-form-item form-item-disabled">-->
<el-datePicker v-model="form.BARQ" :disabled="disabledState" <!-- <el-datePicker v-model="form.BARQ" :disabled="disabledState"-->
:editable="false"></el-datePicker> <!-- :editable="false"></el-datePicker>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item v-show="verifySarStandard" label="标准年份" class="add-form-item form-item-disabled"> <el-form-item v-show="verifySarStandard" label="标准年份" class="add-form-item form-item-disabled">
<el-input v-model="form.standYear" :disabled="disabledState" <el-input v-model="form.standYear" :disabled="disabledState"
clearable></el-input> clearable></el-input>
src/pages/processCenter/pages/creatProcess/qbrk-product/common/uploadFile.vue
+186
View File
@@ -0,0 +1,186 @@
<template>
<div>
<el-upload
ref="importfile"
name="file"
multiple
drag
:file-list="fileList"
:action="action"
:limit="limit"
:accept="accept"
:show-file-list="!showFileList"
:before-upload="beforeUpload"
:on-success="onSuccess"
:on-preview="onPreview"
:on-remove="onRemove"
:on-exceed="handleExceed"
>
<div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i>
<p>点击或拖拽上传文件</p>
</div>
</el-upload>
<ul class="el-upload-list el-upload-list--text" v-if="showFileList">
<li class="el-upload-list__item is-success"
v-for="(file, index) in fileListSol"
:key="index"
:title="file.name"
@click="handlePreview(file)">
<a class="el-upload-list__item-name">
<i class="el-icon-document"></i>
{{ file.name }}
</a>
<label class="el-upload-list__item-status-label">
<i class="el-icon-upload-success el-icon-circle-check"></i>
</label>
<i class="el-icon-edit" @click.stop="handleModifyName(file)"></i>
<i class="el-icon-close" @click.stop="handleRemoveFile(file)"></i>
</li>
</ul>
<el-dialog title="修改文件名称"
:visible.sync="openModifyFileNameDialog"
append-to-body
>
<el-input v-model="modifyFile.fileName"></el-input>
<div class="demo-drawer-footer" style="text-align: right;margin-top:30px">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" :loading="modifyFileNameLoading"
@click="handleModifyNameSubmite">提交</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close"
@click="openModifyFileNameDialog = false">取消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
name: "uploadFile",
data(){
return {
fileListSol: [],
openModifyFileNameDialog: false,
modifyFile: {
fileName: '',
fileId: ''
},
modifyFileNameLoading:false
}
},
computed:{
},
props:{
// 上传文件列表
fileList:{
type:Array
},
// 请求路径
action:{
type:String,
required:true
},
// 上传文件个数限制
limit: {
type: Number,
default: 8
},
// 上传文件类型
accept:{
type:String,
default:'.pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx'
},
// 是否显示已上传文件列表
showFileList:{
type:Boolean,
default:true
},
// 上传文件超出个数的提示信息
exceed:{
type:String
},
// 上传文件之前的钩子
beforeUpload:{
type:Function
},
// 成功回调
onSuccess:{
type:Function
},
// 点击文件列表中已上传的文件时的钩子
onPreview:{
type:Function
},
// 文件列表移除文件时的钩子
onRemove:{
type:Function
},
},
watch:{
},
methods:{
// 文件超出个数
handleExceed(files, fileList) {
if (this.exceed) {
this.$message.warning(this.exceed)
} else {
this.$message.warning(`当前限制选择 ${this.limit} 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`)
}
},
// 预览
handlePreview(file){
this.onPreview(file)
},
// 删除文件
handleRemoveFile(file){
const _fileListSol = []
this.fileListSol.forEach(item => {
if(item.id !== file.id) _fileListSol.push(item)
})
this.fileListSol = _fileListSol
this.onRemove(file,this.fileListSol)
},
// 点击修改
handleModifyName(file) {
this.modifyFile.fileName = file.name
this.modifyFile.fileId = file.id
this.openModifyFileNameDialog = true
},
// 确定修改文件名
handleModifyNameSubmite(){
this.modifyFileNameLoading = true
this.$http.get('att/attFile/updateFileName', this.modifyFile, {
_this: this
}, res => {
if(res.ok){
this.modifyFileNameLoading = false
this.openModifyFileNameDialog = false
this.fileListSol.forEach(item=>{
if(item.id === this.modifyFile.fileId){
item.name = this.modifyFile.fileName
}
})
}
}, e => {
this.modifyFileNameLoading = false
})
},
},
mounted(){
// 回显文件
this.fileListSol = this.fileList
}
}
</script>
<style scoped less>
.el-upload-list__item .el-icon-edit{
position: absolute;
top: 5px;
right: 25px;
cursor: pointer;
opacity: .75;
color: #606266;
}
</style>
src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+7 -7
View File
@@ -58,13 +58,13 @@
:editable="false" :editable="false"
></el-datePicker> ></el-datePicker>
</el-form-item> </el-form-item>
<el-form-item v-show="verifySarStandard" label="企标备案日期" prop="BARQ" class="add-form-item form-item-disabled"> <!-- <el-form-item v-show="verifySarStandard" label="企标备案日期" prop="BARQ" class="add-form-item form-item-disabled">-->
<el-datePicker :disabled="disabledXX" v-model="form.BARQ" <!-- <el-datePicker :disabled="disabledXX" v-model="form.BARQ"-->
:editable="false" <!-- :editable="false"-->
placeholder="请选择企标备案日期" <!-- placeholder="请选择企标备案日期"-->
value-format="yyyy-MM-dd" <!-- value-format="yyyy-MM-dd"-->
></el-datePicker> <!-- ></el-datePicker>-->
</el-form-item> <!-- </el-form-item>-->
<!-- <el-form-item label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
<!-- <el-select :disabled="disabledXX" :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="请选择文本状态">--> <!-- <el-select :disabled="disabledXX" :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="请选择文本状态">-->
<!-- <el-option--> <!-- <el-option-->
src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+75 -49
View File
@@ -232,25 +232,37 @@
> >
</ProcessFooter> </ProcessFooter>
<el-dialog width='400px' :visible.sync="fileMadel" title="上传文件"> <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
<el-upload <!-- <el-upload-->
multiple <!-- multiple-->
drag <!-- drag-->
:file-list="fileList" <!-- :file-list="fileList"-->
:action="fileUrl" <!-- :action="fileUrl"-->
ref="importfile" <!-- ref="importfile"-->
name="file" <!-- name="file"-->
accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx" <!-- accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"-->
:before-upload="beginImportFile" <!-- :before-upload="beginImportFile"-->
:on-success="importFileSuccess" <!-- :on-success="importFileSuccess"-->
:on-preview="handleFilePreview" <!-- :on-preview="handleFilePreview"-->
:on-remove="removeOneFile" <!-- :on-remove="removeOneFile"-->
:show-file-list="true" <!-- :show-file-list="true"-->
<!-- >-->
<!-- <div style="padding: 20px 0">-->
<!-- <i class="el-icon-upload" style="color: #3399ff"></i>-->
<!-- <p>点击或拖拽上传文件</p>-->
<!-- </div>-->
<!-- </el-upload>-->
<upload-file v-if="fileMadel" :fileList="fileList"
:action="fileUrl"
:limit="8"
accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
:showFileList="true"
:beforeUpload="beginImportFile"
:onSuccess="importFileSuccess"
:onPreview="handleFilePreview"
:onRemove="removeOneFile"
> >
<div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i> </upload-file>
<p>点击或拖拽上传文件</p>
</div>
</el-upload>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
:title="config.attrName" :title="config.attrName"
@@ -592,6 +604,7 @@
getBusStandFileByAttId,inboundLiaisonDetail,processCreateBuss,evaluationHisList,taskDel,verifySnExists} from "api/process"; getBusStandFileByAttId,inboundLiaisonDetail,processCreateBuss,evaluationHisList,taskDel,verifySnExists} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import uploadFile from "./common/uploadFile.vue"
let Base64 = require('js-base64').Base64; let Base64 = require('js-base64').Base64;
export default { export default {
@@ -602,7 +615,8 @@
ProcessFooter, ProcessFooter,
ProcessTitle, ProcessTitle,
TreeSelect, TreeSelect,
TreeSelectNew TreeSelectNew,
uploadFile
}, },
data () { data () {
const validateStandNumber = async (rule, value, callback) => { const validateStandNumber = async (rule, value, callback) => {
@@ -2087,7 +2101,7 @@
}, },
// 文件预览及下载 // 文件预览及下载
handleFilePreview(file) { handleFilePreview(file) {
const attId = file.response.data.id const attId = file.response ? file.response.data.id : file.id
if (this.preview) { if (this.preview) {
if (attId) { if (attId) {
window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
@@ -2095,22 +2109,23 @@
this.$message.warning('文件不存在,下载失败') this.$message.warning('文件不存在,下载失败')
} }
} else { } else {
this.getBusStandFileByAttId(attId) this.$preview(attId)
.then(res => { // this.getBusStandFileByAttId(attId)
if(res){ // .then(res => {
const editFileInfo = res // if(res){
if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){ // const editFileInfo = res
window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl) // if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
}else { // window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
const nowTime = new Date().getTime() // }else {
// window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))); // const nowTime = new Date().getTime()
window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) // // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
} // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
} // }
}).catch(e => { // }
console.log(e) // }).catch(e => {
this.$message.warning('文件不存在,预览失败') // console.log(e)
}) // this.$message.warning('文件不存在,预览失败')
// })
} }
}, },
// 导入标准数据成功后执行 // 导入标准数据成功后执行
@@ -2126,35 +2141,43 @@
switch (this.fileType){ switch (this.fileType){
case 'FBGBUSS': case 'FBGBUSS':
this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined); this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined);
this.FBGBUSSFileList.push(fileObj) if(this.FBGBUSSFileList.every(item => item.id !== fileObj.id))
this.FBGBUSSFileList.push(fileObj)
break; break;
case 'BZSMBUSS' : case 'BZSMBUSS' :
this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined); this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined);
this.BZSMBUSSFileList.push(fileObj) if(this.BZSMBUSSFileList.every(item => item.id !== fileObj.id))
this.BZSMBUSSFileList.push(fileObj)
break; break;
case 'LSBBBUSS': case 'LSBBBUSS':
this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined); this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
this.LSBBBUSSFileList.push(fileObj) if(this.LSBBBUSSFileList.every(item => item.id !== fileObj.id))
this.LSBBBUSSFileList.push(fileObj)
break; break;
case 'QTWJBUSS': case 'QTWJBUSS':
this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined); this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
this.QTWJBUSSFileList.push(fileObj) if(this.QTWJBUSSFileList.every(item => item.id !== fileObj.id))
this.QTWJBUSSFileList.push(fileObj)
break; break;
case 'GLWJBUSS': case 'GLWJBUSS':
this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined); this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
this.GLWJBUSSFileList.push(fileObj) if(this.GLWJBUSSFileList.every(item => item.id !== fileObj.id))
this.GLWJBUSSFileList.push(fileObj)
break; break;
case 'summaryFile': case 'summaryFile':
this.summaryFileList = this.summaryFileList.filter ( item => item.response === undefined); this.summaryFileList = this.summaryFileList.filter ( item => item.response === undefined);
this.summaryFileList.push(fileObj) if(this.summaryFileList.every(item => item.id !== fileObj.id))
this.summaryFileList.push(fileObj)
break; break;
case 'madelSub': case 'madelSub':
this.madelSubList = this.madelSubList.filter ( item => item.response === undefined); this.madelSubList = this.madelSubList.filter ( item => item.response === undefined);
this.madelSubList.push(fileObj) if(this.madelSubList.every(item => item.id !== fileObj.id))
this.madelSubList.push(fileObj)
break; break;
case 'XGD': case 'XGD':
this.XGDFileList = this.XGDFileList.filter ( item => item.response === undefined); this.XGDFileList = this.XGDFileList.filter ( item => item.response === undefined);
this.XGDFileList.push(fileObj) if(this.XGDFileList.every(item => item.id !== fileObj.id))
this.XGDFileList.push(fileObj)
break; break;
default : ; default : ;
} }
@@ -2164,6 +2187,8 @@
message: response.message, message: response.message,
type: 'success' type: 'success'
}) })
// 关闭上传弹框
this.fileMadel = false
} }
}, },
downloadFile (data) { downloadFile (data) {
@@ -2235,6 +2260,7 @@
default : ; default : ;
} }
this.formKey++ this.formKey++
this.fileMadel = false
}, },
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) { if(checkedData) {
@@ -2720,17 +2746,17 @@
if(this.form.standStatus === '2'){ if(this.form.standStatus === '2'){
this.form.id = "" this.form.id = ""
this.formKey++ this.formKey++
this.form.standSn = this.form.standNum this.form.standSn = this.form.standNum? this.form.standNum : this.form.standNumber
this.form.standNumber = this.form.standNum this.form.standNumber = this.form.standNum? this.form.standNum : this.form.standNumber
this.form.standYear = year this.form.standYear = year
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
let judgeFn = new RegExp(/\s+/g); let judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){ if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.form.standCode = this.form.standSort + '' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){ }else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.form.standCode = this.form.standSort + '' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else { }else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.form.standCode = this.form.standSort + ' ' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
} }
this.formKey++ this.formKey++
}else if(this.form.standStatus === '1' ){ }else if(this.form.standStatus === '1' ){
src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+5 -5
View File
@@ -1138,17 +1138,17 @@
if(this.form.standStatus === '2'){ if(this.form.standStatus === '2'){
this.form.id = "" this.form.id = ""
this.formKey++ this.formKey++
this.form.standSn = this.form.standNum this.form.standSn = this.form.standNum ? this.form.standNum : this.form.standNumber
this.form.standNumber = this.form.standNum this.form.standNumber = this.form.standNum ? this.form.standNum : this.form.standNumber
this.form.standYear = year this.form.standYear = year
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
var judgeFn = new RegExp(/\s+/g); var judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){ if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.form.standCode = this.form.standSort + '' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){ }else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.form.standCode = this.form.standSort + '' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else { }else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.form.standCode = this.form.standSort + ' ' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
} }
this.formKey++ this.formKey++
}else if(this.form.standStatus === '1' ){ }else if(this.form.standStatus === '1' ){
src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
+99 -54
View File
@@ -2657,61 +2657,106 @@
this.rules.commentText[0].required = true; this.rules.commentText[0].required = true;
} }
}, },
handleSubmit() { // handleSubmit() {
// this.getRule() // // this.getRule()
// const val= this.form.country; // // const val= this.form.country;
// if (val !== '' && val !== null && typeof (val) !== 'undefined') { // // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
// if (val instanceof Array) { // // if (val instanceof Array) {
// this.form.country = val.join(","); // // this.form.country = val.join(",");
// } else { // // } else {
// this.form.country = val // // this.form.country = val
// } // // }
// } else if (val === '') { // // } else if (val === '') {
// this.form.country = [] // // this.form.country = []
// } // // }
this.$refs['form'].validate((valid) => { // this.$refs['form'].validate((valid) => {
if (valid) { // if (valid) {
this.$refs['formTongGuo'].validate((valid) => { // this.$refs['formTongGuo'].validate((valid) => {
if (valid) { // if (valid) {
this.isSubmit = true // this.isSubmit = true
this.saveLoading = true // this.saveLoading = true
//
// this.summary=this.summaryList.map(item => item.id).join(",") // // this.summary=this.summaryList.map(item => item.id).join(",")
// this.summaryName=this.summaryList.map(item => item.name).join(",") // // this.summaryName=this.summaryList.map(item => item.name).join(",")
//
this.form.commentText = this.formTongGuo.commentText // this.form.commentText = this.formTongGuo.commentText
// this.form.approvalOpinion = this.formTongGuo.approvalOpinion // // this.form.approvalOpinion = this.formTongGuo.approvalOpinion
// 会签意见存储 // // 会签意见存储
const json = JSON.stringify(this.form); // const json = JSON.stringify(this.form);
this.$http.post('lawss/activiti/completeTask', { // this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds, // taskIds: this.taskIds,
userId : this.userId, // userId : this.userId,
json: json // json: json
}, { // }, {
_this: this // _this: this
}, res => { // }, res => {
if (res.success) { // if (res.success) {
this.$message.success(res.message) // this.$message.success(res.message)
// 流程提交之后，应该流转至待办任务页面 // // 流程提交之后，应该流转至待办任务页面
this.isSubmit = false // this.isSubmit = false
this.saveLoading = false // this.saveLoading = false
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
// if(this.formTongGuo.approvalOpinion === '1'){ // // if(this.formTongGuo.approvalOpinion === '1'){
// this.$message.warning("驳回成功") // // this.$message.warning("驳回成功")
// this.isSubmit = false // // this.isSubmit = false
// // 流程提交之后，应该流转至待办任务页面 // // // 流程提交之后，应该流转至待办任务页面
// this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
// }else{ // // }else{
// this.processCreateLaws(json) // // this.processCreateLaws(json)
// } // // }
}else { // }else {
this.$message.success(res.message) // this.$message.success(res.message)
} // }
}) // })
}}) // }
} // })
// }
// })
// },
verifyHandle(){
this.$refs['form'].validate((valid) => {
if (valid) {
this.$refs['formTongGuo'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.saveLoading = true
this.form.commentText = this.formTongGuo.commentText
const json = JSON.stringify(this.form);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId : this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message)
// 流程提交之后，应该流转至待办任务页面
this.isSubmit = false
this.saveLoading = false
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
}else {
this.$message.success(res.message)
}
})
}
}) })
}, }
})
},
handleSubmit() {
if(this.form.modelData.length>0){
this.verifyHandle();
}else{
this.$confirm('您暂未填写意见，如有意见，请选择取消，如无意见，请选择确认', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.verifyHandle();
}).catch(() => {});
}
},
busVsFunc(){ busVsFunc(){
this.$http.get('sarVppsTree/list', '', { this.$http.get('sarVppsTree/list', '', {
_this: this _this: this
src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+5 -5
View File
@@ -1216,17 +1216,17 @@
if(this.form.standStatus === '2'){ if(this.form.standStatus === '2'){
this.form.id = "" this.form.id = ""
this.formKey++ this.formKey++
this.form.standSn = this.form.standNum this.form.standSn = this.form.standNum ? this.form.standNum : this.form.standNumber
this.form.standNumber = this.form.standNum this.form.standNumber = this.form.standNum ? this.form.standNum : this.form.standNumber
this.form.standYear = year this.form.standYear = year
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
var judgeFn = new RegExp(/\s+/g); var judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){ if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.form.standCode = this.form.standSort + '' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){ }else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.form.standCode = this.form.standSort + '' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else { }else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.form.standCode = this.form.standSort + ' ' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
} }
this.formKey++ this.formKey++
}else if(this.form.standStatus === '1' ){ }else if(this.form.standStatus === '1' ){
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+5 -5
View File
@@ -1138,17 +1138,17 @@
if(this.form.standStatus === '2'){ if(this.form.standStatus === '2'){
this.form.id = "" this.form.id = ""
this.formKey++ this.formKey++
this.form.standSn = this.form.standNum this.form.standSn = this.form.standNum? this.form.standNum : this.form.standNumber
this.form.standNumber = this.form.standNum this.form.standNumber = this.form.standNum? this.form.standNum : this.form.standNumber
this.form.standYear = year this.form.standYear = year
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
var judgeFn = new RegExp(/\s+/g); var judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){ if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.form.standCode = this.form.standSort + '' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){ }else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.form.standCode = this.form.standSort + '' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else { }else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.form.standCode = this.form.standSort + ' ' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
} }
this.formKey++ this.formKey++
}else if(this.form.standStatus === '1' ){ }else if(this.form.standStatus === '1' ){
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+5 -5
View File
@@ -1226,17 +1226,17 @@
if(this.form.standStatus === '2'){ if(this.form.standStatus === '2'){
this.form.id = "" this.form.id = ""
this.formKey++ this.formKey++
this.form.standSn = this.form.standNum this.form.standSn = this.form.standNum ? this.form.standNum : this.form.standNumber
this.form.standNumber = this.form.standNum this.form.standNumber = this.form.standNum ? this.form.standNum : this.form.standNumber
this.form.standYear = year this.form.standYear = year
//此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外
var judgeFn = new RegExp(/\s+/g); var judgeFn = new RegExp(/\s+/g);
if(judgeFn.test(this.form.standSort)){ if(judgeFn.test(this.form.standSort)){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.form.standCode = this.form.standSort + '' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else if(this.form.standSort === 'Q/QCBFC'){ }else if(this.form.standSort === 'Q/QCBFC'){
this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.form.standCode = this.form.standSort + '' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}else { }else {
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.form.standCode = this.form.standSort + ' ' + (this.form.standNum ? this.form.standNum : this.form.standNumber) + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
} }
this.formKey++ this.formKey++
}else if(this.form.standStatus === '1' ){ }else if(this.form.standStatus === '1' ){
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+9 -1
View File
@@ -723,7 +723,15 @@
disabled disabled
></custom-input> ></custom-input>
</template> </template>
<template v-else> <!-- <template v-else>-->
<!-- <custom-input-->
<!-- :config="field"-->
<!-- v-if="field.attrField !== 'BDTBZBH'"-->
<!-- v-model="sarStandardsInfoEO[field.attrField]"-->
<!-- disabled-->
<!-- ></custom-input>-->
<!-- </template>-->
<template v-else-if="['DYBXH','DYMC','DYBXHCAR','DYMCCAR'].indexOf(field.attrField)===-1">
<custom-input <custom-input
:config="field" :config="field"
v-if="field.attrField !== 'BDTBZBH'" v-if="field.attrField !== 'BDTBZBH'"
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+15 -14
View File
@@ -834,20 +834,21 @@
></custom-input> ></custom-input>
</template> </template>
</template> </template>
<template v-else-if="field.attrType === 'DATE_PICKER' && field.attrField !== 'BARQ'"> <!-- 取消备案日期字段 -->
<custom-date-pick <!-- <template v-else-if="field.attrType === 'DATE_PICKER' && field.attrField !== 'BARQ'">-->
:config="field" <!-- <custom-date-pick-->
v-model="sarBussionessStandEO[field.attrField]" <!-- :config="field"-->
:disabled="formdisableflag" <!-- v-model="sarBussionessStandEO[field.attrField]"-->
></custom-date-pick> <!-- :disabled="formdisableflag"-->
</template> <!-- ></custom-date-pick>-->
<template v-else-if="field.attrType === 'DATE_PICKER' && field.attrField === 'BARQ' && QCBFC"> <!-- </template>-->
<custom-date-pick <!-- <template v-else-if="field.attrType === 'DATE_PICKER' && field.attrField === 'BARQ' && QCBFC">-->
:config="field" <!-- <custom-date-pick-->
v-model="sarBussionessStandEO[field.attrField]" <!-- :config="field"-->
:disabled="formdisableflag" <!-- v-model="sarBussionessStandEO[field.attrField]"-->
></custom-date-pick> <!-- :disabled="formdisableflag"-->
</template> <!-- ></custom-date-pick>-->
<!-- </template>-->
<template v-else-if="field.attrType === 'FILE'"> <template v-else-if="field.attrType === 'FILE'">
<custom-file <custom-file
:config="field" :config="field"