From 7d2dba2945bf807413e7fc809fc06acebe3721a8 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期二, 21 一月 2025 13:46:41 +0800
Subject: [PATCH] 1

---
 src/views/hosp/order/index.vue |  657 +++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 413 insertions(+), 244 deletions(-)

diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index ccc77aa..c5e9a65 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -177,6 +177,7 @@
           type="primary"
           size="mini"
           @click="handleRevoke"
+          :loading="isLoading"
           :disabled="single"
           >鎾ら攢绛惧埌</el-button
         >
@@ -572,17 +573,85 @@
       append-to-body
       :close-on-click-modal="false"
     >
-      <el-tabs
-        type="border-card"
-        style="height: 640px; margin: 0 10px; width: 100%"
-        @tab-click="handleClick"
-        v-model="activeNames"
-      >
-        <el-tab-pane label="缁勫悎" name="first">
-          <div class="tab8">
-            <el-row :gutter="20" style="width: 100%">
-              <el-col :span="6">
-                <div
+      <div class="box">
+        <div class="box1">
+          <div
+            style="text-align: center; margin-bottom: 10px; margin-top: 10px"
+          >
+            椤圭洰閫夋嫨
+          </div>
+          <el-tabs
+            type="border-card"
+            style="height: 560px; margin: 0 10px; width: 100%"
+            @tab-click="handleClick"
+            v-model="activeNames"
+          >
+            <el-tab-pane label="缁勫悎" name="first">
+              <div class="tab8">
+                <el-row :gutter="20" style="width: 100%">
+                  <el-col :span="22">
+                    <!-- <div
+                    style="
+                      text-align: center;
+                      margin-bottom: 10px;
+                      margin-top: 10px;
+                    "
+                  >
+                    椤圭洰鍒楄〃
+                  </div> -->
+                    <el-input
+                      placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
+                      v-model="filterage"
+                    >
+                    </el-input>
+                    <div class="tab3">
+                      <el-tree
+                        class="filter-tree"
+                        v-loading="loading"
+                        :data="packageList"
+                        :props="defaultProp"
+                        show-checkbox
+                        node-key="id"
+                        @check="handlepackage"
+                        :default-checked-keys="checkedkeys"
+                        :filter-node-method="filterpackage"
+                        ref="treas"
+                        :render-content="renderContents"
+                      >
+                      </el-tree>
+                    </div>
+                  </el-col>
+                  <!-- <el-col :span="11">
+                  <div
+                    style="
+                      text-align: center;
+                      margin-bottom: 10px;
+                      margin-top: 10px;
+                    "
+                  >
+                    鏄庣粏椤圭洰鍒楄〃
+                  </div>
+                  <div class="tab3">
+                    <el-tree
+                      class="filter-tree"
+                      v-loading="loading"
+                      :data="packagedataList"
+                      node-key="proId"
+                      :props="defaultpackProps"
+                      :render-content="renderContent"
+                    >
+                    </el-tree>
+                  </div>
+                </el-col> -->
+                  <!-- <el-col :span="11"> </el-col> -->
+                </el-row>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane label="鍗曢」" name="third">
+              <div class="tab8">
+                <el-row type="flex" class="row-bg" justify="space-around">
+                  <el-col :span="22">
+                    <!-- <div
                   style="
                     text-align: center;
                     margin-bottom: 10px;
@@ -590,27 +659,30 @@
                   "
                 >
                   椤圭洰鍒楄〃
-                </div>
-                <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterage">
-                </el-input>
-                <div class="tab3">
-                  <el-tree
-                    class="filter-tree"
-                    v-loading="loading"
-                    :data="packageList"
-                    :props="defaultProp"
-                    show-checkbox
-                    node-key="id"
-                    @check="handlepackage"
-                    :default-checked-keys="checkedkeys"
-                    :filter-node-method="filterpackage"
-                    ref="treas"
-                    :render-content="renderContents"
-                  >
-                  </el-tree>
-                </div>
-              </el-col>
-              <el-col :span="6">
+                </div> -->
+                    <el-input
+                      placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
+                      v-model="filterText"
+                    >
+                    </el-input>
+                    <div class="tab3">
+                      <el-tree
+                        class="filter-tree"
+                        v-loading="loading"
+                        :data="Treedata"
+                        :props="defaultProps"
+                        show-checkbox
+                        node-key="proId"
+                        @check="handleCurrentChecked"
+                        :default-checked-keys="checkedkey"
+                        :filter-node-method="filterNode"
+                        ref="tree"
+                        :render-content="renderContent"
+                      >
+                      </el-tree>
+                    </div>
+                  </el-col>
+                  <!-- <el-col :span="11">
                 <div
                   style="
                     text-align: center;
