modified: src/components/do/b1-ins-order/fiberoptic-config-two.vue modi...

lxp

2024-08-09 1994756ca5b2e646202daa2c04a72bf2d421f3d8

	modified:   src/components/do/b1-ins-order/fiberoptic-config-two.vue
	modified:   src/components/do/b1-ins-order/fiberoptic-config.vue
	modified:   src/components/view/b1-inspect-order-plan.vue
	modified:   src/components/view/b1-inspection-order.vue

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

@@ -100,6 +100,8 @@
                  <span v-else>{{ scope.row.ask }}</span>
                </template>
              </el-table-column>
              <el-table-column prop="tell" label="要求描述" show-overflow-tooltip width="150">
              </el-table-column>
            </el-table>
          </div>
        </el-col>

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

@@ -35,7 +35,7 @@
              </div>
              <div class="search-item" style="margin-right: 10px;">
                <label style="width: 100px">每根管抽检标准量</label>
                <el-input v-model="packageInfo.standNum" placeholder="请输入" size="small" @blur="addStandNum" :disabled="active!=1" style="width:100px"></el-input>
                <el-input v-model="packageInfo.standNum" placeholder="请输入" size="small" @blur="addStandNum" :disabled="packageInfo.radio===0||active!=1" style="width:100px"></el-input>
              </div>
              <div class="search-item">
                <label style="width: 100px">每根管抽检检测量</label>
@@ -95,8 +95,14 @@
              </el-table-column> -->
              <el-table-column prop="ask" label="检测要求" show-overflow-tooltip width="200px">
                <template slot-scope="scope">
                  <el-input v-model="scope.row.ask" placeholder="请输入" size="small" :disabled="active!=1" v-if="!isAskOnlyRead"></el-input>
                  <el-input v-model="scope.row.ask" placeholder="请输入" size="small" :disabled="active!=1" v-if="!isAskOnlyRead" @change="changeASk(scope.row)"></el-input>
                  <span v-else>{{ scope.row.ask }}</span>
                </template>
              </el-table-column>
              <el-table-column prop="tell" label="要求描述" show-overflow-tooltip width="150">
                <template slot-scope="scope">
                  <el-input v-model="scope.row.tell" placeholder="请输入" size="small" :disabled="active!=1" v-if="!isAskOnlyRead" @change="changeASk(scope.row)"></el-input>
                  <span v-else>{{ scope.row.tell }}</span>
                </template>
              </el-table-column>
            </el-table>
@@ -152,8 +158,11 @@
              </div>

            </div>
            <el-table ref="table2" :data="fibersList" tooltip-effect="dark" style="width: 100%" height="270px"
            <!-- <el-table ref="table2" :data="fibersList" tooltip-effect="dark" style="width: 100%" height="270px"
              size="small" @selection-change="handleSelectionChange" highlight-current-row @row-click="(row, column, event)=>rowClickFiber(row, column, event,1)"
              :header-cell-class-name="setClassName0"> -->
              <el-table ref="table2" :data="fibersList" tooltip-effect="dark" style="width: 100%" height="270px"
              size="small" @selection-change="handleSelectionChange" highlight-current-row
              :header-cell-class-name="setClassName0">
              <el-table-column
              type="selection"
@@ -227,9 +236,12 @@
                </el-select>
              </div>
            </div>
            <el-table ref="table3" :data="fiberList" tooltip-effect="dark" style="width: 100%" height="270px"
            <!-- <el-table ref="table3" :data="fiberList" tooltip-effect="dark" style="width: 100%" height="270px"
              size="small" highlight-current-row @selection-change="handleSelectionChange4"
              @row-click="(row, column, event)=>rowClickFiber(row, column, event,0)"
              :header-cell-class-name="setClassName0"> -->
              <el-table ref="table3" :data="fiberList" tooltip-effect="dark" style="width: 100%" height="270px"
              size="small" highlight-current-row @selection-change="handleSelectionChange4"
              :header-cell-class-name="setClassName0">
              <el-table-column
              type="selection"
