合并冲突

licp

2024-08-09 c146c0ae4e57b26e798157fe453426e9fc26db34

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

@@ -339,7 +339,7 @@
         </el-dialog>
      </div>
      <div style="width: 100%;height: 100%;" v-if="active >0">
         <Add :active="active" :currentId="currentId" v-if="active<4" />
         <Add :active="active" :currentId="currentId" v-if="active<4" :examine = "examine" />
      </div>
    <el-dialog title="标签打印" :visible.sync="printDialogVisible" width="40%" top="5vh">
      <div style="width:100%;height: 400px;overflow-y: auto;" v-loading="loadPint">
@@ -460,6 +460,7 @@
      data() {
         return {
        deleteTilte:'撤销',
        examine: null,
        deleteList:[],
        loadPint:false,
        checkAll: false,
@@ -951,6 +952,7 @@
            // this.verifyDialogVisible = true;
            this.active = 3;
            this.currentId = row.id
        this.examine = 1
         },
         // 撤销
         handlEquash(row) {
@@ -1111,6 +1113,7 @@
         // 下单
         playOrder(num) {
            this.active = num
        this.examine = 0
        this.refreshTable('page')
         },
         handleTab(m, i) {