合并冲突

licp

2024-04-29 cd0252da419d4065e322b945da2d836796bc0e1f

 src/components/view/a7-standard-method.vue

@@ -95,7 +95,7 @@
            font: '编辑',
            type: 'text',
            method: 'doDiy',
            field: ['sampleType', 'createUserName', 'updateUserName', '检验对象=structureTestObjectId']
            field: ['createUserName', 'updateUserName']
          }, {
            id: 'delete',
            font: '删除',
@@ -103,9 +103,6 @@
            method: 'doDiy'
          }],
          tagField: {
            structureTestObjectId: {
              select: []
            },
            isProduct: {
              select: [{
                value: 0,
@@ -131,9 +128,6 @@
            }
          },
          selectField: {
            structureTestObjectId: {
              select: []
            },
            isProduct: {
              select: [{
                value: 0,
@@ -158,6 +152,18 @@
              select: []
            }
          },
          cascaderField: {
            structureTestObjectId: {
              tree: []
            },
            // 字段配置
            props: {
              value: 'value',
              label: 'label',
              checkStrictly: true,
              multiple: true
            },
          },
          requiredAdd: ['code', 'name', 'structureTestObjectId', 'isProduct','isUse','nameEn'],
          requiredUp: ['code', 'name', 'structureTestObjectId', 'isProduct','isUse','nameEn']
        },
@@ -170,14 +176,16 @@
    mounted() {
      this.entityCopy = this.HaveJson(this.componentData.entity)
      this.getPower()
      this.selectTestObjectByName()
      this.getQualificationList()
      this.selectTestObjectByName()
    },
    methods: {
      refreshTable() {
        this.$refs['ValueTable'].selectList()
        this.selectTestObjectByName()
      },
      refresh() {
        this.selectTestObjectByName()
        this.componentData.entity = this.HaveJson(this.entityCopy)
        this.upIndex++
      },
@@ -209,19 +217,6 @@
      openAdd() {
        this.$refs.ValueTable.openAddDia(this.$api.standardMethod.addStandardMethod);
      },
      selectTestObjectByName() {
        this.$axios.get(this.$api.capacityScope.selectTestObjectByName).then(res => {
          let data = []
          res.data.forEach(a => {
            data.push({
              label: a.specimenName,
              value: a.id
            })
          })
          this.componentData.selectField.structureTestObjectId.select = data
          this.componentData.tagField.structureTestObjectId.select = data
        })
      },
      getQualificationList(){
        this.$axios.post(this.$api.enums.selectEnumByCategory, {
               category: "资质名称"
@@ -252,7 +247,26 @@
        //       this.componentData.tagField.qualificationId.select = list
        //     }
        //   })
      },
      selectTestObjectByName() {
        this.$axios.get(this.$api.standardTree.getStandardTree2).then(res => {
          res.data.forEach(a => {
            this.cascaderFieldData(a)
          })
          this.componentData.cascaderField.structureTestObjectId.tree = res.data
        })
      },
      cascaderFieldData(val) {
        if (val.children === undefined) {
          return
        } else if (val.children.length == 0) {
          delete val.children
        } else {
          val.children.forEach(a => {
            this.cascaderFieldData(a)
          })
      }
      },
    }
  }
</script>