Merge remote-tracking branch 'origin/master'

晏有为

2024-05-15 c7e7d101d901ae10b9c32ea02f87abef54e280a7

 src/components/view/b2-standard.vue

@@ -1,12 +1,12 @@
<style scoped>
  .standard {
    padding: 20px 0;
    padding: 10px 0;
    display: flex;
  }

  .left {
    width: 270px;
    height: calc(100% - 40px - 30px);
    height: calc(100% - 40px - 10px);
    background-color: white;
    padding: 15px;
  }
@@ -38,8 +38,8 @@
  }

  .right .title {
    height: 50px;
    line-height: 50px;
    height: 34px;
    line-height: 34px;
    padding: 0 10px;
    background-color: white;
  }
@@ -51,19 +51,33 @@

  .product_table {
    border-top: 1px solid #ebeef5;
    height: calc(100% - 275px);
    height: calc(100% - 235px);
    margin-top: 5px;
    background-color: white;
    user-select: none;
  }

  .product_table .el-table {
    height: 100%;
    height: calc(100% - 35px) !important;
  }

  .sort {
    width: 80% !important;
    overflow: hidden;
  }
  >>>.el-table__body-wrapper{
    height: calc(100% - 46px) !important;
  }
  >>>.header-class{
    height: 40px !important;
  }
  >>>.header-class th.el-table__cell>.cell{
    line-height: 20px !important;
    padding-top: 0 !important;
    padding-bottom: 0 !important;
  }
  >>>.el-table__row{
    height: 35px !important;
  }
</style>
<style>
@@ -131,19 +145,10 @@
    <div class="right">
      <el-row class="title">
        <el-col :span="24" style="font-size: 14px;color: #999;">{{selectTree}}</el-col>
        <!-- <el-col :span="selectTree==''?24:14" style="text-align: right;" v-if="selectTree!=''"> -->
        <!-- <el-button size="small" type="primary" @click="addStandardDia = true"
                  v-if="addStandardMethod">新增标准</el-button>
               <el-button size="small" type="primary" @click="addProductDia = true" v-if="addStandardProduct">新增项目</el-button>
               <el-button size="small" @click="delStandardProductByIds" v-if="delStandardProduct">
                  <i class="el-icon-delete" style="color: #3A7BFA;"></i>
                  <span style="color: #3A7BFA;">删除</span>
               </el-button> -->
        <!-- </el-col> -->
      </el-row>
      <el-row class="standard_table" v-loading="tableLoad">
        <el-table class="el-table" :data="standardList" style="width: 100%;" height="220" tooltip-effect="dark"
          highlight-current-row @row-click="rowClick" ref="standard">
        <el-table class="el-table" :data="standardList" style="width: 100%;height: 220px !important;" height="220" tooltip-effect="dark"
          highlight-current-row @row-click="rowClick" ref="standard" header-row-class-name="header-class">
          <el-table-column prop="code" label="标准编号" show-overflow-tooltip width="200">
            <template slot-scope="scope">
              <span style="color: red;font-size: 14px;">{{scope.row['code']}}</span>
@@ -162,11 +167,15 @@
      </el-row>
      <el-row class="product_table" v-loading="tableLoad2">
        <el-table :data="productList" ref="productTable" style="width: 100%;" height="100%" tooltip-effect="dark" stripe
          :fit="true" border @selection-change="handleSelectionChange" :row-class-name="tableRowClassName"
          @select="upProductSelect" @select-all="handleAll">
          <el-table-column type="selection" width="65">
          :fit="true" border
          @selection-change="handleSelectionChange" :row-class-name="tableRowClassName"
          @select="upProductSelect"
          @select-all="handleAll"
          class="productTable"
          header-row-class-name="header-class">
          <el-table-column type="selection" width="50" >
          </el-table-column>
          <el-table-column prop="model" label="型号" min-width="120" show-overflow-tooltip></el-table-column>
          <el-table-column prop="model" label="型号" min-width="100" show-overflow-tooltip></el-table-column>
          <el-table-column prop="inspectionItem" label="检验项" min-width="140" show-overflow-tooltip></el-table-column>
          <!-- <el-table-column prop="inspectionItemClassify" label="检验项类型" width="120" show-overflow-tooltip></el-table-column> -->
          <el-table-column prop="inspectionItemSubclass" label="检验项子项" min-width="140"