@@ -621,128 +693,24 @@
                   鏄庣粏椤圭洰鍒楄〃
                 </div>
                 <div class="tab3">
-                  <el-tree
-                    class="filter-tree"
-                    v-loading="loading"
-                    :data="packagedataList"
-                    node-key="proId"
-                    :props="defaultpackProps"
-                    :render-content="renderContent"
-                  >
-                  </el-tree>
-                </div>
-              </el-col>
-              <el-col :span="11">
-                <div class="grid-content bg-purple">
-                  <div
-                    style="
-                      text-align: center;
-                      margin-bottom: 10px;
-                      margin-top: 10px;
-                    "
-                  >
-                    宸查�夐」鐩垪琛�
+                  <div class="outside1">
+                    <el-tree
+                      class="filter-tree"
+                      v-loading="loading"
+                      :data="TreedataList"
+                      node-key="proId"
+                      :props="defaultProps"
+                      :filter-node-method="filterNode"
+                      show-checkbox
+                      @check-change="handleCurrentChecked1"
+                      :default-checked-keys="checkedListkey"
+                      :render-content="renderContent"
+                    >
+                    </el-tree>
                   </div>
-                  <el-table
-                    :data="Datalists"
-                    border
-                    style="width: 100%"
-                    height="400"
-                    :span-method="objectspanmethod"
-                  >
-                    <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
-                    </el-table-column>
-                    <el-table-column
-                      prop="proName"
-                      label="鏄庣粏椤圭洰"
-                      width="260px"
-                    >
-                    </el-table-column>
-                    <el-table-column prop="proPrice" label="鍘熶环" width="56px">
-                    </el-table-column>
-
-                    <el-table-column
-                      label="鎿嶄綔"
-                      align="center"
-                      class-name="small-padding fixed-width"
-                      width="50px"
-                    >
-                      <template slot-scope="scope">
-                        <el-button
-                          size="mini"
-                          type="text"
-                          icon="el-icon-delete"
-                          @click="handleDel(scope.row)"
-                          title="鍒犻櫎"
-                        ></el-button>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-
-                  <!-- <h3 style="font-weight: 600">鍚堣锛歿{ marryalls }}鍏�</h3> -->
                 </div>
-              </el-col>
-            </el-row>
-          </div>
-        </el-tab-pane>
-        <el-tab-pane label="鍗曢」" name="third">
-          <el-row type="flex" class="row-bg" justify="space-around">
-            <el-col :span="6">
-              <div
-                style="
-                  text-align: center;
-                  margin-bottom: 10px;
-                  margin-top: 10px;
-                "
-              >
-                椤圭洰鍒楄〃
-              </div>
-              <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
-              </el-input>
-              <div class="tab3">
-                <el-tree
-                  class="filter-tree"
-                  v-loading="loading"
-                  :data="Treedata"
-                  :props="defaultProps"
-                  show-checkbox
-                  node-key="proId"
-                  @check="handleCurrentChecked"
-                  :default-checked-keys="checkedkey"
-                  :filter-node-method="filterNode"
-                  ref="tree"
-                  :render-content="renderContent"
-                >
-                </el-tree>
-              </div>
-            </el-col>
-            <el-col :span="5">
-              <div
-                style="
-                  text-align: center;
-                  margin-bottom: 10px;
-                  margin-top: 10px;
-                "
-              >
-                鏄庣粏椤圭洰鍒楄〃
-              </div>
-              <div class="tab3">
-                <el-tree
-                  class="filter-tree"
-                  v-loading="loading"
-                  :data="TreedataList"
-                  node-key="proId"
-                  :props="defaultProps"
-                  :filter-node-method="filterNode"
-                  show-checkbox
-                  @check-change="handleCurrentChecked1"
-                  :default-checked-keys="checkedListkey"
-                  :render-content="renderContent"
-                >
-                </el-tree>
-              </div>
-            </el-col>
-            <el-col :span="11">
+              </el-col> -->
+                  <!-- <el-col :span="11">
               <div class="grid-content bg-purple">
                 <div
                   style="
