From 967f71ac99954cc1f76254c9bcd18bb6cbb93366 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期三, 16 四月 2025 14:15:18 +0800
Subject: [PATCH] qx

---
 src/views/system/comp/index.vue | 1028 ++++++++++++++++++++++++++++++++------------------------
 1 files changed, 579 insertions(+), 449 deletions(-)

diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index d43c277..ce1944f 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"
+      @submit.native.prevent>
       <el-form-item label="鍗曚綅鍚嶇О" prop="cnName">
         <el-input ref="inputName" v-model="queryParams.cnName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�" clearable
           @keyup.enter.native="handleQuery" />
@@ -31,7 +32,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single" @click="mainDepartment"
-          v-hasPermi="['system:comp:edit']">缁存姢閮ㄩ棬</el-button>
+          v-hasPermi="['system:comp:edit']">缁存姢濂楅</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -116,13 +117,13 @@
     </div>
 
     <div>
-      <el-dialog :title="title" :visible.sync="opens" width="1350px" append-to-body :close-on-click-modal="false">
+      <el-dialog :title="title" :visible.sync="opens" width="1350px" append-to-body :close-on-click-modal="true">
         <el-row :gutter="20">
           <el-col :span="7" :xs="24">
             <div style="padding: 0 20px">
-              <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
-                <el-form-item label="閮ㄩ棬鍚嶇О" prop="dwDeptName">
-                  <el-input v-model="form.dwDeptName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" />
+              <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true" @submit.native.prevent>
+                <el-form-item label="濂楅鍚嶇О" prop="dwDeptName">
+                  <el-input v-model="form.dwDeptName" placeholder="璇疯緭鍏ュ椁愬悕绉�" />
                 </el-form-item>
                 <el-form-item label="绛剧害閲戦" prop="signingPrice">
                   <el-input v-model="form.signingPrice" placeholder="璇疯緭鍏ョ绾﹂噾棰�" />
@@ -131,7 +132,7 @@
               <el-row :gutter="10" class="mb8">
                 <el-col :span="1.5">
                   <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddDept"
-                    v-hasPermi="['system:comp:add']">淇濆瓨閮ㄩ棬</el-button>
+                    v-hasPermi="['system:comp:add']">淇濆瓨濂楅</el-button>
                 </el-col>
                 <el-col :span="1.5">
                   <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="singleg" @click="handledeleDept"
@@ -141,12 +142,12 @@
               <el-table ref="tb" v-loading="loading" :data="deptList" @selection-change="handleSelection" border
                 style="width: 320px" height="350">
                 <el-table-column type="selection" width="40px" align="center" />
-                <el-table-column label="閮ㄩ棬鍚嶇О" align="center" prop="dwDeptName" />
+                <el-table-column label="濂楅鍚嶇О" align="center" prop="dwDeptName" />
               </el-table>
             </div>
           </el-col>
           <el-col :span="17" :xs="24">
-            <el-form ref="form" :model="forms" :rules="rules" label-width="78px" :inline="true">
+            <el-form ref="form" :model="forms" :rules="rules" label-width="78px" :inline="true" @submit.native.prevent>
               <el-form-item label="鍒嗙粍鍚嶇О" prop="groupingName">
                 <el-input v-model="forms.groupingName" placeholder="璇疯緭鍏ュ垎缁勫悕绉�" style="width: 130px"
                   @focus="changegroupingName" />
@@ -169,11 +170,6 @@
               <el-form-item label="鍘熶环" prop="price">
                 <el-input v-model="forms.price" placeholder="璇疯緭鍏ュ師浠�" style="width: 130px" />
               </el-form-item>
-              <el-form-item label="鎶樻墸" prop="limits">
-                <el-input v-model="forms.limits" placeholder="璇疯緭鍏ユ姌鎵�" style="width: 130px" @change="numberChange" />
-                <!-- :disabled="isfalse" -->
-              </el-form-item>
-
               <el-form-item label="浼樻儬浠�" prop="ysPrice">
                 <el-input v-model="forms.ysPrice" placeholder="璇疯緭鍏ュ簲鏀�" style="width: 120px" />
               </el-form-item>
@@ -192,31 +188,10 @@
                   <el-input v-model="forms.gtAge" style="width: 54px" />
                 </el-col>
               </el-form-item>
-              <el-form-item label="鍘熶环" prop="price">
-                <el-input
-                  v-model="forms.price"
-                  placeholder="璇疯緭鍏ュ師浠�"
-                  style="width: 130px"
-                />
-              </el-form-item>
-              <el-form-item label="鎶樻墸" prop="limits">
-                <el-input
-                  v-model="forms.limits"
-                  placeholder="璇疯緭鍏ユ姌鎵�"
-                  style="width: 130px"
-                  @change="numberChange"
-                />
-                <!-- :disabled="isfalse" -->
-              </el-form-item>
 
-              <el-form-item label="浼樻儬浠�" prop="ysPrice">
-                <el-input
-                  v-model="forms.ysPrice"
-                  placeholder="璇疯緭鍏ュ簲鏀�"
-                  style="width: 120px"
-                />
-              </el-form-item>
-            
+
+
+
             </el-form>
 
             <el-row :gutter="10" class="mb8">
@@ -224,8 +199,7 @@
                 <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleGroup">淇濆瓨</el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="singlegg"
-                  @click="xiangmuWh">椤圭洰缁存姢</el-button>
+                <el-button type="primary" icon="el-icon-edit" size="mini" @click="xiangmuWh">椤圭洰缁存姢</el-button>
               </el-col>
               <el-col :span="1.5">
                 <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="singlegg"
@@ -261,23 +235,25 @@
 
     <!-- 濂楅 -->
     <div>
-      <el-dialog :title="title" :visible.sync="openss" width="1400px" append-to-body :close-on-click-modal="false">
+      <el-dialog :title="title" :visible.sync="openss" width="1400px" :style="{ height: 1400 + 'px' }" append-to-body
+        :close-on-click-modal="false">
         <el-row :gutter="24">
           <el-col :span="8" :xs="24">
-            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px"
+              @submit.native.prevent>
               <el-form-item label="濂楅鍚嶇О" prop="pacName">
                 <el-input ref="inputName" v-model="queryParams.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable
                   @keyup.enter.native="handleSearch" style="width: 140px" />
               </el-form-item>
               <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearch">鎼滅储</el-button>
-                <!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button> -->
+
               </el-form-item>
             </el-form>
             <el-table ref="tbone" border v-loading="loading" :data="newpacName" @selection-change="handleChangeOne"
               height="478">
               <el-table-column type="selection" width="40px" align="center" />
-              <el-table-column label="搴忓彿" align="center" prop="newID" width="50px" />
+              <el-table-column label="搴忓彿" align="center" prop="pacId" width="50px" />
               <el-table-column label="濂楅鍚嶇О/浠锋牸/鍏�" align="center" prop="pacName">
                 <template slot-scope="scope">
                   {{ scope.row.pacName + "/" + scope.row.price }}
@@ -287,7 +263,7 @@
           </el-col>
           <el-col :span="6" :xs="24">
             <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="46px"
-              style="height: 35px">
+              @submit.native.prevent>
               <el-form-item label="鍚堣" prop="price">
                 <el-input ref="inputName" v-model="queryParams.price" placeholder="鍚堣" clearable style="width: 140px" />
               </el-form-item>