@@ -506,7 +518,7 @@
        this.detectionSelect = val
        // 赋值检测项信息 光纤带
        if(this.detectionItems.type == 1) {
          this.multiFiberList.forEach(item => {
            this.multiFiberList.forEach(item => {
            this.fibersList.forEach(a => {
              if(a.ident == item.ident){
                a.productList  =  []
@@ -514,8 +526,10 @@
              }
            })
          })

      }
      console.log(this.fibersList);
      

      if(this.detectionItems.type == 0) {
        // 赋值检测项信息 光纤
        this.selectFiberList.forEach(item => {
@@ -526,9 +540,9 @@
              }
            })
          })

          // 选择的时候就将fiberList的值赋值给对应的fiberList
          if(this.multiFiberList.length > 0) {
          setTimeout(() => {
            if(this.multiFiberList.length > 0) {
            this.multiFiberList.forEach(item => {
            this.fibersList.forEach(a => {
              if(a.ident == item.ident){
@@ -537,6 +551,7 @@
            })
          })
          }
          },100)
        }
      },
      handleSelectionChange4(val){
@@ -544,6 +559,46 @@
        if(val != 0) {
          this.rowClickFiber(val[val.length-1],null,null,0)
        }
      },

      changeASk(row) {
        // 先勾选的情况下
          this.detectionSelect.forEach(item => {
            if(item.id == row.id) {
              item.ask = row.ask
              item.tell = row.tell
              // 光纤 0  光纤带 1
            if(item.isFibers == 0) {
              this.selectFiberList.forEach(a => {
                this.fiberList.forEach(b => {
                  if(b.ident == a.ident){
                    b.productList.forEach(item => {
                      if(item.id == row.id) {
                        item.ask = row.ask
                        item.tell = row.tell
                      }
                    })
                  }
                })
              })
            }
            if(item.isFibers == 1) {
              this.multiFiberList.forEach(a => {
                this.fibersList.forEach(b => {
                  if(b.ident == a.ident){
                    b.productList.forEach(item => {
                      if(item.id == row.id) {
                        item.ask = row.ask
                        item.tell = row.tell
                      }
                    })
                  }
                })
              })

            }
            }
          })
      },
      outConfig() {
        this.$parent.configShow = false
@@ -572,6 +627,11 @@
      },
      // 套管标准量赋值
      addStandNum() {
        if(this.packageInfo.testNum > this.packageInfo.standNum) {
          this.$message.error('检测量不能大于标准量')
          this.packageInfo.testNum = this.packageInfo.standNum
        }

        if(this.selectBushing.length > 0) {
          this.bushing.forEach(item => {
          this.selectBushing.forEach(a => {
@@ -603,24 +663,32 @@
        this.fiberList = []
        this.fibersList = []
        this.detectionItems = []

        // 页面是否含有光纤带
        if(this.packageInfo.ismiers) {
          // 全检
          if (this.packageInfo.radio == 0) {
            if(this.packageInfo.standNum == null || this.packageInfo.standNum == '') {
          this.$message.error('请先输入标准量')
          return
        }
          // 根据标准量赋值检测量
          if(parseInt(this.packageInfo.standNum) > 0 ) {
            // 给光纤带赋值
            this.packageInfo.testNum = this.packageInfo.standNum
            this.selectBushing = this.bushing
            // 给光纤带赋值
            this.bushing.forEach(item => {
                item.testNum = this.packageInfo.testNum
                item.standNum = this.packageInfo.standNum
                this.$refs.table0.toggleRowSelection(item, true)
              })

            this.addFibers()
            this.multiFiberList = this.fibersList
            // 默认勾选
            setTimeout(() => {
              this.selectBushing.forEach(item =>{
              let rowToSelect =  this.bushing.find(a => a.ident == item.ident)
              this.$refs.table0.toggleRowSelection(rowToSelect, true)
              })
              // this.selectBushing.forEach(item =>{
              // let rowToSelect =  this.bushing.find(a => a.ident == item.ident)
              // this.$refs.table0.toggleRowSelection(rowToSelect, true)
              // })

              this.multiFiberList.forEach(item =>{
              let rowToSelect =  this.fibersList.find(a => a.ident == item.ident)
@@ -631,15 +699,29 @@
      }
        }else {
          if(this.packageInfo.radio == 0) {
            if(this.packageInfo.standNum == null || this.packageInfo.standNum == '') {
          this.$message.error('请先输入标准量')
          return
        }
            if(parseInt(this.packageInfo.standNum) > 0 ) {
              this.packageInfo.testNum = this.packageInfo.standNum
            this.packageInfo.testNum = this.packageInfo.standNum
              this.bushing.forEach(item => {
                item.testNum = this.packageInfo.testNum
                item.standNum = this.packageInfo.standNum
                this.$refs.table0.toggleRowSelection(item, true)
              })
              console.log(this.bushing);
              this.selectBushing = this.bushing
              this.addFiber()
              // 默认勾选
            setTimeout(() => {
              this.selectBushing.forEach(item =>{
              let rowToSelect =  this.bushing.find(a => a.ident == item.ident)
              this.$refs.table0.toggleRowSelection(rowToSelect, true)
              // this.selectBushing.forEach(item =>{
              // let rowToSelect =  this.bushing.find(a => a.ident == item.ident)
              // this.$refs.table0.toggleRowSelection(rowToSelect, true)
              // })

              this.fiberList.forEach(item =>{
                this.$refs.table3.toggleRowSelection(item, true)
              })
            }, 200)
            }
@@ -788,17 +870,7 @@
            this.$message.error('请选择数据')
            return
          }
          this.selectFiberList.forEach(item => {
            this.fiberList.forEach(a => {
              if(a.ident == item.ident){
                a.model = this.mireModel.split(' - ')[1] // 光纤规格
                a.noSplitModel = this.mireModel // 光纤规格
                if(this.mireStandards != null) {
                  a.standard = this.mireStandards.find(a => a.id == this.mireStandard).code  // 参考标准
                }
              }
            })
          })
          
         if (val === null || val === '') return
         if(this.mireStandards == null ) return
        this.$axios.post(this.$api.standardTree.selectStandardProductList, {
@@ -819,6 +891,18 @@
          this.detectionType = 0
           this.$set(this.detectionItems,'type',0)
          }
          this.mireStandards.find(a => a.id == val).code == '委托要求'?this.isAskOnlyRead = false:this.isAskOnlyRead = true
          this.selectFiberList.forEach(item => {
            this.fiberList.forEach(a => {
              if(a.ident == item.ident){
                a.model = this.mireModel.split(' - ')[1] // 光纤规格
                a.noSplitModel = this.mireModel // 光纤规格
                if(this.mireStandards != null) {
                  a.standard = this.mireStandards.find(a => a.id == this.mireStandard).code  // 参考标准
                }
              }
            })
          })

        })
      },
@@ -868,6 +952,8 @@
            this.detectionItems = res.data
            this.detectionType = 1
            this.$set(this.detectionItems,'type',1)
            // 判断是否为委托要求
            this.miresStandards.find(a => a.id == val).code == '委托要求'?this.isAskOnlyRead = false:this.isAskOnlyRead = true
          }

          // 给选中的光纤带赋值
@@ -1181,6 +1267,21 @@
          // 将获取的检测项信息赋值
          this.detectionItems = []
          if(res.data != null && res.data.length != 0){
            res.data.forEach(a => {
              this.$set(a,'isFibers',1)
            })
            // 判断是否为委托要求
            this.miresStandards.find(a => a.id == this.miresStandard).code == '委托要求'?this.isAskOnlyRead = false:this.isAskOnlyRead = true
            if(!this.isAskOnlyRead){
              row.productList.forEach(a => {
                res.data.forEach(b => {
                  if(a.id == b.id){
                    b.ask = a.ask
                    b.tell = a.tell
                  }
                })
              })
            }
            this.detectionItems = res.data
            this.detectionType = 1
            this.$set(this.detectionItems,'type',1)
@@ -1197,7 +1298,7 @@
            }
          }
        })
        },1000)
        },500)
      }else if(type == 0) {
        if((row.noSplitModel == null || row.noSplitModel == '') && (row.standard == null || row.standard == '')){
            this.detectionItems = []
@@ -1224,10 +1325,24 @@
          if(res.data != null && res.data.length != 0){
           res.data.forEach(a => {
            a.state = 0
            this.$set(a,'isFibers',0)
          })
          // 判断是否为委托要求
          this.mireStandards.find(a => a.id == this.mireStandard).code == '委托要求'?this.isAskOnlyRead = false:this.isAskOnlyRead = true
          if(!this.isAskOnlyRead){
            row.productList.forEach(a => {
              res.data.forEach(b => {
                if(a.id == b.id){
                  b.ask = a.ask
                  b.tell = a.tell
                }
              })
            })
          }
          this.detectionItems = res.data
          this.detectionType = 0
          this.$set(this.detectionItems,'type',0)
          

          if (row.productList != null && row.productList.length > 0) {
            let product =  JSON.parse(JSON.stringify(row.productList))
@@ -1242,7 +1357,7 @@
            }
          }
        })
        },1000);
        },500);
      }
    },
      toggleSelection(row) {

 src/components/view/b1-inspect-order-plan.vue

@@ -200,7 +200,7 @@
            </span>
        </el-dialog>
        <div style="width: 100%;height: 100%;" v-if="activeFace >0">
            <Add :active="activeFace" :currentId="currentId"/>
            <Add :active="activeFace" :currentId="currentId" :examine="examine"/>
        </div>
    <Inspection v-if="state>0" @goback="goback" :orderId="orderId" :sonLaboratory="componentData.entity.sonLaboratory" :state="state"/>
      <el-dialog title="数据查看" :visible.sync="dataDialogVisible" width="80%">
@@ -228,6 +228,7 @@
        },
        data() {
            return {
                examine: null,
                alone: false,
                sampleUserForm: {
                    entrustCode: null,
@@ -580,6 +581,7 @@
            },
            selectAllByOne(row) {
                this.activeFace = 2;
                this.examine = 1;
                this.currentId = parseInt(row.id)
            },
            playOrder(num) {

 src/components/view/b1-inspection-order.vue

@@ -929,6 +929,7 @@
                // //复制给formData
                // this.formData = this.HaveJson(row);
                this.currentId = row.id
        this.examine = 1
            },
            // 数据查看
            handleDataLook(row) {