处理冲突

黄何裕

2024-07-22 ce59cac766bd4f0fb70555bff1c08875181e03bf

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

@@ -15,12 +15,12 @@

    <el-row class="op-warp" type="flex" justify="left" >
      <el-col :span="24">
        <el-button size="small" type="info" @click="selectedDistribute" class="op">下发选中工单</el-button>
        <el-button size="mini" type="primary" @click="selectedDistribute" class="op">下发选中工单</el-button>
        <el-popconfirm
          @confirm="allDistribute"
          title="确定要下发所有工单吗？"
        >
          <el-button size="small" type="danger"  class="op" slot="reference">全部下发</el-button>
          <el-button size="mini" type="primary"  class="op" slot="reference">全部下发</el-button>
        </el-popconfirm>

        <el-popover
@@ -56,15 +56,21 @@
              </el-select>
            </el-form-item>
            <el-form-item label="数量限制" prop="fastNumLimit">
              <el-input v-model="fastDistributeForm.fastNumLimit" size="small" type="number" placeholder="此次工单下发最大数量"></el-input>
              <el-input v-model="fastDistributeForm.fastNumLimit" size="mini" type="number" placeholder="此次工单下发最大数量"></el-input>
            </el-form-item>
            <el-form-item>
              <el-button type="primary" size="small" @click="fastDistribute">立即下发</el-button>
              <el-button type="primary" size="mini" @click="fastDistribute">立即下发</el-button>
            </el-form-item>
          </el-form>
          <el-button slot="reference" type="primary" size="small">快捷下发</el-button>
          <el-button slot="reference" type="primary" size="mini">快捷下发</el-button>
        </el-popover>
        <el-button size="small" type="success" @click="handleAdd">手动新增工单</el-button>
        <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-row>