处理工单下发代码冲突

黄何裕

2024-07-22 d60f2ca80ddbe1846fb7ad9fd1f1e2fb01c372fe

 src/views/system/work-order/distribute/index.vue

@@ -13,9 +13,31 @@
      </el-col>
    </el-row>

    <el-row class="op-warp" type="flex" justify="left" >
      <el-col :span="24">
        <el-button size="mini" type="primary" @click="selectedDistribute" class="op">下发选中工单</el-button>
    <el-row class="op-warp">
      <el-row v-show="showSearch">
        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
          <el-form-item label="关键词" prop="keyword">
            <el-input
              v-model="queryParams.menuName"
              placeholder="关键词搜索"
              clearable
              @keyup.enter.native="page"
            />
          </el-form-item>
          <el-form-item label="下发状态" prop="status">
            <el-select v-model="queryParams.status" placeholder="下发状态" clearable>
              <el-option label="未下发" value="WAIT_DISTRIBUTE"/>
              <el-option label="已下发" value="DISTRIBUTED"/>
            </el-select>
          </el-form-item>
          <el-form-item>
            <el-button type="primary" icon="el-icon-search" size="small" @click="page">搜索</el-button>
          </el-form-item>
        </el-form>
      </el-row>

      <el-row>
        <el-button size="small" type="info" @click="selectedDistribute" class="op">下发选中工单</el-button>
        <el-popconfirm
          @confirm="allDistribute"
          title="确定要下发所有工单吗？"
@@ -64,15 +86,9 @@
          </el-form>
          <el-button slot="reference" type="primary" size="mini">快捷下发</el-button>
        </el-popover>
        <el-button
          type="primary"
          plain
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
        >手动新增工单</el-button>
        <el-button icon="el-icon-refresh" circle @click="page"></el-button>
      </el-col>
        <el-button size="small" type="success" @click="handleAdd">手动新增工单</el-button>
        <right-toolbar :showSearch.sync="showSearch" @queryTable="page"></right-toolbar>
      </el-row>
    </el-row>

    <el-row class="content-warp" type="flex" justify="left">
@@ -153,6 +169,7 @@
  name: 'index',
  data() {
    return {
      showSearch: true,
      selectedIdsDistributeForm: {
        ids: [],
        unitId: null
@@ -207,6 +224,8 @@
      },
      queryParams: {
        unitId: null,
        keyword: '',
        status: 'WAIT_DISTRIBUTE',
        pageNum: 1,
        pageSize: 10,
      },