LAPTOP-FO2T5SIU\35838 6 月之前
父节点
当前提交
d4a3241b31

+ 1 - 1
src/views/transactionRecord/convertRecordIndex.vue

@@ -53,7 +53,7 @@
       </el-col>
       <el-col :span="4">
         <el-select
-          v-model="search.contentType"
+          v-model="search.convertType"
           style="width: 100%"
           clearable
           filterable

+ 18 - 11
src/views/workflow/components/myProcess/applyPayment.vue

@@ -2,6 +2,7 @@
   <!--    加班申请单 发起付款申请(不要调用接口的)-->
 
   <el-dialog
+    v-loading="loading1"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
     :visible.sync="dialogVisible"
@@ -13,7 +14,6 @@
     class="statistic_base"
     :modal-append-to-body="true"
     custom-class="tagdialog"
-    v-loading="loading1"
   >
     <div class="tabsdom">
       <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -34,7 +34,7 @@
               <el-row :gutter="15">
                 <el-col :span="24">
                   <el-form-item label="标题" prop="titlexxx">
-                    <el-input v-model="formData.title" placeholder="付款领用单-年月日" readonly/>
+                    <el-input v-model="formData.title" placeholder="付款领用单-年月日" readonly />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -121,7 +121,7 @@
                 <!--                  <el-col :span="24">formData.applyPayMoneyUppercase={{formData.applyPayMoneyUppercase}}</el-col>-->
 
                 <el-col :span="7">
-                  <el-form-item label="相关附件">
+                  <el-form-item label="相关附件111">
                     <el-upload
                       :action="$constant.BASE_URI+'/FileController/upload'"
                       :file-list="formData.fileUrlList"
@@ -133,7 +133,7 @@
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">
-                          <i class="el-icon-delete" @click="handlePictureRemove(file,formData.fileUrlList)" />
+                          <i class="el-icon-delete" @click="handlePictureRemoveXF66(file,formData.fileUrlList)" />
                         </span>
                       </div>
                     </el-upload>
@@ -201,7 +201,7 @@ export default {
     mixins: [Base, BaseData],
     data() {
         return {
-            loading1:false,
+            loading1: false,
             loading: false,
             nodeColor: [
                 { name: '审核通过', nodeback: '#2A3980' },
@@ -214,8 +214,8 @@ export default {
             dialogVisible: false,
 
             formData: {
-                payerName: '无锡市安居投资发展有限公司'
-
+                payerName: '无锡市安居投资发展有限公司',
+                fileUrlList: []
             },
             userinfo: {},
             activeName: 'first',
@@ -485,14 +485,21 @@ export default {
         // this.initProject({ /* signstatus: '2,3'*/ })
     },
     methods: {
-        handlePictureRemove(file, fileUrlList) {
+        handlePictureRemoveXF66(file, fileUrlList) {
             var index = fileUrlList.indexOf(file)
-            fileUrlList.splice(index, 1)
+            this.$nextTick((e) => {
+                this.formData.fileUrlList.splice(index, 1)
+            })
+            const formDataFileUrlList = JSON.parse(JSON.stringify(this.formData.fileUrlList))
+            this.formData.fileUrlList = []
+            this.formData.fileUrlList = formDataFileUrlList
+            this.$forceUpdate()
         },
         uploadFile: function(param) {
             const _this = this
             upload(param, true).then((res) => {
                 _this.formData.fileUrlList.push(res)
+                console.log(' _this.formData.fileUrlList', _this.formData.fileUrlList)
             })
         },
         swapper(n) {
@@ -618,11 +625,11 @@ export default {
             console.log(this.userinfo)
         },
         async getMaxNum() {
-            const { data: maxNum } = await this.baseRequest1('ApplyPaymentSettleController', 'getMaxNum', {  })
+            const { data: maxNum } = await this.baseRequest1('ApplyPaymentSettleController', 'getMaxNum', { })
 
             this.formData.title = maxNum
             this.loading1 = false
-            console.log(maxNum,this.formData.title)
+            console.log(maxNum, this.formData.title)
         },
         baseRequest1(prefix, opUrl, postData) {
             return this.$channel.globleRequest(prefix, opUrl, postData, 'project task')