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

qx

2025-03-27 b094d87d5a47dd03fd8a5136e19e18c1a9dae629

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

 src/views/hosp/customer/index.vue

@@ -395,6 +395,28 @@
      </el-table-column>

      <el-table-column
        label="职业"
        align="center"
        prop="career"
        width="90px"
        :show-overflow-tooltip="true"
      />
      <el-table-column
        label="工龄"
        align="center"
        prop="gl"
        width="90px"
        :show-overflow-tooltip="true"
      />
      <el-table-column
        label="文化程度"
        align="center"
        prop="wenHua"
        width="90px"
        :show-overflow-tooltip="true"
      />

      <el-table-column
        label="介绍人"
        align="center"
        prop="cusIntroduce"
@@ -603,6 +625,27 @@
              :value="dict.value"
            ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="职业" prop="career">
          <el-input
            v-model="form.career"
            placeholder="请输入职业"
            style="width: 200px"
          />
        </el-form-item>
        <el-form-item label="工龄" prop="gl">
          <el-input
            v-model="form.gl"
            placeholder="请输入工龄"
            style="width: 200px"
          />
        </el-form-item>
        <el-form-item label="文化程度" prop="wenHua">
          <el-input
            v-model="form.wenHua"
            placeholder="请输入文化程度"
            style="width: 200px"
          />
        </el-form-item>

        <el-form-item label="介绍人" prop="cusIntroduce">
@@ -1053,6 +1096,9 @@
        cusMarryStatus: null,
        cusIdcard: null,
        cusIntroduce: null,
        career:null,
        gl:null,
        wenHua: null,
        cusNumber: null,
        cusIsvip: null,
      },
@@ -1247,6 +1293,9 @@
        cusMarryStatus: null,
        cusIdcard: null,
        cusIntroduce: null,
        wenHua: null,
        career:null,
        gl:null,
        cusNumber: null,
        cusIsvip: null,
        createBy: null,

 src/views/system/comp/index.vue

@@ -329,7 +329,7 @@

          <el-col :span="15" :xs="24">
            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="46px"
              style="height: 35px" @submit.native.prevent>
              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>
@@ -345,7 +345,7 @@
                <el-button icon="el-icon-refresh" size="mini" @click="resetQuerys">重置</el-button>
              </el-form-item>
            </el-form>
            <el-table border v-loading="loading" :data="OnenewpacName" :row-class-name="tableRowClassName" height="478">
            <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">
@@ -357,7 +357,7 @@
                <template slot-scope="scope">
                  <!-- 只输入纯数字折扣 -->
                  <el-input-number v-model.number="scope.row.limits" @input="validateDiscount(scope.row)"
                    @change="handleManualChange(scope.row)" placeholder="输入折扣" size="small" type="number" :min="0"
                    @change="handleManualChange(scope.row)" placeholder="输入折扣" size="mini" type="number" :min="0"
                    :step="0.1" :precision="1" :max="20">
                  </el-input-number>
                </template>
@@ -373,7 +373,7 @@
            <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">
          <!-- <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">
@@ -382,7 +382,7 @@
                <i class="el-icon-back"></i>
              </el-button>
            </div>
          </el-col>
          </el-col> -->
          <el-col :span="7" :xs="24">
            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
              label-width="68px" @submit.native.prevent>
@@ -444,7 +444,7 @@
                <el-button icon="el-icon-refresh" size="mini" @click="resetQuerys">重置</el-button>
              </el-form-item>
            </el-form>
            <el-table border v-loading="loading" :data="OnenewpacName" :row-class-name="tableRowClassName" height="478">
            <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">
@@ -462,13 +462,13 @@
            <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">
          <!-- <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>
            </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" @submit.native.prevent>
@@ -1127,6 +1127,7 @@
    handleChangesingle(selection) {
      if (selection) {
        this.dataList = selection;
        this.resetright()
      }
    },
    resetright() {
@@ -1617,7 +1618,7 @@
}

::v-deep .el-dialog {
  height: 750px;
  // height: 750px;
  overflow-y: auto;
}