@@ -753,6 +721,7 @@
                 >
                   宸查�夐」鐩垪琛�
                 </div>
+
                 <el-table
                   :data="DataList"
                   border
@@ -788,90 +757,165 @@
                       ></el-button>
                     </template>
                   </el-table-column>
-                </el-table>
-                <!-- <el-collapse v-model="activeName" accordion v-if="list1">
-              <div>
-                <el-collapse-item title="璇烽�夋嫨椤圭洰">
-                  <el-table :data="DataList" border style="width: 100%">
-                    <el-table-column prop="proName" label="椤圭洰" width="180">
-                    </el-table-column>
-                    <el-table-column prop="ordPrice" label="鍘熶环">
-                    </el-table-column>
-                  </el-table>
-                </el-collapse-item>
-              </div>
-            </el-collapse> -->
-                <template>
-                  <el-form :model="form">
-                    <el-form-item label="浣撴绫诲瀷" prop="tjType">
-                      <div class="type">
-                        {{ { 1: "鍥㈤槦", 2: "涓汉", 3: "鍥綋绁�" }[form.tjType] }}
-                      </div>
-
-                      <!-- <el-radio-group v-model="form.tjType">
-                        <el-radio :label="1">鍥㈤槦</el-radio>
-                        <el-radio :label="2">涓汉</el-radio>
-                      </el-radio-group> -->
-                    </el-form-item>
-                  </el-form>
-                </template>
-
-                <div class="outside">
-                  <el-form :inline="true" class="outside1">
-                    <el-form-item label="鍘熶环">
-                      <el-input
-                        placeholder="鍘熶环"
-                        :value="TotalPrice1"
-                        disabled
-                        style="width: 90px"
-                      ></el-input>
-                    </el-form-item>
-                    <el-form-item label="鎶樻墸璁惧畾">
-                      <el-input
-                        style="width: 90px"
-                        type="number"
-                        v-model="discount"
-                        :value="discount"
-                      ></el-input>
-                    </el-form-item>
-                    <el-form-item label="搴斾粯閲戦">
-                      <el-input
-                        placeholder="搴斾粯閲戦"
-                        :value="TotalPrice1 * (discount / 10)"
-                        style="width: 90px"
-                      ></el-input>
-                    </el-form-item>
-                    <el-form-item label="浠樻绫诲瀷" prop="payType">
-                      <el-select
-                        style="width: 120px"
-                        v-model="payType"
-                        placeholder="璇烽�夋嫨浠樻绫诲瀷"
-                        @change="onPayTypeChange"
+                </el-table> -->
+                  <!-- <el-collapse v-model="activeName" accordion v-if="list1">
+                  <div>
+                    <el-collapse-item title="璇烽�夋嫨椤圭洰">
+                      <el-table
+                        :data="DataList"
+                        border
+                        style="width: 100%"
+                        height="400"
+                        :span-method="objectSpanMethod"
                       >
-                        <el-option
-                          v-for="dict in dict.type.dict_pay_type"
-                          :key="dict.value"
-                          :label="dict.label"
-                          :value="dict.value"
-                        ></el-option>
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item>
-                      <el-button
-                        type="primary"
-                        @click="submitPrice"
-                        :disabled="confirm"
-                        style="margin-top: 34px"
-                        >鎻愪氦</el-button
-                      >
-                    </el-form-item>
-                  </el-form>
-                </div>
+                        <el-table-column
+                          prop="proName"
+                          label="椤圭洰"
+                          width="180"
+                        >
+                        </el-table-column>
+                        <el-table-column prop="ordPrice" label="鍘熶环">
+                        </el-table-column>
+                      </el-table>
+                    </el-collapse-item>
+                  </div>
+                </el-collapse> -->
+                  <!-- </div>
+            </el-col> -->
+                </el-row>
               </div>
