2 Revize 9ed84ef52a ... ba9e37b23f

Autor SHA1 Zpráva Datum
  zhongtianhaoyuan ba9e37b23f Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc před 1 rokem
  zhongtianhaoyuan 8528eb2e4e 通用审核上传附件 před 1 rokem
1 změnil soubory, kde provedl 30 přidání a 5 odebrání
  1. 30 5
      src/views/universalityAudit/audit.vue

+ 30 - 5
src/views/universalityAudit/audit.vue

@@ -144,6 +144,9 @@
       <div><el-input type="textarea" :rows="2" placeholder="请输入审核意见" v-model="textarea">
       <div><el-input type="textarea" :rows="2" placeholder="请输入审核意见" v-model="textarea">
         </el-input>
         </el-input>
       </div>
       </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">
       <span slot="footer" class="dialog-footer">
         <el-button @click="rejectshow = false">取 消</el-button>
         <el-button @click="rejectshow = false">取 消</el-button>
         <el-button type="primary" @click="rejectclick">确 定</el-button>
         <el-button type="primary" @click="rejectclick">确 定</el-button>
@@ -155,7 +158,7 @@
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
     </WinseaContentModal>
     </WinseaContentModal>
     <el-dialog width="50%" :visible.sync="dialogVisible1" title="审核记录">
     <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':
         'border-bottom':
           index != recordList.length - 1 ? '1px solid #ccc' : 'none',
           index != recordList.length - 1 ? '1px solid #ccc' : 'none',
       }">
       }">
@@ -163,7 +166,7 @@
           {{ item.operateUser }}({{ item.approveResult == 1 ? '已通过' : '已驳回' }})
           {{ item.operateUser }}({{ item.approveResult == 1 ? '已通过' : '已驳回' }})
         </div>
         </div>
         <div style="width: 100%; text-align: left">
         <div style="width: 100%; text-align: left">
-          {{ item.verifyRemark }}
+          {{ item.verifyRemark?item.verifyRemark.split("##")[0]:"" }}
         </div>
         </div>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -228,7 +231,9 @@ export default {
       compId: localStorage.getItem('ws-pf_compId'),
       compId: localStorage.getItem('ws-pf_compId'),
       currectdata: {},
       currectdata: {},
       dialogVisible1: false,
       dialogVisible1: false,
-      recordList: []
+      recordList: [],
+      auditList:[],
+      auditUrl:""
     }
     }
   },
   },
   activated() {
   activated() {
@@ -239,12 +244,32 @@ export default {
     this.getList()
     this.getList()
   },
   },
   methods: {
   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() {
     rejectclick() {
       if (this.title == '驳回') {
       if (this.title == '驳回') {
         woekflowhandle({
         woekflowhandle({
           taskId: this.currectdata.taskId,
           taskId: this.currectdata.taskId,
           approved: false,
           approved: false,
-          auditMind: this.textarea,
+          auditMind: this.textarea+ "##" + this.auditUrl,
           needReapply: true,
           needReapply: true,
         }).toPromise()
         }).toPromise()
           .then((response) => {
           .then((response) => {
@@ -264,7 +289,7 @@ export default {
         woekflowhandle({
         woekflowhandle({
           taskId: this.currectdata.taskId,
           taskId: this.currectdata.taskId,
           approved: true,
           approved: true,
-          auditMind: this.textarea,
+          auditMind: this.textarea+ "##" + this.auditUrl,
           needReapply: true,
           needReapply: true,
         }).toPromise()
         }).toPromise()
           .then((response) => {
           .then((response) => {