合并冲突

licp

2024-05-27 e59a71579f6afd21c76f9d45c3b3f09c28d03c41

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

@@ -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>
@@ -226,8 +226,7 @@
         </el-dialog>
      </div>
      <div style="width: 100%;height: 100%;" v-if="active >0">
         <Add :active="active" :currentId="currentId" v-if="active<4" />
      <fiberOpticConfig :currentId="currentId" v-if="active==4" />
         <Add :active="active" :currentId="currentId" />
      </div>
   </div>
</template>
@@ -235,12 +234,10 @@
<script>
   import ValueTable from '../tool/value-table.vue'
   import Add from '../do/b1-ins-order/add.vue'
  import fiberOpticConfig from '../do/b1-ins-order/fiberoptic-config.vue'
   export default {
      components: {
         ValueTable,
         Add,
      fiberOpticConfig
         Add
      },
      data() {
         return {
@@ -456,7 +453,8 @@
            tabIndex: 0,
            active: 0, //1：下单，2：查看，3：审核，4：光纤配置,默认为0
            currentId: null,
        more:false
        more:false,
        insOrderRow:{}
         }
      },
      mounted() {
@@ -557,6 +555,7 @@
         // 撤销
         handlEquash(row) {
            this.quashDialogVisible = true;
        this.insOrderRow=row
         },
         // 下发
         handleIssued(row) {
@@ -601,6 +600,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