Merge remote-tracking branch 'origin/master'

value

2024-05-27 6d2e054b221d145036710b1e4e7b3e417dcf07e9

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

@@ -181,7 +181,7 @@
                  <el-col class="search_thing" style="width: 95%;">
                     <div class="search_label"><span class="required-span" v-show="distributeData.type==2">* </span>指派人员：</div>
                     <div class="search_input">
                        <el-select v-model="distributeData.userId" placeholder="请选择" size="small" style="width: 100%;" clearable>
                        <el-select v-model="distributeData.userId" placeholder="请选择" size="small" style="width: 100%;" clearable filterable>
                           <el-option v-for="(item,i) in personList" :key="i" :label="item.label" :value="item.value">
                           </el-option>
                        </el-select>
@@ -204,7 +204,8 @@
         </el-dialog>
      </div>
      <div style="width: 100%;height: 100%;" v-if="active >0">
         <Add :active="active" :currentId="currentId" />
         <Add :active="active" :currentId="currentId" v-if="active<4" />
      <fiberOpticConfig :currentId="currentId" v-if="active==4" />
      </div>
   </div>
</template>
@@ -212,10 +213,12 @@
<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
         Add,
      fiberOpticConfig
      },
      data() {
         return {
@@ -426,7 +429,7 @@
               },
            ],
            tabIndex: 0,
            active: 0, //1：下单，2：查看，3：审核
            active: 4, //1：下单，2：查看，3：审核，4：光纤配置,默认为0
            currentId: null
         }
      },