647cb2146a5914bf584046234b87839a314c6dc3..129fecf9a1cc53fc4d8d7ec6d7751e78571e73d0
2 天以前 spring
出库后刷新
129fec 对比 | 目录
2 天以前 spring
电路试验修改
b40d83 对比 | 目录
已修改4个文件
186 ■■■■■ 文件已修改
src/components/do/b1-inspect-order-plan/circuit-parameters1.vue 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b1-inspect-order-plan/circuit-parameters2.vue 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b1-inspect-order-plan/circuit-parameters3.vue 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/b1-inspect-order-plan.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
@@ -84,7 +84,7 @@
        <template v-for="(n, j) in h.projectList">
          <!-- 电压驻波比 -->
          <el-row :gutter="5" style="margin: 12px 0 0;display: flex;align-items: center;"
            v-if="n.inspectionItemSubclass.includes('驻波比') || n.inspectionItemSubclass.includes('隔离度')">
            v-if="(n.inspectionItemSubclass.includes('驻波比') || n.inspectionItemSubclass.includes('隔离度'))&&isLooks(n)">
            <el-col :span="2">
              <div style="text-align: center;">{{ n.inspectionItemSubclass }}</div>
            </el-col>
@@ -92,7 +92,10 @@
              <div style="text-align: center;">{{ n.unit }}</div>
            </el-col>
            <el-col :span="2">
              <div style="text-align: center;" v-html="n.ask"></div>
              <div style="text-align: center;">
                <el-input size="small" v-model="n.ask" :disabled="state > 1"
                  ></el-input>
              </div>
            </el-col>
            <el-col :span="16">
              <div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -132,7 +135,7 @@
          </el-row>
          <!-- 互调 -->
          <el-row :gutter="5" style="margin: 12px 0 0;display: flex;align-items: center;"
            v-if="n.inspectionItemSubclass.includes('互调')">
            v-if="n.inspectionItemSubclass.includes('互调')&&isLooks(n)">
            <el-col :span="2">
              <div style="text-align: center;">{{ n.inspectionItemSubclass }}</div>
            </el-col>
@@ -140,7 +143,10 @@
              <div style="text-align: center;">{{ n.unit }}</div>
            </el-col>
            <el-col :span="2">
              <div style="text-align: center;" v-html="n.ask"></div>
              <div style="text-align: center;">
                <el-input size="small" v-model="n.ask" :disabled="state > 1"
                  ></el-input>
              </div>
            </el-col>
            <el-col :span="16">
              <div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -202,7 +208,7 @@
          </el-row>
          <!-- 幅度偏差/最大相位偏差 -->
          <el-row :gutter="5" style="margin: 12px 0 0;display: flex;align-items: center;"
            v-if="n.inspectionItemSubclass.includes('偏差')">
            v-if="n.inspectionItemSubclass.includes('偏差')&&isLooks(n)">
            <el-col :span="2">
              <div style="text-align: center;">{{ n.inspectionItemSubclass }}</div>
            </el-col>
@@ -210,7 +216,10 @@
              <div style="text-align: center;">{{ n.unit }}</div>
            </el-col>
            <el-col :span="2">
              <div style="text-align: center;" v-html="n.ask"></div>
              <div style="text-align: center;">
                <el-input size="small" v-model="n.ask" :disabled="state > 1"
                  ></el-input>
              </div>
            </el-col>
            <el-col :span="16">
              <div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -253,7 +262,7 @@
          </el-row>
          <!-- 最大耦合度/最小耦合度 -->
          <el-row :gutter="5" style="margin: 12px 0 0;display: flex;align-items: center;"
            v-if="n.inspectionItemSubclass.includes('耦合度')">
            v-if="n.inspectionItemSubclass.includes('耦合度')&&isLooks(n)">
            <el-col :span="2">
              <div style="text-align: center;">{{ n.inspectionItemSubclass }}</div>
            </el-col>
@@ -261,7 +270,10 @@
              <div style="text-align: center;">{{ n.unit }}</div>
            </el-col>
            <el-col :span="2">
              <div style="text-align: center;" v-html="n.ask"></div>
              <div style="text-align: center;">
                <el-input size="small" v-model="n.ask" :disabled="state > 1"
                  ></el-input>
              </div>
            </el-col>
            <el-col :span="17">
              <div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -294,7 +306,7 @@
              </div>
            </el-col>
          </el-row>
          <el-divider v-if="j != h.projectList.length - 1"></el-divider>
          <el-divider v-if="j != h.projectList.length - 1&&isLooks(n)"></el-divider>
        </template>
      </div>
    </div>
