licp
2024-06-06 32fb43e06c0f3be9e4a1763286217bad5d7bba4d
修改检验下单bug
已修改2个文件
38 ■■■■■ 文件已修改
src/components/do/b1-ins-order/add.vue 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b1-inspect-order-plan/Inspection.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b1-ins-order/add.vue
@@ -788,18 +788,20 @@
          this.$message.error('请输入样品型号')
        } else if (!this.sampleList.every(m => m.standardMethodListId)) {
          this.$message.error('请选择检验标准')
        }else if (this.totalArr.find(a=>a.ask.includes('RTS'))&&!this.RTS) {
        }else if (this.totalArr.find(a=>a.ask.includes('RTS')&&a.state==1)&&!this.RTS) {
          this.$message.error('请输入RTS')
        } else {
          let sampleList = this.HaveJson(this.sampleList)
          let isRTS = this.totalArr.find(a=>a.ask.includes('RTS'))
          let isRTS = this.totalArr.find(a=>a.ask.includes('RTS')&&a.state==1)
          if(isRTS){
            sampleList.forEach(item=>{
              if(item.insProduct&&item.insProduct.length>0){
                item.insProduct.forEach(a=>{
                  let ask = this.handleAsk(a.ask)
                  if(ask){
                    a.ask = ask
                  if(a.state==1){
                    let ask = this.handleAsk(a.ask)
                    if(ask&&a.state==1){
                      a.ask = ask
                    }
                  }
                })
              }
@@ -810,9 +812,11 @@
                    a.fiber.forEach(b=>{
                      if(b.productList&&b.productList.length>0){
                        b.productList.forEach(c=>{
                          let ask = this.handleAsk(c.ask)
                          if(ask){
                            c.ask = ask
                          if(c.state==1){
                            let ask = this.handleAsk(c.ask)
                            if(ask&&c.state==1){
                              c.ask = ask
                            }
                          }
                        })
                      }
@@ -822,9 +826,11 @@
                    a.fibers.forEach(b=>{
                      if(b.productList&&b.productList.length>0){
                        b.productList.forEach(c=>{
                          let ask = this.handleAsk(c.ask)
                          if(ask){
                            c.ask = ask
                          if(c.state==1){
                            let ask = this.handleAsk(c.ask)
                            if(ask&&c.state==1){
                              c.ask = ask
                            }
                          }
                        })
                      }
@@ -832,9 +838,11 @@
                        b.fiber.forEach(c=>{
                          if(c.productList&&c.productList.length>0){
                            c.productList.forEach(d=>{
                              let ask = this.handleAsk(d.ask)
                              if(ask){
                                d.ask = ask
                              if(d.state==1){
                                let ask = this.handleAsk(d.ask)
                                if(ask){
                                  d.ask = ask
                                }
                              }
                            })
                          }
src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -255,7 +255,7 @@
                :rowspan="n.v.mc&&n.v.mc.rs?n.v.mc.rs:1"
                :style="`background:${n.v.bg};color:${n.v.fc};font-size:${n.v.fs}px;width:${handleWidth(n)}px !important;height:${item.style.rowlen[n.r]}px;font-wight:${n.v.bl?'bold':''};`">
                <div class="content" :class="`content-h-${n.v.ht} content-v-${n.v.vt}`"
                  :style="`width:${handleWidth(n)}px !important;min-height:${item.style.rowlen[n.r]}px;`">
                  :style="`width:${handleWidth(n)}px !important;min-height:${item.style.rowlen[n.r]}px;background:${n.v.bg};`">
                  <template v-if="n.v.ps!=undefined && n.v.ps.value==='检验值' && state==1">
                    <el-input v-if="getInspectionValueType(n.i) == 1" class="table_input" v-model="n.v.v"
                      :disabled="getInspectionItemType(n.i) == 1 || (n.u != userId && n.u != undefined && n.u != '')"