光纤配置数据存储和回显

value

2024-05-31 2c6c0ead131ba23511e5f55552c610d3f2f2a764

光纤配置数据存储和回显

 src/assets/api/controller.js

@@ -28,6 +28,7 @@
    companies,
    auxiliaryOutputWorkingHours,
    auxiliaryWorkingHoursDay,
    insBushing
  }
}

@@ -157,8 +158,8 @@
  selectSampleAndProductByOrderId: "/insOrder/selectSampleAndProductByOrderId", //通过检验单查询检验数据（数据查看）
  costStatistics: "/insOrder/costStatistics", //费用统计
  selectSampleDefects: "/insOrder/selectSampleDefects", //样品缺陷指标
  updateStatus:"/insOrder/updateStatus",//将待审核更新成撤销状态
  updateInspected:"/insOrder/updateInspected",//将待检验的的撤销进行更改
  updateStatus: "/insOrder/updateStatus", //将待审核更新成撤销状态
  updateInspected: "/insOrder/updateInspected", //将待检验的的撤销进行更改
}

const sampleOrder = {
@@ -323,3 +324,7 @@
  check: "/auxiliaryWorkingHoursDay/check", //审核
  approve: "/auxiliaryWorkingHoursDay/approve", //批准
}

const insBushing = {
  selectBushingBySampleId: "/insBushing/selectBushingBySampleId", //通过样品id获取样品下光纤配置内容
}

 src/components/do/b1-ins-order/add.vue