@@ -559,19 +571,19 @@
                  this.angleList = angleList
                  this.upTemplateState = false;
                }
                let ask = ''
                if (item.ask.includes(',')) {
                  item.ask.split(',').forEach((m, i) => {
                    ask = ask + m + (i == item.ask.split(',').length - 1 ? '' : '<br/>')
                  })
                } else {
                  ask = item.ask
                }
                console.log(ask)
                // let ask = ''
                // if (item.ask.includes(',')) {
                //   item.ask.split(',').forEach((m, i) => {
                //     ask = ask + m + (i == item.ask.split(',').length - 1 ? '' : '<br/>')
                //   })
                // } else {
                //   ask = item.ask
                // }
                // console.log(ask)
                let obj = {
                  inspectionItemSubclass: item.inspectionItemSubclass,
                  unit: item.unit,
                  ask: ask,
                  ask: n.ask,
                  result: n.result,
                  id: item.id,
                  often: n.often,
@@ -858,7 +870,8 @@
          port: item.portList.map(m => m.value).join(','),
          angle: item.angleList.map(m => m.value).join(','),
          value: JSON.stringify(item.value),
          often: item.often
          often: item.often,
          ask: item.ask
        }
        return obj
      })
@@ -911,7 +924,8 @@
              port: item.portList.map(m => m.value).join(','),
              angle: item.angleList.map(m => m.value).join(','),
              value: JSON.stringify(item.value),
              often: item.often
              often: item.often,
              ask: item.ask
            }
            return obj
          })
@@ -971,6 +985,17 @@
      })
      this.angleList = obj.angleList
      this.intermodulationNum = obj.intermodulationNum
    },
    // 查看时如果没有数据,就不显示这个检验项
    isLooks(n){
      if(this.state<2){
        return true
      }
      let state = n.value.some(m=>m.some(n=>n))
      if(this.state > 1&&state){
        return true
      }
      return false
    }
  }
}
src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
@@ -83,7 +83,7 @@
        <template v-for="(n, j) in h.projectList">
          <!-- 电压驻波比/同极化隔离度/异极化隔离度 -->
          <el-row :gutter="5" style="margin: 12px 0 0;display: flex;align-items: center;"
            v-if="n.inspectionItemSubclass.includes('驻波比') || n.inspectionItemSubclass.includes('隔离度')">
            v-if="(n.inspectionItemSubclass.includes('驻波比') || n.inspectionItemSubclass.includes('隔离度'))&&isLooks(n)">
            <el-col :span="2">
              <div style="text-align: center;">{{ n.inspectionItemSubclass }}</div>
            </el-col>
@@ -91,7 +91,10 @@
              <div style="text-align: center;">{{ n.unit }}</div>
            </el-col>
            <el-col :span="2">
              <div style="text-align: center;" v-html="n.ask"></div>
              <div style="text-align: center;">
                <el-input size="small" v-model="n.ask" :disabled="state > 1"
                  ></el-input>
              </div>
            </el-col>
            <el-col :span="16">
              <div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -129,7 +132,7 @@
          </el-row>
          <!-- 互调 -->
          <el-row :gutter="5" style="margin: 12px 0 0;display: flex;align-items: center;"
            v-if="n.inspectionItemSubclass.includes('互调')">
            v-if="n.inspectionItemSubclass.includes('互调')&&isLooks(n)">
            <el-col :span="2">
              <div style="text-align: center;">{{ n.inspectionItemSubclass }}</div>
            </el-col>
@@ -137,7 +140,10 @@
              <div style="text-align: center;">{{ n.unit }}</div>
            </el-col>
            <el-col :span="2">
              <div style="text-align: center;" v-html="n.ask"></div>
              <div style="text-align: center;">
                <el-input size="small" v-model="n.ask" :disabled="state > 1"
                  ></el-input>
              </div>
            </el-col>
            <el-col :span="16">
              <div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -191,7 +197,7 @@
              </div>
            </el-col>
          </el-row>
          <el-divider v-if="j != h.projectList.length - 1"></el-divider>
          <el-divider v-if="j != h.projectList.length - 1&&isLooks(n)"></el-divider>
        </template>
      </div>
    </div>
