Merge remote-tracking branch 'origin/master'

value

2024-05-27 ce8d90870525b4740fd57f8cff3bccba2202847e

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

@@ -145,7 +145,7 @@
            <ul class="tab">
               <li v-for="(m,i) in tabList" :key="i" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label}}</li>
            </ul>
            <ValueTable :style="'height: calc(100% - '+(more?'94':'44')+'px)'" ref="ValueTable" :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
            <ValueTable :style="getStyle()" ref="ValueTable" :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
               :key="'b'+upIndex"  />
         </div>
         <!-- 审核 -->
@@ -171,7 +171,7 @@
         <!-- 撤销 -->
         <el-dialog title="下单撤销" :visible.sync="quashDialogVisible" width="30%" :before-close="handleClose">
            <p style="font-size:16px;color:#333333" v-if="!isQuash">委托编号<span
                  style="color:#34BD66">ZTMS2023071001</span>的信息是否撤销</p>
                  style="color:#34BD66">{{this.insOrderRow.entrustCode}}</span>的信息是否撤销</p>
            <el-form :label-position="labelPosition" :model="formData" label-width="150px" ref="ruleForm" v-else>
               <el-form-item label="请输入撤销原因：">
                  <el-input v-model="formData.specificationModel" size="small" style="width:60%"></el-input>
@@ -456,7 +456,8 @@
            tabIndex: 0,
            active: 0, //1：下单，2：查看，3：审核，4：光纤配置,默认为0
            currentId: null,
        more:false
        more:false,
        insOrderRow:{}
         }
      },
      mounted() {
@@ -557,6 +558,7 @@
         // 撤销
         handlEquash(row) {
            this.quashDialogVisible = true;
        this.insOrderRow=row
         },
         // 下发
         handleIssued(row) {
@@ -601,6 +603,25 @@
         },
         submitForm() {
            this.upLoad = true;
        if (this.tabIndex==1){
          this.axios.put(this.$api.insOrder.updateInspected+"?id="+this.insOrderRow.id).then(res=>{
            if (res.code===200){
              this.upLoad=false
              this.quashDialogVisible=false
              this.refreshTable()
              this.$message.success("更新成功")
            }
          })
        }else{
          this.axios.put(this.$api.insOrder.updateStatus+"?id="+this.insOrderRow.id).then(res=>{
            if (res.code===200){
              this.upLoad = false
              this.quashDialogVisible = false
              this.refreshTable()
              this.$message.success("更新成功")
            }
          })
        }
            let authorizedPerson = this.formData.authorizedPerson.length > 0 ? this.formData.authorizedPerson.join(',') : ''
            delete this.formData.createTime
            delete this.formData.updateTime
@@ -655,6 +676,9 @@
          this.componentData.tagField.orderType.select = res.data
        })
      },
      getStyle(){
        return 'height: calc(100% - '+(this.more?'94':'44')+'px)'
      }
      }
   }
</script>