|
@@ -144,6 +144,9 @@
|
|
|
<div><el-input type="textarea" :rows="2" placeholder="请输入审核意见" v-model="textarea">
|
|
|
</el-input>
|
|
|
</div>
|
|
|
+ <!-- .pdf, .doc, .docx, .xls, .xlsx -->
|
|
|
+ <ws-upload ref="upload" accept=".jpg, .jpeg, .png," :comp-id="compId" :appendix-ids="auditList" :limit="99"
|
|
|
+ :size-limit="size" @onChange="auditUrlChange" @uploadSuccess="uploadSuccess" />
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button @click="rejectshow = false">取 消</el-button>
|
|
|
<el-button type="primary" @click="rejectclick">确 定</el-button>
|
|
@@ -155,7 +158,7 @@
|
|
|
accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
|
|
|
</WinseaContentModal>
|
|
|
<el-dialog width="50%" :visible.sync="dialogVisible1" title="审核记录">
|
|
|
- <div style="padding: 20px" v-for="(item, index) in recordList" :style="{
|
|
|
+ <div style="padding: 20px" v-for="(item, index) in recordList" :key="index" :style="{
|
|
|
'border-bottom':
|
|
|
index != recordList.length - 1 ? '1px solid #ccc' : 'none',
|
|
|
}">
|
|
@@ -163,7 +166,7 @@
|
|
|
{{ item.operateUser }}({{ item.approveResult == 1 ? '已通过' : '已驳回' }})
|
|
|
</div>
|
|
|
<div style="width: 100%; text-align: left">
|
|
|
- {{ item.verifyRemark }}
|
|
|
+ {{ item.verifyRemark?item.verifyRemark.split("##")[0]:"" }}
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
@@ -228,7 +231,9 @@ export default {
|
|
|
compId: localStorage.getItem('ws-pf_compId'),
|
|
|
currectdata: {},
|
|
|
dialogVisible1: false,
|
|
|
- recordList: []
|
|
|
+ recordList: [],
|
|
|
+ auditList:[],
|
|
|
+ auditUrl:""
|
|
|
}
|
|
|
},
|
|
|
activated() {
|
|
@@ -239,12 +244,32 @@ export default {
|
|
|
this.getList()
|
|
|
},
|
|
|
methods: {
|
|
|
+ auditUrlChange() {//审核附件
|
|
|
+ this.$refs.upload
|
|
|
+ .handleSaveBill()
|
|
|
+ .then(async response => {
|
|
|
+ this.auditList = response
|
|
|
+ // this.deptBudgetList.addressUrl = response
|
|
|
+ })
|
|
|
+ .catch(res => {
|
|
|
+ EventBus.$emit('error', (JSON.parse(res) || {}).message)
|
|
|
+ this.$refs.upload.clearFiles()
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 上传附件
|
|
|
+ uploadSuccess(data, files) {
|
|
|
+ if (!this.auditUrl) {
|
|
|
+ this.auditUrl = data.appendixPath
|
|
|
+ } else {
|
|
|
+ this.auditUrl = this.auditUrl + "," + data.appendixPath
|
|
|
+ }
|
|
|
+ },
|
|
|
rejectclick() {
|
|
|
if (this.title == '驳回') {
|
|
|
woekflowhandle({
|
|
|
taskId: this.currectdata.taskId,
|
|
|
approved: false,
|
|
|
- auditMind: this.textarea,
|
|
|
+ auditMind: this.textarea+ "##" + this.auditUrl,
|
|
|
needReapply: true,
|
|
|
}).toPromise()
|
|
|
.then((response) => {
|
|
@@ -264,7 +289,7 @@ export default {
|
|
|
woekflowhandle({
|
|
|
taskId: this.currectdata.taskId,
|
|
|
approved: true,
|
|
|
- auditMind: this.textarea,
|
|
|
+ auditMind: this.textarea+ "##" + this.auditUrl,
|
|
|
needReapply: true,
|
|
|
}).toPromise()
|
|
|
.then((response) => {
|