@@ -672,6 +672,7 @@
        filters: [],
        formType: [],
        configShow: false,
        sampleId: null
      }
    },
    watch: {
@@ -870,6 +871,7 @@
          this.addObj.custom = selects.name
          this.addObj.code = selects.code
          this.addObj.phone = selects.phone
          this.addObj.companyId = selects.departId
        })
      },
      searchFilter() {
@@ -1052,6 +1054,11 @@
        })
      },
      rowClick(row, column, event) {
        this.sampleId = row.id
        if(this.active!==1){
          this.sampleIds = []
          this.sampleIds.push(row.id)
        }
        this.productList = row.insProduct
        setTimeout(() => {
          this.productList.forEach(a => {
@@ -1320,11 +1327,29 @@
        return row[property] === value;
      },
      openConfig(){
        if(this.sampleIds.length===0){
          this.$message.error("未选择样品")
          return
        if(this.active===1){
          if(this.sampleIds.length===0){
            this.$message.error("未选择样品")
            return
          }
          this.configShow = true
        }else{
          if(this.sampleId === null){
            this.$message.error('未选中样品')
            return
          }
          this.$axios.post(this.$api.insBushing.selectBushingBySampleId,{
            sampleId: this.sampleId
          }).then(res=>{
            for(var i in this.sampleList){
              if(this.sampleList[i].id = this.sampleId){
                this.sampleList[i].bushing = res.data
                break
              }
            }
            this.configShow = true
          })
        }
        this.configShow = true
      }
    }
  }

 src/components/do/b1-ins-order/fiberoptic-config.vue

@@ -35,11 +35,11 @@
              </div>
              <div class="search-item" style="margin-right: 10px;">
                <label style="width: 70px;">标准量</label>
                <el-input v-model="packageInfo.num2" placeholder="请输入" size="small" @change="upNum"></el-input>
                <el-input v-model="packageInfo.standNum" placeholder="请输入" size="small" @change="upNum"></el-input>
              </div>
              <div class="search-item">
                <label style="width: 70px;">检测量</label>
                <el-input v-model="packageInfo.num3" placeholder="请输入" size="small" @change="upNum"
                <el-input v-model="packageInfo.testNum" placeholder="请输入" size="small" @change="upNum"
                  :disabled="packageInfo.radio===0"></el-input>
              </div>
            </div>
@@ -55,9 +55,9 @@
                  </el-select>
                </template>
              </el-table-column>
              <el-table-column prop="num2" label="标量" show-overflow-tooltip align="center">
              <el-table-column prop="standNum" label="标量" show-overflow-tooltip align="center">
              </el-table-column>
              <el-table-column prop="num3" label="测试量" show-overflow-tooltip align="center">
              <el-table-column prop="testNum" label="测试量" show-overflow-tooltip align="center">
              </el-table-column>
            </el-table>
          </div>
@@ -200,8 +200,8 @@
        packageInfo: {
          radio: 1,
          num1: null,
          num2: null,
          num3: null,
          standNum: null,
          testNum: null,
          ismiers: false
        },
        tableData: [],
@@ -275,9 +275,11 @@
      }else{
        this.bushing = this.HaveJson(this.sample[0].bushing)
        this.packageInfo.num1 = this.sample[0].bushing.length
        this.packageInfo.num2 = this.sample[0].bushing[0].num2
        this.packageInfo.num3 = this.sample[0].bushing[0].num3
        this.packageInfo.standNum = this.sample[0].bushing[0].standNum
        this.packageInfo.testNum = this.sample[0].bushing[0].testNum
        this.bushing.forEach(a=>{
          if(a.fibers===null)a.fibers=[]
          if(a.fiber===null)a.fiber=[]
          if(this.packageInfo.ismiers){
            a.fibers.forEach(b=>{
              this.fibersList.push(b)
@@ -323,14 +325,14 @@
        this.fibersList = []
        this.detectionItems = []
        if (this.packageInfo.radio === 0) {
          this.packageInfo.num3 = this.packageInfo.num2
          this.packageInfo.testNum = this.packageInfo.standNum
        }
        if (parseInt(this.packageInfo.num2) < parseInt(this.packageInfo.num3)) {
          this.packageInfo.num3 = this.packageInfo.num2
        if (parseInt(this.packageInfo.standNum) < parseInt(this.packageInfo.testNum)) {
          this.packageInfo.testNum = this.packageInfo.standNum
        }
        if (this.packageInfo.num1 !== null && this.packageInfo.num1 !== '' &&
          this.packageInfo.num2 !== null && this.packageInfo.num2 !== '' &&
          this.packageInfo.num3 != null && this.packageInfo.num3 !== '') {
          this.packageInfo.standNum !== null && this.packageInfo.standNum !== '' &&
          this.packageInfo.testNum != null && this.packageInfo.testNum !== '') {
          let colors2 = []
          if (this.packageInfo.num1 / this.colors.length > 1) {
            let num = this.packageInfo.num1 / this.colors.length
@@ -345,8 +347,8 @@
          for (var i = 0; i < this.packageInfo.num1; i++) {
            let bushing = {
              color: colors2[i].label,
              num2: this.packageInfo.num2,
              num3: this.packageInfo.num3,
              standNum: this.packageInfo.standNum,
              testNum: this.packageInfo.testNum,
              fibers: [],
              fiber: []
            }
@@ -355,7 +357,6 @@
        } else {
          this.bushing = []
        }
        console.log(1111111,this.bushing)
      },
      getStandTreeBySampleType() {
        this.$axios.post(this.$api.standardTree.getStandTreeBySampleType, {
@@ -483,7 +484,7 @@
        } else {
          this.selectBushing.forEach(a => {
            a.fiber = []
            for (var i = 0; i < parseInt(a.num3); i++) {
            for (var i = 0; i < parseInt(a.testNum); i++) {
              let fiber = {
                bushColor: a.color,
                color: colors2[i].label,
@@ -509,13 +510,13 @@
        this.selectBushing.forEach(a => {
          a.fiber = []
          a.fibers = []
          for (var i = 0; i < parseInt(a.num3); i++) {
          for (var i = 0; i < parseInt(a.testNum); i++) {
            let fibers = {
              code: null,
              color: a.color,
              model: this.miresModel,
              standard: standard,
              num: a.num3,
              num: a.testNum,
              productList: this.HaveJson(this.productList2),
              fiber: []
            }
@@ -527,6 +528,7 @@
      rowClickFiber(row, column, event){
        this.currentDetectionItems = row
        this.detectionItems = row.productList
        if(this.detectionItems === null) return
        setTimeout(() => {
          this.detectionItems.forEach(a => {
            if (a.state == 1) this.toggleSelection(a)
@@ -626,6 +628,10 @@
        })
      },
      save(){
        if(this.bushing.length === 0){
          this.$message.error('缺少配置无法保存')
          return
        }
        for(let a in this.bushing){
          if(this.bushing[a].fibers.length===0&&this.bushing[a].fiber.length===0){
            this.$message.error(this.bushing[a].color+'管色标套管缺少配置无法保存')
@@ -636,7 +642,7 @@
          a.bushing = this.bushing
        })
        this.$message.success('已保存')
        console.log(11111111,this.bushing)
        console.log(this.bushing);
      }
    }
  }

 src/components/view/person-manage.vue

@@ -289,7 +289,7 @@
            type: 'text',
            method: 'doDiy',
            field: ['roleName', '角色=roleId', '密码=password',
              '姓名EN=nameEn', '年龄=age', '邮箱=email', '单位=company', '签名=pictureUrl', '本人照=signatureUrl'
              '姓名EN=nameEn', '年龄=age', '邮箱=email', '单位=company', '签名=pictureUrl', '个人照片=signatureUrl'
            ]
          }],
          tagField: {
@@ -322,20 +322,8 @@
            },
            company: {select: []}
          },
          /* cascaderField:{
            departId:{
              tree:[]
            },
            // 字段配置
            props:{
              value:'id',
              label:'name',
              checkStrictly: true
            }
          }, */
          requiredAdd: ['account', 'name', 'state', 'roleId', 'password', 'nameEn', 'phone'],
          requiredUp: ['account', 'name', 'state', 'roleId', 'nameEn', 'phone'],
          // disabledUp:['departId'],
          addUpload: ['pictureUrl', 'signatureUrl'],
          addUploadConfig: {
            accept: '.png, .jpg, .jpeg, .gif',
@@ -360,7 +348,6 @@
        addLoad: false,
        personList: [],
        personListCopy: [],
        treeLoad: false,
        personLoad: false,
        search2: '',
        multipleSelection: [],
@@ -425,12 +412,6 @@
      opeaAdd() {
        this.$refs.ValueTable.openAddDia(this.$api.user.addUser);
        this.$refs['ValueTable'].upData.departId = this.selectTree
      },
      selectTreeList() {
        /* this.$axios.get(this.$api.department.selectDepartment).then(res => {
          this.componentData.cascaderField.departId.tree = this.handleTree(res.data[0].children)
                }) */
        this.$refs.ValueTable.selectList()
      },
      handleTree(arr) {
        arr.forEach(a => {
@@ -508,12 +489,6 @@
      },
      nodeClose(data, node, el) {
        $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder')
      },
      getNodeParent(val) {
        if (val.parent != null) {
          this.selectTree += ' - ' + val.label
          this.getNodeParent(val.parent)
        }
      },
      remove(node, data) {
        this.$confirm("是否删除该层级", "提示", {