From 0ac2d43fce4d74f6eea5a51a2e16af4e6a536c7c Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 14 八月 2024 14:19:24 +0800
Subject: [PATCH] 11

---
 src/views/project/tallage/computingBill/index.vue |   61 +++++++++++++++++++-----------
 1 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/src/views/project/tallage/computingBill/index.vue b/src/views/project/tallage/computingBill/index.vue
index bc2a741..50bcbba 100644
--- a/src/views/project/tallage/computingBill/index.vue
+++ b/src/views/project/tallage/computingBill/index.vue
@@ -306,19 +306,29 @@
               >
                 <el-form-item label="鎹愮尞妗堜緥" prop="status">
                   <el-select
-                    v-model="patientqueryParams.donorno"
+                    v-model="patientqueryParams.donorname"
                     filterable
+                    allow-create
+                    default-first-option
                     placeholder="璇烽�夋嫨"
                   >
                     <el-option
                       v-for="item in donorchargeanlList"
                       :key="item.id"
                       :label="item.name"
-                      :value="item.id"
+                      :value="item.name"
                     >
                     </el-option>
-                  </el-select> </el-form-item
-                ><el-form-item label="绠楃◣鐘舵��" prop="status">
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="鐢宠浜�" prop="name">
+                  <el-input
+                    v-model="patientqueryParams.pausername"
+                    placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕"
+                    @keyup.enter.native="handleAddpatient"
+                  />
+                </el-form-item>
+                <!-- <el-form-item label="绠楃◣鐘舵��" prop="status">
                   <el-select
                     v-model="patientqueryParams.istax"
                     filterable
@@ -332,7 +342,7 @@
                     >
                     </el-option>
                   </el-select>
-                </el-form-item>
+                </el-form-item> -->
 
                 <el-form-item>
                   <el-button
@@ -581,8 +591,8 @@
   data() {
     return {
       swgatheringlist: [
-        { label: "鏈畻绋�", value: 0 },
-        { label: "宸茬畻绋�", value: 1 }
+        { label: "宸茬畻绋�", value: 1 },
+        { label: "鏈畻绋�", value: 0 }
       ],
       gatheringlist: [
         { label: "鏈粯娆�", value: "0" },
@@ -594,9 +604,9 @@
       overallCase: [],
       patientqueryParams: {
         paApplyType: 1,
-        pacheckno: "047",
-        checkstatus: 0,
-        istax: 0,
+        // pacheckno: "047",
+        // checkstatus: 0,
+        pfundtaxid: 0,
         pageNum: 1,
         pageSize: 10
       },
@@ -783,18 +793,24 @@
     },
     handleQuery() {},
     resetQuery() {
-      this.patientqueryParams.donorno = null;
-      this.patientqueryParams.donorchargeid = null;
+      this.patientqueryParams.pausername = null;
+      this.patientqueryParams.donorname = null;
       this.handleAddpatient();
     },
     handleUploadError() {},
     // 寮规娣诲姞
     AddDispatchpatients() {
-      this.donorchargeorgans = this.donorchargeorgans.concat(this.overallCase);
-      console.log(this.donorchargeorgans, "donorchargeorgans");
-      this.donorchargeorgans.forEach(item => {
-        CalculationDetail({ id: item.id, fundTaxId: this.form.id });
+      let newArr = this.donorchargeorgans.concat(this.overallCase);
+      this.donorchargeorgans = newArr.filter((item, index, self) => {
+        return !self.slice(index + 1).some(other => other.id === item.id);
       });
+
+      console.log(this.donorchargeorgans, "donorchargeorgans");
+      if (this.form.id) {
+        this.donorchargeorgans.forEach(item => {
+          CalculationDetail({ id: item.id, fundTaxId: this.form.id });
+        });
+      }
       this.donorchargeorgans.forEach(item => {
         item.taXmoney = item.pretaxcost - item.taxedcost;
         item.taXmoney = item.taXmoney.toFixed(2);
@@ -862,7 +878,6 @@
       if (this.multipleSelection.length <= selection.length) {
         this.multipleSelection = selection;
       } else {
-        console.log(11);
         this.multipleSelection.forEach(item => {
           if (selection.includes(item)) {
           } else {
@@ -970,11 +985,11 @@
       });
     },
 
-    /** 閲嶇疆鎸夐挳鎿嶄綔 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
+    // /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    // resetQuery() {
+    //   this.resetForm("queryForm");
+    //   this.handleQuery();
+    // },
 
     // 鍙栨秷鎸夐挳
     cancel() {
@@ -987,7 +1002,7 @@
       this.title = "鏂板涓撳璐规眹鎬诲崟";
       //鑾峰彇鐧诲綍鑰呬俊鎭�
       getUserProfile().then(res => {
-        this.form.username = res.createBy;
+        this.form.username = res.data.createBy;
       });
     },
 

--
Gitblit v1.9.3