@@ -300,9 +276,9 @@
             </div> -->
             <!--       @row-dblclick="dbclick" -->
             <el-table border v-loading="loading" :data="OnenewpacName" :row-class-name="tableRowClassName" height="478">
-              <el-table-column label="椤圭洰鍚嶇О/浠锋牸/鍏�" align="center" prop="proName">
+              <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName">
                 <template slot-scope="scope">
-                  {{ scope.row.proName + "/" + scope.row.proPrice }}
+                  {{ scope.row.proName }}
                 </template>
               </el-table-column>
 
@@ -313,6 +289,10 @@
                 </template>
               </el-table-column>
             </el-table>
+            <div style="font-size: 16px;margin-top: 10px;">褰撳墠椤圭洰鏉℃暟锛�<span style="font-weight: 700;">{{
+              OnenewpacName.length
+            }}</span>鏉�</div>
+
           </el-col>
           <el-col :span="2" :xs="24">
             <div style="margin: 240% 16%">
@@ -320,10 +300,10 @@
             </div>
           </el-col>
           <el-col :span="8" :xs="24">
-            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-              label-width="68px">
+            <el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+              label-width="68px" @submit.native.prevent>
               <el-form-item label="椤圭洰鍚嶇О" prop="proName">
-                <el-input ref="inputName" v-model="queryParams.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable
+                <el-input ref="inputName" v-model="queryParams1.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable
                   @keyup.enter.native="handleSearchFor" style="width: 140px" />
               </el-form-item>
               <el-form-item>
@@ -347,65 +327,144 @@
 
     <div>
       <el-dialog :title="title" :visible.sync="openOne" width="1400px" append-to-body :close-on-click-modal="false">
-        <el-row :gutter="24">
-          <el-col :span="8" :xs="24">
-            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+        <el-row :gutter="24" v-if="!isTableVisible">
+
+          <el-col :span="15" :xs="24">
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="46px"
+              style="height: 50px" @submit.native.prevent>
+              <el-form-item label="鍘熶环">
+                <el-input ref="inputName" v-model="queryParams.price" placeholder="鍚堣" clearable style="width: 140px" />
+              </el-form-item>
+              <el-form-item label="鎶樻墸">
+                <el-input-number ref="inputNumber" style="width: 150px" v-model="youhui" :precision="1" :step="0.1"
+                  :min="0" :max="10" @change="debounceNumberChange" :debounce="3000"></el-input-number>
+              </el-form-item>
+              <el-form-item label="鐜颁环">
+                <el-input ref="inputName" v-model="queryParams.xianprice" placeholder="鍚堣" clearable
+                  style="width: 140px" @input="changeXianjia" @blur="numberChangeXianPrice(youhui, youhui)" />
+              </el-form-item>
+              <el-form-item>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuerys">閲嶇疆</el-button>
+               
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">閫夋嫨濂楅</el-button>
+              </el-form-item>
+            </el-form>
+            <el-table border v-loading="loading" :data="OnenewpacName" :row-class-name="tableRowClassName" height="478"
+              :cell-style="{ padding: '5px 0' }">
+              <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="410">
+
+                <template slot-scope="scope">
+                  {{ scope.row.proName }}
+                </template>
+              </el-table-column>
+              <el-table-column label="鍘熶环" align="center" prop="proPrice" width="85"></el-table-column>
+              <el-table-column label="鎶樻墸" width="151">
+                <template slot-scope="scope">
+                  <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸  @input="validateDiscount(scope.row)"-->
+                  <el-input-number v-model="scope.row.limits" @change="handleManualChange(scope.row)" placeholder="杈撳叆鎶樻墸"
+                    size="mini" type="number" :min="0" :step="0.1" :precision="1" :max="10">
+                  </el-input-number>
+                </template>
+              </el-table-column>
+              <el-table-column label="鐜颁环" align="center" prop="ysPrice" width="85"></el-table-column>
+              <el-table-column label="鎿嶄綔" align="center" width="85">
+                <template slot-scope="scope">
+                  <el-button size="mini" type="text" icon="el-icon-delete"
+                    @click="handledbelete(scope.row)">鍒犻櫎</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+            <div style="font-size: 16px;margin-top: 10px;">褰撳墠椤圭洰鏉℃暟锛�<span style="font-weight: 700;">{{
+              OnenewpacName.length
+            }}</span>鏉�</div>
+
+          </el-col>
+          <!-- <el-col :span="2" :xs="24">
+            <div style="margin: 240% 16%" class="btntoleft">
+              <el-button type="primary" size="medium"
+                style="writing-mode: vertical-rl; text-align: center; letter-spacing: 5px;" @click="resetright">
+                纭�
+                璁�
+                <i class="el-icon-back"></i>
+              </el-button>
+            </div>
+          </el-col> -->
+          <el-col :span="7" :xs="24">
+            <el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+              label-width="68px" @submit.native.prevent>
+             
+              <el-form-item label="椤圭洰鍚嶇О" prop="proName">
+                <el-input ref="inputName" v-model="queryParams1.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable
+                  @keyup.enter.native="handleSearchFor" style="width: 140px" />
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearchFor">鎼滅储</el-button>
+              </el-form-item>
+            </el-form>
+            <el-table border v-loading="loading" ref="tre" :data="Treedata" @selection-change="handleChangesingle"
+              height="478" style="width: 100%">
+              <el-table-column type="selection" width="40px" align="center" />
+              <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="230px"/>
+              <el-table-column label="椤圭洰浠锋牸/鍏�" align="center" prop="proPrice" width="100px"/>
+            </el-table>
+          </el-col>
+        </el-row>
+        <!-- -=----------------------------------------------------- -->
+        <el-row :gutter="24" v-else>
+          <el-col :span="6" :xs="24">
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px"
+              @submit.native.prevent>
               <el-form-item label="濂楅鍚嶇О" prop="pacName">
                 <el-input ref="inputName" v-model="queryParams.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable
                   @keyup.enter.native="handleSearch" style="width: 140px" />
               </el-form-item>
               <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearch">鎼滅储</el-button>
-                <!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button> -->
               </el-form-item>
             </el-form>
             <el-table ref="tbone" border v-loading="loading" :data="newpacName" @selection-change="handleChangeOne"
-              height="478"  v-if="isTableVisible" >
-              <el-table-column type="selection" width="40px" align="center" />
-              <el-table-column label="搴忓彿" align="center" prop="newID" width="50px" />
+              height="483">
+              <!-- <el-table-column type="selection" width="40px" align="center" /> -->
+
+              <el-table-column label="搴忓彿" align="center" prop="newID" width="50px">
+                <template slot-scope="scope">
+                  {{ scope.row.newID }}
+                </template>
+              </el-table-column>
+
               <el-table-column label="濂楅鍚嶇О/浠锋牸/鍏�" align="center" prop="pacName">
                 <template slot-scope="scope">
                   {{ scope.row.pacName + "/" + scope.row.price }}
                 </template>
               </el-table-column>
             </el-table>
+            <div style="font-size: 16px;margin-top: 10px;">椤圭洰鎬绘潯鏁帮細<span style="font-weight: 700;margin-right: 5px;">{{
+              newpacName.length }}</span>鏉�</div>
           </el-col>
-          <el-col :span="6" :xs="24">
+          <el-col :span="8" :xs="24">
             <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="46px"
