|
|
@@ -22,7 +22,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-button size="mini" type="primary" @click="dialogCheck(1,scope.row)">查看</el-button>
|
|
|
<el-button size="mini" type="danger" v-if="scope.row.sts != 1"
|
|
|
- @click="dialogCheck(2,scope.row)">审批</el-button>
|
|
|
+ @click="dialogCheck(2,scope.row)">处理</el-button>
|
|
|
<!-- <el-button size="mini" type="danger" @click="delLine(scope.row)">删除</el-button> -->
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -41,42 +41,46 @@
|
|
|
<div class="info-line">
|
|
|
<el-form-item>
|
|
|
<span>文件名称</span>
|
|
|
- <el-input v-model="infoApply.tit" placeholder="文件名称" disabled></el-input>
|
|
|
+ <el-input v-model="infoApply.tit" placeholder="文件名称" :disabled="mydisable"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
<span>信息类型</span>
|
|
|
- <el-input v-model="infoApply.xxlx" placeholder="信息类型" disabled></el-input>
|
|
|
+ <el-input v-model="infoApply.xxlx" placeholder="信息类型" :disabled="mydisable"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
<span>项目分类</span>
|
|
|
- <el-input v-model="infoApply.xmfl" placeholder="项目分类" disabled></el-input>
|
|
|
+ <el-input v-model="infoApply.xmfl" placeholder="项目分类" :disabled="mydisable"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
<span>发送时间</span>
|
|
|
- <el-date-picker style="display: inline-flex;width: calc(100% - 100px);" disabled
|
|
|
+ <el-date-picker style="display: inline-flex;width: calc(100% - 100px);" :disabled="mydisable"
|
|
|
v-model="infoApply.fssj" type="daterange" placeholder="发送时间">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
<span>公务卡</span>
|
|
|
- <el-input v-model="infoApply.gwk" placeholder="是否已剔除公务卡" disabled>
|
|
|
+ <el-input v-model="infoApply.gwk" placeholder="是否已剔除公务卡" :disabled="mydisable">
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
<el-form-item class="info-line online">
|
|
|
<span>背景说明</span>
|
|
|
- <el-input v-model="infoApply.bjsm" placeholder="背景说明" type="textarea" :rows="3" disabled>
|
|
|
+ <el-input v-model="infoApply.bjsm" placeholder="背景说明" type="textarea" :rows="3" :disabled="mydisable">
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item class="info-line online">
|
|
|
<span>文件内容</span>
|
|
|
- <el-input v-model="infoApply.wjnr" placeholder="补充说明" type="textarea" :rows="3" disabled>
|
|
|
+ <el-input v-model="infoApply.wjnr" placeholder="补充说明" type="textarea" :rows="3" :disabled="mydisable">
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
- <div style="padding:0 20px 0 100px;margin-bottom: 20px;">
|
|
|
+ <div style="padding:0 20px 0 100px;margin-bottom: 20px;" v-if="mydisable">
|
|
|
<uploadDown :datalist="datalist" :dialogStatus="uploadstatus"></uploadDown>
|
|
|
</div>
|
|
|
- <el-form-item class="info-line online">
|
|
|
+ <div style="padding-left: 80px" v-if="!mydisable">
|
|
|
+ <myUpload @uploadBack="uploadBack" :fileInfo="fileInfo" :fileList="fileInfo.fileList">
|
|
|
+ </myUpload>
|
|
|
+ </div>
|
|
|
+ <el-form-item class="info-line online" v-if="mydisable">
|
|
|
<span>审批说明</span>
|
|
|
<el-input v-model="infolist.remark" placeholder="审批说明" type="textarea" :rows="3"
|
|
|
:disabled="disableStatus">
|
|
|
@@ -85,22 +89,22 @@
|
|
|
<div style="margin-bottom: 20px;padding: 0 20px;">
|
|
|
<el-table class="com-table" ref="multipleTable" :data="rovaList" tooltip-effect="dark" size="small"
|
|
|
border style="width: 100%">
|
|
|
- <el-table-column prop="procId" label="编号">
|
|
|
+ <el-table-column prop="taskId" label="编号">
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="taskName" label="环节">
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="opName" label="处理人">
|
|
|
+ <el-table-column prop="assigneeName" label="处理人">
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="opNo" label="处理人工号">
|
|
|
+ <el-table-column prop="assigneeNo" label="处理人工号">
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="createTime" label="处理时间">
|
|
|
+ <el-table-column prop="opTime" label="处理时间">
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="remark" label="备注">
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
</div>
|
|
|
</el-form>
|
|
|
- <div slot="footer" class="dialog-footer myfooter">
|
|
|
+ <div slot="footer" class="dialog-footer myfooter" v-if="mydisable">
|
|
|
<el-button v-if="!disableStatus && vision != '在线公司操作'" type="primary" @click="dialogCli(2)">同 意
|
|
|
</el-button>
|
|
|
<el-button v-if="!disableStatus && vision != '在线公司操作'" type="primary" @click="dialogCli(1)">驳 回
|
|
|
@@ -108,6 +112,11 @@
|
|
|
<el-button v-if="disableStatus" @click="dialogCli(3)">确 定</el-button>
|
|
|
<el-button @click="dialogCli(3)">取 消</el-button>
|
|
|
</div>
|
|
|
+ <div slot="footer" class="dialog-footer myfooter" v-if="!mydisable">
|
|
|
+ <el-button v-if="!disableStatus && vision != '在线公司操作'" type="primary" @click="dialogCli(2)">发 起
|
|
|
+ </el-button>
|
|
|
+ <el-button @click="dialogCli(3)">取 消</el-button>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
|
|
|
@@ -156,9 +165,9 @@
|
|
|
loading: false,
|
|
|
loadinged: false,
|
|
|
fileInfo: {
|
|
|
- limit: 10,
|
|
|
- url: '/market/cwo/upload',
|
|
|
- fileList: []
|
|
|
+ limit: 5,
|
|
|
+ url: '/bpm/api/upload',
|
|
|
+ fileList: []
|
|
|
},
|
|
|
infoApply: {},
|
|
|
rovaList: [],
|
|
|
@@ -168,7 +177,11 @@
|
|
|
type: 1
|
|
|
},
|
|
|
uploadstatus: false,
|
|
|
- rovaList:[]
|
|
|
+ rovaList:[],
|
|
|
+ mydisable:false,
|
|
|
+ opname:'',
|
|
|
+ opno:'',
|
|
|
+ attList:[]
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
@@ -198,7 +211,7 @@
|
|
|
data: v,
|
|
|
}).then((res) => {
|
|
|
this.tableData = res.data.data;
|
|
|
- this.total = res.data.data.totalRecord;
|
|
|
+ this.total = res.data.totalRecord;
|
|
|
this.loading = false;
|
|
|
});
|
|
|
},
|
|
|
@@ -211,12 +224,16 @@
|
|
|
dialogCheck(v, n) {
|
|
|
this.dialogStatus = true;
|
|
|
this.infolist = Object.assign({}, n);
|
|
|
+ this.mydisable = true;
|
|
|
if (v === 1) {
|
|
|
this.titname = '查看';
|
|
|
this.disableStatus = true;
|
|
|
} else if (v === 2) {
|
|
|
this.titname = '修改';
|
|
|
this.disableStatus = false;
|
|
|
+ if(n.opName == this.userInfo.loginName){
|
|
|
+ this.mydisable = false;
|
|
|
+ }
|
|
|
} else if (v === 3) {
|
|
|
this.$router.push({
|
|
|
path: '/groupAdd',
|
|
|
@@ -235,6 +252,8 @@
|
|
|
},
|
|
|
}).then((res) => {
|
|
|
// this.infolist = Object.assign({}, res.data);
|
|
|
+ this.opname = res.data.opName;
|
|
|
+ this.opno = res.data.opNo;
|
|
|
this.infoApply = JSON.parse(res.data.params.terminalRes);
|
|
|
if (res.data.taskList[res.data.taskList.length - 1].taskName == '需求审批') {
|
|
|
this.vision = '需求审批';
|
|
|
@@ -244,6 +263,22 @@
|
|
|
this.vision = '';
|
|
|
}
|
|
|
this.datalist.attList = JSON.parse(res.data.params.attList);
|
|
|
+ this.attList = [];
|
|
|
+ this.fileInfo.fileList = [];
|
|
|
+ this.datalist.attList.forEach(item => {
|
|
|
+ this.fileInfo.fileList.push({
|
|
|
+ name: item.fileName,
|
|
|
+ url: '',
|
|
|
+ id: item.id,
|
|
|
+ fileName: item.fileName
|
|
|
+ });
|
|
|
+ this.attList.push({
|
|
|
+ name: item.fileName,
|
|
|
+ url: '',
|
|
|
+ id: item.id,
|
|
|
+ fileName: item.fileName
|
|
|
+ });
|
|
|
+ })
|
|
|
this.rovaList = res.data.taskList;
|
|
|
this.uploadstatus = true;
|
|
|
});
|
|
|
@@ -258,7 +293,6 @@
|
|
|
this.infolist.opTime = _this.$formatDate(new Date(), "YYYY-MM-DD HH:mm:ss")
|
|
|
this.infolist.opNo = this.userInfo.loginNo;
|
|
|
this.infolist.opName = this.userInfo.loginName;
|
|
|
- console.log(this.infolist)
|
|
|
if (v === 1) {
|
|
|
let params = {
|
|
|
dealType: '1',
|
|
|
@@ -274,7 +308,9 @@
|
|
|
opTime: this.infolist.opTime,
|
|
|
params: {
|
|
|
procExeCondiVal: '不同意',
|
|
|
- terminalRes: JSON.stringify(this.infoApply)
|
|
|
+ terminalRes: JSON.stringify(this.infoApply),
|
|
|
+ assigneeNo:this.opno,
|
|
|
+ assigneeName:this.opname,
|
|
|
},
|
|
|
woNo: this.infolist.woNo,
|
|
|
}
|
|
|
@@ -301,6 +337,22 @@
|
|
|
param.params.assigneeNo = this.infoApply.secNo;
|
|
|
param.params.assigneeName = this.infoApply.secName;
|
|
|
}
|
|
|
+ if (!this.mydisable) {
|
|
|
+ let attList = [];
|
|
|
+ for (let i = 0; i < this.attList.length; i++) {
|
|
|
+ attList.push({
|
|
|
+ id: this.attList[i].id,
|
|
|
+ fileCode: this.attList[i].fileCode,
|
|
|
+ fileName: this.attList[i].fileName,
|
|
|
+ opName: this.attList[i].opName,
|
|
|
+ opNo: this.attList[i].opNo,
|
|
|
+ opTime: this.attList[i].opTime,
|
|
|
+ woNo: this.infolist.woNo,
|
|
|
+ attchFileId: this.attList[i].attchFileId,
|
|
|
+ });
|
|
|
+ }
|
|
|
+ param.params.attList = JSON.stringify(attList)
|
|
|
+ }
|
|
|
this.submitInfo("/bpm/api/submitTask", param);
|
|
|
}
|
|
|
},
|
|
|
@@ -384,8 +436,8 @@
|
|
|
},
|
|
|
//文件返回值
|
|
|
uploadBack(v) {
|
|
|
- console.log(v)
|
|
|
- },
|
|
|
+ this.attList = v;
|
|
|
+ },
|
|
|
//功能栏
|
|
|
iconCli(v) {
|
|
|
if (v === 1) {
|
liyuanpeng