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

lkk

2025-01-22 baabdb83057cf3f165658d14d0c6d1116afc23ff

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

 src/views/system/tijian/index.vue

@@ -374,70 +374,45 @@
        </el-tab-pane>
        <el-tab-pane label="单项" name="second">
          <div class="tab8">
            <el-row :gutter="24">
              <el-col :span="8">
                <div style="
                    text-align: center;
                  ">
                  项目列表
                </div>
                <!-- @input="gaibian" -->
                <el-input placeholder="输入关键字进行过滤" v-model="filterText">
                </el-input>
                <div class="tab3">
    <div style="width: 500px; float: left; margin-right: 10px;">
      <div style="text-align: center;">项目列表</div>
      <el-input placeholder="输入关键字进行过滤" v-model="filterText" style="margin-bottom: 10px;"></el-input>
      <div class="tab3" style="overflow: hidden;">
                  <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="8">
                <div style="
                    text-align: center;
                    margin-bottom: 10px;
                    margin-top: 10px;
                  ">
                  明细项目列表
                </div>
                <div class="tab3">
    <div style="width: 400px; float: left; margin: 0 10px;">
      <div style="text-align: center; margin-bottom: 45px;">明细项目列表</div>
      <div class="tab3" style="overflow: hidden;">
                  <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="8">
                <div class="grid-content bg-purple">
                  <div style="
                      text-align: center;
                      margin-bottom: 10px;
                      margin-top: 10px;
                    ">
                    已选项目列表
                  </div>
                  <el-table :data="DataList" border style="width: 100%" height="400" :span-method="objectSpanMethod">
                    <el-table-column prop="propinName" label="检查项目">
                    </el-table-column>
                    <el-table-column prop="sl" label="数量" width="56px">
                    </el-table-column>
    <div style="width: 500px; float: left;">
      <div style="text-align: center; margin-bottom: 45px;">已选项目列表</div>
      <div style="height: 350px; overflow-y: auto; overflow-x: hidden;">
        <el-table :data="DataList" border style="width: 100%;" height="350" :span-method="objectSpanMethod">
          <el-table-column prop="propinName" label="检查项目"></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 prop="proName" label="明细项目" width="260px">
                    </el-table-column>

                    <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width"
                      width="50px">
          <el-table-column prop="proName" label="明细项目" width="220px"></el-table-column>
          <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="50px">
                      <template slot-scope="scope">
                        <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                          title="删除"></el-button>
              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" title="删除"></el-button>
                      </template>
                    </el-table-column>
                  </el-table>
                  <h3 style="font-weight: 600">合计：{{ marryall }}元</h3>
                </div>
              </el-col>
            </el-row>
          </div>
    <div style="clear: both;"></div>
</div>
  <h3 style="font-weight: 600; text-align: center; margin-top: 40px;">合计：{{ marryall }}元</h3>
        </el-tab-pane>
      </el-tabs>
      <span slot="footer" class="dialog-footer">
@@ -2241,6 +2216,7 @@
  this.malldisble = false;
  this.defaultKeys = [];
  this.DataLists = [];
      
},

    cancell() {
@@ -2668,16 +2644,6 @@
          }
        }
      }

      // if (columnIndex == 3) {
      //   let rowspan = 0;
      //   this.DataLists.forEach((element) => {
      //     if (element.propinName === row.propinName) {
      //       rowspan++;
      //     }
      //   });
      //   return [rowspan, 1];
      // }
    },
    handlePackageChecked(data, checked, checkedNodes) {
      if (checked == false) {
@@ -3355,11 +3321,8 @@
}

.filter-tree {
  /* max-height: 360px;
  overflow-y: auto;
  border: 1px solid #d9d9d9; */
  overflow: auto;
  flex: 1;
  overflow-y: auto; /* 保留纵向滚动条 */
  overflow-x: hidden; /* 隐藏横向滚动条 */
  height: 350px;
}

@@ -3470,4 +3433,16 @@
  width: 100%;
  display: flex;
}
/* .tab3 {
  overflow-y: auto;
}

.tab3::-webkit-scrollbar {
  width: 0px;
  background: transparent;
}

.tab3::-webkit-scrollbar-thumb {
  background: transparent;
} */
</style>