-              style="height: 35px">
+              style="height: 51px" @submit.native.prevent>
               <el-form-item label="鍚堣" prop="price">
                 <el-input ref="inputName" v-model="queryParams.price" placeholder="鍚堣" clearable style="width: 140px" />
               </el-form-item>
               <el-form-item>
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuerys">閲嶇疆</el-button>
               </el-form-item>
+              <el-form-item>
+                <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">閫夋嫨濂楅</el-button>
+              </el-form-item>
             </el-form>
-            <!-- <div style="color: red; font-size: 8px">
-              娉ㄩ噴锛氶紶鏍囧乏閿弻鍑婚�変腑琛屽彲鍒犻櫎
-            </div> -->
-            <!--       @row-dblclick="dbclick" -->
-            <el-table
-              border
-              v-loading="loading"
-              :data="OnenewpacName"
-              :row-class-name="tableRowClassName"
-              height="478"
-            >
-              <el-table-column
-                label="椤圭洰鍚嶇О/浠锋牸/鍏�"
-                align="center"
-                prop="proName"
-              >
-             
+            <el-table border v-loading="loading" :data="OnenewpacName" :row-class-name="tableRowClassName" height="478"
+              :cell-style="{ padding: '5px 0' }">
+              <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="170">
+
                 <template slot-scope="scope">
-                  {{ scope.row.proName + "/" + scope.row.proPrice }}
+                  {{ scope.row.proName }}
                 </template>
               </el-table-column>
-              <el-table-column
-                label="鍘熶环"
-                align="center"
-                prop="proPrice"
-              ></el-table-column>
+              <el-table-column label="鍘熶环" align="center" prop="proPrice"></el-table-column>
               <el-table-column label="鎿嶄綔" align="center" width="68">
                 <template slot-scope="scope">
                   <el-button size="mini" type="text" icon="el-icon-delete"
@@ -413,42 +472,35 @@
                 </template>
               </el-table-column>
             </el-table>
+            <div style="font-size: 16px;margin-top: 10px;">褰撳墠椤圭洰鏉℃暟锛�<span style="font-weight: 700;">{{
+              OnenewpacName.length
+            }}</span>鏉�</div>
+
           </el-col>
-          <el-col :span="2" :xs="24">
-            <div style="margin: 240% 6%">
+          <!-- <el-col :span="2" :xs="24">
+            <div style="margin: 240% 16%">
               <el-button type="primary" size="medium " icon="el-icon-back"
-                style="writing-mode: vertical-rl; text-align: center;letter-spacing: 10px;"
-                @click="resetright">纭</el-button>
+                style="writing-mode: vertical-rl; text-align: center;letter-spacing: 10px;" @click="resetright">纭�
+                璁�</el-button>
             </div>
-          </el-col>
+          </el-col> -->
           <el-col :span="8" :xs="24">
-            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-              label-width="68px">
+            <el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+              label-width="68px" @submit.native.prevent>
+             
               <el-form-item label="椤圭洰鍚嶇О" prop="proName">
-                <el-input ref="inputName" v-model="queryParams.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable
+                <el-input ref="inputName" v-model="queryParams1.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable
                   @keyup.enter.native="handleSearchFor" style="width: 140px" />
               </el-form-item>
               <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearchFor">鎼滅储</el-button>
               </el-form-item>
             </el-form>
-            <el-table
-              border
-              v-loading="loading"
-              ref="tre"
-              :data="Treedata"
-              @selection-change="handleChangesingle"
-              height="478"
-              style="width: 70%"
-            >
+            <el-table border v-loading="loading" ref="tre" :data="Treedata" @selection-change="handleChangesingle"
+              height="478">
               <el-table-column type="selection" width="40px" align="center" />
-              <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="130" />
-              <el-table-column
-                label="椤圭洰浠锋牸/鍏�"
-                align="center"
-                prop="proPrice"
-                width="100"
-              />
+              <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="288" />
+              <el-table-column label="椤圭洰浠锋牸/鍏�" align="center" prop="proPrice" width="100" />
             </el-table>
           </el-col>
         </el-row>
@@ -459,10 +511,34 @@
       </el-dialog>
     </div>
 
+
+    <el-dialog title="閫夋嫨濂楅" :visible.sync="taocan" width="70%" height="700px" :close-on-click-modal="false">
+      <!-- <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" label-width="auto">
+        <el-form-item label="濂楅鍚嶇О" prop="pacName">
+          <el-input v-model="queryParam.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable @keyup.enter.native="handle"
+            style="width: 200px" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handle">鎼滅储</el-button>
+        </el-form-item>
+      </el-form> -->
+      <el-table v-loading="loading" element-loading-text="姝e湪鍔犺浇涓�..." element-loading-spinner="el-icon-loading" border
+        :data="newpacName1" @selection-change="handleSelectionChange1" height="450px" ref="tb">
+        <el-table-column type="selection" width="40px" align="center" label="閫夋嫨" />
+        <el-table-column label="濂楅鍚嶇О" align="center" prop="pacName" width="120px" />
+        <el-table-column label="濂楅浠锋牸" align="center" prop="price" width="120px" />
+        <el-table-column label="濂楅鏄庣粏" align="center" prop="allProName" :show-overflow-tooltip="true" />
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="cancel1">鍙� 娑�</el-button>
+        <el-button type="primary" @click="submit">纭� 瀹�</el-button>
+      </span>
+    </el-dialog>
+
     <!-- 娣诲姞鎴栦慨鏀逛綋妫�鍗曚綅淇℃伅缁存姢瀵硅瘽妗� -->
     <div class="dia">
       <el-dialog :title="title" :visible.sync="open" width="1340px" append-to-body>
-        <el-form ref="form" :model="form" :rules="rules" label-width="106px" :inline="true">
+        <el-form ref="form" :model="form" :rules="rules" label-width="106px" :inline="true" @submit.native.prevent>
           <el-form-item label="鍗曚綅鍚嶇О" prop="cnName">
             <el-input v-model="form.cnName" placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" style="width: 520px" />
           </el-form-item>
@@ -511,79 +587,7 @@
           <el-form-item label="琛屾斂鍖哄垝鍚嶇О" prop="areaName">
             <el-input v-model="form.areaName" placeholder="璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�" />
           </el-form-item>