@@ -218,7 +227,8 @@
          <el-table-column prop="manHourGroup" label="工时分组" width="100" show-overflow-tooltip></el-table-column>
          <el-table-column prop="templateId" label="模板" width="200">
            <template slot-scope="scope">
              <el-select v-model="scope.row.templateId" size="small" @change="(value)=>upStandardProductListOfTemplate(value,scope.row.id)">
              <el-select v-model="scope.row.templateId" size="small" filterable
               @change="(value)=>upStandardProductListOfTemplate(value,scope.row.id)">
                <el-option v-for="(a, ai) in templateList" :key="ai" :label="a.name" :value="a.id"></el-option>
              </el-select>
            </template>
@@ -230,6 +240,14 @@
            </template>
          </el-table-column>
        </el-table>
        <el-pagination
        style="position: absolute;right: 16px;bottom: 1px;"
          @current-change="handleCurrentChange"
          :current-page="currentPage"
          :page-size="pageSize"
          layout="total, prev, pager, next, jumper"
          :total="total">
        </el-pagination>
      </el-row>
    </div>
    <el-dialog title="分类添加" :visible.sync="addDia" width="400px">
@@ -272,7 +290,7 @@
        <el-button type="primary" @click="addStandardTree" :loading="addLoad">确 定</el-button>
      </span>
    </el-dialog>
    <el-dialog title="新增标准" :visible.sync="addStandardDia" width="400px">
    <!-- <el-dialog title="新增标准" :visible.sync="addStandardDia" width="400px">
      <div class="body">
        <el-row style="line-height: 50px;">
          <el-col :span="6" style="text-align: right;">
@@ -289,8 +307,8 @@
        <el-button @click="addStandardDia = false">取 消</el-button>
        <el-button type="primary" @click="addStandardMethodList" :loading="addLoad2">确 定</el-button>
      </span>
    </el-dialog>
    <el-dialog title="新增项目" :visible.sync="addProductDia" width="70%">
    </el-dialog> -->
    <!-- <el-dialog title="新增项目" :visible.sync="addProductDia" width="70%">
      <div class="body" style="height: 60vh;" v-if="addProductDia">
        <ValueTable ref="ValueTable" :url="$api.capacityScope.selectItemParameterList" :componentData="componentData" />
      </div>
@@ -298,7 +316,7 @@
        <el-button @click="addProductDia = false">取 消</el-button>
        <el-button type="primary" @click="addStandardProductDo" :loading="addLoad3">确 定</el-button>
      </span>
    </el-dialog>
    </el-dialog> -->
    <el-dialog title="区间设置" :visible.sync="sectionUpDia" width="70%">
      <div class="body" style="padding: 5px 0;">
        <el-table :data="sectionList" border style="width: 100%" height="350px">
@@ -427,7 +445,11 @@
        sectionLoad: false,
        sectionRow: null,
        sectionList: [],
        templateList: []
        templateList: [],
        total:0,
        pageSize:100,
        currentPage:1,
        standardId: 0
      }
    },
    mounted() {
@@ -906,16 +928,19 @@
      },
      rowClick(row, column, event) {
        this.tableLoad2 = true
        this.standardId = row.id
        this.$axios.post(this.$api.standardTree.selectStandardProductListByMethodId, {
          id: row.id,
          tree: this.selectTree
          tree: this.selectTree,
          page: this.currentPage
        }).then(res => {
          this.productList = res.data
          this.productList = res.data.productList
          this.total = res.data.total
          setTimeout(() => {
            this.productList.forEach(a => {
              if (a.state == 1) this.toggleSelection(a)
            })
          }, 300)
          }, 200)
          this.tableLoad2 = false
        })
      },
@@ -932,7 +957,7 @@
        return '';
      },
      upProductSelect(selection, row) {
        row.state = row.state == 1 ? 0 : 1
        row.state = (row.state == 1 ? 0 : 1)
        this.$axios.post(this.$api.standardTree.upStandardProductList, {
          id: row.id,
          state: row.state
@@ -954,12 +979,14 @@
      },
      handleAll(e) {
        if (e.length > 0) {
          this.productList.map(m => {
          this.productList = this.productList.map(m => {
            m.state = 0
            this.upProductSelect(null, m)
            return m
          })
        } else {
          this.productList.map(m => {
          this.productList = this.productList.map(m => {
            m.state = 1
            this.upProductSelect(null, m)
            return m
          })
@@ -1036,6 +1063,23 @@
          this.templateList = res.data
        })
      },
      handleCurrentChange(val) {
        this.currentPage = val;
        this.tableLoad2 = true
        this.$axios.post(this.$api.standardTree.selectStandardProductListByMethodId, {
          id: this.standardId,
          tree: this.selectTree,
          page: val
        }).then(res => {
          this.productList = res.data.productList
          setTimeout(() => {
            this.productList.forEach(a => {
              if (a.state == 1) this.toggleSelection(a)
            })
          }, 200)
          this.tableLoad2 = false
        })
      },
    }
  }
</script>