@@ -420,18 +426,18 @@
                  this.angleList = angleList
                  this.upTemplateState = false
                }
                let ask = ''
                if (item.ask.includes(',')) {
                  item.ask.split(',').forEach((m, i) => {
                    ask = ask + m + (i == item.ask.split(',').length - 1 ? '' : '<br/>')
                  })
                } else {
                  ask = item.ask
                }
                // let ask = ''
                // if (item.ask.includes(',')) {
                //   item.ask.split(',').forEach((m, i) => {
                //     ask = ask + m + (i == item.ask.split(',').length - 1 ? '' : '<br/>')
                //   })
                // } else {
                //   ask = item.ask
                // }
                let obj = {
                  inspectionItemSubclass: item.inspectionItemSubclass,
                  unit: item.unit,
                  ask: ask,
                  ask: n.ask,
                  result: n.result,
                  id: item.id,
                  often: n.often,
@@ -720,7 +726,8 @@
          port: item.portList.map(m => m.value).join(','),
          angle: item.angleList.map(m => m.value).join(','),
          value: JSON.stringify(item.value),
          often: item.often
          often: item.often,
          ask: item.ask
        }
        return obj
      })
@@ -774,7 +781,8 @@
              port: item.portList.map(m => m.value).join(','),
              angle: item.angleList.map(m => m.value).join(','),
              value: JSON.stringify(item.value),
              often: item.often
              often: item.often,
              ask: item.ask
            }
            return obj
          })
@@ -835,6 +843,17 @@
      })
      this.angleList = obj.angleList
      this.intermodulationNum = obj.intermodulationNum
    },
    // 查看时如果没有数据,就不显示这个检验项
    isLooks(n){
      if(this.state<2){
        return true
      }
      let state = n.value.some(m=>m.some(n=>n))
      if(this.state > 1&&state){
        return true
      }
      return false
    }
  }
}
src/components/do/b1-inspect-order-plan/circuit-parameters3.vue
@@ -77,7 +77,7 @@
        <template v-for="(n, j) in h.projectList">
          <!-- 电压驻波比 -->
          <el-row :gutter="5" style="margin: 12px 0 0;display: flex;align-items: center;"
            v-if="n.inspectionItemSubclass.includes('驻波比') || n.inspectionItemSubclass.includes('隔离度') || n.inspectionItemSubclass.includes('带外抑制') || n.inspectionItemSubclass.includes('带内波动') || n.inspectionItemSubclass.includes('插入损耗')">
            v-if="(n.inspectionItemSubclass.includes('驻波比') || n.inspectionItemSubclass.includes('隔离度') || n.inspectionItemSubclass.includes('带外抑制') || n.inspectionItemSubclass.includes('带内波动') || n.inspectionItemSubclass.includes('插入损耗'))&&isLooks(n)">
            <el-col :span="2">
              <div style="text-align: center;">{{ n.inspectionItemSubclass }}</div>
            </el-col>
@@ -85,7 +85,10 @@
              <div style="text-align: center;">{{ n.unit }}</div>
            </el-col>
            <el-col :span="2">
              <div style="text-align: center;" v-html="n.ask"></div>
              <div style="text-align: center;">
                <el-input size="small" v-model="n.ask" :disabled="state > 1"
                  ></el-input>
              </div>
            </el-col>
            <el-col :span="16">
              <div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -124,7 +127,7 @@
          </el-row>
          <!-- 互调 -->
          <el-row :gutter="5" style="margin: 12px 0 0;display: flex;align-items: center;"
            v-if="n.inspectionItemSubclass.includes('互调')">
            v-if="n.inspectionItemSubclass.includes('互调')&&isLooks(n)">
            <el-col :span="2">
              <div style="text-align: center;">{{ n.inspectionItemSubclass }}</div>
            </el-col>