-          <!-- <el-form-item label="浼佷笟绫诲瀷" prop="typeOfEnterprise">
-          <el-select v-model="form.typeOfEnterprise" placeholder="璇烽�夋嫨浼佷笟绫诲瀷">
-            <el-option
-              v-for="dict in dict.type.dict_comp_type"
-              :key="dict.value"
-              :label="dict.label"
-:value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item> -->
-          <!-- <el-form-item label="琛屾斂鍖哄垝id" prop="areaid">
-          <el-input v-model="form.areaid" placeholder="璇疯緭鍏ヨ鏀垮尯鍒抜d" />
-        </el-form-item> -->
-          <!-- <el-form-item label="GMP璇佷功缂栧彿" prop="gmpNo">
-          <el-input v-model="form.gmpNo" placeholder="璇疯緭鍏MP璇佷功缂栧彿" />
-        </el-form-item> -->
-          <!-- <el-form-item label="GMP鍙戣瘉鏃ユ湡" prop="gmpissueDate">
-          <el-date-picker clearable
-            v-model="form.gmpissueDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨GMP鍙戣瘉鏃ユ湡">
-          </el-date-picker>
-        </el-form-item> -->
-          <!-- <el-form-item label="缁忚惀璁稿彲璇佸彿" prop="businessLicenseNumber">
-          <el-input v-model="form.businessLicenseNumber" placeholder="璇疯緭鍏ョ粡钀ヨ鍙瘉鍙�" />
-        </el-form-item> -->
-          <!-- <el-form-item label="GMP鏈夋晥鎴鏃ユ湡" prop="gmpDeadlineDate">
-          <el-date-picker clearable
-            v-model="form.gmpDeadlineDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨GMP鏈夋晥鎴鏃ユ湡">
-          </el-date-picker>
-        </el-form-item> -->
-          <!-- <el-form-item label="GMP璁よ瘉鑼冨洿" prop="gmpRange">
-          <el-input v-model="form.gmpRange" placeholder="璇疯緭鍏MP璁よ瘉鑼冨洿" />
-        </el-form-item> -->
-          <!-- <el-form-item label="GMP寤剁画鑼冨洿" prop="gmpDelayRange">
-          <el-input v-model="form.gmpDelayRange" placeholder="璇疯緭鍏MP寤剁画鑼冨洿" />
-        </el-form-item> -->
-          <!-- <el-form-item label="GMP寤剁画鏃ユ湡" prop="gmpDelayDate">
-          <el-date-picker clearable
-            v-model="form.gmpDelayDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="璇烽�夋嫨GMP寤剁画鏃ユ湡">
-          </el-date-picker>
-        </el-form-item> -->
-          <!-- <el-form-item label="GMP璇佷功鍥剧墖(base64缂栫爜)">
-          <image-upload v-model="form.gmpPhoto"/>
-        </el-form-item> -->
-          <!-- <el-form-item label="鎺掑簭" prop="orderNum">
-            <el-input v-model="form.orderNum" placeholder="璇疯緭鍏ユ帓搴�" />
-          </el-form-item> -->
-          <!-- <el-form-item label="鏁版嵁鐘舵��(PT10.00.004)" prop="effective">
-          <el-select v-model="form.effective" placeholder="璇烽�夋嫨鏁版嵁鐘舵��(PT10.00.004)">
-            <el-option
-              v-for="dict in dict.type.dict_data_status"
-              :key="dict.value"
-              :label="dict.label"
-:value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item> -->
-          <!-- <el-form-item label="鎷奸煶" prop="spell">
-          <el-input v-model="form.spell" placeholder="璇疯緭鍏ユ嫾闊�" />
-        </el-form-item> -->
-          <!-- <el-form-item label="鏈夋晥鏃堕棿" prop="validTime">
-            <el-date-picker clearable v-model="form.validTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="璇烽�夋嫨鏈夋晥鏃堕棿">
-            </el-date-picker>
-          </el-form-item><br> -->
+
           <el-form-item label="澶囨敞" prop="remark">
             <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" :rows="2" label-width="400px"
               style="width: 830px" resize="none"></el-input>
@@ -602,13 +606,12 @@
 </template>
 
 <script>
-
+import Big from 'big.js';
 import {
   listComp,
   getComp,
   delComp,
   addComp,
-  getfzgrouping,
   updateComp,
   addDept,
   Deptlist,
@@ -645,10 +648,11 @@
       // 閬僵灞�
       loading: true,
       Treedata: [],
-      getInfodis: 0,
       id: "",
       // 閫変腑鏁扮粍
       ids: [],
+      newpacName1 : [],
+      taocan:false,
       // 鎺у埗鎬у埆閫夋嫨妗嗘槸鍚︾鐢�
       isSexDisabled: false,
       dwIds: [],
@@ -682,6 +686,10 @@
       opens: false,
       openss: false,
       openOne: false,
+      queryParams1: {
+        proName: null,
+        pym: null,
+      },
       // 鏌ヨ鍙傛暟
       queryParams: {
         pageNum: 1,
@@ -690,20 +698,26 @@
         enName: null,
         code: null,
         price: null,
+        xianprice: null,
+        limits: null
       },
+
+
       id: "",
       // 琛ㄥ崟鍙傛暟
       form: {},
+      lastXianPrice: 0,
       forms: {
         limits: 10,
         ltAge: 0,
         gtAge: 100,
         groupingName: "",
         pacName: "",
-        payType: "",
-        sex: "",
+        payType: "1",
+        sex: "2",
       },
       sfzs: '',
+      youhui: '',
       // 琛ㄥ崟鏍¢獙
       rules: {
         cnName: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
@@ -714,7 +728,7 @@
           { required: true, validator: checkPhoneNum, trigger: "blur" },
         ],
         gtAge: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
-        limits: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
+        limits: [{ required: false, validator: checkPhoneNum, trigger: "blur" }],
         ltAge: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
         /*  pacName: [
           { required: true, validator: checkPhoneNum, trigger: "blur" },
@@ -771,7 +785,69 @@
     this.getList();
   },
   methods: {
-   
+    handleManualChange(row) {
+      console.log("杩欐槸涓诲姩鍑哄彂鐨�");
+      this.updateProPrice(row);
+    },
+    validateDiscount(row) {
+      if (this.queryParams.xianprice !== undefined &&
+        !isNaN(this.queryParams.xianprice) &&
+        this.queryParams.xianprice !== this.lastXianPrice) {
+        // 鍙湁鍦ㄧ幇浠峰疄闄呯敱鐢ㄦ埛杈撳叆淇敼鏃舵墠鏇存柊
+        this.updateProPrice1(row);
+        this.lastXianPrice = this.queryParams.xianprice;
+      }
+    },
+    updateProPrice(row) {
+      const proPrice = new Big(row.proPrice);
+      const limits = new Big(row.limits);
+      const result = proPrice.times(limits.div(10)).toNumber();  // ordPrice * (discount / 10)
+      row.ysPrice = result.toFixed(2);
+      this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
+        return sum.plus(new Big(item.ysPrice || '0'));
+      }, new Big(0)).toNumber();
+      this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10
+    },
+    updateProPrice1(row) {
+      const proPrice = new Big(row.proPrice);
+      const limits = new Big(row.limits);
+      const result = proPrice.times(limits.div(10)).toNumber();  // ordPrice * (discount / 10)
+      row.ysPrice = result.toFixed(2);
+      const totalYsPrice = this.OnenewpacName.reduce((sum, item) => {
+        return sum.plus(new Big(item.ysPrice || '0'));
+      }, new Big(0));
+      const totalYsPriceNum = totalYsPrice.toNumber();
+      if (this.queryParams.xianprice !== undefined && !isNaN(this.queryParams.xianprice)) {
+        const xianPrice = new Big(this.queryParams.xianprice);
+        const diff = xianPrice.minus(totalYsPriceNum);
+        if (!diff.eq(0) && this.OnenewpacName.length > 0) {
+          const lastItem = this.OnenewpacName[this.OnenewpacName.length - 1];
+          const newYsPrice = new Big(lastItem.ysPrice).plus(diff).toNumber();
+          this.$set(this.OnenewpacName[this.OnenewpacName.length - 1], 'ysPrice', newYsPrice);
+        }
+      }
+
+      // Update youhui calculation
+
+      if (this.queryParams.price !== 0 && this.queryParams.xianprice !== 0) {
+        this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
+      } else {
+        this.youhui = 10;
+      }
+    },
+    debounceNumberChange(currentValue, oldValue) {
+      clearTimeout(this.debounceTimer);
+      this.debounceTimer = setTimeout(() => {
+        this.numberChange(currentValue, oldValue);
+      }, 300);
+    },
+    changeXianjia() {
+      // 鍘熷鎶樻墸鐜囪绠�
+      if (this.queryParams.price !== 0) {
+        this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
+      }
+    },
+
     getList() {
       this.$nextTick(() => {
         this.$refs.inputName.focus();
@@ -779,7 +855,7 @@
         (this.loading = true);
       listComp(this.queryParams).then((response) => {
         this.compList = response.rows;
-        
+
         response.rows.forEach((item, index) => {
           item.newID =
             (this.queryParams.pageNum - 1) * this.queryParams.pageSize +
@@ -790,18 +866,19 @@
         this.loading = false;
       });
     },
-    // 鍙栨秷鎸夐挳
+
     cancel() {
       this.open = false;
       this.opens = false;
-      this.$router.go(0);
+      // this.$router.go(0);
     },
 
     // 鍙栨秷濂楅
     cancell() {
       this.openss = false;
       this.openOne = false;
-      this.reset();
+      this.youhui = 10
+      // this.reset();
     },
     // 琛ㄥ崟閲嶇疆
     reset() {
@@ -857,9 +934,10 @@
       this.handleQuery();
     },
     resetQuerys() {
-      (this.OnenewpacName = []),
-        (this.queryParams.price = 0),
-        this.$refs.tbone.toggleRowSelection(this.pacList[0], false);
+      this.OnenewpacName = [],
+        this.queryParams.price = 0,
+        this.queryParams.xianprice = 0,
+        this.youhui = 0
     },
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
@@ -923,29 +1001,81 @@
       if (this.form.drugManufacturerId) {
         this.beCurrentDept();
       }
-      this.title = "閮ㄩ棬鍒嗙粍缁存姢" + "( " + this.form.cnName + ")";
-      getInfo().then((response) => {
-        this.getInfodis = response.user.discount;
-        if (this.getInfodis == null || this.getInfodis == 10) {
-          this.isfalse = true;
-        }
-      });
+      this.title = "濂楅鍒嗙粍缁存姢" + "( " + this.form.cnName + ")";
+
     },
-    // 鎶樻墸
-    numberChange(currentValue) {
-      this.forms.limits = currentValue;
-      /* if (this.forms.limits > this.getInfodis) {
-        this.forms.limits = this.getInfodis;
-        this.forms.ysPrice = (
-          this.forms.price *
-          (this.forms.limits / 10)
-        ).toFixed(2);
-      } */
-      this.forms.ysPrice = (
-        this.forms.price *
-        (this.forms.limits / 10)
-      ).toFixed(2);
+    numberChange(currentValue, oldValue) {
+      this.$confirm("纭畾淇敼鎵�鏈夊瓙椤圭殑鎶樻墸鍚楋紵", "鎻愮ず", {
+        confirmButtonText: "纭畾",
+        cancelButtonText: "鍙栨秷",
+        type: "warning",
+      })
+        .then(() => {
+          this.youhui = currentValue;
+
+          this.OnenewpacName.forEach((item) => {
+            item.limits = this.youhui
+            const proPrice = new Big(item.proPrice);
+            const limits = new Big(item.limits);
+            const result = proPrice.times(limits.div(10));  // ordPrice * (discount / 10)
+            item.ysPrice = result.toNumber();
+            this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
+              return sum.plus(new Big(item.ysPrice || '0'));
+            }, new Big(0)).toNumber();
+          })
+          // ----------------------------------------------------------
+
+        })
+        .catch(() => {
+          this.youhui = oldValue;
+        });
+
     },
