licp
2024-10-24 9f6cfe14a2f4a296d531dbbc043d0d0fb7b5b2ae
检验下单多个样品bug
已修改3个文件
101 ■■■■■ 文件已修改
src/components/do/b1-ins-order/add.vue 95 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/b1-inspect-order-plan.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b1-ins-order/add.vue
@@ -148,10 +148,7 @@
          <el-button size="medium" @click="templateDia=true" v-show="active==1">
            <span style="color: #3A7BFA;">保存模板</span>
          </el-button>
          <el-button size="medium" type="primary" @click="openCableConfig"
            v-if="active==1&&PROJECT=='装备电缆'&&addObj.sampleType!=undefined&&addObj.sampleType.indexOf('电缆')>-1">电缆配置</el-button>
          <el-button size="medium" type="primary" @click="openEquipConfig" v-if="active==1">子样品配置</el-button>
          <el-button size="medium" type="primary" @click="openConfig" v-if="addObj.sampleType==='光缆'">光纤配置</el-button>
          <el-button size="medium" type="primary" @click="save" :loading="saveLoad" v-show="active==1">提交</el-button>
          <!-- 审核 -->
          <el-button size="medium" @click="upInsOrderOfState(2)" :loading="saveLoad" v-show="active==3&&addObj.companyId"
@@ -1536,7 +1533,13 @@
        })
        this.circulateShow = false
        this.changeProductList0()
        this.currentMethod.insProduct = this.productList0
        if(this.sampleSelectionList.length>0){
          this.sampleSelectionList.forEach(item=>{
            item.insProduct = this.productList0
          })
        }else{
          this.currentMethod.insProduct = this.productList0
        }
        this.getProNum()
      },
      spliceTemperatureTest () {
@@ -1994,7 +1997,6 @@
                 let min = Math.min(...splits)
                 let max = Math.max(...splits)
                 if(min==max){
                  console.log(2222);
                  isTrue = false
                 }
                //要求描述中不包含±以及区间的数字,则返回false
@@ -2746,7 +2748,13 @@
        // }
        this.changeProductList0()
        this.currentMethod.insProduct = this.productList0
        if(this.sampleSelectionList.length>0){
          this.sampleSelectionList.forEach(item=>{
            item.insProduct = this.productList0
          })
        }else{
          this.currentMethod.insProduct = this.productList0
        }
        this.getProNum()
      },
      searchProject () {
@@ -3104,7 +3112,13 @@
          })
        }
        this.changeProductList0()
        this.currentMethod.insProduct = this.productList0
        if(this.sampleSelectionList.length>0){
          this.sampleSelectionList.forEach(item=>{
            item.insProduct = this.productList0
          })
        }else{
          this.currentMethod.insProduct = this.productList0
        }
        this.getProNum()
        this.$nextTick(() => {
          this.$refs.productTable.doLayout()
@@ -3150,36 +3164,6 @@
        const property = column['property'];
        return row[property] === value;
      },
      openConfig() {
        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.sampleIds = [this.sampleId]
          this.$axios.post(this.$api.insBushing.selectBushingBySampleId, {
            sampleId: this.sampleId
          }).then(res => {
            if (res.data.length === 0) {
              this.$message.error('该样品没有配置光纤')
              return
            }
            for (var i in this.sampleList) {
              if (this.sampleList[i].id = this.sampleId) {
                this.sampleList[i].bushing = res.data
                break
              }
            }
            this.configShow = true
          })
        }
      },
      openEquipConfig() {
        if (this.active === 1) {
          if (this.sampleIds.length === 0) {
@@ -3187,35 +3171,6 @@
            return
          }
          this.equipConfigShow = true
        } else {
          if (this.sampleId === null) {
            this.$message.error('未选中样品')
            return
          }
          // this.$axios.post(this.$api.insBushing.selectBushingBySampleId, {
          //   sampleId: this.sampleId
          // }).then(res => {
          //   if (res.data.length === 0) {
          //     this.$message.error('该样品没有配置光纤')
          //     return
          //   }
          //   for (var i in this.sampleList) {
          //     if (this.sampleList[i].id = this.sampleId) {
          //       this.sampleList[i].bushing = res.data
          //       break
          //     }
          //   }
          //   this.configShow = true
          // })
        }
      },
      openCableConfig() {
        if (this.active === 1) {
          if (this.sampleIds.length === 0) {
            this.$message.error("未选择样品")
            return
          }
          this.cableConfigShow = true
        } else {
          if (this.sampleId === null) {
            this.$message.error('未选中样品')
@@ -3284,7 +3239,13 @@
          }
        }
        this.changeProductList0()
        this.currentMethod.insProduct = this.productList0
        if(this.sampleSelectionList.length>0){
          this.sampleSelectionList.forEach(item=>{
            item.insProduct = this.productList0
          })
        }else{
          this.currentMethod.insProduct = this.productList0
        }
      },
      save1 () {
        if (this.bsm1DiaList.length > 0) {
src/components/view/b1-inspect-order-plan.vue
@@ -265,7 +265,7 @@
            <el-button @click="handleConnect(scope.row)" type="text" size="small" :disabled="scope.row.userName == null || scope.row.insState == 5  || scope.row.insState == 3||scope.row.insState == 6||(scope.row.userName&&!scope.row.userName.includes(userName))" v-if="connect">交接</el-button>
            <el-button @click="handleReview(scope.row)" type="text" size="small" :disabled="scope.row.userName == null || scope.row.insState != 3 ||(scope.row.checkName&&!scope.row.checkName.includes(userName))" v-if="review">复核</el-button>
            <el-button @click="claimFun(scope.row)" type="text" size="small" :disabled="scope.row.userName != null || scope.row.checkName!=null" v-if="claim">认领</el-button>
            <el-button @click="lookHistory0(scope.row)" type="text" size="small" :disabled="!scope.row.num1 || scope.row.num1<1">查看记录</el-button>
            <el-button @click="lookHistory0(scope.row)" type="text" size="small">查看记录</el-button>
          </template>
          </el-table-column>
        </el-table>
src/main.js
@@ -21,11 +21,11 @@
//本地
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
// const javaApi = 'http://172.20.10.5:8001';
const javaApi = 'http://172.20.10.5:8001';
// //通信测试库
// Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
const javaApi = 'http://10.1.13.77:8001';
// const javaApi = 'http://10.1.13.77:8001';
//云
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";