Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/workflow/components/myProcess/changeClient.vue

src/views/invoice/components/addInvoice.vue

@@ -190,9 +190,6 @@ export default {
             this.baseRequest('getById', postData).then(res => {
                 if (res.data) {
                     this.form = res.data
-                    if (res.data.sendStatus == '0') {
-                        this.getBankTaxRateByFloor()
-                    }
                 }
             }).catch(err => {
                 this.$message.error(err)
@@ -203,8 +200,8 @@ export default {
                 this.bankOptions = res.data || []
             })
         },
-        getBankTaxRateByFloor() {
-            this.baseRequest('getBankTaxRateByFloor', { id: this.form.id }).then(res => {
+        getBankTaxRateByFloor(data) {
+            this.baseRequest('getBankTaxRateByFloor_2', data).then(res => {
                 if (res.data) {
                     this.form.invoiceSellerBank = res.data.invoiceSellerBank
                     this.form.invoiceTax = res.data.invoiceTax
@@ -240,11 +237,18 @@ export default {
             console.log('data', data)
             this.dialogVisible = false
             const postData = {
-                id: data
+                id: data,
+                invoiceGoodsName: '*房地产预收款*&'
             }
             this.baseRequest('getByContractId', postData).then(res => {
                 if (res.data) {
                     this.form = res.data
+                    // 带出银行
+                    const postData = {
+                        contractId: data,
+                        paymentType: '房款'
+                    }
+                    this.getBankTaxRateByFloor(postData)
                 }
             })
         },

src/views/invoice/formalInvoiceManage.vue

@@ -103,7 +103,7 @@
       <el-col :span="24" style="margin-top: 20px">
         <el-button size="small" class="ch-button-warning" @click="handleReset()"><i class="el-icon-refresh" />&nbsp;重置</el-button>
         <el-button size="small" class="ch-button" @click="handleSearch()"><i class="el-icon-search" />&nbsp;查询</el-button>
-        <el-button size="small" class="ch-button-export" @click="batchInvoice()">批量开票</el-button>
+        <el-button size="small" class="ch-button-export" @click="batchInvoice()">批量推送</el-button>
         <!--        <el-button size="small" type="danger" @click="handleBatchBadDebt()">红冲</el-button>-->
         <el-button size="small" class="ch-button-export" :loading="excelFlag" @click="handleExportAll()">导出</el-button>
       </el-col>
@@ -156,7 +156,7 @@
           </el-table-column>
           <el-table-column header-align="center" label="操作" width="180">
             <template scope="scope">
-              <el-button v-if="scope.row.sendStatus === '0'" type="text" size="mini" @click="handleInvoice(scope.row)">开票</el-button>
+              <el-button v-if="scope.row.sendStatus === '0'" type="text" size="mini" @click="handleInvoice(scope.row)">推送</el-button>
               <el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button>
             </template>
           </el-table-column>
@@ -313,7 +313,7 @@ export default {
         },
         batchInvoice() {
             if (!this.selected.length) {
-                this.$message.warning('请先勾选要批量开票的数据')
+                this.$message.warning('请先勾选要批量推送的数据')
                 return
             }
             let check = true
@@ -323,11 +323,11 @@ export default {
                 }
             })
             if (!check) {
-                this.$message.warning('仅可对待推送的数据进行批量开票')
+                this.$message.warning('仅可对待推送的数据进行批量推送')
                 return
             }
             this.dialogBatchVisible = true
-            this.dialogBatchTitle = '批量开票'
+            this.dialogBatchTitle = '批量推送'
             this.$nextTick(() => {
                 this.$refs.batchInvoice.initData(this.selected)
             })

src/views/invoice/invoiceManage.vue

@@ -5,19 +5,19 @@
         <span>买受人</span>
       </el-col>
       <el-col :span="4" class="col-input">
-        <el-input style="width: 100%" v-model="search.buyerName" @keyup.enter.native="handleSearch()" />
+        <el-input v-model="search.buyerName" style="width: 100%" @keyup.enter.native="handleSearch()" />
       </el-col>
       <el-col :span="2" class="col-txt">
         <span>房屋</span>
       </el-col>
       <el-col :span="4" class="col-input">
-        <el-input style="width: 100%" v-model="search.houseName" @keyup.enter.native="handleSearch()" />
+        <el-input v-model="search.houseName" style="width: 100%" @keyup.enter.native="handleSearch()" />
       </el-col>
       <el-col :span="2" class="col-txt">
         <span>推送状态</span>
       </el-col>
       <el-col :span="4" class="col-input">
-        <el-select style="width: 100%" v-model="search.sendStatus" placeholder="请选择" popper-class="statistic_base">
+        <el-select v-model="search.sendStatus" style="width: 100%" placeholder="请选择" popper-class="statistic_base">
           <el-option
             v-for="item in dc_data.SEND_STATUS"
             :key="item.value"
@@ -31,8 +31,8 @@
       </el-col>
       <el-col :span="4" class="col-input">
         <el-select
-            style="width: 100%"
           v-model="search.invoiceStatus"
+          style="width: 100%"
           filterable
           popper-class="statistic_base"
         >
@@ -121,8 +121,8 @@
           <el-table-column label="网签备案号" prop="recordNumber" />
           <el-table-column label="买受人" prop="buyerName" width="200" />
           <el-table-column label="房屋" prop="houseName" width="200" />
-          <el-table-column label="应收（元）" prop="receivableMoney" />
-          <el-table-column label="已收（元）" prop="receivedMoney" />
+          <el-table-column label="应收（元）" prop="receivableMoney" width="100" />
+          <el-table-column label="已收（元）" prop="receivedMoney" width="100" />
           <el-table-column label="收款状态" prop="collectionStatusStr" width="110">
             <template scope="scope">
               <span
@@ -260,10 +260,12 @@ export default {
             item.collectionStatusStr = this.dc_map.HOUSE_PAYMENT_STATUS[item.collectionStatus]
             return item
         },
-        handleAdd(val) {
+        handleAdd() {
             this.dialogVisible = true
             this.dialogTitle = ''
-            val.isView = false
+            const val = {
+                isView: false
+            }
             // 新vue时调用的方法
             this.$nextTick(() => {
                 this.$refs.addInvoice.initData(val)

src/views/receiveRefundsManagement/maintenanceFundsManagement/addFunds.vue

@@ -60,7 +60,7 @@
                       popper-class="statistic_base"
                       :popper-append-to-body="false"
                       :label="item.bankName + (item.bankBranchName?item.bankBranchName:'') + item.bankNumber"
-                      :value="item"
+                      :value="item.id"
                     />
                   </el-select>
                 </el-form-item>
@@ -127,7 +127,7 @@
     </el-form>
     <div style="text-align: right">
       <el-button @click="cancel">取 消</el-button>
-      <el-button v-if="!isView" type="primary" @click="confirmSubmit()">提 交</el-button>
+      <el-button v-if="!isView" :loading="loading" type="primary" @click="confirmSubmit()">提 交</el-button>
     </div>
 
   </div>
@@ -157,7 +157,8 @@ export default {
             isView: false,
             bankOptions: [],
             bankObject: '',
-            contractId: ''
+            contractId: '',
+            loading: false
         }
     },
     mounted() {
@@ -205,6 +206,7 @@ export default {
             const _this = this
             this.$refs.form.validate(valid => {
                 if (valid) {
+                    _this.loading = true
                     const soaUrl = 'add'
                     const extraData = {
                         paymentVoucher: JSON.stringify(_this.fileList),
@@ -224,6 +226,7 @@ export default {
                                 type: 'warning'
                             })
                         }
+                        _this.loading = false
                     }).catch(err => {
                         _this.$message({
                             message: err,
@@ -250,8 +253,8 @@ export default {
                 this.bankOptions = res.data || []
             })
         },
-        bankChange(val) {
-            console.log(val)
+        bankChange(data) {
+            const val = this.bankOptions.findIndex((e) => { data = e.id })
             this.form.bankName = val.bankName
             this.form.bankBranchName = val.bankBranchName
             this.form.bankNumber = val.bankNumber

src/views/receiveRefundsManagement/paymentManagement/addPayment.vue

@@ -82,7 +82,7 @@
                       popper-class="statistic_base"
                       :popper-append-to-body="false"
                       :label="item.bankName + (item.bankBranchName?item.bankBranchName:'') + item.bankNumber"
-                      :value="item"
+                      :value="item.id"
                     />
                   </el-select>
                 </el-form-item>
@@ -141,7 +141,7 @@
     </el-form>
     <div style="text-align: right">
       <el-button @click="cancel">取 消</el-button>
-      <el-button v-if="!isView" type="primary" @click="confirmSubmit()">提 交</el-button>
+      <el-button v-if="!isView" :loading="loading" type="primary" @click="confirmSubmit()">提 交</el-button>
     </div>
 
   </div>
@@ -160,7 +160,9 @@ export default {
         return {
             dc_key: ['CONTENT_TYPE', 'PAYMENT_METHODS', 'COLLECTION_METHODS'],
             form: {
-
+                bankName: '',
+                bankBranchName: '',
+                bankNumber: ''
             },
             rules: {
 
@@ -228,6 +230,7 @@ export default {
             const _this = this
             this.$refs.form.validate(valid => {
                 if (valid) {
+                    this.loading = true
                     const soaUrl = 'add'
                     const extraData = {
                         fileList: JSON.stringify(_this.fileList),
@@ -250,6 +253,7 @@ export default {
                                 type: 'warning'
                             })
                         }
+                        this.loading = false
                     }).catch(err => {
                         _this.$message({
                             message: err,
@@ -274,8 +278,8 @@ export default {
                 this.bankOptions = res.data || []
             })
         },
-        bankChange(val) {
-            console.log(val)
+        bankChange(data) {
+            const val = this.bankOptions.findIndex((e) => { data = e.id })
             this.form.bankName = val.bankName
             this.form.bankBranchName = val.bankBranchName
             this.form.bankNumber = val.bankNumber

src/views/receiveRefundsManagement/paymentManagement/index.vue

@@ -51,7 +51,7 @@
           <el-table-column label="买卖单价（㎡）" prop="housePrice" />
           <el-table-column label="买受人产权份额占比" prop="buyerProportion" />
           <el-table-column label="付款方式" prop="paymentMethodStr" />
-          <el-table-column label="应收房款（元）" prop="totalPrice" />
+          <el-table-column label="应收房款（元）" prop="buyerMoney" />
           <el-table-column label="已收房款（元）" prop="receivedMoney" />
           <el-table-column label="尚欠房款（元）" prop="arrears" />
           <el-table-column label="收款状态" prop="collectionStatusStr" width="110">

src/views/signingManagement/contractManagement/index.vue

@@ -73,7 +73,7 @@
           <el-table-column label="买卖单价（㎡）" prop="housePrice" />
           <el-table-column label="买受人产权份额占比" prop="buyerProportionStr" />
           <el-table-column label="付款方式" prop="paymentMethodStr" />
-          <el-table-column label="应收房款（元）" prop="totalPrice" />
+          <el-table-column label="应收房款（元）" prop="buyerMoney" />
           <el-table-column label="应收专项维修资金（元）" prop="maintenanceFunds" />
           <el-table-column label="合同状态" prop="contractStatusStr" width="110">
             <template scope="scope">

src/views/workflow/components/myProcess/applyAgainPayment.vue

@@ -1,165 +1,174 @@
 <template>
-	<el-dialog
-	 :close-on-click-modal="false"
-	 :close-on-press-escape="false"
-	 :visible.sync="dialogVisible"
-	 title="付款申请单"
-	 top="50px"
-	 width="75%"
-	>
-		<div class="tabsdom">
-			<el-tabs v-model="activeName" @tab-click="handleClick">
-				<el-tab-pane label="加班申请" name="first">
-					<el-card shadow="always" style="padding: 15px 5px 5px 15px">
-						<el-row :gutter="15">
-							<el-form ref="elForm" :model="formData" :rules="rules" label-width="100px">
-								<el-col :span="24">
-									<el-form-item label="姓名">
-										<el-input v-model="userinfo.truename" placeholder="请输入加班申请" readonly>
-										</el-input>
-									</el-form-item>
-								</el-col>
-								<el-col :span="12">
-									<el-form-item label="所在部门">
-										<el-input v-model="userinfo.deptName" placeholder="请输入所在部门" readonly>
-										</el-input>
-									</el-form-item>
-								</el-col>
-								<el-col :span="12">
-									<el-form-item label="岗位">
-										<el-input v-model="userinfo.postName" placeholder="请输入岗位" readonly>
-										</el-input>
-									</el-form-item>
-								</el-col>
-								<el-col :span="24">
-									<el-form-item label="关联项目" prop="proId">
-										<el-select v-model="formData.proId" filterable placeholder="关联项目名称">
-											<el-option
-											 v-for="item in ProjectData"
-											 :key="item.value"
-											 :label="item.label"
-											 :value="item.value"
-											>
-												<span style="float: left">{{ item.label }}</span>
-												<span style="float: right; color: #8492a6; font-size: 13px">{{
-														item.custname
-													}}</span>
-											</el-option>
-										</el-select>
-									</el-form-item>
-
-								</el-col>
-								<el-col :span="24">
-									<el-form-item label="加班事由" prop="applyReasons">
-										<el-input v-model="formData.applyReasons" :autosize="{minRows: 4, maxRows: 4}"
-															placeholder="请输入加班事由"
-															type="textarea"
-										></el-input>
-									</el-form-item>
-								</el-col>
-								<el-col :span="24">
-									<el-form-item label="加班位置" prop="position">
-										<el-radio-group v-model="formData.position" size="medium">
-											<el-radio
-											 v-for="(item, index) in positionOptions"
-											 :key="index" :disabled="item.disabled"
-											 :label="item.value"
-											>
-												{{ item.label }}
-											</el-radio>
-										</el-radio-group>
-									</el-form-item>
-								</el-col>
-								<el-col :span="24">
-
-									<el-form-item label="加班时间">
-										<el-row v-for="(item,index) in applyAddWorkTime">
-											<el-col :span="10">
-												<el-date-picker
-												 v-model="item.startDay"
-												 class="pdr10px mgb10px"
-												 placeholder="选择日期"
-												 type="date"
-
-												 value-format="yyyy-MM-dd"
-												>
-												</el-date-picker>
-											</el-col>
-											<el-col :span="10">
-												<div style="display: flex;align-items: center">
-													<el-time-picker
-													 :disabled="!item.startDay"
-													 @change="getStartTime($event,index)"
-													 value-format="HH:mm"
-													 format="HH:mm"
-													 v-model="item.startTime"
-													 placeholder="开始时间"
-													>
-													</el-time-picker>
-													<div class="zhi">至</div>
-													<el-time-picker
-													 :disabled="!(item.startDay&&item.startTime)"
-													 @input="getEndTime($event,index)"
-													 value-format="HH:mm"
-													 format="HH:mm"
-													 v-model="item.endTime"
-													 placeholder="结束时间"
-													>
-													</el-time-picker>
-												</div>
-											</el-col>
-											<el-col :span="2">
-												<div style="text-align: center">小计{{ item.useTime }}（h）</div>
-											</el-col>
-											<el-col :span="1" class="col-txt" style="text-align: center">
-												&nbsp;
-												<el-button
-												 v-if="index!=0"
-												 circle
-												 icon="el-icon-minus"
-												 @click="spliceListRow(index)"
-												/>
-											</el-col>
-											<el-col :span="1" class="col-txt" style="text-align: center">
-												<el-button
-												 circle
-												 icon="el-icon-plus"
-												 type="primary"
-												 @click="addListRow()"
-												/>
-											</el-col>
-										</el-row>
-										<div class="totalApplyTime">共计加班时长{{ formData.totalAddTime }}（h)</div>
-									</el-form-item>
-
-								</el-col>
-								<el-col :span="24">
-									<el-form-item label="备注">
-										<el-input
-										 v-model="formData.remark"
-										 :autosize="{minRows: 4, maxRows: 4}"
-										 :style="{width: '100%'}"
-										 placeholder="请输入备注"
-										 type="textarea"
-										></el-input>
-									</el-form-item>
-								</el-col>
-							</el-form>
-						</el-row>
-					</el-card>
-				</el-tab-pane>
-				<el-tab-pane label="流程图  " name="second">
-					<add-work-canvas ref="addWorkCanvas"/>
-
-				</el-tab-pane>
-			</el-tabs>
-		</div>
-		<div slot="footer">
-			<el-button @click="dialogVisible=false">取消</el-button>
-
-			<el-button :loading="loading" type="primary" @click="handelConfirm">确定</el-button>
-		</div>
-	</el-dialog>
+  <el-dialog
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    :visible.sync="dialogVisible"
+    title="付款申请单"
+    top="50px"
+    width="75%"
+    :append-to-body="true"
+    :before-close="beforeClose"
+    class="statistic_base"
+    :modal-append-to-body="true"
+    custom-class="tagdialog"
+  >
+      <div class="tabsdom">
+          <el-tabs v-model="activeName" @tab-click="handleClick">
+              <el-tab-pane label="付款申请" name="first">
+
+                  <el-row type="flex" justify="end">
+                      <el-col :span="3" class="col-txt"><span>流程编号:</span></el-col>
+                      <el-col :span="6" class="col-input"><span style="font-size: 14px">{{ formData.flowNum }}</span></el-col>
+                  </el-row>
+                  <el-form
+                      ref="elForm"
+                      :model="formData"
+                      :rules="rules"
+                      label-width="150px"
+                  >
+
+                      <el-card shadow="always" style="padding: 15px 5px 5px 15px">
+                          <el-row :gutter="15">
+                              <el-col :span="24">
+                                  <el-form-item label="标题" prop="title">
+                                      <el-input v-model="formData.title" placeholder="付款领用单-年月日" readonly/>
+                                  </el-form-item>
+                              </el-col>
+                              <el-col :span="12">
+                                  <el-form-item label="创建人">
+                                      <el-input v-model="userinfo.truename" placeholder="创建人" readonly />
+                                  </el-form-item>
+                              </el-col>
+                              <el-col :span="12">
+                                  <el-form-item label="创建部门">
+                                      <el-input v-model="userinfo.deptName" placeholder="创建部门" readonly />
+                                  </el-form-item>
+                              </el-col>
+                              <el-col :span="24">
+                                  <el-form-item label="是否为无合同付款">
+                                      <el-select
+                                          v-model="formData.isNoContract"
+                                          clearable
+                                          filterable
+                                          placeholder="是否为无合同付款"
+                                          style="width: 100%"
+                                          :popper-append-to-body="false"
+                                          popper-class="statistic_base"
+                                      >
+                                          <el-option
+                                              v-for="item in dc_data.ANSWER_NEED"
+                                              :key="item.value"
+                                              :label="item.label"
+                                              :value="item.value"
+                                              :popper-append-to-body="false"
+                                              popper-class="statistic_base"
+                                          />
+                                      </el-select>
+                                  </el-form-item>
+                              </el-col>
+                              <el-col :span="24">
+                                  <el-form-item label="付款单位">
+                                      <el-input v-model="formData.payerName" placeholder="请填写" />
+                                  </el-form-item>
+                              </el-col>
+                              <el-col :span="24">
+                                  <el-form-item label="收款单位">
+                                      <el-input v-model="formData.payeeName" placeholder="请填写" />
+                                  </el-form-item>
+                              </el-col>
+                              <el-col :span="24">
+                                  <el-form-item label="资金用途">
+                                      <el-input v-model="formData.moneyPurpose" placeholder="请填写" />
+                                  </el-form-item>
+                              </el-col>
+                              <el-col :span="24">
+                                  <el-form-item label="合同总价">
+                                      <el-input v-model="formData.contractPrice" oninput="value=value.replace(/[^\d.]/g,'')" placeholder="请填写" />
+                                  </el-form-item>
+                              </el-col>
+
+                              <el-col :span="24">
+                                  <el-form-item label="付款说明">
+                                      <el-input
+                                          v-model="formData.payRemark"
+                                          :autosize="{minRows: 4, maxRows: 4}"
+                                          :style="{width: '100%'}"
+                                          placeholder="请填写"
+                                          type="textarea"
+                                          maxlength="2000"
+                                          show-word-limit
+                                      />
+                                  </el-form-item>
+                              </el-col>
+                              <el-col :span="24">
+                                  <el-form-item label="累计付款">
+                                      <el-input v-model="formData.havePayMoney" oninput="value=value.replace(/[^\d.]/g,'')" placeholder="请填写" />
+                                  </el-form-item>
+                              </el-col>
+                              <el-col :span="12">
+                                  <el-form-item label="申请金额（小写）" prop="applyPayMoney">
+                                      <el-input v-model="formData.applyPayMoney" oninput="value=value.replace(/[^\d.]/g,'')" placeholder="请填写" @change="swapper(formData.applyPayMoney)" />
+                                  </el-form-item>
+                              </el-col>
+                              <el-col :span="12">
+                                  <el-form-item label="申请金额（大写）" prop="applyPayMoneyUppercase">
+                                      <el-input v-model="formData.applyPayMoneyUppercase" placeholder="请填写" />
+                                  </el-form-item>
+                              </el-col>
+                              <!--                  <el-col :span="24">formData.applyPayMoneyUppercase={{formData.applyPayMoneyUppercase}}</el-col>-->
+
+                              <el-col :span="7">
+                                  <el-form-item label="相关附件">
+                                      <el-upload
+                                          :action="$constant.BASE_URI+'/FileController/upload'"
+                                          :file-list="formData.fileUrlList"
+                                          :http-request="uploadFile"
+                                          class="upload-demo"
+                                          multiple
+                                      >
+                                          <el-button size="small" type="primary">上传附件</el-button>
+                                          <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)" />
+                        </span>
+                                          </div>
+                                      </el-upload>
+
+                                  </el-form-item>
+                              </el-col>
+                              <el-col :span="17" />
+                          </el-row>
+                      </el-card>
+
+                  </el-form>
+
+              </el-tab-pane>
+              <el-tab-pane label="流程图  " name="second">
+                  <div style="width: 100%">
+                      <el-row>
+                          <el-col :span="24">
+                              <div class="node_info">
+                                  <div>节点说明：</div>
+                                  <div v-for="item in nodeColor" class="dis_flex">
+                                      <div class="node_class" :style="{backgroundColor: item.nodeback}" />
+                                      {{ item.name }}
+
+                                  </div>
+                              </div>
+                              <div v-show="true" id="containeraddwork" style="width: 100%" />
+                          </el-col>
+                      </el-row>
+                  </div>
+              </el-tab-pane>
+          </el-tabs>
+      </div>
+    <div slot="footer">
+      <el-button @click="dialogVisible=false">取消</el-button>
+
+      <el-button :loading="loading" type="primary" @click="handelConfirm">确定</el-button>
+    </div>
+  </el-dialog>
 
 </template>
 
@@ -171,189 +180,210 @@ import UserSelect from '@/views/components/UserSelect'
 
 const applyAddWorkTime = { useTime: 0 }
 export default {
-	name: 'ApplyPay',
-	mixins: [Base, BaseData],
-	components: {
-		upload, UserSelect
-	},
-	data() {
-		return {
-			row: {},
-			loading: false,
-			dc_key: ['ORDER_STATUS', 'PAY_TYPE', 'BUDGET_FY'],
-			ProjectData: [],
-			dialogVisible: false,
-			applyAddWorkTime: [{ ...applyAddWorkTime }],
-			formData: {
-				proId: '',
-				totalAddTime: 0,
-				applyReasons: '',
-				position: '',
-				applyAddWorkTime: [
-					{
-						useTime: 0
-					}
-				]
-			},
-			userinfo: {},
-			activeName: 'first',
-			rules: {
-
-				proId: [{
-					required: true,
-					message: '请选择关联项目',
-					trigger: 'change'
-				}],
-				applyReasons: [{
-					required: true,
-					message: '请输入加班事由',
-					trigger: 'change'
-				}],
-				position: [{
-					required: true,
-					message: '加班位置不能为空',
-					trigger: 'change'
-				}]
-
-			},
-
-			positionOptions: [
-				{
-					'label': '公司',
-					'value': 1
-				},
-				{
-					'label': '客户处',
-					'value': 2
-				}, {
-					'label': '居家',
-					'value': 3
-				}]
-		}
-	},
-	computed: {},
-	watch: {
-		'applyAddWorkTime': {
-			deep: true,
-			handler(newValue, oldValue) {
-				let totalAddTime = 0
-				for (let i = 0; i < this.applyAddWorkTime.length; i++) {
-					if (this.applyAddWorkTime[i].useTime === 0 || this.applyAddWorkTime[i].useTime) {
-						totalAddTime = totalAddTime + Number(this.applyAddWorkTime[i].useTime)
-					}
-				}
-				console.log(totalAddTime)
-				this.changeAddWorkTime(totalAddTime.toFixed(1))
-			}
-		}
-	},
-	created() {
-
-	},
-	mounted() {
-
-		this.initDict(this.dc_key).then((res) => {
-		})
-		// this.initProject({ /* signstatus: '2,3'*/ })
-
-	},
-	methods: {
-		handleClick(tab, event) {
-			this.canVasStatus = false
-			if (this.activeName == 'second') {
-				this.canVasStatus = true
-				this.$nextTick(() => {
-					this.$refs.addWorkCanvas.createNodeCanvas(this.row)
-
-				})
-			}
-		},
-		changeAddWorkTime(totalAddTime) {
-			this.formData.totalAddTime = totalAddTime
-		},
-		getHour(s1, s2) {
-			var reDate = /\d{4}-\d{1,2}-\d{1,2} /
-
-			s1 = new Date((reDate.test(s1) ? s1 : '2018-1-1 ' + s1).replace(/-/g, '/'))
-			s2 = new Date((reDate.test(s2) ? s2 : '2018-1-1 ' + s2).replace(/-/g, '/'))
-			var ms = s2.getTime() - s1.getTime()
-			if (ms < 0) return 0
-			console.log(ms)
-
-			return (ms / 1000 / 60 / 60).toFixed(1)  //小时
-		},
-		getTimeRange(event, i) {
-			this.$nextTick(() => {
-				this.applyAddWorkTime[i].startTime = this.applyAddWorkTime[i].startDay + ' ' + event[0] + ':00'
-				this.applyAddWorkTime[i].endTime = this.applyAddWorkTime[i].startDay + ' ' + event[1] + ':00'
-				let timeRang = this.getHour(event[0], event[1])
-				this.applyAddWorkTime[i].useTime = timeRang
-			})
-		},
-		async getUserInfo() {
-			let { data: userinfo } = await this.baseRequest1('ApplyAddWorkController', 'getUserInfoByUserId', { userId: '' })
-			this.userinfo = userinfo
-			console.log(this.userinfo)
-		},
-		baseRequest1(prefix, opUrl, postData) {
-			return this.$channel.globleRequest(prefix, opUrl, postData, 'project task')
-		},
-		addListRow() {
-			this.applyAddWorkTime.push({ ...applyAddWorkTime })
-		},
-		spliceListRow(index) {
-			this.applyAddWorkTime.splice(index, 1)
-		},
-		async setVisible(status, row) {
-			this.row = row
-			this.activeName = 'first'
-			this.getUserInfo(row.applyUser)
-			let { data } = await this.baseRequest1('ApplyAddWorkController', 'getInfoByFlowMainId', { flowMainId: row.id })
-			this.formData = data
-			this.formData.flowMainId = data.flowMainId
-			this.applyAddWorkTime = data.applyAddWorkTimeList.map((e) => {
-				return {
-					useTime: e.useTime,
-					startDay: this.$common.transDate(e.startDay),
-					timeRange: [this.$common.transMinute(e.startTime), this.$common.transMinute(e.endTime)],
-					startTime: this.$common.transMinute(e.startTime) + ':00',
-					endTime: this.$common.transMinute(e.endTime) + ':00'
-				}
-			})
-			console.log(this.applyAddWorkTime)
-			// flowMainPushId
-			this.dialogVisible = status
-		},
-		onOpen() {
-		},
-		onClose() {
-			this.$refs['elForm'].resetFields()
-		},
-		close() {
-			this.$emit('update:visible', false)
-		},
-		async handelConfirm() {
-			this.$refs['elForm'].validate(async valid => {
-				if (!valid) return
-				let formData = {
-					...this.formData,
-					applyAddWorkTimeString: JSON.stringify(this.applyAddWorkTime)
-				}
-				delete formData.applyAddWorkTime
-				delete formData.applyAddWorkTimeList
-				console.error('formDataformDataformDataformDataformData', formData)
-				this.loading = true
-				let { data } = await this.baseRequest1('ApplyAddWorkController', 'addApplyAddWorkAgain', { ...formData })
-				this.loading = false
-				if (data.code == 200) {
-					this.$message.success('加班申请发起成功')
-					this.dialogVisible = false
-					this.$emit('getData')
-				}
-				this.close()
-			})
-		}
-	}
+    name: 'ApplyPay',
+    components: {
+        upload, UserSelect
+    },
+    mixins: [Base, BaseData],
+    data() {
+        return {
+            row: {},
+            loading: false,
+            dc_key: ['ORDER_STATUS', 'PAY_TYPE', 'BUDGET_FY'],
+            ProjectData: [],
+            dialogVisible: false,
+            applyAddWorkTime: [{ ...applyAddWorkTime }],
+            formData: {
+                proId: '',
+                totalAddTime: 0,
+                applyReasons: '',
+                position: '',
+                applyAddWorkTime: [
+                    {
+                        useTime: 0
+                    }
+                ]
+            },
+            userinfo: {},
+            activeName: 'first',
+            rules: {
+
+                proId: [{
+                    required: true,
+                    message: '请选择关联项目',
+                    trigger: 'change'
+                }],
+                applyReasons: [{
+                    required: true,
+                    message: '请输入加班事由',
+                    trigger: 'change'
+                }],
+                position: [{
+                    required: true,
+                    message: '加班位置不能为空',
+                    trigger: 'change'
+                }]
+
+            },
+
+            positionOptions: [
+                {
+                    'label': '公司',
+                    'value': 1
+                },
+                {
+                    'label': '客户处',
+                    'value': 2
+                }, {
+                    'label': '居家',
+                    'value': 3
+                }]
+        }
+    },
+    computed: {},
+    watch: {
+        'applyAddWorkTime': {
+            deep: true,
+            handler(newValue, oldValue) {
+                let totalAddTime = 0
+                for (let i = 0; i < this.applyAddWorkTime.length; i++) {
+                    if (this.applyAddWorkTime[i].useTime === 0 || this.applyAddWorkTime[i].useTime) {
+                        totalAddTime = totalAddTime + Number(this.applyAddWorkTime[i].useTime)
+                    }
+                }
+                console.log(totalAddTime)
+                this.changeAddWorkTime(totalAddTime.toFixed(1))
+            }
+        }
+    },
+    created() {
+
+    },
+    mounted() {
+        this.initDict(this.dc_key).then((res) => {
+        })
+        // this.initProject({ /* signstatus: '2,3'*/ })
+    },
+    methods: {
+        handlePictureRemove(file, fileUrlList) {
+            var index = fileUrlList.indexOf(file)
+            fileUrlList.splice(index, 1)
+        },
+        uploadFile: function(param) {
+            const _this = this
+            upload(param, true).then((res) => {
+                _this.formData.fileUrlList.push(res)
+            })
+        },
+        swapper(n) {
+            // console.log('ddd',n)
+            if (!/^(0|[1-9]\d*)(\.\d+)?$/.test(n)) { return '数据非法' }
+            var unit = '千百拾亿千百拾万千百拾元角分'; var str = ''
+            n += '00'
+            var p = n.indexOf('.')
+            if (p >= 0) { n = n.substring(0, p) + n.substr(p + 1, 2) }
+            unit = unit.substr(unit.length - n.length)
+            for (var i = 0; i < n.length; i++) { str += '零壹贰叁肆伍陆柒捌玖'.charAt(n.charAt(i)) + unit.charAt(i) }
+            // console.log('end',str.replace(/零(千|百|拾|角)/g, '零').replace(/(零)+/g, '零').replace(/零(万|亿|元)/g, '$1').replace(/(亿)万|壹(拾)/g, '$1$2').replace(/^元零?|零分/g, '').replace(/元$/g, '元整'))
+            this.formData.applyPayMoneyUppercase = str.replace(/零(千|百|拾|角)/g, '零').replace(/(零)+/g, '零').replace(/零(万|亿|元)/g, '$1').replace(/(亿)万|壹(拾)/g, '$1$2').replace(/^元零?|零分/g, '').replace(/元$/g, '元整')
+
+            // console.log('end',this.formData.applyPayMoneyUppercase)
+            this.$forceUpdate()
+        },
+        beforeClose() {
+            // eslint-disable-next-line no-mixed-spaces-and-tabs
+            this.formData = {
+                // payerName: '无锡市安居投资发展有限公司'
+                // eslint-disable-next-line no-mixed-spaces-and-tabs
+            }
+            this.dialogVisible = false
+            this.activeName = 'first'
+            this.$forceUpdate()
+        },
+        handleClick(tab, event) {
+            this.canVasStatus = false
+            if (this.activeName == 'second') {
+                this.canVasStatus = true
+                this.$nextTick(() => {
+                    this.$refs.addWorkCanvas.createNodeCanvas(this.row)
+                })
+            }
+        },
+        changeAddWorkTime(totalAddTime) {
+            this.formData.totalAddTime = totalAddTime
+        },
+        getHour(s1, s2) {
+            var reDate = /\d{4}-\d{1,2}-\d{1,2} /
+
+            s1 = new Date((reDate.test(s1) ? s1 : '2018-1-1 ' + s1).replace(/-/g, '/'))
+            s2 = new Date((reDate.test(s2) ? s2 : '2018-1-1 ' + s2).replace(/-/g, '/'))
+            var ms = s2.getTime() - s1.getTime()
+            if (ms < 0) return 0
+            console.log(ms)
+
+            return (ms / 1000 / 60 / 60).toFixed(1) // 小时
+        },
+        getTimeRange(event, i) {
+            this.$nextTick(() => {
+                this.applyAddWorkTime[i].startTime = this.applyAddWorkTime[i].startDay + ' ' + event[0] + ':00'
+                this.applyAddWorkTime[i].endTime = this.applyAddWorkTime[i].startDay + ' ' + event[1] + ':00'
+                const timeRang = this.getHour(event[0], event[1])
+                this.applyAddWorkTime[i].useTime = timeRang
+            })
+        },
+        async getUserInfo() {
+            const { data: userinfo } = await this.baseRequest1('ApplyPaymentSettleController', 'getUserInfoByUserId', { userId: '' })
+            this.userinfo = userinfo
+            console.log(this.userinfo)
+        },
+        baseRequest1(prefix, opUrl, postData) {
+            return this.$channel.globleRequest(prefix, opUrl, postData, 'project task')
+        },
+        addListRow() {
+            this.applyAddWorkTime.push({ ...applyAddWorkTime })
+        },
+        spliceListRow(index) {
+            this.applyAddWorkTime.splice(index, 1)
+        },
+        async setVisible(status, row) {
+            this.row = row
+            this.activeName = 'first'
+            this.getUserInfo(row.applyUser)
+            const { data } = await this.baseRequest1('ApplyPaymentSettleController', 'getInfoByFlowMainId', { flowMainId: row.id })
+            this.formData = data
+            this.formData.flowMainId = data.flowMainId
+            this.dialogVisible = status
+        },
+        onOpen() {
+        },
+        onClose() {
+            this.$refs['elForm'].resetFields()
+        },
+        close() {
+            this.$emit('update:visible', false)
+        },
+        async handelConfirm() {
+            this.$refs['elForm'].validate(async valid => {
+                if (!valid) return
+                const formData = {
+                    ...this.formData,
+                    applyAddWorkTimeString: JSON.stringify(this.applyAddWorkTime)
+                }
+                delete formData.applyAddWorkTime
+                delete formData.applyAddWorkTimeList
+                console.error('formDataformDataformDataformDataformData', formData)
+                this.loading = true
+                const { data } = await this.baseRequest1('ApplyPaymentSettleController', 'addApplyPaymentSettleAgain', { ...formData })
+                this.loading = false
+                if (data.code == 200) {
+                    this.$message.success('加班申请发起成功')
+                    this.dialogVisible = false
+                    this.$emit('getData')
+                }
+                this.close()
+            })
+        }
+    }
 }
 
 </script>
@@ -423,7 +453,6 @@ export default {
 		text-rendering: optimizeLegibility;
 		font-weight: 400;
 
-
 	}
 
 	.moneydetails:before {
@@ -433,7 +462,6 @@ export default {
 	}
 }
 
-
 .txtc {
 	text-align: center
 }
@@ -480,4 +508,3 @@ export default {
 }
 </style>
 
-

src/views/workflow/components/myProcess/applyPay.vue

@@ -8,6 +8,10 @@
     top="50px"
     width="75%"
     :before-close="beforeClose"
+    class="statistic_base"
+    :append-to-body="true"
+    :modal-append-to-body="true"
+    custom-class="tagdialog"
   >
     <div class="tabsdom">
       <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -429,7 +433,7 @@ export default {
                 { name: '撤回', nodeback: '#4294E0' }
             ],
             onlineForm: {},
-            dialogTitle: '发起付款申请',
+            dialogTitle: '发起付款申请1111',
             dialogVisible: false,
             form: {},
             activeName: 'first',

src/views/workflow/components/myProcess/applyPayment.vue

@@ -10,6 +10,10 @@
     width="75%"
     :append-to-body="true"
     :before-close="beforeClose"
+    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">
@@ -29,8 +33,8 @@
             <el-card shadow="always" style="padding: 15px 5px 5px 15px">
               <el-row :gutter="15">
                 <el-col :span="24">
-                  <el-form-item label="标题" prop="title">
-                    <el-input v-model="formData.title" placeholder="付款领用单-年月日" />
+                  <el-form-item label="标题" prop="titlexxx">
+                    <el-input v-model="formData.title" placeholder="付款领用单-年月日" readonly/>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -155,7 +159,7 @@
 
                   </div>
                 </div>
-                <div v-show="true" id="containeraddwork" style="width: 100%" />
+                <div v-show="true" id="containeraddwork1" style="width: 100%" />
               </el-col>
             </el-row>
           </div>
@@ -197,6 +201,7 @@ export default {
     mixins: [Base, BaseData],
     data() {
         return {
+            loading1:false,
             loading: false,
             nodeColor: [
                 { name: '审核通过', nodeback: '#2A3980' },
@@ -520,7 +525,7 @@ export default {
         },
         createNodeCanvas() {
             this.$nextTick(() => {
-                const chartDom = document.getElementById('containeraddwork')
+                const chartDom = document.getElementById('containeraddwork1')
                 var myCharts = echarts.init(chartDom)
                 const charts = {
                     nodes: this.nodes,
@@ -612,18 +617,27 @@ export default {
             this.formData.deptName = userinfo.deptName
             console.log(this.userinfo)
         },
+        async getMaxNum() {
+            const { data: maxNum } = await this.baseRequest1('ApplyPaymentSettleController', 'getMaxNum', {  })
+
+            this.formData.title = maxNum
+            this.loading1 = false
+            console.log(maxNum,this.formData.title)
+        },
         baseRequest1(prefix, opUrl, postData) {
             return this.$channel.globleRequest(prefix, opUrl, postData, 'project task')
         },
 
         setVisible(status) {
+            this.loading1 = true
             this.formData = {
                 payerName: '无锡市安居投资发展有限公司'
 
             }
             this.formData.fileUrlList = []
-
+            this.getMaxNum()
             this.getUserInfo()
+
             this.dialogVisible = status
         },
         onOpen() {
@@ -671,7 +685,7 @@ export default {
 	}
 }
 
-#containeraddwork {
+#containeraddwork1 {
 	height: 600px;
 	width: 100%;
 	background: #F5F5F5;

src/views/workflow/components/myProcess/applyPaymentConfirm.vue

@@ -7,6 +7,9 @@
     top="50px"
     width="75%"
     :append-to-body="true"
+    class="statistic_base"
+    :modal-append-to-body="true"
+    custom-class="tagdialog"
   >
     <div class="tabsdom">
       <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -26,7 +29,7 @@
               <el-row :gutter="15">
                 <el-col :span="24">
                   <el-form-item label="标题" prop="title">
-                    <el-input v-model="formData.title" placeholder="付款领用单-年月日" />
+                    <el-input v-model="formData.title" placeholder="付款领用单-年月日" readonly/>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -219,7 +222,10 @@
                       <user-select
                         :default-select="confirmList"
                         :multiple="true"
-                        class="cclist"
+                        class="cclist,statistic_base"
+                        :append-to-body="true"
+                        :modal-append-to-body="true"
+                        custom-class="tagdialog"
                         @selectValue="parentMethod"
                       />
                     </el-form-item>
@@ -232,7 +238,7 @@
 
         </el-tab-pane>
         <el-tab-pane label="流程图  " name="second">
-          <payment-canvas ref="PaymentCanvas" />
+          <payment-canvas ref="PaymentCanvas" id="paymentConfirm"/>
         </el-tab-pane>
       </el-tabs>
     </div>

src/views/workflow/components/myProcess/applyPaymentDetail.vue

@@ -9,6 +9,9 @@
     width="75%"
     :append-to-body="true"
     :before-close="closeDialog"
+    class="statistic_base"
+    :modal-append-to-body="true"
+    custom-class="tagdialog"
   >
     <div class="tabsdom">
       <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -28,7 +31,7 @@
               <el-row :gutter="15">
                 <el-col :span="24">
                   <el-form-item label="标题" prop="title">
-                    <el-input v-model="formData.title" placeholder="付款领用单-年月日" />
+                    <el-input v-model="formData.title" placeholder="付款领用单-年月日" readonly/>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -182,7 +185,7 @@
 
         </el-tab-pane>
         <el-tab-pane label="流程图" name="second">
-          <payment-canvas ref="PaymentCanvas" />
+          <payment-canvas ref="PaymentCanvas" id="paymanetDetail"/>
         </el-tab-pane>
       </el-tabs>
     </div>

src/views/workflow/components/myProcess/changeClient.vue

@@ -8,6 +8,10 @@
     :visible.sync="dialogVisible"
     top="50px"
     width="50%"
+    :append-to-body="true"
+    class="statistic_base"
+    :modal-append-to-body="true"
+    custom-class="tagdialog"
   >
     <div class="tabsdom">
       <el-form ref="form" :model="form" :rules="1" style="width: 100%;padding: 5px">
@@ -22,6 +26,10 @@
                   :multiple="false"
                   width="700"
                   @selectValue="parentMethod"
+                  class="statistic_base"
+                  :append-to-body="true"
+                  :modal-append-to-body="true"
+                  custom-class="tagdialog"
                 />
               </el-col>
             </el-row>

src/views/workflow/components/myProcess/paymentCanvas.vue

@@ -8,7 +8,7 @@
 
       </div>
     </div>
-    <div v-show="true" id="containeraddworkdetail" style="width: 100%" />
+    <div v-show="true" :id="id" style="width: 100%" />
 
   </div>
 </template>
@@ -299,6 +299,12 @@ const linesData = [ // 连线
 ]
 export default {
     name: 'AddWorkCanvas',
+    props: {
+        id: {
+            type: String,
+            default: ''
+        }
+    },
     data() {
         return {
             linesData: [],
@@ -452,7 +458,7 @@ export default {
         },
         getNode() {
             this.$nextTick(() => {
-                const chartDom = document.getElementById('containeraddworkdetail')
+                const chartDom = document.getElementById(this.id)
                 let myCharts = null
                 myCharts = echarts.init(chartDom)
                 const charts = {
@@ -530,5 +536,19 @@ export default {
 </script>
 
 <style scoped>
-
+#containeraddworkdetail1 {
+    height: 600px;
+    width: 100%;
+    background: #F5F5F5;
+}
+#paymanetDetail{
+    height: 600px;
+    width: 100%;
+    background: #F5F5F5;
+}
+#paymentConfirm{
+    height: 600px;
+    width: 100%;
+    background: #F5F5F5;
+}
 </style>

src/views/workflow/myProcess.vue

@@ -13,7 +13,14 @@
         </el-tabs>
       </el-col>
       <el-col :span="2">
-        <el-dropdown style="float:right" trigger="click">
+        <el-dropdown
+          class="statistic_base"
+          :append-to-body="true"
+          :modal-append-to-body="true"
+          custom-class="tagdialog"
+          style="float:right"
+          trigger="click"
+        >
           <span class="el-dropdown-link">
             流程发起<i
               class="el-icon-arrow-down el-icon--right"
@@ -178,27 +185,27 @@
       <!--          + 65001 " fit="scale-down"/>-->
     </el-row>
 
-<!--    <apply-cost ref="applyCsot" @getData="getData()" />-->
-<!--    <apply-holiday ref="applyHoliday" @getData="getData()" />-->
-<!--    <apply-pay ref="applyPay" @getData="getData()" />-->
-<!--    <apply-pay-confirm ref="applyPayConfirm" @getData="getData()" />-->
-<!--    <apply-cost-confirm ref="applyCostConfirm" @getData="getData()" />-->
-<!--    <apply-holiday-confirm ref="applyHolidayConfirm" @getData="getData()" />-->
+    <!--    <apply-cost ref="applyCsot" @getData="getData()" />-->
+    <!--    <apply-holiday ref="applyHoliday" @getData="getData()" />-->
+    <!--    <apply-pay ref="applyPay" @getData="getData()" />-->
+    <!--    <apply-pay-confirm ref="applyPayConfirm" @getData="getData()" />-->
+    <!--    <apply-cost-confirm ref="applyCostConfirm" @getData="getData()" />-->
+    <!--    <apply-holiday-confirm ref="applyHolidayConfirm" @getData="getData()" />-->
     <change-client ref="changeClient" @getData="getData" />
-<!--    <apply-again-cost ref="applyAgainCost" @getData="getData" />-->
-<!--    <apply-pay-details ref="applyPayDetails" @getData="getData" />-->
-<!--    <apply-again-pay ref="applyAgainPay" @getData="getData" />-->
-<!--    <apply-cost-details ref="applyCostDetails" />-->
-<!--    <holiday-details ref="holidayDetails" @getData="getData" />-->
-<!--    <apply-again-holiday ref="applyAgainHoliday" @getData="getData" />-->
+    <!--    <apply-again-cost ref="applyAgainCost" @getData="getData" />-->
+    <!--    <apply-pay-details ref="applyPayDetails" @getData="getData" />-->
+    <!--    <apply-again-pay ref="applyAgainPay" @getData="getData" />-->
+    <!--    <apply-cost-details ref="applyCostDetails" />-->
+    <!--    <holiday-details ref="holidayDetails" @getData="getData" />-->
+    <!--    <apply-again-holiday ref="applyAgainHoliday" @getData="getData" />-->
     <apply-add-work ref="applyAddWork" @getData="getData()" />
     <apply-add-work-confirm ref="applyAddWorkConfirm" @getData="getData()" />
     <apply-add-work-detail ref="applyAddWorkDetail" />
-      <apply-again-add-work ref="applyAgainAddWork" @getData="getData()" />
+    <apply-again-add-work ref="applyAgainAddWork" @getData="getData()" />
 
-      <apply-payment ref="applyPayment" @getData="getData()" />
-      <apply-payment-confirm ref="applyPaymentConfirm" @getData="getData()" />
-      <apply-payment-detail ref="applyPaymentDetail" />
+    <apply-payment ref="applyPayment" @getData="getData()" />
+    <apply-payment-confirm ref="applyPaymentConfirm" @getData="getData()" />
+    <apply-payment-detail ref="applyPaymentDetail" />
     <apply-again-payment ref="applyAgainPayment" @getData="getData()" />
     <el-dialog
       :close-on-click-modal="false"
@@ -233,7 +240,6 @@ import applyPayment from '@/views/workflow/components/myProcess/applyPayment.vue
 import applyPaymentDetail from '@/views/workflow/components/myProcess/applyPaymentDetail.vue'
 import applyAgainPayment from '@/views/workflow/components/myProcess/applyAgainPayment.vue'
 
-
 import applyPayDetails from '@/views/workflow/components/myProcess/applyPayDetails.vue'
 
 // import applyCostDetails from '@/views/workflow/components/myProcess/applyCostDetails.vue'
@@ -272,7 +278,7 @@ export default {
                 // { name: '费用报支申请', ref: 'applyCsot' },
                 // { name: '付款申请单', ref: 'applyPay' },
                 // { name: '加班申请单', ref: 'applyAddWork' },
-                { name: '付款流程', ref: 'applyPayment' },
+                { name: '付款流程', ref: 'applyPayment' }
 
                 // { name: '采购申请', ref: 'applyPurchase' }
                 // {name: '付款审核', ref: 'applyPayConfirm'},
@@ -314,7 +320,7 @@ export default {
     },
     mounted() {
         const _this = this
-        if(this.$route.query&&this.$route.query.activeName){
+        if (this.$route.query && this.$route.query.activeName) {
             this.activeName = this.$route.query.activeName
         }
         _this.getData()
@@ -387,6 +393,9 @@ export default {
                 case 'paymen' :
                     this.$refs.applyAgainPay.setVisible(true, row)
                     break
+                case 'payment' :
+                    this.$refs.applyAgainPayment.setVisible(true, row)
+                    break
                 case 'off_work':
                     this.$refs.applyAgainHoliday.setVisible(true, row)
                     break