+    numberChangeXianPrice(currentValue, oldValue) {
+      // 濡傛灉鐜颁环娌℃湁鍙樺寲锛岀洿鎺ヨ繑鍥�
+      if (this.queryParams.xianprice === this.lastXianPrice || !this.queryParams.xianprice) {
+        return;
+      }
+
+      this.$confirm("纭畾淇敼鎵�鏈夊瓙椤圭殑鎶樻墸鍚楋紵", "鎻愮ず", {
+        confirmButtonText: "纭畾",
+        cancelButtonText: "鍙栨秷",
+        type: "warning",
+      })
+        .then(() => {
+          // 纭繚淇敼鎶樻墸鐨勫��
+          this.youhui = currentValue;
+
+          let totalYsprice = new Big(0); // 鍒濆鍖栨�� ysprice
+          // 閬嶅巻姣忎釜椤圭洰锛屾洿鏂版瘡涓瓙椤圭殑浠锋牸
+          this.OnenewpacName.forEach((item) => {
+            item.limits = this.youhui;
+            const proPrice = new Big(item.proPrice);
+            const limits = new Big(item.limits);
+            const result = proPrice.times(limits.div(10));  // ordPrice * (discount / 10)
+            item.ysPrice = result.toNumber();
+            totalYsprice = totalYsprice.plus(new Big(item.ysPrice));
+          });
+          // 濡傛灉鎬荤殑 ysPrice 鍜屾煡璇㈠弬鏁颁腑鐨� xianprice 涓嶄竴鑷达紝杩涜璋冩暣
+          if (!totalYsprice.eq(this.queryParams.xianprice)) {
+            const diff = new Big(this.queryParams.xianprice).minus(totalYsprice);
+            // 濡傛灉 OnenewpacName 鏁扮粍涓嶄负绌猴紝璋冩暣鏈�鍚庝竴椤圭殑 ysPrice
+            if (this.OnenewpacName.length > 0) {
+              const lastItem = this.OnenewpacName[this.OnenewpacName.length - 1];
+              const newYsPrice = new Big(lastItem.ysPrice).plus(diff).toNumber();
+              // 浣跨敤 $set 纭繚鍝嶅簲鎬ф洿鏂�
+              this.$set(this.OnenewpacName[this.OnenewpacName.length - 1], 'ysPrice', newYsPrice);
+            }
+          }
+          // 鏇存柊 lastXianPrice 浠ヤ究涓嬫姣旇緝
+          this.lastXianPrice = this.queryParams.xianprice;
+        })
+        .catch(() => {
+          // 濡傛灉鍙栨秷淇敼锛屾仮澶嶅師鏈夌殑浼樻儬鍊�
+          this.youhui = oldValue;
+        });
+    },
+
 
     changegroupingName() {
       if (this.selectionList.length <= 0) {
@@ -969,36 +1099,7 @@
               index +
               1;
           });
-          // if (this.groupList.length >= 1) {
-          //   if (this.groupList[0].id) {
-          //     getfzgrouping(this.groupList[0].id).then((response) => {
-          //       this.OnenewpacName = response.data.groupingProList;
-          //       this.queryParams.price = 0;
-          //       this.OnenewpacName.forEach((item) => {
-          //         this.queryParams.price += item.proPrice;
-          //       });
-          //     });
-          //   }
-          // }
 
