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

feat: There is no way the,

Browse Source
This commit is contained in:
super_liu
2022-01-10 23:25:03 +08:00
parent f36cae2b5d
commit 8fe1c59c8e
12 changed files with 1140 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/home2/components/todoList/index.vue
+12 -1
View File
@@ -230,7 +230,7 @@ export default {
prcType: row.prcType prcType: row.prcType
} }
}) })
}else if (row.taskInfo === '标准法规部标准化工程师发布'){ }else if (row.taskInfo === '主起草人培训'){
this.$router.push({ this.$router.push({
name: 'bussLibrary12', name: 'bussLibrary12',
query: { query: {
@@ -241,6 +241,17 @@ export default {
prcType: row.prcType prcType: row.prcType
} }
}) })
}else if (row.taskInfo === '标准法规部标准化工程师发布'){
this.$router.push({
name: 'bussLibrary13',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} }
break break
case 'buss2': case 'buss2':
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+238 -14
View File
@@ -17,6 +17,11 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-show="fbNode" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.issueTime" :disabled="disabledState"
:editable="false"
></el-datePicker>
</el-form-item>
<el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled"> <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="form.standName" v-model="form.standName"
@@ -40,13 +45,6 @@
<!-- placeholder="请输入标准年份"--> <!-- placeholder="请输入标准年份"-->
<!-- clearable></el-input>--> <!-- clearable></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.putTime"
:editable="false"
placeholder="请选择企标实施日期"
value-format="yyyy-MM-dd"
></el-datePicker>
</el-form-item>
<!-- <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">--> <!-- <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">-->
<!-- <el-datePicker v-model="form.FSRQBUSS"--> <!-- <el-datePicker v-model="form.FSRQBUSS"-->
<!-- :editable="false"--> <!-- :editable="false"-->
@@ -75,6 +73,19 @@
<!-- clearable--> <!-- clearable-->
<!-- ></el-input>--> <!-- ></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item v-show="fbNode" label="企业标准号" prop="standCode" class="add-form-item form-item-disabled">
<el-input
v-model="form.standCode" :disabled="disabledState"
clearable
></el-input>
</el-form-item>
<el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.putTime"
:editable="false"
placeholder="请选择企标实施日期"
value-format="yyyy-MM-dd"
></el-datePicker>
</el-form-item>
<el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled"> <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="form.standEnName" v-model="form.standEnName"
@@ -114,7 +125,7 @@
<div style="width: 80%;"> <div style="width: 80%;">
<div v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass"> <div v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span> <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="width: 20%;margin-left: 15px;"> <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button> <el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>
</span> </span>
</div> </div>
@@ -142,7 +153,7 @@
<div style="width: 80%;"> <div style="width: 80%;">
<div v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass"> <div v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span> <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="width: 20%;margin-left: 15px;"> <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button> <el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>
</span> </span>
</div> </div>
@@ -172,7 +183,7 @@
<div style="width: 80%;"> <div style="width: 80%;">
<div v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass"> <div v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span> <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="width: 20%;margin-left: 15px;"> <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button> <el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>
</span> </span>
</div> </div>
@@ -200,7 +211,7 @@
<div style="width: 80%;"> <div style="width: 80%;">
<div v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass"> <div v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span> <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="width: 20%;margin-left: 15px;"> <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button> <el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>
</span> </span>
</div> </div>
@@ -405,7 +416,7 @@
<div style="width: 80%;"> <div style="width: 80%;">
<div v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass"> <div v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span> <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="width: 20%;margin-left: 15px;"> <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button> <el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>
</span> </span>
</div> </div>
@@ -425,6 +436,184 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<ProcessTitle v-show="opinionsShow">
<template slot="title">意见信息</template>
</ProcessTitle>
<div class="prc-content-border" v-show="opinionsShow">
<el-table
ref="selection"
tooltip-effect="dark"
style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;border-bottom: 1px solid #EBEEF5;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
row-key="id"
:data="form.infoList"
border
default-expand-all>
<el-table-column
label="序号"
min-width="5%"
align="center">
<template slot-scope="scope">
{{scope.$index + 1}}
</template>
</el-table-column>
<el-table-column
prop="modelNum"
label="条款号"
min-width="8%"
align="center"
>
</el-table-column>
<el-table-column
prop="modelUpdBefore"
label="修改前"
align="center"
min-width="20%">
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >-->
<!-- <el-input v-model="scope.row.modelUpdBefore" :title="scope.row.modelUpdBefore" :disabled="scope.row.disabled" placeholder="请维护章节修改前内容" @blur="modelNameFunc1(scope.row)"/>-->
<!-- </el-form-item>-->
<!-- </template>-->
</el-table-column>
<el-table-column
prop="modelUpdAfter"
label="修改后"
align="center"
min-width="20%">
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >-->
<!-- <el-input v-model="scope.row.modelUpdAfter" :title="scope.row.modelUpdAfter" :disabled="scope.row.disabled" placeholder="请维护章节修改后内容" @blur="modelNameFunc2(scope.row)"/>-->
<!-- </el-form-item>-->
<!-- </template>-->
</el-table-column>
<el-table-column
prop="modelContent"
label="修改理由"
align="center"
min-width="20%">
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >-->
<!-- <el-input v-model="scope.row.modelContent" :disabled="scope.row.disabled" placeholder="请填写修改理由"/>-->
<!-- </el-form-item>-->
<!-- </template>-->
</el-table-column>
<el-table-column
prop="zrDeptIdName"
label="提出部门"
align="center"
min-width="15%">
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >-->
<!-- <el-input v-model="scope.row.zrDeptIdName" disabled placeholder="请选择提出人自动带入部门"/>-->
<!-- </el-form-item>-->
<!-- </template>-->
</el-table-column>
<el-table-column
prop="zrUserIdName"
label="责任人"
min-width="15%"
align="center">
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >-->
<!-- <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" disabled />-->
<!-- </el-form-item>-->
<!-- </template>-->
</el-table-column>
<el-table-column
label="意见是否采纳"
min-width="15%"
align="center">
<template slot-scope="scope">
{{filterOp(scope.row.opinionsAdopted)}}
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >-->
<!-- <el-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable :disabled="disabledState">-->
<!-- <el-option-->
<!-- v-for="item in opinionsAdoptedOptions"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
</template>
</el-table-column>
<el-table-column
prop="opinionsAdoptedCont"
label="采纳理由"
align="center"
min-width="15%">
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >-->
<!-- <el-input v-model="scope.row.opinionsAdoptedCont" clearable placeholder="请选择提出人自动带入部门"/>-->
<!-- </el-form-item>-->
<!-- </template>-->
</el-table-column>
</el-table>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="汇总评审意见文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
<div v-if="summaryFileList.length > 0" v-for="(item,index) in summaryFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>
</span>
</div>
</el-form-item>
</el-col>
</el-row>
</div>
<ProcessTitle v-show="opinionsShow">
<template slot="title">培训信息</template>
</ProcessTitle>
<div class="prc-content-border" v-show="opinionsShow">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="培训文件" prop="madelSubName" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="form.madelSubName"
clearable
></el-input>
<div style="display: flex;justify-content: left;margin-top: 5px;padding-left: 20px;">
<div style="width: 80%;">
<div v-for="(item,index) in madelSubList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="width: 20%;margin-left: 15px;">
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>
</span>
</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-top: 6px; float: left;"
@click="fileUpload('madelSub')">
<i class="el-icon-upload"></i>
</el-button>
</div>
</div>
</el-form-item>
</el-col>
</el-row>
</div>
</form> </form>
</template> </template>
@@ -463,6 +652,14 @@ export default {
type: Array, type: Array,
required: true required: true
}, },
summaryFileListSub: {
type: Array,
required: false
},
madelSubListSub: {
type: Array,
required: false
},
disabledState: { disabledState: {
type: Boolean, type: Boolean,
default: false default: false
@@ -471,10 +668,18 @@ export default {
type: Boolean, type: Boolean,
default: false default: false
}, },
fbNode: {
type: Boolean,
default: false
},
fileMadelSub: { fileMadelSub: {
type: Boolean, type: Boolean,
default: false default: false
}, },
opinionsShow: {
type: Boolean,
default: false
},
fbgDown: { fbgDown: {
type: Boolean, type: Boolean,
default: false default: false
@@ -516,6 +721,8 @@ export default {
LSBBBUSSFileList: [], LSBBBUSSFileList: [],
QTWJBUSSFileList: [], QTWJBUSSFileList: [],
GLWJBUSSFileList: [], GLWJBUSSFileList: [],
summaryFileList: [],
madelSubList: [],
countryOptions:[],//国家地区 countryOptions:[],//国家地区
standSortOptions: [], // 标准类别 standSortOptions: [], // 标准类别
standNatureOptions: [], // 标准性质 standNatureOptions: [], // 标准性质
@@ -554,6 +761,16 @@ export default {
...mapGetters(['userInfo']) ...mapGetters(['userInfo'])
}, },
methods: { methods: {
filterOp(data){
if(!data){
return ""
}
const map = new Map();
map.set("1","采纳");
map.set("2","部分采纳");
map.set("3","不采纳");
return map.get(data)
},
choiceZRR1(type, title, id) { choiceZRR1(type, title, id) {
this.$emit('formChoiceZRR1',type,title,id) this.$emit('formChoiceZRR1',type,title,id)
}, },
@@ -627,10 +844,14 @@ export default {
case 'GLWJBUSS': case 'GLWJBUSS':
this.fileList=this.GLWJBUSSFileList this.fileList=this.GLWJBUSSFileList
break; break;
case 'madelSub':
this.fileList=this.madelSubList
break;
default : ; default : ;
} }
this.fileMadel = true; this.fileMadel = true;
this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,fileType); console.log(this.madelSubList)
this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,fileType,this.madelSubList);
}, },
filePreview(){ filePreview(){
this.$preview(this.fileId) this.$preview(this.fileId)
@@ -687,11 +908,14 @@ export default {
}, },
mounted () { mounted () {
this.form = this.formSub, this.form = this.formSub,
console.log(this.form)
this.FBGBUSSFileList= this.FBGBUSSFileListSub, this.FBGBUSSFileList= this.FBGBUSSFileListSub,
this.BZSMBUSSFileList= this.BZSMBUSSFileListSub, this.BZSMBUSSFileList= this.BZSMBUSSFileListSub,
this.LSBBBUSSFileList= this.LSBBBUSSFileListSub, this.LSBBBUSSFileList= this.LSBBBUSSFileListSub,
this.QTWJBUSSFileList= this.QTWJBUSSFileListSub, this.QTWJBUSSFileList= this.QTWJBUSSFileListSub,
this.GLWJBUSSFileList= this.GLWJBUSSFileListSub, this.GLWJBUSSFileList= this.GLWJBUSSFileListSub,
this.summaryFileList= this.summaryFileListSub,
this.madelSubList= this.madelSubListSub,
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this _this: this
}, res => { }, res => {
@@ -730,7 +954,7 @@ export default {
form: { form: {
handler: function (val) { handler: function (val) {
if(val){ if(val){
this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel); this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,'',this.madelSubList);
} }
}, },
deep: true //对象的深度验证 deep: true //对象的深度验证
src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
+138 -71
View File
@@ -94,9 +94,9 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled"> <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
<div v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass"> <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span> <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="width: 20%;margin-left: 15px;"> <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button> <el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>
</span> </span>
</div> </div>
@@ -106,9 +106,9 @@
<!-- </div>--> <!-- </div>-->
</el-form-item> </el-form-item>
<el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled"> <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
<div v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass"> <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span> <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="width: 20%;margin-left: 15px;"> <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button> <el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>
</span> </span>
</div> </div>
@@ -120,9 +120,9 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled"> <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
<div v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass"> <div v-if="BZSMBUSSFileList.length > 0" v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span> <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="width: 20%;margin-left: 15px;"> <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button> <el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>
</span> </span>
</div> </div>
@@ -132,9 +132,9 @@
<!-- </div>--> <!-- </div>-->
</el-form-item> </el-form-item>
<el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled"> <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
<div v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass"> <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span> <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="width: 20%;margin-left: 15px;"> <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button> <el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>
</span> </span>
</div> </div>
@@ -271,9 +271,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled"> <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
<div v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass"> <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span> <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="width: 20%;margin-left: 15px;"> <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button> <el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>
</span> </span>
</div> </div>
@@ -299,75 +299,129 @@
:data="form.infoList" :data="form.infoList"
border border
default-expand-all> default-expand-all>
<el-table-column <el-table-column
label="序号" label="序号"
min-width="15%" min-width="5%"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.$index + 1}} {{scope.$index + 1}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="userName" prop="modelNum"
label="会签人" label="条款号"
align="center" min-width="8%"
min-width="15%"> align="center"
</el-table-column> >
<el-table-column </el-table-column>
prop="commentText" <el-table-column
label="会签意见" prop="modelUpdBefore"
min-width="35%" label="修改前"
align="center"> align="center"
</el-table-column> min-width="20%">
<el-table-column <!-- <template slot-scope="scope">-->
prop="commentText" <!-- <el-form-item-->
label="会签意见文件" <!-- style="margin-left: 0;margin-bottom:0;"-->
min-width="35%" <!-- >-->
align="left"> <!-- <el-input v-model="scope.row.modelUpdBefore" :title="scope.row.modelUpdBefore" :disabled="scope.row.disabled" placeholder="请维护章节修改前内容" @blur="modelNameFunc1(scope.row)"/>-->
<template slot-scope="scope"> <!-- </el-form-item>-->
<el-form-item <!-- </template>-->
style="margin-left: 0;margin-bottom:0;" </el-table-column>
> <el-table-column
<div v-if="scope.row.summaryList.length>0" v-for="(value,index) in scope.row.summaryList" :title="value.name" :key="index" style="margin-left: -210px;cursor: pointer;color: #00b7ee" @click="downloadFile(value)"> prop="modelUpdAfter"
<!-- {{ value.name }} --> label="修改后"
{{value.name | ellipsis}} align="center"
</div> min-width="20%">
<div v-else> <!-- <template slot-scope="scope">-->
- - <!-- <el-form-item-->
</div> <!-- style="margin-left: 0;margin-bottom:0;"-->
</el-form-item> <!-- >-->
</template> <!-- <el-input v-model="scope.row.modelUpdAfter" :title="scope.row.modelUpdAfter" :disabled="scope.row.disabled" placeholder="请维护章节修改后内容" @blur="modelNameFunc2(scope.row)"/>-->
</el-table-column> <!-- </el-form-item>-->
<!-- </template>-->
</el-table-column>
<el-table-column
prop="modelContent"
label="修改理由"
align="center"
min-width="20%">
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >-->
<!-- <el-input v-model="scope.row.modelContent" :disabled="scope.row.disabled" placeholder="请填写修改理由"/>-->
<!-- </el-form-item>-->
<!-- </template>-->
</el-table-column>
<el-table-column
prop="zrDeptIdName"
label="提出部门"
align="center"
min-width="15%">
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >-->
<!-- <el-input v-model="scope.row.zrDeptIdName" disabled placeholder="请选择提出人自动带入部门"/>-->
<!-- </el-form-item>-->
<!-- </template>-->
</el-table-column>
<el-table-column
prop="zrUserIdName"
label="责任人"
min-width="15%"
align="center">
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >-->
<!-- <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" disabled />-->
<!-- </el-form-item>-->
<!-- </template>-->
</el-table-column>
<el-table-column <el-table-column
label="意见是否采纳" label="意见是否采纳"
min-width="15%" min-width="15%"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item {{filterOp(scope.row.opinionsAdopted)}}
style="margin-left: 0;margin-bottom:0;" <!-- <el-form-item-->
> <!-- style="margin-left: 0;margin-bottom:0;"-->
<el-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable :disabled="disabledState"> <!-- >-->
<el-option <!-- <el-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable :disabled="disabledState">-->
v-for="item in opinionsAdoptedOptions" <!-- <el-option-->
:key="item.value" <!-- v-for="item in opinionsAdoptedOptions"-->
:value="item.value" <!-- :key="item.value"-->
:label="item.label" <!-- :value="item.value"-->
></el-option> <!-- :label="item.label"-->
</el-select> <!-- ></el-option>-->
</el-form-item> <!-- </el-select>-->
<!-- </el-form-item>-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop="opinionsAdoptedCont"
label="采纳理由"
align="center"
min-width="15%">
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >-->
<!-- <el-input v-model="scope.row.opinionsAdoptedCont" clearable placeholder="请选择提出人自动带入部门"/>-->
<!-- </el-form-item>-->
<!-- </template>-->
</el-table-column>
</el-table> </el-table>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="汇总评审意见文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled"> <el-form-item label="汇总评审意见文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
<div v-if="summaryFileList.length>0" v-for="(value,index) in this.summaryFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)"> <div v-if="summaryFileList.length > 0" v-for="(item,index) in summaryFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<!-- {{ value.name }} --> <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
{{value.name}} <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
</div> <el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>
<div v-else> </span>
- - </div>
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -442,9 +496,10 @@ export default {
}, },
data () { data () {
return { return {
opinionsAdoptedOptions:[ opinionsAdoptedOptions:[
{value: '1',label: '采纳'}, {value: '1',label: '采纳'},
{value: '2',label: '不采纳'}, {value: '2',label: '部分采纳'},
{value: '3',label: '不采纳'},
], ],
countryOptions:[],//国家地区 countryOptions:[],//国家地区
standSortOptions: [], // 标准类别 standSortOptions: [], // 标准类别
@@ -484,6 +539,16 @@ export default {
...mapGetters(['userInfo']) ...mapGetters(['userInfo'])
}, },
methods: { methods: {
filterOp(data){
if(!data){
return ""
}
const map = new Map();
map.set("1","采纳");
map.set("2","部分采纳");
map.set("3","不采纳");
return map.get(data)
},
// 文件预览及下载 // 文件预览及下载
handleFilePreview(file,type) { handleFilePreview(file,type) {
let attId = "" let attId = ""
@@ -530,6 +595,8 @@ export default {
}, },
}, },
mounted () { mounted () {
console.log(this.form.infoList)
console.log(this.form)
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this _this: this
}, res => { }, res => {
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+7 -1
View File
@@ -1927,10 +1927,16 @@
this.form.SYCXCLASS = this.filterDate(this.standardCheckedList[0].area) this.form.SYCXCLASS = this.filterDate(this.standardCheckedList[0].area)
// 采标程度 // 采标程度
this.form.CBCD = this.filterDate(this.standardCheckedList[0].useLevel) this.form.CBCD = this.filterDate(this.standardCheckedList[0].useLevel)
// 采用标准 // 采用标准drafter
this.form.CYBZ = this.filterDate(this.standardCheckedList[0].esStandRelations) this.form.CYBZ = this.filterDate(this.standardCheckedList[0].esStandRelations)
// 引用标准 // 引用标准
this.form.YYBZ = this.filterDate(this.standardCheckedList[0].esMatingRelations) this.form.YYBZ = this.filterDate(this.standardCheckedList[0].esMatingRelations)
// 起草人带入
this.form.QCRBUSS = this.filterDate(this.standardCheckedList[0].drafterName)
this.form.QCRBUSSID = this.filterDate(this.standardCheckedList[0].drafter)
// 起草部门带入
this.form.QCDW = this.filterDate(this.standardCheckedList[0].unitName)
this.form.QCDWID = this.filterDate(this.standardCheckedList[0].unit)
this.standardDrawer = false this.standardDrawer = false
this.verifySarStandard = true this.verifySarStandard = true
this.planDisabled = false this.planDisabled = false
src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+80 -14
View File
@@ -26,10 +26,13 @@
:BZSMBUSSFileListSub = "BZSMBUSSFileList" :BZSMBUSSFileListSub = "BZSMBUSSFileList"
:QTWJBUSSFileListSub = "QTWJBUSSFileList" :QTWJBUSSFileListSub = "QTWJBUSSFileList"
:GLWJBUSSFileListSub = "GLWJBUSSFileList" :GLWJBUSSFileListSub = "GLWJBUSSFileList"
:summaryFileListSub = "summaryFileList"
:madelSubListSub = "madelSubList"
:disabledState = "disabledState" :disabledState = "disabledState"
:verifySarStandard = "verifySarStandard" :verifySarStandard = "verifySarStandard"
:fileMadelSub = "fileMadel" :fileMadelSub = "fileMadel"
:fbgDown = "false" :fbgDown = "false"
:opinionsShow = "true"
@formCancel="formCancel" @formCancel="formCancel"
@formSelectLawsCancel = "formSelectLawsCancel" @formSelectLawsCancel = "formSelectLawsCancel"
@formChoiceZRRListCancel = "formChoiceZRRListCancel" @formChoiceZRRListCancel = "formChoiceZRRListCancel"
@@ -665,6 +668,7 @@
QTWJBUSSFileList: [], QTWJBUSSFileList: [],
GLWJBUSSFileList: [], GLWJBUSSFileList: [],
summaryFileList: [], summaryFileList: [],
madelSubList: [],
caFileList: [], caFileList: [],
FBGBJBDFileList: [], FBGBJBDFileList: [],
xgdFileList: [], xgdFileList: [],
@@ -807,6 +811,8 @@
modelData:[], modelData:[],
modelDataNameVerify:[], modelDataNameVerify:[],
modelDataZrUserVerify:[], modelDataZrUserVerify:[],
madelSub:'',
madelSubName:'',
summaryFile:'', summaryFile:'',
summaryFileName:'', summaryFileName:'',
country:[], country:[],
@@ -1123,13 +1129,14 @@
this.replaceLawType = replaceLawType this.replaceLawType = replaceLawType
this.getReplaceLawsNumRow() this.getReplaceLawsNumRow()
}, },
formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType) { formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType,list6) {
this.form = form this.form = form
this.FBGBUSSFileList = list1 this.FBGBUSSFileList = list1
this.LSBBBUSSFileList = list2 this.LSBBBUSSFileList = list2
this.BZSMBUSSFileList = list3 this.BZSMBUSSFileList = list3
this.QTWJBUSSFileList = list4 this.QTWJBUSSFileList = list4
this.GLWJBUSSFileList = list5 this.GLWJBUSSFileList = list5
this.madelSubList = list6
if(fileMadel){ if(fileMadel){
this.fileType = fileType this.fileType = fileType
this.fileUpload(fileType) this.fileUpload(fileType)
@@ -1343,6 +1350,8 @@
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName); this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName); this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
this.madelSubList=this.assemble(this.form.madelSub,this.form.madelSubName);
this.roleForm = mes.roleForm this.roleForm = mes.roleForm
this.commentText = mes.commentText this.commentText = mes.commentText
this.formKey++ this.formKey++
@@ -1944,6 +1953,23 @@
}) })
}) })
}, },
handleFilePreview2(file,type) {
let attId = ""
if(file && file.id){
attId = file.id
}else {
attId = file.response.data.id
}
if (type === 'down') {
if (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
} else {
this.$message.warning('文件不存在,下载失败')
}
} else {
this.$preview(attId)
}
},
// 文件预览及下载 // 文件预览及下载
handleFilePreview(file) { handleFilePreview(file) {
const attId = file.response.data.id const attId = file.response.data.id
@@ -1979,25 +2005,41 @@
// this.fileList = fileList.splice(0, 1) // this.fileList = fileList.splice(0, 1)
// } // }
if (response.ok) { if (response.ok) {
const fileObj = {}
fileObj.id = file.response.data.id
fileObj.name = file.response.data.name
switch (this.fileType){ switch (this.fileType){
case 'FBGBUSS': case 'FBGBUSS':
this.FBGBUSSFileList = fileList this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined);
this.FBGBUSSFileList.push(fileObj)
break; break;
case 'BZSMBUSS' : case 'BZSMBUSS' :
this.BZSMBUSSFileList = fileList this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined);
this.BZSMBUSSFileList.push(fileObj)
break; break;
case 'LSBBBUSS': case 'LSBBBUSS':
this.LSBBBUSSFileList = fileList this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
this.LSBBBUSSFileList.push(fileObj)
break; break;
case 'GLWJLAWS': case 'GLWJLAWS':
this.QTWJBUSSFileList = fileList this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
this.GLWJLAWSFileList.push(fileObj)
break; break;
case 'GLWJBUSS': case 'GLWJBUSS':
this.GLWJBUSSFileList = fileList this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
this.GLWJBUSSFileList.push(fileObj)
break;
case 'summaryFile':
this.summaryFileList = this.summaryFileList.filter ( item => item.response === undefined);
this.summaryFileList.push(fileObj)
break;
case 'madelSub':
this.madelSubList = this.madelSubList.filter ( item => item.response === undefined);
this.madelSubList.push(fileObj)
break; break;
default : ; default : ;
} }
this.formKey++
this.$message({ this.$message({
showClose: true, showClose: true,
message: response.message, message: response.message,
@@ -2031,6 +2073,12 @@
case 'GLWJBUSS': case 'GLWJBUSS':
this.fileList=this.GLWJBUSSFileList this.fileList=this.GLWJBUSSFileList
break; break;
case 'summaryFile':
this.fileList=this.summaryFileList
break;
case 'madelSub':
this.fileList=this.madelSubList
break;
default : ; default : ;
} }
this.fileMadel = true; this.fileMadel = true;
@@ -2054,6 +2102,12 @@
case 'GLWJBUSS': case 'GLWJBUSS':
this.GLWJBUSSFileList = fileList this.GLWJBUSSFileList = fileList
break; break;
case 'summaryFile':
this.summaryFileList = fileList
break;
case 'madelSub':
this.madelSubList = fileList
break;
default : ; default : ;
} }
}, },
@@ -2186,21 +2240,27 @@
fileInfoHandle(){ fileInfoHandle(){
//拼接文件名和id 提交到流程Activity //拼接文件名和id 提交到流程Activity
this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.response.data.id).join(",") this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",")
this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",") this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",")
this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.response.data.id).join(",") this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id).join(",")
this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",") this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",")
this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.response.data.id).join(",") this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id).join(",")
this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",") this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",")
this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.response.data.id).join(",") this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id).join(",")
this.form.QTWJBUSSName=this.QTWJBUSSFileList.map(item => item.name).join(",") this.form.QTWJBUSSName=this.QTWJBUSSFileList.map(item => item.name).join(",")
this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.response.data.id).join(",") this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",")
this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",") this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",")
this.form.summaryFile=this.summaryFileList.map(item => item.id).join(",")
this.form.summaryFileName=this.summaryFileList.map(item => item.name).join(",")
this.form.madelSub=this.madelSubList.map(item => item.id).join(",")
this.form.madelSubName=this.madelSubList.map(item => item.name).join(",")
}, },
// 删除方法 // 删除方法
deletedId(data, ids) { deletedId(data, ids) {
@@ -2287,6 +2347,7 @@
// } else if (val === '') { // } else if (val === '') {
// this.form.country = [] // this.form.country = []
// } // }
this.fileInfoHandle()
this.$refs['formTongGuo'].validate((valid) => { this.$refs['formTongGuo'].validate((valid) => {
if (valid) { if (valid) {
this.isSubmit = true this.isSubmit = true
@@ -2305,7 +2366,9 @@
// this.$message.success(res.message) // this.$message.success(res.message)
// 流程提交之后，应该流转至待办任务页面 // 流程提交之后，应该流转至待办任务页面
this.isSubmit = false this.isSubmit = false
this.processCreateBuss(json) this.submitLoading = false
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
// this.processCreateBuss(json)
// if(this.formTongGuo.approvalOpinion === '1'){ // if(this.formTongGuo.approvalOpinion === '1'){
// this.$message.warning("驳回成功") // this.$message.warning("驳回成功")
// this.isSubmit = false // this.isSubmit = false
@@ -2375,12 +2438,14 @@
getFormFieldList (item) { getFormFieldList (item) {
this.$nextTick(() => { this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item)) this.form = JSON.parse(JSON.stringify(item))
console.log(this.form)
this.form.topId = this.pId this.form.topId = this.pId
this.form.prcNum = this.prcNum this.form.prcNum = this.prcNum
this.form.prcName = this.prcName this.form.prcName = this.prcName
this.form.issueTime = this.dateFormatter() this.form.issueTime = this.dateFormatter()
this.form['id'] = item.id this.form['id'] = item.id
this.getStandInfoByReviseStatus() this.formKey++
// this.getStandInfoByReviseStatus()
}) })
}, },
assemble(ids,names){ assemble(ids,names){
@@ -2416,6 +2481,7 @@
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName); this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName); this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName); this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName);
this.madelSubList=this.assemble(processForm.madelSub,processForm.madelSubName);
this.formKey++ this.formKey++
} }
}).catch(e => { }).catch(e => {
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+59 -13
View File
@@ -26,10 +26,14 @@
:BZSMBUSSFileListSub = "BZSMBUSSFileList" :BZSMBUSSFileListSub = "BZSMBUSSFileList"
:QTWJBUSSFileListSub = "QTWJBUSSFileList" :QTWJBUSSFileListSub = "QTWJBUSSFileList"
:GLWJBUSSFileListSub = "GLWJBUSSFileList" :GLWJBUSSFileListSub = "GLWJBUSSFileList"
:summaryFileListSub = "summaryFileList"
:madelSubListSub = "madelSubList"
:disabledState = "disabledState" :disabledState = "disabledState"
:verifySarStandard = "verifySarStandard" :verifySarStandard = "verifySarStandard"
:fileMadelSub = "fileMadel" :fileMadelSub = "fileMadel"
:fbgDown = "false" :fbgDown = "false"
:opinionsShow = "true"
:fbNode = "true"
@formCancel="formCancel" @formCancel="formCancel"
@formSelectLawsCancel = "formSelectLawsCancel" @formSelectLawsCancel = "formSelectLawsCancel"
@formChoiceZRRListCancel = "formChoiceZRRListCancel" @formChoiceZRRListCancel = "formChoiceZRRListCancel"
@@ -665,6 +669,7 @@
QTWJBUSSFileList: [], QTWJBUSSFileList: [],
GLWJBUSSFileList: [], GLWJBUSSFileList: [],
summaryFileList: [], summaryFileList: [],
madelSubList: [],
caFileList: [], caFileList: [],
FBGBJBDFileList: [], FBGBJBDFileList: [],
xgdFileList: [], xgdFileList: [],
@@ -809,6 +814,8 @@
modelDataZrUserVerify:[], modelDataZrUserVerify:[],
summaryFile:'', summaryFile:'',
summaryFileName:'', summaryFileName:'',
madelSub:'',
madelSubName:'',
country:[], country:[],
// 基础信息 // 基础信息
standSort: '', standSort: '',
@@ -1123,13 +1130,14 @@
this.replaceLawType = replaceLawType this.replaceLawType = replaceLawType
this.getReplaceLawsNumRow() this.getReplaceLawsNumRow()
}, },
formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType) { formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType,list6) {
this.form = form this.form = form
this.FBGBUSSFileList = list1 this.FBGBUSSFileList = list1
this.LSBBBUSSFileList = list2 this.LSBBBUSSFileList = list2
this.BZSMBUSSFileList = list3 this.BZSMBUSSFileList = list3
this.QTWJBUSSFileList = list4 this.QTWJBUSSFileList = list4
this.GLWJBUSSFileList = list5 this.GLWJBUSSFileList = list5
this.madelSubList = list6
if(fileMadel){ if(fileMadel){
this.fileType = fileType this.fileType = fileType
this.fileUpload(fileType) this.fileUpload(fileType)
@@ -1343,6 +1351,8 @@
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName); this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName); this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
this.madelSubList=this.assemble(this.form.madelSub,this.form.madelSubName);
this.roleForm = mes.roleForm this.roleForm = mes.roleForm
this.commentText = mes.commentText this.commentText = mes.commentText
this.formKey++ this.formKey++
@@ -1979,25 +1989,41 @@
// this.fileList = fileList.splice(0, 1) // this.fileList = fileList.splice(0, 1)
// } // }
if (response.ok) { if (response.ok) {
const fileObj = {}
fileObj.id = file.response.data.id
fileObj.name = file.response.data.name
switch (this.fileType){ switch (this.fileType){
case 'FBGBUSS': case 'FBGBUSS':
this.FBGBUSSFileList = fileList this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined);
this.FBGBUSSFileList.push(fileObj)
break; break;
case 'BZSMBUSS' : case 'BZSMBUSS' :
this.BZSMBUSSFileList = fileList this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined);
this.BZSMBUSSFileList.push(fileObj)
break; break;
case 'LSBBBUSS': case 'LSBBBUSS':
this.LSBBBUSSFileList = fileList this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
this.LSBBBUSSFileList.push(fileObj)
break; break;
case 'GLWJLAWS': case 'GLWJLAWS':
this.QTWJBUSSFileList = fileList this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
this.GLWJLAWSFileList.push(fileObj)
break; break;
case 'GLWJBUSS': case 'GLWJBUSS':
this.GLWJBUSSFileList = fileList this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
this.GLWJBUSSFileList.push(fileObj)
break;
case 'summaryFile':
this.summaryFileList = this.summaryFileList.filter ( item => item.response === undefined);
this.summaryFileList.push(fileObj)
break;
case 'madelSub':
this.madelSubList = this.madelSubList.filter ( item => item.response === undefined);
this.madelSubList.push(fileObj)
break; break;
default : ; default : ;
} }
this.formKey++
this.$message({ this.$message({
showClose: true, showClose: true,
message: response.message, message: response.message,
@@ -2031,10 +2057,15 @@
case 'GLWJBUSS': case 'GLWJBUSS':
this.fileList=this.GLWJBUSSFileList this.fileList=this.GLWJBUSSFileList
break; break;
case 'summaryFile':
this.fileList=this.summaryFileList
break;
case 'madelSub':
this.fileList=this.madelSubList
break;
default : ; default : ;
} }
this.fileMadel = true; this.fileMadel = true;
}, },
removeOneFile(file, fileList) { removeOneFile(file, fileList) {
@@ -2054,6 +2085,12 @@
case 'GLWJBUSS': case 'GLWJBUSS':
this.GLWJBUSSFileList = fileList this.GLWJBUSSFileList = fileList
break; break;
case 'summaryFile':
this.summaryFileList = fileList
break;
case 'madelSub':
this.madelSubList = fileList
break;
default : ; default : ;
} }
}, },
@@ -2186,21 +2223,27 @@
fileInfoHandle(){ fileInfoHandle(){
//拼接文件名和id 提交到流程Activity //拼接文件名和id 提交到流程Activity
this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.response.data.id).join(",") this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",")
this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",") this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",")
this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.response.data.id).join(",") this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id).join(",")
this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",") this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",")
this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.response.data.id).join(",") this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id).join(",")
this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",") this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",")
this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.response.data.id).join(",") this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id).join(",")
this.form.QTWJBUSSName=this.QTWJBUSSFileList.map(item => item.name).join(",") this.form.QTWJBUSSName=this.QTWJBUSSFileList.map(item => item.name).join(",")
this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.response.data.id).join(",") this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",")
this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",") this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",")
this.form.summaryFile=this.summaryFileList.map(item => item.id).join(",")
this.form.summaryFileName=this.summaryFileList.map(item => item.name).join(",")
this.form.madelSub=this.madelSubList.map(item => item.id).join(",")
this.form.madelSubName=this.madelSubList.map(item => item.name).join(",")
}, },
// 删除方法 // 删除方法
deletedId(data, ids) { deletedId(data, ids) {
@@ -2287,6 +2330,7 @@
// } else if (val === '') { // } else if (val === '') {
// this.form.country = [] // this.form.country = []
// } // }
this.fileInfoHandle()
this.$refs['formTongGuo'].validate((valid) => { this.$refs['formTongGuo'].validate((valid) => {
if (valid) { if (valid) {
this.isSubmit = true this.isSubmit = true
@@ -2381,6 +2425,7 @@
this.form.issueTime = this.dateFormatter() this.form.issueTime = this.dateFormatter()
this.form['id'] = item.id this.form['id'] = item.id
this.getStandInfoByReviseStatus() this.getStandInfoByReviseStatus()
this.formKey++
}) })
}, },
assemble(ids,names){ assemble(ids,names){
@@ -2416,6 +2461,7 @@
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName); this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName); this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName); this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName);
this.madelSubList=this.assemble(processForm.madelSub,processForm.madelSubName);
this.formKey++ this.formKey++
} }
}).catch(e => { }).catch(e => {
src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+82 -53
View File
@@ -187,7 +187,7 @@
</div> </div>
<div class="block" id="active3" v-show="active === '3'"> <div class="block" id="active3" v-show="active === '3'">
<ProcessTitle> <ProcessTitle>
<template slot="title">模块信息</template> <template slot="title">条款信息</template>
</ProcessTitle> </ProcessTitle>
<template> <template>
<div class="prc-content-border" style="height: 66vh;position: relative;"> <div class="prc-content-border" style="height: 66vh;position: relative;">
@@ -212,21 +212,25 @@
row-key="id" row-key="id"
:data="form.modelData" :data="form.modelData"
border border
default-expand-all default-expand-all>
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<!-- <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>--> <!-- <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>-->
<el-table-column <el-table-column
prop="id"
label="序号" label="序号"
min-width="5%" min-width="5%"
align="center"> align="center">
<template slot-scope="scope">
{{scope.$index + 1}}
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="modelNum" prop="modelNum"
label="条款号" label="条款号"
min-width="5%" min-width="8%"
align="center" align="center"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"> >
<template slot-scope="scope">
<el-input v-model="scope.row.modelNum" :title="scope.row.modelNum" placeholder="请填写条款号"/>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="修改前" label="修改前"
@@ -236,7 +240,7 @@
<el-form-item <el-form-item
style="margin-left: 0;margin-bottom:0;" style="margin-left: 0;margin-bottom:0;"
> >
<el-input v-model="scope.row.modelUpdateBefore" :title="scope.row.modelUpdateBefore" :disabled="scope.row.disabled" placeholder="请维护章节修改前内容" @blur="modelNameFunc1(scope.row)"/> <el-input v-model="scope.row.modelUpdBefore" :title="scope.row.modelUpdBefore" :disabled="scope.row.disabled" placeholder="请填写章节修改前内容"/>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
@@ -248,7 +252,7 @@
<el-form-item <el-form-item
style="margin-left: 0;margin-bottom:0;" style="margin-left: 0;margin-bottom:0;"
> >
<el-input v-model="scope.row.modelUpdateAfter" :title="scope.row.modelUpdateAfter" :disabled="scope.row.disabled" placeholder="请维护章节修改后内容" @blur="modelNameFunc2(scope.row)"/> <el-input v-model="scope.row.modelUpdAfter" :title="scope.row.modelUpdAfter" :disabled="scope.row.disabled" placeholder="请填写章节修改后内容"/>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
@@ -260,42 +264,44 @@
<el-form-item <el-form-item
style="margin-left: 0;margin-bottom:0;" style="margin-left: 0;margin-bottom:0;"
> >
<el-input v-model="scope.row.modelUpdateAfter" :disabled="scope.row.disabled" placeholder="请填写修改理由"/> <el-input v-model="scope.row.modelContent" :disabled="scope.row.disabled" placeholder="请填写修改理由"/>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zrDeptIdName"
label="提出部门" label="提出部门"
align="center" align="center"
min-width="20%"> min-width="15%">
<template slot-scope="scope">
<el-form-item
style="margin-left: 0;margin-bottom:0;"
>
<el-input v-model="scope.row.modelUpdateAfter" :disabled="scope.row.disabled" placeholder="请选择提出人自动带入部门"/>
</el-form-item>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- label="责任人"-->
<!-- min-width="15%"-->
<!-- align="center">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-form-item--> <!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"--> <!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >--> <!-- >-->
<!-- <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>--> <!-- <el-input v-model="scope.row.zrDeptIdName" disabled placeholder="请选择提出人自动带入部门"/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> </el-table-column>
<el-table-column
prop="zrUserIdName"
label="责任人"
min-width="15%"
align="center">
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >-->
<!-- <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" disabled />-->
<!-- </el-form-item>-->
<!-- </template>-->
</el-table-column>
<el-table-column label="操作" align="center" min-width="5%"> <el-table-column label="操作" align="center" min-width="5%">
<template slot-scope="scope"> <template slot-scope="scope">
<div @click.stop style="display: inline-block"> <div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item> <!-- <el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>-->
<el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item> <!-- <el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item>-->
<el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item> <el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
@@ -1448,8 +1454,6 @@
return isChecked return isChecked
}, },
handleDelete(val, row) { handleDelete(val, row) {
console.log(row)
console.log(this.form.modelData)
// 模态框删除按钮 // 模态框删除按钮
this.$confirm("是否确认删除本条数据?", "提示", { this.$confirm("是否确认删除本条数据?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@@ -1457,10 +1461,10 @@
type: "info" type: "info"
}).then(() => { }).then(() => {
// 此为假删除，只是删除了模态框中当前行的数据，并没有真正删除表格数据 // 此为假删除，只是删除了模态框中当前行的数据，并没有真正删除表格数据
const ids = [] // const ids = []
ids.push(row.id) // ids.push(row.id)
this.form.modelData = this.changeRestTree(this.deletedId(this.form.modelData,ids)) // this.form.modelData = this.changeRestTree(this.deletedId(this.form.modelData,ids))
console.log(this.form.modelData) this.form.modelData.splice(val,1)
this.$message({ this.$message({
message: "删除成功", message: "删除成功",
type: "success", type: "success",
@@ -1487,22 +1491,54 @@
// } // }
const list = { const list = {
id: this.form.modelData.length + 1, id: this.form.modelData.length + 1,
modelNum: this.form.modelData.length + 1+'', modelNum: '',
orderNum: this.form.modelData.length + 1, // orderNum为新创建行的索引 orderNum: this.form.modelData.length + 1, // orderNum为新创建行的索引
pid: '0', pid: '0',
modelIndex: this.form.modelData.length, modelIndex: this.form.modelData.length,
disabled1: false, disabled1: false,
disabled2: false, disabled2: false,
modelName: "", modelName: "",
modelUpdateBefore: "", modelUpdBefore: "",
modelUpdateAfter: "", modelUpdAfter: "",
modelContent: "", modelContent: "",
zrUserId:"", zrUserId:this.$store.getters.userInfo.userId,
zrUserIdName:"", zrUserIdName:this.$store.getters.userInfo.userName,
zrDeptId:this.$store.getters.userInfo.institutionId,
zrDeptIdName:this.$store.getters.userInfo.institutionName,
children:[], children:[],
}; };
this.form.modelData.push(list); this.form.modelData.push(list);
}, },
// createRow() {
// // 创建行
// // if (this.diaTable.length >= 6) { // 判断当前表格是否可继续创建
// // this.$message({
// // message: "超出数量，无法创建",
// // type: "info",
// // duration: 2000
// // });
// // return false;
// // }
// const list = {
// id: this.form.modelData.length + 1,
// modelNum: this.form.modelData.length + 1+'',
// orderNum: this.form.modelData.length + 1, // orderNum为新创建行的索引
// pid: '0',
// modelIndex: this.form.modelData.length,
// disabled1: false,
// disabled2: false,
// modelName: "",
// modelUpdBefore: "",
// modelUpdAfter: "",
// modelContent: "",
// zrUserId:this.$store.getters.userInfo.userId,
// zrUserIdName:this.$store.getters.userInfo.userName,
// zrDeptId:this.$store.getters.userInfo.institutionId,
// zrDeptIdName:this.$store.getters.userInfo.institutionName,
// children:[],
// };
// this.form.modelData.push(list);
// },
createChildRow(index,row) { createChildRow(index,row) {
// 创建行 // 创建行
// if (this.diaTable.length >= 6) { // 判断当前表格是否可继续创建 // if (this.diaTable.length >= 6) { // 判断当前表格是否可继续创建
@@ -1522,14 +1558,17 @@
disabled1: false, disabled1: false,
disabled2: false, disabled2: false,
modelName: "", modelName: "",
modelUpdateBefore: "", modelUpdBefore: "",
modelUpdateAfter: "", modelUpdAfter: "",
modelContent: "", modelContent: "",
zrUserId:"", zrUserId:this.$store.getters.userInfo.userId,
zrUserIdName:"", zrUserIdName:this.$store.getters.userInfo.userName,
zrDeptId:this.$store.getters.userInfo.institutionId,
zrDeptIdName:this.$store.getters.userInfo.institutionName,
children:[], children:[],
}; };
row.children.push(list) // row.children.push(list)
row.push(list)
}, },
dateFormatter () { dateFormatter () {
//默认返回yyyy-MM-dd HH-mm-ss //默认返回yyyy-MM-dd HH-mm-ss
@@ -2604,17 +2643,6 @@
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 infoList = []
const maryList=this.assemble(this.summary,this.summaryName);
const info = {}
info.userId = this.userId
info.userName = this.userName
info.commentText = this.formTongGuo.commentText
info.summary = this.summary
info.summaryName = this.summaryName
info.summaryList = maryList
infoList.push(info)
this.form.infoList = infoList
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,
@@ -2776,6 +2804,7 @@
}, },
}, },
mounted () { mounted () {
console.log(this.$store.getters.userInfo)
this.getTaskId() this.getTaskId()
this.getData() this.getData()
this.processTable() this.processTable()
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+96 -39
View File
@@ -179,69 +179,114 @@
style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;border-bottom: 1px solid #EBEEF5;" style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;border-bottom: 1px solid #EBEEF5;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
@selection-change="handleSelectionChange"
row-key="id" row-key="id"
:data="form.infoList" :data="form.infoList"
border border
default-expand-all> default-expand-all>
<el-table-column <el-table-column
label="序号" label="序号"
min-width="15%" min-width="5%"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.$index + 1}} {{scope.$index + 1}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="userName" prop="modelNum"
label="会签人" label="条款号"
min-width="8%"
align="center"
>
</el-table-column>
<el-table-column
prop="modelUpdBefore"
label="修改前"
align="center"
min-width="20%">
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >-->
<!-- <el-input v-model="scope.row.modelUpdBefore" :title="scope.row.modelUpdBefore" :disabled="scope.row.disabled" placeholder="请维护章节修改前内容" @blur="modelNameFunc1(scope.row)"/>-->
<!-- </el-form-item>-->
<!-- </template>-->
</el-table-column>
<el-table-column
prop="modelUpdAfter"
label="修改后"
align="center"
min-width="20%">
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >-->
<!-- <el-input v-model="scope.row.modelUpdAfter" :title="scope.row.modelUpdAfter" :disabled="scope.row.disabled" placeholder="请维护章节修改后内容" @blur="modelNameFunc2(scope.row)"/>-->
<!-- </el-form-item>-->
<!-- </template>-->
</el-table-column>
<el-table-column
prop="modelContent"
label="修改理由"
align="center"
min-width="20%">
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >-->
<!-- <el-input v-model="scope.row.modelContent" :disabled="scope.row.disabled" placeholder="请填写修改理由"/>-->
<!-- </el-form-item>-->
<!-- </template>-->
</el-table-column>
<el-table-column
prop="zrDeptIdName"
label="提出部门"
align="center" align="center"
min-width="15%"> min-width="15%">
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >-->
<!-- <el-input v-model="scope.row.zrDeptIdName" disabled placeholder="请选择提出人自动带入部门"/>-->
<!-- </el-form-item>-->
<!-- </template>-->
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="commentText" prop="zrUserIdName"
label="会签意见" label="责任人"
min-width="35%" min-width="15%"
align="center"> align="center">
</el-table-column> <!-- <template slot-scope="scope">-->
<el-table-column <!-- <el-form-item-->
prop="commentText" <!-- style="margin-left: 0;margin-bottom:0;"-->
label="会签意见文件" <!-- >-->
min-width="35%" <!-- <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" disabled />-->
align="left"> <!-- </el-form-item>-->
<template slot-scope="scope"> <!-- </template>-->
<el-form-item
style="margin-left: 0;margin-bottom:0;"
>
<div v-if="scope.row.summaryList.length>0" v-for="(value,index) in scope.row.summaryList" :title="value.name" :key="index" style="margin-left: -210px;cursor: pointer;color: #00b7ee" @click="downloadFile(value)">
<!-- {{ value.name }} -->
{{value.name | ellipsis}}
</div>
<div v-else>
- -
</div>
</el-form-item>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="意见是否采纳" label="意见是否采纳"
min-width="15%" min-width="15%"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item <el-select v-model="scope.row.opinionsAdopted" filterable clearable :disabled="disabledState">
style="margin-left: 0;margin-bottom:0;" <el-option
> v-for="item in opinionsAdoptedOptions"
<el-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable> :key="item.value"
<el-option :value="item.value"
v-for="item in opinionsAdoptedOptions" :label="item.label"
:key="item.value" ></el-option>
:value="item.value" </el-select>
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop="opinionsAdoptedCont"
label="采纳理由"
align="center"
min-width="15%">
<template slot-scope="scope">
<el-input v-model="scope.row.opinionsAdoptedCont" clearable placeholder="请填写采纳理由"/>
</template>
</el-table-column>
</el-table> </el-table>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
@@ -1242,7 +1287,8 @@
userType:'', // 选择用户ID判断 userType:'', // 选择用户ID判断
opinionsAdoptedOptions:[ opinionsAdoptedOptions:[
{value: '1',label: '采纳'}, {value: '1',label: '采纳'},
{value: '2',label: '不采纳'}, {value: '2',label: '部分采纳'},
{value: '3',label: '不采纳'},
], ],
countryOptions:[],//国家地区 countryOptions:[],//国家地区
standSortOptions: [], // 标准类别 standSortOptions: [], // 标准类别
@@ -1324,6 +1370,14 @@
}, },
}, },
methods: { methods: {
filterData(data){
if(data && data.length > 0){
data.forEach((item,index) =>{
item.xh = index
})
}
return data
},
filterData2(){ filterData2(){
let spanOneArr = [] let spanOneArr = []
let concatOne = 0 let concatOne = 0
@@ -2944,6 +2998,9 @@
/deep/ .el-input__suffix{ /deep/ .el-input__suffix{
display: none !important; display: none !important;
} }
/deep/ #active1 .el-form-item__content{
margin-left: 0px !important;
}
/deep/ #active2 .el-form-item__content{ /deep/ #active2 .el-form-item__content{
margin-left: 0px !important; margin-left: 0px !important;
} }
src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
+32 -3
View File
@@ -30,6 +30,38 @@
:verifySarStandard = "verifySarStandard" :verifySarStandard = "verifySarStandard"
:opinionsShow = "true" :opinionsShow = "true"
></formList> ></formList>
<div>
<el-collapse accordion v-model="activeName">
<el-collapse-item title="审批意见" name = "1">
<div style="margin: 10px 0;">
<el-form
ref="formTongGuo"
:model="formTongGuo"
:rules="rules">
<!-- <el-form-item-->
<!-- prop="approvalOpinion"-->
<!-- >-->
<!-- <el-select @change="getRule" v-model="formTongGuo.approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">-->
<!-- <el-option label="驳回" value="1"></el-option>-->
<!-- <el-option label="通过" value="0"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item
prop="commentText"
>
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="formTongGuo.commentText">
</el-input>
</el-form-item>
</el-form>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div> </div>
<div class="block" style="padding-top: 20px;" v-show="active === '3'"> <div class="block" style="padding-top: 20px;" v-show="active === '3'">
<div class="flow-list"> <div class="flow-list">
@@ -105,13 +137,10 @@
<!-- 保存||提交--> <!-- 保存||提交-->
<ProcessFooter <ProcessFooter
v-show="verifySarStandard" v-show="verifySarStandard"
show-save
show-over2 show-over2
show-submit2 show-submit2
show-transfer show-transfer
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@transfer="handleTransfer" @transfer="handleTransfer"
@submit2="handle2" @submit2="handle2"
@over2="handle1" @over2="handle1"
src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+367 -79
View File
@@ -5,7 +5,8 @@
<template slot="proNode">重新技术委员会评审/评审意见修改评审</template> <template slot="proNode">重新技术委员会评审/评审意见修改评审</template>
</ProcessHeader> </ProcessHeader>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">评审评分</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">基础信息</div>
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>--> <!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div> <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div> </div>
@@ -17,7 +18,135 @@
class="label-input-form" class="label-input-form"
label-width="210px" label-width="210px"
> >
<div style="flex: auto;" v-show="active === '1'"> <div style="flex: auto;" id="active1" v-show="active === '1'">
<template>
<el-table
:data="form.evaluationData"
:summary-method="getSummaries"
show-summary
:span-method="(({row, column, rowIndex, columnIndex})=>objectSpanMethod({row, column, rowIndex, columnIndex},form.evaluationData))"
style="width: 100%">
<el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1">
<el-table-column
label="标准类别"
>
<el-table-column
prop="oneIndexTitle"
align="center"
label="一级指标"
width = '120'
>
</el-table-column>
</el-table-column>
<el-table-column
:label="form.standSort"
>
<el-table-column
prop="twoIndexTitle"
align="center"
label="二级指标"
width = '120'
>
</el-table-column>
<el-table-column
prop="threeIndexTitle"
label="三级指标"
width="300"
>
</el-table-column>
</el-table-column>
<el-table-column
label="标准名称"
>
<el-table-column
prop="weight"
align="center"
label="指标权重 %"
width = '100'
>
<template slot-scope="scope">
{{scope.row.valueType === 'number' ? scope.row.weight * 100 : '加分项（'+scope.row.weight+'分）'}}
</template>
</el-table-column>
</el-table-column>
<el-table-column
:label="form.standName"
>
<el-table-column
prop="score"
align="center"
label="指标分值（10分制）优≥8分；合格6～8分；不合格＜6分"
width = '200'
>
<template slot-scope="scope">
<el-form-item
:prop="'evaluationData.'+scope.$index + '.score'"
:rules="scope.row.valueType !== 'add' ? rules.score : rules.scoreNot" >
<el-input v-model.number="scope.row.score" placeholder="请填写分值" />
</el-form-item>
</template>
</el-table-column>
<el-table-column
prop="scoreMin"
align="center"
label="分值小计"
width = '80'
>
<template slot-scope="scope">
{{setScoreMin(scope.row)}}
</template>
</el-table-column>
<el-table-column
prop="reason"
align="center"
label="简述扣分理由（不合格＜6分，必填）"
>
<template slot-scope="scope" v-if="(scope.row.valueType !== 'add' && scope.row.score !== undefined && scope.row.score !== '' && scope.row.score < 10)">
<el-form-item
:prop="'evaluationData.'+scope.$index + '.reason'"
:rules="scope.row.score < 6 ? rules.reason : rules.reasonNot" >
<el-input v-model="scope.row.reason" placeholder="请填写扣分理由" />
</el-form-item>
</template>
</el-table-column>
</el-table-column>
</el-table-column>
</el-table>
</template>
<div>
<el-collapse accordion v-model="activeName">
<el-collapse-item title="审批意见" name = "1">
<div style="margin: 10px 0;">
<el-form
ref="formTongGuo"
:model="formTongGuo"
:rules="rules">
<!-- <el-form-item-->
<!-- prop="approvalOpinion"-->
<!-- >-->
<!-- <el-select @change="getRule" v-model="formTongGuo.approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">-->
<!-- <el-option label="驳回" value="1"></el-option>-->
<!-- <el-option label="通过" value="0"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item
prop="commentText"
>
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="formTongGuo.commentText">
</el-input>
</el-form-item>
</el-form>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div style="flex: auto;" v-show="active === '2'">
<formEditList <formEditList
:key = "formKey" :key = "formKey"
:formSub = "form" :formSub = "form"
@@ -50,67 +179,112 @@
style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;border-bottom: 1px solid #EBEEF5;" style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;border-bottom: 1px solid #EBEEF5;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
@selection-change="handleSelectionChange"
row-key="id" row-key="id"
:data="form.infoList" :data="form.infoList"
border border
default-expand-all> default-expand-all>
<el-table-column <el-table-column
label="序号" label="序号"
min-width="15%" min-width="5%"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.$index + 1}} {{scope.$index + 1}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="userName" prop="modelNum"
label="会签人" label="条款号"
min-width="8%"
align="center"
>
</el-table-column>
<el-table-column
prop="modelUpdBefore"
label="修改前"
align="center"
min-width="20%">
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >-->
<!-- <el-input v-model="scope.row.modelUpdBefore" :title="scope.row.modelUpdBefore" :disabled="scope.row.disabled" placeholder="请维护章节修改前内容" @blur="modelNameFunc1(scope.row)"/>-->
<!-- </el-form-item>-->
<!-- </template>-->
</el-table-column>
<el-table-column
prop="modelUpdAfter"
label="修改后"
align="center"
min-width="20%">
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >-->
<!-- <el-input v-model="scope.row.modelUpdAfter" :title="scope.row.modelUpdAfter" :disabled="scope.row.disabled" placeholder="请维护章节修改后内容" @blur="modelNameFunc2(scope.row)"/>-->
<!-- </el-form-item>-->
<!-- </template>-->
</el-table-column>
<el-table-column
prop="modelContent"
label="修改理由"
align="center"
min-width="20%">
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >-->
<!-- <el-input v-model="scope.row.modelContent" :disabled="scope.row.disabled" placeholder="请填写修改理由"/>-->
<!-- </el-form-item>-->
<!-- </template>-->
</el-table-column>
<el-table-column
prop="zrDeptIdName"
label="提出部门"
align="center" align="center"
min-width="15%"> min-width="15%">
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
<!-- >-->
<!-- <el-input v-model="scope.row.zrDeptIdName" disabled placeholder="请选择提出人自动带入部门"/>-->
<!-- </el-form-item>-->
<!-- </template>-->
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="commentText" prop="zrUserIdName"
label="会签意见" label="责任人"
min-width="35%" min-width="15%"
align="center"> align="center">
</el-table-column> <!-- <template slot-scope="scope">-->
<el-table-column <!-- <el-form-item-->
prop="commentText" <!-- style="margin-left: 0;margin-bottom:0;"-->
label="会签意见文件" <!-- >-->
min-width="35%" <!-- <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" disabled />-->
align="left"> <!-- </el-form-item>-->
<template slot-scope="scope"> <!-- </template>-->
<el-form-item
style="margin-left: 0;margin-bottom:0;"
>
<div v-if="scope.row.summaryList.length>0" v-for="(value,index) in scope.row.summaryList" :title="value.name" :key="index" style="margin-left: -210px;cursor: pointer;color: #00b7ee" @click="downloadFile(value)">
<!-- {{ value.name }} -->
{{value.name | ellipsis}}
</div>
<div v-else>
- -
</div>
</el-form-item>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="意见是否采纳" label="意见是否采纳"
min-width="15%" min-width="15%"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item <el-select v-model="scope.row.opinionsAdopted" filterable clearable :disabled="disabledState">
style="margin-left: 0;margin-bottom:0;" <el-option
> v-for="item in opinionsAdoptedOptions"
<el-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable> :key="item.value"
<el-option :value="item.value"
v-for="item in opinionsAdoptedOptions" :label="item.label"
:key="item.value" ></el-option>
:value="item.value" </el-select>
:label="item.label" </template>
></el-option> </el-table-column>
</el-select> <el-table-column
</el-form-item> prop="opinionsAdoptedCont"
label="采纳理由"
align="center"
min-width="15%">
<template slot-scope="scope">
<el-input v-model="scope.row.opinionsAdoptedCont" clearable placeholder="请填写采纳理由"/>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -148,38 +322,6 @@
</el-row> </el-row>
</div> </div>
</template> </template>
<div>
<el-collapse accordion v-model="activeName">
<el-collapse-item title="审批意见" name = "1">
<div style="margin: 10px 0;">
<el-form
ref="formTongGuo"
:model="formTongGuo"
:rules="rules">
<!-- <el-form-item-->
<!-- prop="approvalOpinion"-->
<!-- >-->
<!-- <el-select @change="getRule" v-model="formTongGuo.approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">-->
<!-- <el-option label="驳回" value="1"></el-option>-->
<!-- <el-option label="通过" value="0"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item
prop="commentText"
>
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="formTongGuo.commentText">
</el-input>
</el-form-item>
</el-form>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div> </div>
<!-- <div class="block" id="active2" v-show="active === '2'">--> <!-- <div class="block" id="active2" v-show="active === '2'">-->
<!-- <ProcessTitle>--> <!-- <ProcessTitle>-->
@@ -696,6 +838,7 @@
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process"; import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} 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 {getEvaluationIndex} from "api/businessApi";
let Base64 = require('js-base64').Base64; let Base64 = require('js-base64').Base64;
export default { export default {
@@ -718,6 +861,25 @@
} }
}, },
data () { data () {
const numberCodeNot = (rule, value, callback) => {
let pattern = /^[1]*$/
if (!pattern.test(value)) {
return callback(new Error('评分分值只可为1分'))
} else {
callback()
}
};
const numberCode = (rule, value, callback) => {
if(value === undefined || value === ''){
return callback(new Error('评分分值不可为空'))
}
let pattern = /^[0-9]*$/
if (!pattern.test(value)) {
return callback(new Error('只能输入数字'))
} else {
callback()
}
};
const validateZrUserIdName = (rule, value, callback) => { const validateZrUserIdName = (rule, value, callback) => {
if(this.FBGBUSSFileList.length === 0){ if(this.FBGBUSSFileList.length === 0){
callback(new Error('请上传发布稿文件！')) callback(new Error('请上传发布稿文件！'))
@@ -925,6 +1087,7 @@
countryArr:'', countryArr:'',
commentCycleDate:'', commentCycleDate:'',
form: { form: {
evaluationData:[],
planId:'', planId:'',
planStatus:'', planStatus:'',
reviseStatus:'', reviseStatus:'',
@@ -995,6 +1158,8 @@
xdUserName: this.$store.getters.userInfo.userName, xdUserName: this.$store.getters.userInfo.userName,
pxUserId: this.$store.getters.userInfo.userId, pxUserId: this.$store.getters.userInfo.userId,
pxUserName: this.$store.getters.userInfo.userName, pxUserName: this.$store.getters.userInfo.userName,
fbUserId: '',
fbUserName: '',
qcUserId: '', // 多实例 qcUserId: '', // 多实例
qcUserName:'', // 多实例 qcUserName:'', // 多实例
bzhUserId:'', bzhUserId:'',
@@ -1055,6 +1220,15 @@
], ],
}, },
rules:{ rules:{
scoreNot:[
{required: false, validator: numberCodeNot, trigger: 'blur'},
],
score: [
{required: true, validator: numberCode, trigger: 'blur'},
{ type: 'number',min: 0, max: 10, message: '分值 0 ~ 10 分 ', trigger: 'blur' },
],
reason: [{ required: true, message: '请填写扣分理由', trigger: 'blur' }],
reasonNot:[],
commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }], commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }], approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
zrUserIdName: [ zrUserIdName: [
@@ -1094,7 +1268,7 @@
{ required: false, message: '请选择企标发布日期', trigger: 'change'} { required: false, message: '请选择企标发布日期', trigger: 'change'}
], ],
putTime: [ putTime: [
{ required: false, message: '请选择企标实施日期', trigger: 'change' } { required: true, message: '请选择企标实施日期', trigger: 'change' }
], ],
FBGBUSSName: [ FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
@@ -1113,7 +1287,8 @@
userType:'', // 选择用户ID判断 userType:'', // 选择用户ID判断
opinionsAdoptedOptions:[ opinionsAdoptedOptions:[
{value: '1',label: '采纳'}, {value: '1',label: '采纳'},
{value: '2',label: '不采纳'}, {value: '2',label: '部分采纳'},
{value: '3',label: '不采纳'},
], ],
countryOptions:[],//国家地区 countryOptions:[],//国家地区
standSortOptions: [], // 标准类别 standSortOptions: [], // 标准类别
@@ -1195,6 +1370,92 @@
}, },
}, },
methods: { methods: {
filterData(data){
if(data && data.length > 0){
data.forEach((item,index) =>{
item.xh = index
})
}
return data
},
filterData2(){
let spanOneArr = []
let concatOne = 0
this.form.evaluationData.forEach((item,index)=>{//循环后端查询出来的数据(orderdata)
if(index === 0){
spanOneArr.push(1)
}else{
//name 修改
if(item.twoIndexTitle === this.form.evaluationData[index - 1].twoIndexTitle){ //第一列需合并相同内容的字段
spanOneArr[concatOne] += 1
spanOneArr.push(0)
}else{
spanOneArr.push(1)
concatOne = index
}
}
})
return {
one: spanOneArr,
}
},
setScoreMin(row){
return row.scoreMin = ((row.score === undefined || row.score === '') ? '' : row.valueType === 'add' ? row.score : (row.score / 10).toFixed(1))
},
getSummaries(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 3) {
sums[index] = '合计：';
return;
}else if(index === 6){
sums[index] = '';
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index] += ' ';
} else {
sums[index] = '';
}
if(sums[index] !== '' && sums[index].indexOf(".") !== -1){
sums[index] = parseFloat(sums[index]).toFixed(1);
}
});
return sums;
},
objectSpanMethod({ row, column, rowIndex, columnIndex },value) {
if (columnIndex === 0) {
if (rowIndex === 0) {
return {
rowspan: value.length,
colspan: 1
};
} else {
return {
rowspan: 0,
colspan: 0
};
}
}else if(columnIndex === 1 ) {
const _row = (this.filterData2(this.form.evaluationData).one)[rowIndex]
const _col = _row > 0 ? 1 : 0
return {
rowspan: _row,
colspan: _col
}
}
},
drawerCheckZRBM(data) { drawerCheckZRBM(data) {
let idList = '' let idList = ''
let nameList = '' let nameList = ''
@@ -2055,11 +2316,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] // 后缀名
// 判断上传文件格式 // 判断上传文件格式
this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined); // this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined);
if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){ // if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
this.$message.error('文件限制只可上传一个') // this.$message.error('文件限制只可上传一个')
return false // return false
} // }
if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
return true return true
} else { } else {
@@ -2587,6 +2848,8 @@
getFormFieldList (item) { getFormFieldList (item) {
this.$nextTick(() => { this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item)) this.form = JSON.parse(JSON.stringify(item))
this.form.evaluationData = []
this.getEvaluation()
this.form.prcNum = this.prcNum this.form.prcNum = this.prcNum
this.form.prcName = this.prcName this.form.prcName = this.prcName
this.form['id'] = item.id this.form['id'] = item.id
@@ -2604,6 +2867,28 @@
} }
return list; return list;
}, },
getEvaluation() {
return new Promise((resolve, reject) => {
getEvaluationIndex({
indexType: 'quality'
}).then(res => {
if (res) {
const evalList = []
res.data.forEach(item =>{
item.score = ''
item.scoreMin = ''
item.reason = ''
item.userId = this.userId
item.processNode = this.taskInfo
evalList.push(item)
})
this.form.evaluationData = evalList
this.$forceUpdate()
}
}).catch(e => {
})
})
},
getData() { getData() {
if(this.taskIds && this.pId){ if(this.taskIds && this.pId){
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@@ -2713,6 +2998,9 @@
/deep/ .el-input__suffix{ /deep/ .el-input__suffix{
display: none !important; display: none !important;
} }
/deep/ #active1 .el-form-item__content{
margin-left: 0px !important;
}
/deep/ #active2 .el-form-item__content{ /deep/ #active2 .el-form-item__content{
margin-left: 0px !important; margin-left: 0px !important;
} }
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+12 -1
View File
@@ -451,7 +451,7 @@ export default {
prcType: row.prcType prcType: row.prcType
} }
}) })
}else if (row.taskInfo === '标准法规部标准化工程师发布'){ }else if (row.taskInfo === '主起草人培训'){
this.$router.push({ this.$router.push({
name: 'bussLibrary12', name: 'bussLibrary12',
query: { query: {
@@ -462,6 +462,17 @@ export default {
prcType: row.prcType prcType: row.prcType
} }
}) })
}else if (row.taskInfo === '标准法规部标准化工程师发布'){
this.$router.push({
name: 'bussLibrary13',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} }
break break
case 'laws1': case 'laws1':
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+17 -5
View File
@@ -418,14 +418,26 @@ export default {
verifySarStandard: true, verifySarStandard: true,
} }
}) })
}else if (mes.taskInfo === '标准法规部标准化工程师发布'){ }else if (row.taskInfo === '主起草人培训'){
this.$router.push({ this.$router.push({
name: 'bussLibrary12', name: 'bussLibrary12',
query: { query: {
type: 'buss1', taskIds: row.taskIds,
processName: mes.taskInfo, prcId: row.prcId,
bpnId: id, prcNum: row.prcNum,
verifySarStandard: true, prcName: row.prcName,
prcType: row.prcType
}
})
}else if (row.taskInfo === '标准法规部标准化工程师发布'){
this.$router.push({
name: 'bussLibrary13',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
} }
}) })
} }