Merge remote-tracking branch 'origin/master'

gaoluyang

2024-07-31 38e6f27a8082e1173e3c02a33da5da39b6c6872c

 src/components/view/b2-standard.vue

@@ -231,7 +231,10 @@
          @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="sample" label="产品" min-width="100" 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="inspectionItemClass" v-if="PROJECT === '装备电缆'" label="检验项分类" min-width="140" show-overflow-tooltip></el-table-column>
          <el-table-column prop="inspectionItemClassEn" v-if="PROJECT === '装备电缆'" label="检验项分类(EN)" min-width="140" 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"
@@ -428,6 +431,7 @@
            header-row-class-name="header-class" :row-key="row=>row.id" @filter-change="filterHandler" highlight-current-row>
            <el-table-column type="selection" width="50">
            </el-table-column>
            <el-table-column prop="sample" label="产品" min-width="100" 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 :filters="filters0"
              :filter-multiple="false" column-key="inspectionItem" filter-placement="bottom-start"></el-table-column>
@@ -456,7 +460,7 @@
        </div>
      </div>
    </el-dialog>
    <el-dialog title="区间设置" :visible.sync="sectionUpDia" width="70%">
    <el-dialog title="区间设置" :visible.sync="sectionUpDia" width="70%" :close-on-click-modal="false">
      <div class="body" style="padding: 5px 0;">
        <el-table :data="sectionList" border style="width: 100%" height="350px">
          <el-table-column type="index" label="序号" width="70" align="center">
@@ -498,12 +502,12 @@
      <span slot="footer" class="dialog-footer">
        <el-button @click="sectionUpDia = false">取 消</el-button>
        <el-button type="primary" @click="sectionLoadAdd" :loading="sectionLoad">保 存</el-button>
        <el-button type="primary" @click="sectionList.push({thing: ''})" icon="el-icon-plus"></el-button>
        <el-button type="primary" @click="sectionList.push({thing: '',price: sectionRow.price,manHour: sectionRow.manHour})" icon="el-icon-plus"></el-button>
      </span>
    </el-dialog>
    <el-dialog title="数据导入" :visible.sync="uploadDia" width="500px">
      <div style="margin: 0 auto;">
        <el-upload ref="upload" drag :action="javaApi + $api.standardTree.inExcelOfTree" :headers="token" :file-list="fileList" name="file"
        <el-upload ref="upload" drag :action="javaApi + $api.standardTree.inExcelOfTree + '/' + isEquipment" :headers="token" :file-list="fileList" name="file"
          :auto-upload="false" accept=".xlsx" :limit="1" :on-change="beforeUpload" :on-success="onSuccess"
          :on-error="onError">
          <i class="el-icon-upload"></i>
@@ -630,6 +634,7 @@
        fileList: [],
        inExcelOfTreePower: false,
        uploading: false,
        isEquipment: false,
      }
    },
    watch: {
@@ -668,7 +673,8 @@
      this.selectStandardMethods()
      this.token = {
        'token': sessionStorage.getItem('token')
      }
      },
      this.isEquipment = this.PROJECT === '装备电缆' ? true : false
    },
    methods: {
      filterNode(value, data) {
@@ -703,7 +709,7 @@
      getNodeParent(val) {
        if (val.parent != null) {
          if(val.data.children === null){
            this.selectTree += ' - ' + val.label + ' - ' + ''
            this.selectTree += ' - ' + val.label + ' - ' + 'null'
          }else{
            this.selectTree += ' - ' + val.label
          }
@@ -1218,6 +1224,7 @@
          }
          this.sectionRow = {}
          this.sectionUpDia = true
          this.sectionList = []
        } else {
          // 值是一个对象
          this.sectionRow = row
@@ -1286,7 +1293,7 @@
          })
        } else {
          this.$axios.post(this.$api.standardTree.upStandardProducts, {
            ids: this.moreSelects.map(a => a.id),
            ids: JSON.stringify(this.moreSelects.map(a => a.id)),
            standardProductList: {
              section: this.sectionRow.section,
              ask: this.sectionRow.ask,
@@ -1445,7 +1452,8 @@
      getItemEnum() {
        this.$axios.post(this.$api.standardTree.selectStandardProductEnumByMethodId, {
          id: this.standardId,
          tree: this.selectTree
          tree: this.selectTree,
          item:this.inspectionItem
        }).then(res => {
          this.filters0 = []
          this.filters1 = []