-          // if (this.newpacName.length != 0) {
-          //   this.$nextTick(() => {
-          //     if (this.forms.pacName) {
-          //       this.newpacName.forEach((item, index) => {
-          //         if (this.forms.pacName == item.pacName) {
-          //           this.$refs.tbone.toggleRowSelection(
-          //             this.newpacName[index],
-          //             true
-          //           );
-          //         }
-          //       });
-          //     } else {
-          //       this.$refs.tbone.toggleRowSelection(this.newpacName[0], true);
-          //     }
-          //   });
-          // } else {
-          //   this.$refs.tbone.clearSelection();
-          // }
         });
       } else {
         deptTreeSelect().then((response) => {
@@ -1010,43 +1111,18 @@
               index +
               1;
           });
-          // if (this.groupList.length >= 1) {
-          //   if (this.groupList[0].id) {
-          //     getfzgrouping(this.groupList[0].id).then((response) => {
-          //       this.OnenewpacName = response.data.groupingProList;
-          //       this.queryParams.price = 0;
-          //       this.OnenewpacName.forEach((item) => {
-          //         this.queryParams.price += item.proPrice;
-          //       });
-          //     });
-          //   }
-          // }
-          // if (this.newpacName.length != 0) {
-          //   this.$nextTick(() => {
-          //     if (this.forms.pacName) {
-          //       this.newpacName.forEach((item, index) => {
-          //         if (this.forms.pacName == item.pacName) {
-          //           this.$refs.tbone.toggleRowSelection(
-          //             this.newpacName[index],
-          //             true
-          //           );
-          //         }
-          //       });
-          //     } else {
-          //       this.$refs.tbone.toggleRowSelection(this.newpacName[0], true);
-          //     }
-          //   });
-          // } else {
-          //   this.$refs.tbone.clearSelection();
-          // }
+
         });
       }
       getProjectList().then((response) => {
         this.Treedata = response.data;
-        
       });
     },