-            </el-col>
-          </el-row>
-        </el-tab-pane>
-      </el-tabs>
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+
+        <div class="grid-content bg-purple">
+          <div style="text-align: center; margin-bottom: 10px; margin-top: 9px">
+            宸查�夐」鐩垪琛�
+          </div>
+          <el-table
+            :data="DataList3"
+            border
+            style="width: 100%"
+            height="560"
+            :span-method="objectspanmethod"
+          >
+            <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+            </el-table-column>
+            <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="200px">
+            </el-table-column>
+            <el-table-column prop="sl" label="鏁伴噺" width="56px">
+            </el-table-column>
+            <el-table-column prop="proPrice" label="鍘熶环" width="56px">
+            </el-table-column>
+
+            <el-table-column
+              label="鎿嶄綔"
+              align="center"
+              class-name="small-padding fixed-width"
+              width="50px"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="handleDel(scope.row)"
+                  title="鍒犻櫎"
+                ></el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <!-- <h3 style="font-weight: 600">鍚堣锛歿{ marryalls }}鍏�</h3> -->
+        </div>
+      </div>
+      <el-form
+        :model="form"
+        inline
+        style="display: flex; justify-content: space-between; margin-top: 20px"
+      >
+        <!-- 浣撴绫诲瀷 -->
+        <el-form-item label="浣撴绫诲瀷" prop="tjType" style="display: flex">
+          <div class="type">
+            {{ { 1: "鍥㈤槦", 2: "涓汉", 3: "鍥綋绁�" }[form.tjType] }}
+          </div>
+        </el-form-item>
+
+        <!-- 鍘熶环 -->
+        <el-form-item label="鍘熶环" style="display: flex">
+          <el-input
+            placeholder="鍘熶环"
+            :value="TotalPrice1"
+            disabled
+            style="width: 90px"
+          ></el-input>
+        </el-form-item>
+
+        <!-- 鎶樻墸璁惧畾 -->
+        <el-form-item label="鎶樻墸" style="display: flex">
+          <el-input
+            style="width: 90px"
+            type="number"
+            v-model="discount"
+            :value="discount"
+          ></el-input>
+        </el-form-item>
+
+        <!-- 搴斾粯閲戦 -->
+        <el-form-item label="搴斾粯" style="display: flex">
+          <el-input
+            placeholder="搴斾粯閲戦"
+            :value="TotalPrice1 * (discount / 10)"
+            style="width: 90px"
+          ></el-input>
+        </el-form-item>
+
+        <!-- 浠樻绫诲瀷 -->
+        <el-form-item label="浠樻绫诲瀷" prop="payType" style="display: flex">
+          <el-select
+            style="width: 120px"
+            v-model="payType"
+            placeholder="璇烽�夋嫨浠樻绫诲瀷"
+            @change="onPayTypeChange"
+          >
+            <el-option
+              v-for="dict in dict.type.dict_pay_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <!-- 缁撶畻鏂瑰紡 -->
+        <el-form-item label="缁撶畻鏂瑰紡" prop="jsType" style="display: flex">
+          <el-select
+            v-model="jsType"
+            placeholder="璇烽�夋嫨缁撶畻鏂瑰紡"
+            style="width: 130px"
+            clearable
+          >
+            <el-option
+              v-for="dict in dict.type.reservation_pay_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+
+        <!-- 鎻愪氦鎸夐挳 -->
+        <el-form-item style="display: flex">
+          <el-button
+            type="primary"
+            :loading="isSubmit1"
+            @click="submitPrice1"
+            :disabled="confirm"
+          >
+            鎻愪氦
+          </el-button>
+        </el-form-item>
+      </el-form>
     </el-dialog>
 
     <!-- 娣诲姞琛ュ綍椤圭洰 -->
@@ -1111,7 +1155,9 @@
           >
             <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
             </el-table-column>
-            <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
+            <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="200px">
+            </el-table-column>
+            <el-table-column prop="sl" label="鏁伴噺" width="56px">
             </el-table-column>
             <el-table-column prop="proPrice" label="鍘熶环" width="56px">
             </el-table-column>
@@ -1138,7 +1184,95 @@
         </div>
       </div>
 
