Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb

lkk

9 天以前 942697763a76be6f6e9402d34015c8a94336406c

 src/views/system/tijian/index.vue

@@ -1,4 +1,6 @@
<template>
   <div v-loading="isLoading" element-loading-text="请稍候..." element-loading-spinner="el-icon-loading"
    element-loading-background="rgba(255, 255, 255, 0.8)" style="height: 100%; padding: 20px; position: relative;">
  <div class="app-container">
    <el-dialog :title="title" :visible.sync="open1" width="1000px" append-to-body>
      <el-form ref="form1" :model="form1" :rules="rules1" label-width="100px" :inline="true">
@@ -562,6 +564,15 @@
            </div>
            已选项目列表
          </div>

          <div v-loading="contentLoading" element-loading-text="加载中..." element-loading-spinner="el-icon-loading" element-loading-background="rgba(255, 255, 255, 0.7)" style=" padding: 0px 6px;
    border: 1px solid #e6ebf5;
    max-height: 650%;
    overflow: auto;
    width: 916px;
    margin-left: 35px;" >

          
          <div style="
              padding: 0px 6px;
              border: 1px solid #e6ebf5;
@@ -617,6 +628,7 @@
                </template>
              </el-table-column>
            </el-table>
          </div>
          </div>
        </div>
      </el-col>
@@ -749,6 +761,7 @@
    <Packages ref="aaa" @add="handleChanges" />
    <selectName ref="bbb" @add="handleChangesName" />
  </div>
</div>
</template>

<script>
@@ -815,6 +828,8 @@
  data() {
    return {
      isSubmitting: false,
      contentLoading: false,
      isLoading: false,
      open1: false,
      filterage: "",
      checkedkeys: [],
@@ -2910,6 +2925,7 @@

    // 项目提交
    submit() {
    this.isLoading = true;
      if (this.form.cusIdcard) {
        var cusId = this.form.cusIdcard;
      } else {
@@ -2923,6 +2939,8 @@
      this.isSubmitting = true; // 开始提交时设置标志
      this.TotalPrice1 = 0; // 初始化应收金额
      this.TotalPrice = 0; // 初始化实收金额

      this.contentLoading = true; 
      this.discount = 10; // 初始化折扣为10（100%）

      // 判断是否有选中的套餐
@@ -2959,9 +2977,11 @@
              this.processOrderItems(cusId);
            }
            this.isSubmitting = false; // 提交完成后重置标志
             this.isLoading = false;
          })
          .catch(() => {
            this.isSubmitting = false; // 确保在错误情况下也重置标志
             this.isLoading = false;
          });
      } else {
        getaddtTransition(data)
@@ -2970,9 +2990,13 @@
              this.processOrderItems(cusId);
            }
            this.isSubmitting = false; // 提交完成后重置标志
             this.isLoading = false;
            // this.contentLoading = false;
          })
          .catch(() => {
            this.isSubmitting = false; // 确保在错误情况下也重置标志
             this.isLoading = false;
            // this.contentLoading = false;
          });
      }

@@ -2984,6 +3008,7 @@
    // 处理订单项目
    processOrderItems(cusId) {
      getTransitionList1(cusId).then((response) => {
        this.contentLoading = false;
        this.tableData1 = response.data;
        let Price = 0;
        if (this.tableData1) {