-
+    getpro() {
+      getProjectList().then((response) => {
+        this.Treedata = response.data;
+      });
+    },
     handleSearch() {
       if (this.queryParams.pacName) {
         getPackageList(this.queryParams.pacName).then((response) => {
@@ -1078,83 +1154,114 @@
       }
     },
     handleSearchFor() {
-      getProjectList(this.queryParams.proName).then((response) => {
-        this.Treedata = response.data;
-        response.data.forEach((item, index) => {
-          item.newID =
-            (this.queryParams.pageNum - 1) * this.queryParams.pageSize +
-            index +
-            1;
+      // 鍒ゆ柇鏄惁涓烘眽瀛�
+      const isChineseChar = (char) => /[\u4E00-\u9FA5]/.test(char)
+      if (isChineseChar(this.queryParams1.proName)) {
+        this.queryParams1.pym = null
+        getProjectList(this.queryParams1).then((response) => {
+          this.Treedata = response.data;
         });
-      });
+      } else {
+        this.queryParams1.pym = this.queryParams1.proName
+        this.queryParams1.proName = null
+        getProjectList(this.queryParams1).then((response) => {
+          this.Treedata = response.data;
+        });
+      }
     },
     // 鍗曢」鏁版嵁鑾峰彇
     handleChangesingle(selection) {
       if (selection) {
         this.dataList = selection;
+        this.resetright()
       }
     },
-    // 鍗曢」閫夊畾鎸夐挳
     resetright() {
-      this.queryParams.price = 0;
-      // this.dataLists=JSON.parse(JSON.stringify(this.dataList));
-      this.dataList.forEach((item) => {
-        this.$refs.tre.toggleRowSelection(item, false);
-        this.OnenewpacName.push(item);
-      });
+      if (this.dataList.length == 0) {
+        return; // 濡傛灉鏁版嵁鍒楄〃涓虹┖锛岀洿鎺ヨ繑鍥�
+      } else {
+        this.queryParams.price = 0; // 鍒濆鍖栨�讳环
+        this.queryParams.xianprice = 0; // 鍒濆鍖栫幇浠�
+        this.youhui = 0; // 鍒濆鍖栦紭鎯�
 
-      for (var i = 0; i < this.OnenewpacName.length - 1; i++) {
-        for (var j = i + 1; j < this.OnenewpacName.length; j++) {
-          if (this.OnenewpacName[i].proId == this.OnenewpacName[j].proId) {
-            this.OnenewpacName.splice(j, 1);
-            j--;
+        const newItemsToAdd = []; // 鐢ㄤ簬瀛樺偍鏂伴渶瑕佹坊鍔犵殑椤圭洰
+
+        this.dataList.forEach((item) => {
+          this.$refs.tre.toggleRowSelection(item, false); // 鍙栨秷閫変腑鐘舵��
+          // 浣跨敤 $set 纭繚鍝嶅簲鎬�
+          this.$set(item, 'limits', 10); // 璁剧疆闄愬埗鏁伴噺
+          this.$set(item, 'ysPrice', item.proPrice); // 璁剧疆鐜颁环涓哄師浠�
+
+          // 妫�鏌ユ槸鍚﹀凡缁忓瓨鍦ㄧ浉鍚岀殑椤圭洰
+          const existingItem = this.OnenewpacName.find(existing => existing.proId === item.proId);
+          if (!existingItem) {
+            newItemsToAdd.push(item); // 濡傛灉涓嶅瓨鍦ㄧ浉鍚岄」鐩紝鍒欐坊鍔犲埌鏂版暟缁�
+            this.updateProPrice(item);
+          }
+        });
+
+        // 娣诲姞鏂伴」鐩埌 OnenewpacName
+        this.OnenewpacName.push(...newItemsToAdd);
+
+        // 鍒犻櫎閲嶅椤圭洰锛岃繖閲屾垜浠彧闇�澶勭悊鏂版坊鍔犵殑椤圭洰鍜屽師鏈夐」鐩箣闂寸殑閲嶅
+        for (let i = this.OnenewpacName.length - newItemsToAdd.length; i < this.OnenewpacName.length - 1; i++) {
+          for (let j = i + 1; j < this.OnenewpacName.length; j++) {
+            if (this.OnenewpacName[i].proId === this.OnenewpacName[j].proId) {
+              this.OnenewpacName.splice(j, 1); // 鍒犻櫎閲嶅鐨勯」鐩�
+              j--; // 鍥犱负鍒犻櫎浜嗕竴涓厓绱狅紝褰撳墠鐨刯瑕佸噺1
+            }
           }
         }
+        this.queryParams.price = 0
+        this.queryParams.xianprice = 0
+        // 閲嶆柊璁$畻鎬讳环鍜岀幇浠�
+        this.OnenewpacName.forEach((item) => {
+          this.queryParams.price += item.proPrice; // 绱姞鍘熶环
+          //this.queryParams.xianprice += item.ysPrice || 0;  绱姞鐜颁环锛屽鏋測sPrice涓簎ndefined鍒欑疮鍔�0
+        });
+        this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
+          return sum.plus(new Big(item.ysPrice || '0'));
+        }, new Big(0)).toNumber();
+        this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10
       }
-      return this.OnenewpacName.forEach((item) => {
-        this.queryParams.price += item.proPrice;
-      });
     },
     handledbelete(row) {
       this.queryParams.price = 0;
-      this.OnenewpacName.forEach((item, index) => {
-        if (item.proId == row.proId) {
-          this.OnenewpacName.splice(index, 1);
-        }
-      });
-      return this.OnenewpacName.forEach((item) => {
+      this.queryParams.xianprice = 0; // 鍒濆鍖栫幇浠�
+      this.youhui = 0; // 鍒濆鍖栦紭鎯�
+
+      // 鍏堟壘鍒板苟鍒犻櫎椤圭洰
+      this.OnenewpacName = this.OnenewpacName.filter(item => item.proId !== row.proId);
+
+      // 鐒跺悗鏇存柊鎬讳环鍜岀幇浠�
+      this.OnenewpacName.forEach((item) => {
         this.queryParams.price += item.proPrice;
+        this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
+          return sum.plus(new Big(item.ysPrice || "0"));
+        }, new Big(0)).toNumber();
       });
-    },
-    /*  submitrighr() {
-      if (this.pacList.length >= 1) {
-        this.openss = false;
-        this.forms.pacName = this.pacList[0].pacName;
-        this.forms.price = this.queryParams.price;
-        this.forms.ysPrice = (
-          this.forms.price *
-          (this.forms.limits / 10)
-        ).toFixed(2);
+
+      // 璁$畻浼樻儬
+      if (this.queryParams.price > 0) {
+        this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
       } else {
-        this.$modal.msgError("璇烽�夋嫨濂楅");
+        this.youhui = 10;
       }
-    }, */
+    },
+
     submitrighr() {
       this.openOne = false;
-      // this.forms.pacName = this.pacList[0].pacName;
       this.forms.price = this.queryParams.price;
-      this.forms.ysPrice = (
-        this.forms.price *
-        (this.forms.limits / 10)
-      ).toFixed(2);
-      // console.log(this.groupingList, 555);
-
+      this.forms.ysPrice = this.queryParams.xianprice
+      this.forms.limits = this.youhui
       let mapList = [];
       this.OnenewpacName.forEach((item) => {
         mapList.push({
           proName: item.proName,
           proId: item.proId,
           proPrice: item.proPrice,
+          limits: item.limits,
+          ysPrice: item.ysPrice
         });
       });
 
@@ -1177,7 +1284,7 @@
         mapList: mapList,
         price: this.forms.price,
         ysPrice: this.forms.ysPrice,
-        id: this.groupList[0].id,
+        id: this.groupList[0] ? this.groupList[0].id : ''
       };
 
       // 鍙戦�佽姹備繚瀛樻暟鎹�
@@ -1185,11 +1292,11 @@
         if (res.code == 200) {
           this.beCurrent();
           this.forms.groupingName = "";
-          this.forms.sex = "";
+          this.forms.sex = "2";
           this.forms.pacName = "";
           this.forms.price = "";
           this.forms.ysPrice = "";
-          this.forms.payType = "";
+          this.forms.payType = "1";
         }
       });
 
@@ -1208,9 +1315,6 @@
       this.pacList.forEach((item) => {
         this.OnenewpacName = item.tjProjectList;
       });
-      // this.dataLists.forEach((item2) => {
-      //   this.OnenewpacName.push(item2);
-      // });
       this.OnenewpacName.forEach((item) => {
         this.queryParams.price += item.proPrice;
       });
@@ -1253,12 +1357,12 @@
 
     handleChange(selection) {
       this.groupList = selection;
-
       if (selection.length > 0) {
         this.groupList.forEach((item) => {
           this.forms.groupingName = item.groupingName;
           this.forms.gtAge = item.gtAge;
           this.forms.limits = item.limits;
+          this.youhui = item.limits
           this.forms.ltAge = item.ltAge;
           this.forms.pacName = item.pacName;
           this.forms.payType = item.payType;
@@ -1272,58 +1376,58 @@
         this.GroupUpdate();
         this.isSexDisabled = false; // 鎭㈠鎬у埆閫夋嫨妗嗕负鍙敤
       }
-
-      /* this.groupList.forEach((item) => {
-        this.forms.groupingName = item.groupingName;
-        this.forms.gtAge = item.gtAge;
-        this.forms.limits = item.limits;
-        this.forms.ltAge = item.ltAge;
-        this.forms.pacName = item.pacName;
-        this.forms.payType = item.payType;
-        this.forms.sex = item.sex;
-        this.forms.price = item.price;
-        this.forms.ysPrice = item.ysPrice;
-      });
-      if (selection.length > 1) {
-        let del_row = selection.shift();
-        this.$refs.tbs.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
-      }
-      if(selection.length > 0) {
-        this.isSexDisabled = true;
-      }
-      else {
-        this.isSexDisabled = false;
-      } */
       this.groupIds = selection.map((item) => item.id);
       this.singlegg = !selection.length;
     },
+    handleBeforeClose(done) {
+      this.$confirm('纭鍏抽棴锛�')
+        .then(() => done())
+        .catch(() => { /* 鍙栨秷鍏抽棴 */ });
+    },
     xiangmuWh() {
+      if (!this.forms.groupingName ||
+        !this.forms.sex ||
+        !this.forms.payType) {
+        this.$modal.msgError("璇峰厛濉啓鎵�鏈夊繀濉」!");
+        return; // Stop execution if any required field is empty
+      }
       this.openOne = true;
       this.title = "鍒嗙粍椤圭洰缁存姢";
       this.OnenewpacName = [];
       this.queryParams.price = 0;
       this.loading = true;
-      let id = this.groupList[0].id;
+      if (this.groupList[0]) {
+        let id = this.groupList[0].id || '';
+        getDetails(id).then((res) => {
+          this.OnenewpacName = res.data.groupingProList;
+          // this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
+          //   return sum.plus(new Big(item.ysPrice || '0'));
+          // }, new Big(0)).toNumber();
+
+          // this.OnenewpacName.forEach((item, index) => {
+          //   this.queryParams.price += item.proPrice;
+          // });
+          // 
+
+          // this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10
+          this.queryParams.xianprice = res.data.ysPrice
+          this.queryParams.price = res.data.price
+          this.youhui = res.data.limits
+        });
+      }
       // console.log(this.groupList[0].id, 9966);
       getconfigKey("sfzstc").then((res) => {
         this.sfzs = res.msg;
-     
-        
       });
-      getDetails(id).then((res) => {
-        this.OnenewpacName = res.data.groupingProList;
-        this.OnenewpacName.forEach((item, index) => {
-          this.queryParams.price += item.proPrice;
-        });
-        // return this.OnenewpacName.forEach((item) => {
-        //   this.queryParams.price += item.proPrice;
-        // });
-      });
+
+
+
       if (this.forms.sex) {
+        console.log('杩涙潵浜唅f');
+
         deptTreeSelect(this.forms.sex).then((response) => {
           // 濂楅鍚嶇О
           this.newpacName = response.rows;
-
           this.loading = false;
           response.rows.forEach((item, index) => {
             item.newID =
@@ -1333,6 +1437,8 @@
           });
         });
       } else {
+        console.log('杩涙潵浜唀lse');
+
         deptTreeSelect().then((response) => {
           this.newpacName = response.rows;
           this.loading = false;
@@ -1346,73 +1452,9 @@
       }
       getProjectList().then((response) => {
         this.Treedata = response.data;
-        // console.log(this.Treedata,999888);
       });
     },
-    //淇濆瓨鍒嗙粍
-    /* handleGroup() {
-      if (this.selectionList.length <= 0) {
-        this.$modal.msgError("璇峰厛閫変腑閮ㄩ棬鎴栨坊鍔犳柊鐨勯儴闂�");
-      } else {
-        this.groupList.forEach((item) => {
-          if (item.id) {
-            this.id = item.id;
-          }
-        });
-        let mapList = [];
-        this.OnenewpacName.forEach((item) => {
-          mapList.push({
-            proName: item.proName,
-            proId: item.proId,
-            proPrice: item.proPrice,
-          });
-        });
-        if (this.id) {
-          var data = {
-            id: this.id,
-            groupingName: this.forms.groupingName,
-            gtAge: this.forms.gtAge,
-            limits: this.forms.limits,
-            ltAge: this.forms.ltAge,
-            pacName: this.forms.pacName,
-            payType: this.forms.payType,
-            sex: this.forms.sex,
-            dwDeptId: this.selectionList[0].id,
-            dwId: this.selectionList[0].dwId,
-            mapList: mapList,
-            price: this.forms.price,
-            ysPrice: this.forms.ysPrice,
-          };
-        } else {
-          var data = {
-            groupingName: this.forms.groupingName,
-            gtAge: this.forms.gtAge,
-            limits: this.forms.limits,
-            ltAge: this.forms.ltAge,
-            pacName: this.forms.pacName,
-            payType: this.forms.payType,
-            sex: this.forms.sex,
-            dwDeptId: this.selectionList[0].id,
-            dwId: this.selectionList[0].dwId,
-            mapList: mapList,
-            price: this.forms.price,
-            ysPrice: this.forms.ysPrice,
-          };
-        }
-        dwgrouping(data).then((res) => {
-          if (res.code == 200) {
-            this.beCurrent();
-            this.groupingList = res.data.updatedGroupingList; 
-            this.forms.groupingName = "";
-            this.forms.sex = "";
-            this.forms.pacName = "";
-            this.forms.price = "";
-            this.forms.ysPrice = "";
-            this.forms.payType = "";
-          }
-        });
-      }
-    }, */
+
     handleGroup() {
       // 濡傛灉娌℃湁閫変腑浠讳綍閮ㄩ棬锛堝嵆娌℃湁 selectionList锛夛紝鍙互鐩存帴浠� OnenewpacName 鑾峰彇鏁版嵁
       let mapList = [];
@@ -1423,17 +1465,6 @@
           proPrice: item.proPrice,
         });
       });
-
-      // 濡傛灉 selectionList 涓虹┖锛屼娇鐢� mapList 缁х画淇濆瓨
-      /* if (this.OnenewpacName.length === 0) {
-        this.$modal.msgError("璇峰厛閫変腑椤圭洰");
-        return; // 鎻愮ず鐢ㄦ埛閫変腑椤圭洰
-      } */
-
-      this.forms.ysPrice = (
-        this.forms.price *
-        (this.forms.limits / 10)
-      ).toFixed(2);
 
       let data = {
         groupingName: this.forms.groupingName,
@@ -1456,30 +1487,29 @@
         if (res.code == 200) {
           this.beCurrent();
           this.forms.groupingName = "";
-          this.forms.sex = "";
+          this.forms.sex = "2";
           this.forms.pacName = "";
           this.forms.price = "";
           this.forms.ysPrice = "";
-          this.forms.payType = "";
+          this.forms.payType = "1";
         }
       });
     },
     // 淇敼鍒嗙粍
     GroupUpdate() {
-      // this.forms = {};
+      this.$refs.tbs.clearSelection();
       this.forms = {
         groupingName: "",
         gtAge: "",
         limits: "",
         ltAge: "",
         pacName: "",
-        payType: "",
-        sex: "",
+        payType: "1",
+        sex: "2",
         price: "",
         ysPrice: "",
       };
 
-      // this.$refs.forms.resetFields();
     },
     beCurrent() {
       let data = {
@@ -1537,9 +1567,35 @@
       }
     },
 
-    // 鎶婃瘡涓�琛岀殑绱㈠紩鏀捐繘row,鏂逛究鍙屽嚮淇敼鏃犳硶鑾峰緱绱㈠紩鍒欐棤娉曞彇娑堝悗鏁版嵁杩涜杩樺師
+
     tableRowClassName({ row, rowIndex }) {
       row.index = rowIndex;
+    },
+
+
+    Package() {
+      this.taocan = true;
+      deptTreeSelect(this.forms.sex).then((res) => {
+        if (res.rows) {
+          this.newpacName1 = res.rows
+        }
+      });
+    },
+
+
+    handle() {
+      this.loading = true;
+      deptTreeSelect(this.forms.sex, this.queryParam).then((res) => {
+        if (res.rows) {
+          this.newpacName1 = res.rows; // 鏇存柊濂楅鍒楄〃
+        } else {
+          this.newpacName1 = [];
+        }
+        this.loading = false;
+      }).catch(() => {
+        this.loading = false;
+        this.$modal.msgError("鎼滅储澶辫触锛岃绋嶅悗閲嶈瘯");
+      });
     },
 
     /** 鎻愪氦鎸夐挳 */
@@ -1588,6 +1644,65 @@
         })
         .catch(() => { });
     },