-      <div class="heji">
+      <el-form
+        :model="form"
+        inline
+        style="display: flex; justify-content: space-between; margin-top: 20px"
+      >
+        <!-- 浣撴绫诲瀷 -->
+        <el-form-item label="浣撴绫诲瀷" prop="tjType" style="display: flex">
+          <div class="type">
+            {{ { 1: "鍥㈤槦", 2: "涓汉", 3: "鍥綋绁�" }[form.tjType] }}
+          </div>
+        </el-form-item>
+
+        <!-- 鍘熶环 -->
+        <el-form-item label="鍘熶环" style="display: flex">
+          <el-input
+            placeholder="鍘熶环"
+            :value="TotalPrice1"
+            disabled
+            style="width: 90px"
+          ></el-input>
+        </el-form-item>
+
+        <!-- 鎶樻墸璁惧畾 -->
+        <el-form-item label="鎶樻墸" style="display: flex">
+          <el-input
+            style="width: 90px"
+            type="number"
+            v-model="discount"
+            :value="discount"
+          ></el-input>
+        </el-form-item>
+
+        <!-- 搴斾粯閲戦 -->
+        <el-form-item label="搴斾粯" style="display: flex">
+          <el-input
+            placeholder="搴斾粯閲戦"
+            :value="TotalPrice1 * (discount / 10)"
+            style="width: 90px"
+          ></el-input>
+        </el-form-item>
+
+        <!-- 浠樻绫诲瀷 -->
+        <el-form-item label="浠樻绫诲瀷" prop="payType" style="display: flex">
+          <el-select
+            style="width: 120px"
+            v-model="payType"
+            placeholder="璇烽�夋嫨浠樻绫诲瀷"
+            @change="onPayTypeChange"
+          >
+            <el-option
+              v-for="dict in dict.type.dict_pay_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <!-- 缁撶畻鏂瑰紡 -->
+        <el-form-item label="缁撶畻鏂瑰紡" prop="jsType" style="display: flex">
+          <el-select
+            v-model="jsType"
+            placeholder="璇烽�夋嫨缁撶畻鏂瑰紡"
+            style="width: 130px"
+            clearable
+          >
+            <el-option
+              v-for="dict in dict.type.reservation_pay_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+
+        <!-- 鎻愪氦鎸夐挳 -->
+        <el-form-item style="display: flex">
+          <el-button
+            type="primary"
+            :loading="isSubmit1"
+            @click="submitPrice1"
+            :disabled="confirm"
+          >
+            鎻愪氦
+          </el-button>
+        </el-form-item>
+      </el-form>
+
+      <!-- <div class="heji">
         <div class="o">
           <el-form
             :model="form"
@@ -1193,6 +1327,21 @@
                 ></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="缁撶畻鏂瑰紡" prop="payType">
+              <el-select
+                v-model="payType"
+                placeholder="璇烽�夋嫨缁撶畻鏂瑰紡"
+                style="width: 130px"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.reservation_pay_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
             <el-form-item style="display: flex">
               <el-button
                 type="primary"
@@ -1203,7 +1352,7 @@
             </el-form-item>
           </el-form>
         </div>
-      </div>
+      </div> -->
     </el-dialog>
 
     <!-- 娣诲姞鎴栦慨鏀逛綋妫�璁板綍瀵硅瘽妗� -->
@@ -1539,7 +1688,7 @@
   components: {
     ViewPdf,
   },
-  dicts: ["dict_pay_type", "dict_team"],
+  dicts: ["dict_pay_type", "dict_team", "reservation_pay_type"],
   name: "Order",
   data() {
     return {
@@ -1555,6 +1704,9 @@
       DataList3: [],
       bldhid: "",
       budadaozhen: false,
+      isLoading: false,
+      isSubmit: false,
+      isSubmit1: false,
       huizongList: [],
       DataLists: [],
       infoList: [],
@@ -1582,6 +1734,7 @@
       packagedataList: [],
       cusId: "",
       payType: "0",
+      jsType: "0",
       packageList: [],
       checkedkeys: [],
       dialogVisible: false,
@@ -1844,7 +1997,6 @@
       // 鑾峰彇鍗曚綅淇℃伅闆嗗悎
       getCompany(this.queryParams).then((response) => {
         this.CompanyList = response.data;
-        console.log(this.CompanyList, 555);
 
         this.loading = false;
       });
@@ -1981,6 +2133,7 @@
     },
 
     handleRevoke() {
+      this.isLoading = true;
       this.$confirm("鎮ㄧ‘璁よ鎾ら攢锛�", "纭淇℃伅", {
         distinguishCancelAndClose: true,
         confirmButtonText: "纭",
@@ -1989,6 +2142,7 @@
         .then(() => {
           revokeTjOrderByTjNum(this.tjnumbers).then((res) => {
             this.$modal.msgSuccess("鎾ら攢鎴愬姛");
+            // this.isLoading = false;
             this.getList();
           });
         })
@@ -1999,6 +2153,10 @@
               message: "宸插彇娑�",
             });
           }
+        })
+        .finally(() => {
+          // 涓嶈鎿嶄綔鎴愬姛杩樻槸澶辫触锛岄兘浼氭墽琛�
+          this.isLoading = false;
         });
     },
     /** 鐐瑰嚮鏄剧ず浣撴鎶ュ憡鎶ヨ〃*/
