fix8-bug

wujian

2024-08-25 a5383f185d9ea618cfed8e887dfc020f1b23b64b

fix8-bug

 jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java

@@ -186,7 +186,6 @@
    /**
     * 查询下线数量
     */
    @PreAuthorize("@ss.hasPermi('bs:orderScheduling:list')")
    @GetMapping("/getOffLineNum")
    public TableDataInfo getOffLineNum(BsOrderScheduling bsOrderScheduling)
    {

 jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java

@@ -48,7 +48,6 @@
        return getDataTable(list);
    }

    @PreAuthorize("@ss.hasPermi('da:passingStationCollection:list')")
    @GetMapping("/getTopProcess")
    public TableDataInfo getTopProcess()
    {
@@ -67,7 +66,6 @@
        return getDataTable(list);
    }

    @PreAuthorize("@ss.hasPermi('da:passingStationCollection:list')")
    @GetMapping("/getProduceNumToday")
    public R getProduceNumToday(String fieldName)
    {

 jcdm-ui/src/views/main/bs/modelNumber/index.vue

@@ -104,17 +104,17 @@
    </el-card>

    <el-card style="margin-top: 10px" class="box-card">
<!--        <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
            <el-button
              type="primary"
              plain
              icon="el-icon-plus"
              size="mini"
              @click="handleAdd"
              v-hasPermi="['bs:modelNumber:add']"
            >新增</el-button>
          </el-col>
        <el-row :gutter="10" class="mb8">
<!--          <el-col :span="1.5">-->
<!--            <el-button-->
<!--              type="primary"-->
<!--              plain-->
<!--              icon="el-icon-plus"-->
<!--              size="mini"-->
<!--              @click="handleAdd"-->
<!--              v-hasPermi="['bs:modelNumber:add']"-->
<!--            >新增</el-button>-->
<!--          </el-col>-->
          <el-col :span="1.5">
            <el-button
              type="success"
@@ -126,29 +126,29 @@
              v-hasPermi="['bs:modelNumber:edit']"
            >修改</el-button>
          </el-col>
          <el-col :span="1.5">
            <el-button
              type="danger"
              plain
              icon="el-icon-delete"
              size="mini"
              :disabled="multiple"
              @click="handleDelete"
              v-hasPermi="['bs:modelNumber:remove']"
            >删除</el-button>
          </el-col>
          <el-col :span="1.5">
            <el-button
              type="warning"
              plain
              icon="el-icon-download"
              size="mini"
              @click="handleExport"
              v-hasPermi="['bs:modelNumber:export']"
            >导出</el-button>
          </el-col>
<!--          <el-col :span="1.5">-->
<!--            <el-button-->
<!--              type="danger"-->
<!--              plain-->
<!--              icon="el-icon-delete"-->
<!--              size="mini"-->
<!--              :disabled="multiple"-->
<!--              @click="handleDelete"-->
<!--              v-hasPermi="['bs:modelNumber:remove']"-->
<!--            >删除</el-button>-->
<!--          </el-col>-->
<!--          <el-col :span="1.5">-->
<!--            <el-button-->
<!--              type="warning"-->
<!--              plain-->
<!--              icon="el-icon-download"-->
<!--              size="mini"-->
<!--              @click="handleExport"-->
<!--              v-hasPermi="['bs:modelNumber:export']"-->
<!--            >导出</el-button>-->
<!--          </el-col>-->
          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
        </el-row>-->
        </el-row>

        <el-table border v-loading="loading" :data="modelNumberList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="55" align="center" />
@@ -231,7 +231,7 @@
        <i class="el-icon-s-order"></i>
        {{titleName}}
      </span>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
        <el-form-item label="机型" prop="model">
          <el-input v-model="form.model" placeholder="请输入机型" />
        </el-form-item>

 jcdm-ui/src/views/main/om/productionOrde/index.vue

@@ -688,6 +688,7 @@
      } else if (selection.length === 1){
        this.single = true
        this.multiple = false
        this.singleSelect = selection[0]
      } else {
        this.single = true
        this.multiple = true