+
+    submit() {
+      if (!this.selectedPackage) {
+        this.$modal.msgError("璇峰厛閫夋嫨涓�涓椁�");
+        return;
+      }
+
+      // 娓呯┖宸︿晶琛ㄦ牸
+      this.OnenewpacName = [];
+
+      // 鑾峰彇閫変腑鐨勫椁愰」鐩垪琛�
+      const newProjects = this.selectedPackage.tjProjectList || [];
+
+      // 灏嗛�変腑鐨勫椁愰」鐩坊鍔犲埌宸︿晶琛ㄦ牸
+      this.loading = true;
+      newProjects.forEach(project => {
+        // 涓烘瘡涓」鐩缃粯璁ゆ姌鎵e拰鐜颁环
+        this.$set(project, 'limits', 10); // 榛樿鎶樻墸 10锛堝嵆鍘熶环锛�
+        this.$set(project, 'ysPrice', project.proPrice); // 鐜颁环鍒濆鍖栦负鍘熶环
+        this.OnenewpacName.push(project);
+      });
+
+      // 鏇存柊鎬讳环鍜岀幇浠�
+      this.queryParams.price = this.OnenewpacName.reduce((sum, item) => {
+        return sum + (item.proPrice || 0);
+      }, 0);
+
+      this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
+        return sum + (item.ysPrice || 0);
+      }, 0);
+
+      // 鏇存柊浼樻儬鍊�
+      this.youhui = this.queryParams.price > 0
+        ? (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10
+        : 0;
+
+      // 鍏抽棴瀵硅瘽妗�
+      this.taocan = false;
+      this.loading = false;
+      this.$modal.msgSuccess("娣诲姞鎴愬姛");
+    },
+    cancel1() {
+      this.taocan = false;
+    },
+
+
+    handleSelectionChange1(selection) {
+      // 瀹炵幇鍗曢�夐�昏緫
+      if (selection.length > 1) {
+        const lastSelected = selection[selection.length - 1];
+        this.$refs.tb.clearSelection();
+        this.$refs.tb.toggleRowSelection(lastSelected, true);
+        this.selectedPackage = lastSelected;
+      } else if (selection.length === 1) {
+        this.selectedPackage = selection[0];
+      } else {
+        this.selectedPackage = null;
+      }
+    },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
       this.download(
@@ -1601,7 +1716,7 @@
   },
 };
 </script>
-<style scoped>
+<style lang="scss" scoped>
 .pag {
   width: 100%;
   display: flex;
@@ -1635,4 +1750,19 @@
   width: 50px;
   height: 100px;
 }
+
+::v-deep .el-dialog__body {
+  padding: 5px 30px;
+}
+
+::v-deep .el-dialog {
+  // height: 750px;
+  overflow-y: auto;
+}
+
+::v-deep .btntoleft .el-button--medium {
+  padding: 20px 20px 10px;
+  font-size: 14px;
+  border-radius: 4px;
+}
 </style>

--
Gitblit v1.8.0