代码更新

hdy

2023-12-28 c6a3be3e7346becc2c44428a3335dbdedf7dfa67

代码更新

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

@@ -256,6 +256,11 @@
        workshopCode: null,
        workCalendar: null,
      },
      workshopCodeQueryParams: {
        pageNum: 1,
        pageSize: 10,
        workshopCode: null,
      },
      // 表单参数
      form: {},
      // 表单校验
@@ -286,8 +291,8 @@
  methods: {
    // 在这里编写处理选中事件的逻辑
    handleSelectChange(selectedOption) {
      this.queryParams.workshopCode = selectedOption;
      listWorkshop(this.queryParams).then(response => {
      this.workshopCodeQueryParams.workshopCode = selectedOption;
      listWorkshop(this.workshopCodeQueryParams).then(response => {
        this.form.workshopName = response.rows[0].workshopName;
      });
    },

 jcdm-ui/src/views/main/em/equipmentArchives/index.vue

@@ -80,7 +80,7 @@
          <el-table-column label="规格型号" align="center" prop="equipmentSpec"/>
          <el-table-column label="车间编码" align="center" prop="workshopCode"/>
          <el-table-column label="设备状态" align="center" prop="status"/>
          <el-table-column label="报警时间" width="160" align="center" prop="createTime"/>
          <el-table-column label="创建时间" width="160" align="center" prop="createTime"/>
          <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width">
            <template slot-scope="scope">
              <el-button

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

@@ -23,122 +23,120 @@
          <el-button type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">高级查询</el-button>
          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        </el-form-item>
      </el-form>
      <el-form :model="queryParams" ref="queryParams" size="small" :inline="true" v-show="advancedShowSearch" label-width="68px">
        <el-form-item label="产品编号" prop="productCode">
          <el-input
            v-model="queryParams.productCode"
            placeholder="请输入产品编号"
            clearable
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="产品名称" prop="productName">
          <el-input
            v-model="queryParams.productName"
            placeholder="请输入产品名称"
            clearable
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="是否合格" prop="status">
          <el-input
            v-model="queryParams.status"
            placeholder="请输入是否合格"
            clearable
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form :model="queryParams" ref="queryParams" size="small" :inline="true" v-show="advancedShowSearch" label-width="68px">
          <el-form-item label="产品编号" prop="productCode">
            <el-input
              v-model="queryParams.productCode"
              placeholder="请输入产品编号"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="产品名称" prop="productName">
            <el-input
              v-model="queryParams.productName"
              placeholder="请输入产品名称"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="是否合格" prop="status">
            <el-input
              v-model="queryParams.status"
              placeholder="请输入是否合格"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
        </el-form>
      </el-form>
    </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="['om:workReport:add']"
        >新增</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="success"
          plain
          icon="el-icon-edit"
          size="mini"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['om:workReport: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="['om:workReport: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="['om:workReport:export']"
        >导出</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-table v-loading="loading" border :data="workReportList" @selection-change="handleSelectionChange" v-if="workReportList.length > 0">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="工单编号" width="130" align="center" prop="workOrderCode"/>
      <el-table-column label="SFC总成序列号" align="center" prop="sfcCode" />
      <el-table-column label="产品编号" align="center" prop="productCode" />
      <el-table-column label="产品名称" align="center" prop="productName" />
      <el-table-column label="上线时间" align="center" prop="upTime" />
      <el-table-column label="下线时间" align="center" prop="offlineTime" />
      <el-table-column label="是否合格" align="center" prop="status">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.status"/>
        </template>
      </el-table-column>
      <el-table-column label="备注" align="center" prop="remark" />
      <el-table-column fixed="right" label="操作" width="200" align="center" class-name="small-padding fixed-width">
          <el-button
            type="success"
            plain
            icon="el-icon-edit"
            size="mini"
            style="width: 72px"
            :disabled="single"
            @click="handleUpdate"
            v-hasPermi="['om:workReport:edit']"
          >修改</el-button>
    <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="['om:workReport:add']"
            >新增</el-button>
          </el-col>
          <el-col :span="1.5">
            <el-button
              type="success"
              plain
              icon="el-icon-edit"
              size="mini"
              :disabled="single"
              @click="handleUpdate"
              v-hasPermi="['om:workReport:edit']"
            >修改</el-button>
          </el-col>
          <el-col :span="1.5">
            <el-button
              type="danger"
              plain
              icon="el-icon-delete"
              size="mini"
              style="width: 72px"
              :disabled="multiple"
              @click="handleDelete"
              v-hasPermi="['om:workReport:remove']"
            >删除</el-button>
      </el-table-column>
    </el-table>
      <el-empty v-else>
        <span slot="description">暂无数据</span>
      </el-empty>
          </el-col>
          <el-col :span="1.5">
            <el-button
              type="warning"
              plain
              icon="el-icon-download"
              size="mini"
              @click="handleExport"
              v-hasPermi="['om:workReport:export']"
            >导出</el-button>
          </el-col>
          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
        </el-row>
        <el-table border v-loading="loading" :data="workReportList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="55" align="center" />
          <el-table-column label="工单编号" width="130" align="center" prop="workOrderCode"/>
          <el-table-column label="SFC总成序列号" align="center" prop="sfcCode" />
          <el-table-column label="产品编号" align="center" prop="productCode" />
          <el-table-column label="产品名称" align="center" prop="productName" />
          <el-table-column label="上线时间" align="center" prop="upTime" />
          <el-table-column label="下线时间" align="center" prop="offlineTime" />
          <el-table-column label="是否合格" align="center" prop="status">
            <template slot-scope="scope">
              <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.status"/>
            </template>
          </el-table-column>
          <el-table-column label="备注" align="center" prop="remark" />
          <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width">
            <template slot-scope="scope">
              <el-button
                size="mini"
                type="success"
                plain
                style="width: 72px"
                icon="el-icon-edit"
                @click="handleUpdate(scope.row)"
                v-hasPermi="['om:workReport:edit']"
              >修改</el-button>
              <el-button
                size="mini"
                type="danger"
                plain
                style="width: 72px"
                icon="el-icon-delete"
                @click="handleDelete(scope.row)"
                v-hasPermi="['om:workReport:remove']"
              >删除</el-button>
            </template>
          </el-table-column>
        </el-table>
    </el-card>

    <pagination
      v-show="total>0"
      :total="total"
@@ -166,9 +164,9 @@
        <el-form-item label="产品名称" prop="productName">
          <el-input v-model="form.productName" placeholder="请输入产品名称" />
        </el-form-item>
<!--        <el-form-item label="是否合格" prop="status">-->
<!--          <el-input v-model="form.status" placeholder="请输入产品名称" />-->
<!--        </el-form-item>-->
        <!--        <el-form-item label="是否合格" prop="status">-->
        <!--          <el-input v-model="form.status" placeholder="请输入产品名称" />-->
        <!--        </el-form-item>-->
        <el-form-item label="是否合格" prop="status">
          <el-radio-group v-model="form.status">
            <el-radio
@@ -181,7 +179,6 @@
        <el-form-item label="备注" prop="remark">
          <el-input v-model="form.remark" placeholder="请输入备注" />
        </el-form-item>

      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -201,7 +198,7 @@
    return {
      // 遮罩层
      loading: true,
      titleName: 'test',
      titleName: "test",
      // 选中数组
      ids: [],
      // 非单个禁用
@@ -264,8 +261,8 @@
    this.queryParams.workOrderCode = workOrderNo
    this.queryRouteCode = workOrderNo
    this.getList();
    // this.headerInformation();
    // this.getProcesses();
    this.headerInformation();
    this.getProcesses();
  },
  methods: {
    advancedQuery(){