@@ -132,7 +135,10 @@
              <div style="text-align: center;">{{ n.unit }}</div>
            </el-col>
            <el-col :span="2">
              <div style="text-align: center;" v-html="n.ask"></div>
              <div style="text-align: center;">
                <el-input size="small" v-model="n.ask" :disabled="state > 1"
                  ></el-input>
              </div>
            </el-col>
            <el-col :span="16">
              <div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -185,7 +191,7 @@
          </el-row>
          <!-- 幅度偏差/最大相位偏差 -->
          <el-row :gutter="5" style="margin: 12px 0 0;display: flex;align-items: center;"
            v-if="n.inspectionItemSubclass.includes('偏差')">
            v-if="n.inspectionItemSubclass.includes('偏差')&&isLooks(n)">
            <el-col :span="2">
              <div style="text-align: center;">{{ n.inspectionItemSubclass }}</div>
            </el-col>
@@ -193,7 +199,10 @@
              <div style="text-align: center;">{{ n.unit }}</div>
            </el-col>
            <el-col :span="2">
              <div style="text-align: center;" v-html="n.ask"></div>
              <div style="text-align: center;">
                <el-input size="small" v-model="n.ask" :disabled="state > 1"
                  ></el-input>
              </div>
            </el-col>
            <el-col :span="16">
              <div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -230,7 +239,7 @@
          </el-row>
          <!-- 最大耦合度/最小耦合度 -->
          <el-row :gutter="5" style="margin: 12px 0 0;display: flex;align-items: center;"
            v-if="n.inspectionItemSubclass.includes('耦合度')">
            v-if="n.inspectionItemSubclass.includes('耦合度')&&isLooks(n)">
            <el-col :span="2">
              <div style="text-align: center;">{{ n.inspectionItemSubclass }}</div>
            </el-col>
@@ -238,7 +247,10 @@
              <div style="text-align: center;">{{ n.unit }}</div>
            </el-col>
            <el-col :span="2">
              <div style="text-align: center;" v-html="n.ask"></div>
              <div style="text-align: center;">
                <el-input size="small" v-model="n.ask" :disabled="state > 1"
                  ></el-input>
              </div>
            </el-col>
            <el-col :span="17">
              <div class="content" style="text-align: center;width: 100%;overflow-x: auto;">
@@ -268,7 +280,7 @@
              </div>
            </el-col>
          </el-row>
          <el-divider v-if="j != h.projectList.length - 1"></el-divider>
          <el-divider v-if="j != h.projectList.length - 1&&isLooks(n)"></el-divider>
        </template>
      </div>
    </div>
@@ -463,19 +475,19 @@
                    portList.push({ value: m })
                  })
                }
                let ask = ''
                if (item.ask.includes(',')) {
                  item.ask.split(',').forEach((m, i) => {
                    ask = ask + m + (i == item.ask.split(',').length - 1 ? '' : '<br/>')
                  })
                } else {
                  ask = item.ask
                }
                console.log(ask)
                // let ask = ''
                // if (item.ask.includes(',')) {
                //   item.ask.split(',').forEach((m, i) => {
                //     ask = ask + m + (i == item.ask.split(',').length - 1 ? '' : '<br/>')
                //   })
                // } else {
                //   ask = item.ask
                // }
                // console.log(ask)
                let obj = {
                  inspectionItemSubclass: item.inspectionItemSubclass,
                  unit: item.unit,
                  ask: ask,
                  ask: n.ask,
                  result: n.result,
                  id: item.id,
                  often: n.often,
@@ -720,7 +732,8 @@
          equipName: this.insProductNew.find(m => m.id == item.id).equipName,
          port: item.portList.map(m => m.value).join(','),
          value: JSON.stringify(item.value),
          often: item.often
          often: item.often,
          ask: item.ask
        }
        return obj
      })
@@ -772,7 +785,8 @@
              equipName: this.insProductNew.find(m => m.id == item.id).equipName,
              port: item.portList.map(m => m.value).join(','),
              value: JSON.stringify(item.value),
              often: item.often
              often: item.often,
              ask: item.ask
            }
            return obj
          })
@@ -830,6 +844,17 @@
        // this.allBandList[index].projectList = arr
      })
      this.intermodulationNum = obj.intermodulationNum
    },
    // 查看时如果没有数据,就不显示这个检验项
    isLooks(n){
      if(this.state<2){
        return true
      }
      let state = n.value.some(m=>m.some(n=>n))
      if(this.state > 1&&state){
        return true
      }
      return false
    }
  }
}
src/components/view/b1-inspect-order-plan.vue
@@ -872,6 +872,7 @@
          return
        }
        this.$message.success('出库成功')
        this.refreshTable()
        this.handleShelf(this.entity.shelfId)
      })
    },