Merge remote-tracking branch 'origin/dev' into dev

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -8,7 +8,7 @@
         <div class="upper_right_button">
           <el-button type="primary" size="small" @click="editHandle" v-if="editDisable">编 辑</el-button>
           <el-button type="warning" class="el-button--small-yh" size="small" :loading="buttonLoading" v-if="form.id"
-            :disabled="!form.id || editDisable" @click.stop="confirmSettlement">{{financeDisabled?"付费":"撤销付费"}}
+            :disabled="!form.id || editDisable" @click.stop="confirmSettlement">{{ financeDisabled ? "付费" : "撤销付费" }}
           </el-button>
           <el-button class="el-button--small-yh" type="primary" size="small" :loading="buttonLoading"
             @click.stop="saveSettlement" :disabled="editDisable">保存数据
@@ -37,7 +37,7 @@
           <template slot="accountNo">
             <el-select v-model="form.accountNo" placeholder="请选择"
               :disabled="(!financeDisabled && form.id) || editDisable" @change="accountNoChange" clearable filterable>
-              <el-option v-for="(item,index) in form.bankList" :key="index" :label="item.accountNo"
+              <el-option v-for="(item, index) in form.bankList" :key="index" :label="item.accountNo"
                 :value="item.accountNo">
               </el-option>
             </el-select>
@@ -58,22 +58,22 @@
               :disabled="!financeButton || editDisable" @click="selectPurchase">选择采购合同
             </el-button>
           </template>
-          <template slot-scope="scope" slot="menu">
+          <template slot-scope="{ row,index }" slot="menu">
             <el-button type="text" size="small" icon="el-icon-edit" :disabled="!financeButton || editDisable"
-              @click.stop="rowCell(scope.row,scope.index)"> {{ scope.row.$cellEdit ? '修改完成' : '修改' }}
+              @click.stop="rowCell(row,index)"> {{row.$cellEdit ? '修改完成' : '修改' }}
             </el-button>
             <el-button type="text" size="small" icon="el-icon-delete" :disabled="!financeButton || editDisable"
-              @click.stop="rowDel(scope.row,scope.index)">删除
+              @click.stop="rowDel(row,index)">删除
             </el-button>
           </template>
           <template slot="srcOrderno" slot-scope="scope">
             <span style="color: #409EFF;cursor: pointer"
-              @click="jumpPage(scope.row, scope.index)">{{scope.row.srcOrderno}}</span>
+              @click="jumpPage(scope.row, scope.index)">{{ scope.row.srcOrderno }}</span>
           </template>
           <template slot-scope="{ row }" slot="currency">
             <el-select v-if="row.$cellEdit" v-model="row.currency" size="small" placeholder="请选择 币别" clearable
               filterable>
-              <el-option v-for="(item,index) in currencyDic" :key="index" :label="item.dictValue"
+              <el-option v-for="(item, index) in currencyDic" :key="index" :label="item.dictValue"
                 :value="item.dictValue"></el-option>
             </el-select>
             <span v-else>{{ row.currency }}</span>
@@ -99,8 +99,8 @@
 
 <script>
 import option from "./configuration/detailsPage.json";
-import { getDetail, editFinance } from "@/api/financialManagement/financialManagement"
-import { getDetails, modify, cancelModify, saveOrEdit } from "@/api/financialManagement/paymentRequest";
+import { getDetail} from "@/api/financialManagement/financialManagement"
+import { getDetails, modify, cancelModify, saveOrEdit, deleteDetail  } from "@/api/financialManagement/paymentRequest";
 import { contrastObj, contrastList } from "@/util/contrastData";
 import billDetail from "@/components/bill/billDetailList";
 import { getlistBankBy } from "@/api/financialManagement/paymentRequest";
@@ -498,7 +498,17 @@ export default {
       // row.$cellEdit = !row.$cellEdit
     },
     rowDel(row, index) {
-      this.dataList.splice(index, 1);
+      if (row.id) {
+          deleteDetail({ids: row.id}).then(res => {
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.dataList.splice(index, 1);
+          })
+        } else {
+          this.dataList.splice(index, 1);
+        }
     },
     searchReset() {
       console.log('1')