Merge remote-tracking branch 'origin/master'

value

2024-05-20 ff7e5f562a45f0d4e13fe8336ee8b290643b3ae4

 src/components/view/b2-standard.vue

@@ -400,14 +400,14 @@
            <el-table-column type="selection" width="50" >
            </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="inspectionItem" label="检验项" min-width="140" show-overflow-tooltip :filter-method="filterHandler" :filters="filters0"></el-table-column>
            <el-table-column prop="inspectionItemSubclass" label="检验项子项" min-width="140"
              show-overflow-tooltip></el-table-column>
              show-overflow-tooltip :filter-method="filterHandler" :filters="filters1"></el-table-column>
            <el-table-column prop="sonLaboratory" label="子实验室" width="130" show-overflow-tooltip :filters="filters"
              :filter-method="filterHandler"></el-table-column>
            <el-table-column prop="ask" label="要求值" min-width="200px"></el-table-column>
            <el-table-column prop="tell" label="要求描述" min-width="220px"></el-table-column>
            <el-table-column prop="method" label="试验方法" width="200"></el-table-column>
            <el-table-column prop="methodS" label="试验方法" width="200"></el-table-column>
            <el-table-column prop="unit" label="计量单位" width="100" show-overflow-tooltip></el-table-column>
            <el-table-column prop="price" label="单价(元)" width="120"></el-table-column>
            <el-table-column prop="manHour" label="工时系数" width="120"></el-table-column>
@@ -604,7 +604,35 @@
          templateId:''
        },
        methodList:[],
        productTableLoading0:false
        productTableLoading0:false,
        filters0:[
          {
            text:'测试',
            value:0,
          },
          {
            text:'测试1',
            value:1,
          },
          {
            text:'测试2',
            value:2,
          }
        ],
        filters1:[
        {
            text:'测试',
            value:0,
          },
          {
            text:'测试1',
            value:1,
          },
          {
            text:'测试2',
            value:2,
          }
        ]
      }
    },
    watch: {
@@ -1102,6 +1130,7 @@
        this.addProductDia = false
      },
      rowClick(row, column, event) {
        this.currentPage = 1;
        this.tableLoad2 = true
        this.standardId = row.id
        this.$axios.post(this.$api.standardTree.selectStandardProductListByMethodId, {
@@ -1115,7 +1144,7 @@
            this.productList.forEach(a => {
              if (a.state == 1) this.toggleSelection(a)
            })
          }, 200)
          }, 300)
          this.tableLoad2 = false
        })
      },
@@ -1154,13 +1183,13 @@
      },
      handleAll(e) {
        if (e.length > 0) {
          this.productList = this.productList.map(m => {
          this.productList.map(m => {
            m.state = 0
            this.upProductSelect(null, m)
            return m
          })
        } else {
          this.productList = this.productList.map(m => {
          this.productList.map(m => {
            m.state = 1
            this.upProductSelect(null, m)
            return m
@@ -1267,6 +1296,7 @@
          this.sectionUpDia = false
          this.currentPage0 = 1;
          this.getList()
          this.rowClick({id:this.standardId})
        })
        }
      },
@@ -1333,6 +1363,7 @@
          this.$message.success('已保存')
          this.currentPage0 = 1;
          this.getList()
          this.rowClick({id:this.standardId})
          // this.moreInfo = {
          //   ask:'',
          //   tell:'',