-
-
{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
@@ -248,7 +260,7 @@ import {
processCreateStand,
changeAssigneeNew,
queryTaskFirst,
- getBusStandFileByAttId, saveTaskFirst, processCreateBuss, taskDel, evaluationHisList
+ getBusStandFileByAttId, saveTaskFirst, processCreateBuss, taskDel, evaluationHisList, saveTaskForPub
} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import CusTomDataPickerGroup
@@ -329,9 +341,8 @@ export default {
}
}]
},
+ taskInfo:'发布',
loading: false,
- drawerModal: false,
- assigneeNewLoading: false,
dataLoading: true,
disabledState: true,
userId:this.$store.getters.userInfo.account,
@@ -347,7 +358,9 @@ export default {
LSBBBUSSFileList: [],
QTWJBUSSFileList: [],
GLWJBUSSFileList: [],
+ summaryFileList: [],
XGDFileList: [],
+ madelSubList: [],
caFileList: [],
FBGBJBDFileList: [],
ZCWBLAWSFileList: [],
@@ -385,6 +398,7 @@ export default {
// 任务分解单数据
taskTableData: []
},
+ tablePHeight:'',
tableHeight: {
standardTableHeight: null
},
@@ -421,6 +435,7 @@ export default {
replaceLawsNumRow: [], // 代替政策号 数组内容
replaceTotal: 0,
selectedListRep: [],
+ selListRep2: [],
replaceLoading: true,
replacePage: 1,
ListModel: false, // 新增编辑抽屉开关
@@ -439,6 +454,8 @@ export default {
children: 'children',
label: 'model'
},
+ modalShowFlagZRBM: false,
+ nodeListZRBM: [],
nodeList: [],
nodeList2: [],
zrType: '',
@@ -449,6 +466,7 @@ export default {
children: 'children',
label: 'name'
},
+ formKey:1,
key:1,
key1:2,
key2:3,
@@ -464,6 +482,7 @@ export default {
multipleFlag2:'',
url:'',
urlChild:'',
+ drawerModal: false,
drawerTitle: '', //drawer标题
showCheckBox: true, // 树形控件是否展示多选框
nodeKey: 'id',
@@ -481,7 +500,6 @@ export default {
form: {
selListRep2:[],
id:'',
- standNum:'',
standStatus:'', // 标准状态
planId:'',
planStatus:'',
@@ -490,10 +508,13 @@ export default {
modelData:[],
modelDataNameVerify:[],
modelDataZrUserVerify:[],
+ summaryFile:'',
+ summaryFileName:'',
+ madelSub:'',
+ madelSubName:'',
BARQ: '',
XGD: '',
XGDName: '',
- // 基础信息
country:[],
// 基础信息
standSort: '',
@@ -519,14 +540,20 @@ export default {
// 适用范围
QCDW: '',
QCRBUSS: '',
- WJSCRYBUSS: this.$store.getters.userInfo.account,
- WJSCRYBUSSName: this.$store.getters.userInfo.userName,
+ WJSCRYBUSS: this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.account)+')',
+ WJSCRYBUSSName: this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.account)+')',
SYCXCLASS: '',
NYLXCLASS: '',
SYCPXCLASS: '',
TXLBBUSS: '',
VPPSBMBUSS: '',
VPPSCNBUSS: '',
+ KCVPPSBMBUSS: '',
+ KCVPPSCNBUSS: '',
+ CYCVPPSBMBUSS: '',
+ CYCVPPSCNBUSS: '',
+ DYBXHBUSS: '',
+ DYMCBUSS: '',
// 关联信息
DTQBBHBUSS: '',
BDTQBBHBUSS: '',
@@ -535,6 +562,16 @@ export default {
GLWJBUSS: '',
GLWJBUSSName: '',
XCSJBUSS: '',
+ //流程信息
+ topId:'',
+ prcNum:'',
+ commentText:'',
+ prcName:'',
+ standType: '',
+ CBCD:'',
+ CYBZ:'',
+ YYBZ:'',
+ standNum:'',
}, // 标准信息
roleForm:{
hzUserId: this.$store.getters.userInfo.account,
@@ -543,6 +580,8 @@ export default {
xdUserName: this.$store.getters.userInfo.userName,
pxUserId: this.$store.getters.userInfo.account,
pxUserName: this.$store.getters.userInfo.userName,
+ fbUserId: '',
+ fbUserName: '',
qcUserId: '', // 多实例
qcUserName:'', // 多实例
bzhUserId:'',
@@ -603,7 +642,7 @@ export default {
],
},
rules:{
- commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
+ // commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
zrUserIdName: [
{ required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
@@ -634,8 +673,11 @@ export default {
textStatusBuss: [
{ required: true, message: '请选择文本状态', trigger: 'change' }
],
+ standStatus: [
+ { required: true, message: '请选择标准状态', trigger: 'change' }
+ ],
issueTime: [
- { required: false, message: '请选择企标发布日期', trigger: 'change'}
+ { required: true, message: '请选择企标发布日期', trigger: 'change'}
],
FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
@@ -722,6 +764,13 @@ export default {
}
}
},
+ 'form.standSort': {
+ handler (val) {
+ if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+ this.getStandInfoByReviseStatus("")
+ }
+ }
+ },
filterText(val) {
this.$refs.tree.filter(val);
},
@@ -732,6 +781,27 @@ export default {
},
},
methods: {
+ checkedRoleTransfer (data) {
+ this.isSubmit = true
+ this.saveLoading = true
+ changeAssigneeNew({
+ taskId: this.$route.query.taskIds, // 任务id
+ userId:this.$store.getters.userInfo.account, // 委托人
+ assignee: data[0].id, // 被委托人
+ pId: this.$route.query.prcId, // 流程实例
+ }).then(res => {
+ this.isSubmit = false
+ this.saveLoading = false
+ if (res.success) {
+ this.drawerModal = false
+ this.$message.success('调整成功')
+ this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ this.processNum()
+ } else {
+ this.$message.warning(res.message)
+ }
+ })
+ },
drawerCheckZRBM(data) {
let idList = ''
let nameList = ''
@@ -785,9 +855,11 @@ export default {
formChoiceZRRListCancel(type, title, id){
this.choiceZRRList(type, title, id)
},
- formSelectLawsCancel(replaceLawsNumModel,replaceLawType){
+ formSelectLawsCancel(replaceLawsNumModel,replaceLawType,title){
+ this.replaceLawsNumForm.numberName = ""
this.replaceLawsNumModel = replaceLawsNumModel
this.replaceLawType = replaceLawType
+ this.config.attrName = title
this.getReplaceLawsNumRow()
},
emitDataLoading(boo){
@@ -999,30 +1071,35 @@ export default {
if (!value) return true;
return data.name.indexOf(value) !== -1;
},
- getTaskId () {
- if(this.$route.query.bpnId){
- queryTaskFirst({
- bpnId: this.$route.query.bpnId
- }).then(res => {
- this.verifySarStandard = this.$route.query.verifySarStandard
- let mes = JSON.parse(res.mes)
- mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
- this.form = mes.form
- this.getStandInfoByReviseStatus()
- this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
- this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
- this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
- this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
- this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
- this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
- this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
- this.roleForm = mes.roleForm
- this.commentText = mes.commentText
- this.formKey++
- })
- }else {
- this.form.XCSJBUSS = this.dateFormatter()
+ getTaskId (mesg) {
+ this.form = mesg.form
+ this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
+ this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+ this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+ this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+ this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.account)+')'
+ this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.account)+')'
+ this.getStandInfoByReviseStatus()
+ this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
+ this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
+ this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
+ this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
+ this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
+ this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+ this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
+ this.roleForm = mesg.roleForm
+ this.formTongGuo.commentText = mesg.commentText
+ this.formKey++
+ },
+ filterObj(obj){
+ if(obj && obj !== ''){
+ if(obj instanceof Array){
+ return obj;
+ }else {
+ return obj.split(",")
+ }
}
+ return "";
},
// 将文本状态的id与name对应
setMap(data){
@@ -1498,10 +1575,14 @@ export default {
let textArr2 = []
this.selectedListRep.map((item) => {
let texts = ''
- if (item.standYear != null && item.standYear !== '') {
- texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
- } else {
- texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+ if(item.standCode !== null && item.standCode !== ''){
+ texts = item.standCode
+ }else {
+ if (item.standYear != null && item.standYear !== '') {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+ } else {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+ }
}
textArr2.push(item.standNumber)
textArr.push(texts)
@@ -1512,14 +1593,14 @@ export default {
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'DTQBBHBUSS'){
- this.form.DTQBBHBUSS = textArr.join(',')
+ this.form.DTQBBHBUSS = this.filterSetData(textArr.join(','))
}else if(this.replaceLawType === 'yybj'){
this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'cbbh'){
this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'BDTQBBHBUSS'){
- this.form.BDTQBBHBUSS = textArr.join(',')
- this.form.standNum = textArr2.join(',')
+ this.form.BDTQBBHBUSS = this.filterSetData(textArr.join(','))
+ this.form.standNum = this.filterSetData(textArr2.join(','))
}else {
this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
}
@@ -1527,6 +1608,14 @@ export default {
this.$refs.selections.clearSelection()
this.formKey++
},
+ filterSetData(data){
+ const arr=new Set()
+ let permission = data.split(",");
+ permission.forEach((item, index) => {
+ arr.add(item)
+ })
+ return Array.from(arr).join(',');
+ },
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
@@ -1555,6 +1644,7 @@ export default {
// this.$refs.selections.selectAll(false)
// }
// this.sarBussionessLawsEO.replaceLawsNum = ''
+ this.replaceLawsNumForm.numberName = ""
this.replaceLawsNumModel = true
this.replaceLawType = ''
this.replaceLawType = type
@@ -1593,7 +1683,7 @@ export default {
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
- 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 === '.xls' || fileSuffix === '.xlsx') {
return true
} else {
this.spinShow = false
@@ -1676,9 +1766,9 @@ export default {
this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
this.LSBBBUSSFileList.push(fileObj)
break;
- case 'GLWJLAWS':
- this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
- this.GLWJLAWSFileList.push(fileObj)
+ case 'QTWJBUSS':
+ this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
+ this.QTWJBUSSFileList.push(fileObj)
break;
case 'GLWJBUSS':
this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
@@ -1810,6 +1900,19 @@ export default {
popoverHideCancel(){
this.modalShowFlag1 = false
},
+ popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+ if(checkedData && checkedData.length != 0) {
+ if(checkedData.length > 0 && checkedData.length != 0){
+ this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
+ this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
+ }else {
+ this.form.cycvppsbm = checkedData.code
+ this.form.cycvppscn = checkedData.chineseName
+ }
+ this.modalShowFlag2 = false
+ }
+
+ },
popoverHideBusVsCancel(){
this.modalShowFlag2 = false
},
@@ -1862,27 +1965,32 @@ export default {
handleTabs(name) {
this.active = name
},
+ handleTransfer() {
+ this.drawerModal = true
+ this.drawerTitle = '转办处理人'
+ },
//保存
handleSave() {
this.form.country=this.countryArr;
// if(item.country !== undefined && item.country !== null){
// this.sarStandardsInfoEO.country = item.country.split(",");
// }
-
+ this.fileInfoHandle()
this.saveLoading = true
let _formData = new FormData()
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.account)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
+ _formData.append('taskIds', this.taskIds)
_formData.append('prcType', 'buss2')
_formData.append('prcName', '企标制修订-产品标准')
_formData.append('json', JSON.stringify({
taskInfo: this.taskInfo,
form: this.form,
roleForm: this.roleForm,
- commentText: this.commentText
+ commentText: this.formTongGuo.commentText
}))
- saveTaskFirst(_formData).then(res => {
+ saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
@@ -2126,6 +2234,11 @@ export default {
this.form.prcName = this.prcName
this.form.issueTime = this.dateFormatter()
this.form['id'] = item.id
+ this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+ this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+ this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+ this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.account)+')'
+ this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.account)+')'
this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
@@ -2133,6 +2246,12 @@ export default {
this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
this.XGDFileList=this.assemble(item.XGD,item.XGDName);
this.getStandInfoByReviseStatus()
+ const dateArr = []
+ if(item.commentCycleStart && item.commentCycleEnd){
+ dateArr[0] = item.commentCycleStart
+ dateArr[1] = item.commentCycleEnd
+ this.commentCycleDate = dateArr
+ }
this.formKey++
})
},
@@ -2156,14 +2275,12 @@ export default {
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg)
- const dateArr = []
- if(processForm.commentCycleStart && processForm.commentCycleEnd){
- dateArr[0] = processForm.commentCycleStart
- dateArr[1] = processForm.commentCycleEnd
- this.commentCycleDate = dateArr
+ if (processForm.form === undefined) {
+ this.getFormFieldList(processForm)
+ } else {
+ //表单文件处理
+ this.getTaskId(processForm)
}
- this.getFormFieldList(processForm)
- this.formKey++
}
}).catch(e => {
})
@@ -2233,37 +2350,21 @@ export default {
},
processTable () {
- this.$nextTick(() => {
- Promise.all([this.getTaskId()]).then((value) => {
- if(value[0] &&value.length > 0){
- let mes = JSON.parse(value[0].mes)
- mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
- this.form = mes.form
- this.taskIds = mes.taskIds;
- this.pId = mes.pId;
- this.userId = mes.userId;
- this.prcNum = mes.prcNum;
- this.prcName = mes.prcName;
- this.roleForm = mes.roleForm
- this.commentText = mes.commentText
- }
- this.loading = true
- this.$http.get('lawss/activiti/get_list_by_instance', {
- prcNum: this.prcNum,
- sortWord: this.shunxu ? this.paixu : '',
- shunxu: this.shunxu
- }, {
- loading: 'loading',
- _this: this
- }, res => {
- this.detailData = res
- this.loading = false
- }, e => {})
- })
+ this.$http.get("lawss/activiti/get_list_by_instance", {
+ prcNum: this.$route.query.prcNum,
+ sortWord: this.shunxu ? this.paixu : "",
+ shunxu: this.shunxu
+ }, {
+ loading: "loading",
+ _this: this
+ }, res => {
+ this.detailData = res
+ }, e => {
})
},
},
mounted () {
+ // this.getTaskId()
this.getData()
this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
@@ -2296,6 +2397,10 @@ export default {
this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
this.setMap(this.standStateOptions)
})
+ this.tablePHeight = $('.content').height()
+ window.onresize = () => {
+ this.tablePHeight = $('.content').height()
+ }
this.busVsFunc()
this.modelFunc()
}
diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step4.vue b/src/pages/processCenter/pages/phone/qbrk-product/step4.vue
index afd1bd61f..e3b015bbe 100644
--- a/src/pages/processCenter/pages/phone/qbrk-product/step4.vue
+++ b/src/pages/processCenter/pages/phone/qbrk-product/step4.vue
@@ -55,42 +55,113 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+