@@ -2210,7 +2368,7 @@
         var discount = "";
         response.data.water.forEach((item) => {
           copeWith += item.copeWith;
-          paidIn += item.copeWith;
+          paidIn += item.paidIn;
           discount = item.discount;
         });
         this.bill.push({
@@ -2251,7 +2409,7 @@
         var discount = "";
         response.data.water.forEach((item) => {
           copeWith += item.copeWith;
-          paidIn += item.copeWith;
+          paidIn += item.paidIn;
           discount = item.discount;
         });
         this.bill.push({
@@ -2362,8 +2520,10 @@
         let datas = {
           zhId: data.id,
         };
+
         getlistByZhId(datas).then((res) => {
           this.packagedataList = res.data.tjProjectList;
+
           for (var i = 0; i < this.packagedataList.length; i++) {
             let proId = this.packagedataList[i].proId;
             getProSonDxList(proId).then((res) => {
@@ -2515,7 +2675,6 @@
             this.checkedListkey.push(item.proId);
             this.DataList.push(item);
             this.DataList3 = this.DataList.concat(this.Datalists);
-            console.log(this.DataList, 77777);
             this.spliceData();
             this.DataList.forEach((item1) => {
               if (item1.proParentId == data.proId) {
@@ -2526,7 +2685,7 @@
           this.TotalPrice1 = 0;
           if (this.DataList3.length != 0) {
             this.DataList3.forEach((item) => {
-              this.TotalPrice1 += item.proPrice;
+              this.TotalPrice1 += item.proPrice * item.sl;
             });
           }
           // this.TotalPrice1 = 0;
@@ -2579,7 +2738,6 @@
         });
       } else if (checked == true) {
         this.DataList.push(data);
-        console.log(this.DataList, 6666);
         this.DataList.forEach((item1) => {
           if (item1.proParentId == this.dataObj.proId) {
             item1.propinName = this.dataObj.proName;
@@ -2588,6 +2746,9 @@
         this.spliceData();
         this.TotalPrice1 = 0;
         this.DataList.forEach((item1) => {
+          console.log(item1.proPrice, 3322);
+          console.log(this.TotalPrice1, 1122);
+
           this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
         });
         if (this.marryalls != 0) {
@@ -2714,6 +2875,7 @@
     // 鏀惰垂鎸夐挳
     submitPrice() {
       this.proIds = [];
+      this.isSubmit = true;
       if (this.DataList.length != 0) {
         this.DataList.forEach((item) => {
           this.proIds.push(item.proId);
@@ -2749,6 +2911,7 @@
             payType: this.payType,
           };
           getwater(data).then((res) => {
+            this.isSubmit = false;
             this.$modal.msgSuccess("鎻愪氦鎴愬姛");
             this.mobanId = res.data.mobanId;
             this.waterId = res.data.waterId;
@@ -2764,6 +2927,7 @@
     // 鏀惰垂鎸夐挳
     submitPrice1() {
       this.proIds = [];
+      this.isSubmit1 = true;
       if (this.DataList.length != 0) {
         this.DataList.forEach((item) => {
           this.proIds.push(item.proId);
@@ -2793,10 +2957,12 @@
             discount,
             copeWith,
             tjType,
+            payStasus: this.jsType,
             orderId: this.orderIds,
             tjProIds: this.proIds,
             payType: this.payType,
           };
+
           getwater(data).then((res) => {
             this.$modal.msgSuccess("鎻愪氦鎴愬姛");
             this.mobanId = res.data.mobanId;
@@ -2806,8 +2972,11 @@
             const params = { viewNum, tjnumber };
             this.$tab.openPage("鏀舵灏忕エ", "/report/charge", params);
             this.Projectopen1 = false;
+            this.Projectopen = false;
+            this.isSubmit1 = false;
           });
         }
+        this.isSubmit1 = false;
       });
     },
 

--
Gitblit v1.8.0