Merge remote-tracking branch 'origin/master'

懒羊羊

2024-01-15 7f1dbf4296013a4b15fbc2748de072f7c7ad4388

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

@@ -2,9 +2,9 @@
  <div class="app-container">
    <el-card class="box-card">
        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
          <el-form-item label="订单编号" prop="orderNumber">
          <el-form-item label="订单编号" prop="orderNo">
            <el-input
              v-model="queryParams.orderNumber"
              v-model="queryParams.orderNo"
              placeholder="请输入订单编号"
              clearable
              @keyup.enter.native="handleQuery"
@@ -18,6 +18,7 @@
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>

          <el-form-item label="机型" prop="model">
            <el-input
              v-model="queryParams.model"
@@ -26,6 +27,7 @@
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>

          <el-form-item label="工时" prop="workingHours">
            <el-input
              v-model="queryParams.workingHours"
@@ -42,6 +44,7 @@
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>

          <el-form-item label="是否打印" prop="whetherOrPrint">
            <el-input
              v-model="queryParams.whetherOrPrint"
@@ -74,8 +77,66 @@
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>

<!--          <el-form-item label="预留字段1" prop="spareField1">-->
<!--            <el-input-->
<!--              v-model="queryParams.spareField1"-->
<!--              placeholder="请输入预留字段1"-->
<!--              clearable-->
<!--              @keyup.enter.native="handleQuery"-->
<!--            />-->
<!--          </el-form-item>-->
<!--          <el-form-item label="预留字段2" prop="spareField2">-->
<!--            <el-input-->
<!--              v-model="queryParams.spareField2"-->
<!--              placeholder="请输入预留字段2"-->
<!--              clearable-->
<!--              @keyup.enter.native="handleQuery"-->
<!--            />-->
<!--          </el-form-item>-->
<!--          <el-form-item label="预留字段3" prop="spareField3">-->
<!--            <el-input-->
<!--              v-model="queryParams.spareField3"-->
<!--              placeholder="请输入预留字段3"-->
<!--              clearable-->
<!--              @keyup.enter.native="handleQuery"-->
<!--            />-->
<!--          </el-form-item>-->
<!--          <el-form-item label="预留字段4" prop="spareField4">-->
<!--            <el-input-->
<!--              v-model="queryParams.spareField4"-->
<!--              placeholder="请输入预留字段4"-->
<!--              clearable-->
<!--              @keyup.enter.native="handleQuery"-->
<!--            />-->
<!--          </el-form-item>-->
<!--          <el-form-item label="创建用户" prop="createUser">-->
<!--            <el-input-->
<!--              v-model="queryParams.createUser"-->
<!--              placeholder="请输入创建用户"-->
<!--              clearable-->
<!--              @keyup.enter.native="handleQuery"-->
<!--            />-->
<!--          </el-form-item>-->
<!--          <el-form-item label="更改用户" prop="updateUser">-->
<!--            <el-input-->
<!--              v-model="queryParams.updateUser"-->
<!--              placeholder="请输入更改用户"-->
<!--              clearable-->
<!--              @keyup.enter.native="handleQuery"-->
<!--            />-->
<!--          </el-form-item>-->
<!--          <el-form-item label="备注" prop="remarks">-->
<!--            <el-input-->
<!--              v-model="queryParams.remarks"-->
<!--              placeholder="请输入备注"-->
<!--              clearable-->
<!--              @keyup.enter.native="handleQuery"-->
<!--            />-->
<!--          </el-form-item>-->
          <el-form-item style="float: right">
            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
            <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>
@@ -130,36 +191,44 @@

        <el-table border v-loading="loading" :data="orderSchedulingList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="55" align="center" />
          <el-table-column label="订单编号" align="center" prop="orderNumber">
          <el-table-column label="ID" align="center" prop="id" />
          <el-table-column label="订单编号" align="center" prop="orderNo">

          </el-table-column>
          <el-table-column label="发动机号" align="center" prop="engineNo">

          </el-table-column>
          <el-table-column label="产品类型" align="center" prop="productType">
<!--            <template slot-scope="scope">-->
<!--              <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.productType"/>-->
<!--            </template>-->

          </el-table-column>
          <el-table-column label="机型" align="center" prop="model">

          </el-table-column>
          <el-table-column label="生产状态" align="center" prop="productionStatus">

          </el-table-column>
          <el-table-column label="工时" align="center" prop="workingHours">

          </el-table-column>
          <el-table-column label="当前工位" align="center" prop="currentWorkstation">

          </el-table-column>
          <el-table-column label="质量状态" align="center" prop="qualityStatus">

          </el-table-column>
          <el-table-column label="是否打印" align="center" prop="whetherOrPrint">

          </el-table-column>
          <el-table-column label="10报工" align="center" prop="report10">

          </el-table-column>
          <el-table-column label="20报工" align="center" prop="report20">

          </el-table-column>
          <el-table-column label="合箱上线" align="center" prop="combinedBoxLaunch">
          <el-table-column label="合箱上线" align="center" prop="combinedBoxTime">

          </el-table-column>
          <el-table-column label="总装下线" align="center" prop="finalAssemblyOffline">
          <el-table-column label="总装下线" align="center" prop="finalAssemblyTime">

          </el-table-column>
          <el-table-column label="操作人" align="center" prop="operator">
@@ -168,6 +237,30 @@
          <el-table-column label="操作时间" align="center" prop="operateTime">

          </el-table-column>
<!--          <el-table-column label="状态" align="center" prop="status">-->

<!--          </el-table-column>-->
<!--          <el-table-column label="预留字段1" align="center" prop="spareField1">-->

<!--          </el-table-column>-->
<!--          <el-table-column label="预留字段2" align="center" prop="spareField2">-->

<!--          </el-table-column>-->
<!--          <el-table-column label="预留字段3" align="center" prop="spareField3">-->

<!--          </el-table-column>-->
<!--          <el-table-column label="预留字段4" align="center" prop="spareField4">-->

<!--          </el-table-column>-->
<!--          <el-table-column label="创建用户" align="center" prop="createUser">-->

<!--          </el-table-column>-->
<!--          <el-table-column label="更改用户" align="center" prop="updateUser">-->

<!--          </el-table-column>-->
<!--          <el-table-column label="备注" align="center" prop="remarks">-->

<!--          </el-table-column>-->
          <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width">
            <template slot-scope="scope">
              <el-button
@@ -208,20 +301,48 @@
        {{titleName}}
      </span>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="订单编号" prop="orderNumber">
          <el-input v-model="form.orderNumber" placeholder="请输入订单编号" />
        <el-form-item label="订单编号" prop="orderNo">
          <el-input v-model="form.orderNo" placeholder="请输入订单编号" />
        </el-form-item>
        <el-form-item label="发动机号" prop="engineNo">
          <el-input v-model="form.engineNo" placeholder="请输入发动机号" />
        </el-form-item>
        <el-form-item label="产品类型" prop="productType">
          <el-select v-model="form.productType" placeholder="请选择产品类型">
<!--            <el-option-->
<!--              v-for="dict in dict.type.${dictType}"-->
<!--              :key="dict.value"-->
<!--              :label="dict.label"-->
<!--              :value="dict.value"-->
<!--            ></el-option>-->
          </el-select>
        </el-form-item>
        <el-form-item label="机型" prop="model">
          <el-input v-model="form.model" placeholder="请输入机型" />
        </el-form-item>
        <el-form-item label="生产状态" prop="productionStatus">
          <el-radio-group v-model="form.productionStatus">
<!--            <el-radio-->
<!--              v-for="dict in dict.type.${dictType}"-->
<!--              :key="dict.value"-->
<!--              :label="dict.value"-->
<!--            >{{dict.label}}</el-radio>-->
          </el-radio-group>
        </el-form-item>
        <el-form-item label="工时" prop="workingHours">
          <el-input v-model="form.workingHours" placeholder="请输入工时" />
        </el-form-item>
        <el-form-item label="当前工位" prop="currentWorkstation">
          <el-input v-model="form.currentWorkstation" placeholder="请输入当前工位" />
        </el-form-item>
        <el-form-item label="质量状态" prop="qualityStatus">
          <el-radio-group v-model="form.qualityStatus">
<!--            <el-radio-->
<!--              v-for="dict in dict.type.${dictType}"-->
<!--              :key="dict.value"-->
<!--              :label="dict.value"-->
<!--            >{{dict.label}}</el-radio>-->
          </el-radio-group>
        </el-form-item>
        <el-form-item label="是否打印" prop="whetherOrPrint">
          <el-input v-model="form.whetherOrPrint" placeholder="请输入是否打印" />
@@ -235,6 +356,36 @@
        <el-form-item label="操作人" prop="operator">
          <el-input v-model="form.operator" placeholder="请输入操作人" />
        </el-form-item>
        <el-form-item label="状态" prop="status">
          <el-radio-group v-model="form.status">
<!--            <el-radio-->
<!--              v-for="dict in dict.type.${dictType}"-->
<!--              :key="dict.value"-->
<!--              :label="dict.value"-->
<!--            >{{dict.label}}</el-radio>-->
          </el-radio-group>
        </el-form-item>
<!--        <el-form-item label="预留字段1" prop="spareField1">-->
<!--          <el-input v-model="form.spareField1" placeholder="请输入预留字段1" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="预留字段2" prop="spareField2">-->
<!--          <el-input v-model="form.spareField2" placeholder="请输入预留字段2" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="预留字段3" prop="spareField3">-->
<!--          <el-input v-model="form.spareField3" placeholder="请输入预留字段3" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="预留字段4" prop="spareField4">-->
<!--          <el-input v-model="form.spareField4" placeholder="请输入预留字段4" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="创建用户" prop="createUser">-->
<!--          <el-input v-model="form.createUser" placeholder="请输入创建用户" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="更改用户" prop="updateUser">-->
<!--          <el-input v-model="form.updateUser" placeholder="请输入更改用户" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="备注" prop="remarks">-->
<!--          <el-input v-model="form.remarks" placeholder="请输入备注" />-->
<!--        </el-form-item>-->
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -274,7 +425,7 @@
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        orderNumber: null,
        orderNo: null,
        engineNo: null,
        productType: null,
        model: null,
@@ -285,15 +436,26 @@
        whetherOrPrint: null,
        report10: null,
        report20: null,
        combinedBoxLaunch: null,
        finalAssemblyOffline: null,
        combinedBoxTime: null,
        finalAssemblyTime: null,
        operator: null,
        operateTime: null
        operateTime: null,
        status: null,
        spareField1: null,
        spareField2: null,
        spareField3: null,
        spareField4: null,
        createUser: null,
        updateUser: null,
        remarks: null
      },
      // 表单参数
      form: {},
      // 表单校验
      rules: {
        id: [
          { required: true, message: "ID不能为空", trigger: "blur" }
        ],
      }
    };
  },
@@ -318,7 +480,8 @@
    // 表单重置
    reset() {
      this.form = {
        orderNumber: null,
        id: null,
        orderNo: null,
        engineNo: null,
        productType: null,
        model: null,
@@ -329,10 +492,20 @@
        whetherOrPrint: null,
        report10: null,
        report20: null,
        combinedBoxLaunch: null,
        finalAssemblyOffline: null,
        combinedBoxTime: null,
        finalAssemblyTime: null,
        operator: null,
        operateTime: null
        operateTime: null,
        status: null,
        spareField1: null,
        spareField2: null,
        spareField3: null,
        spareField4: null,
        createUser: null,
        createTime: null,
        updateUser: null,
        updateTime: null,
        remarks: null
      };
      this.resetForm("form");
    },
@@ -348,7 +521,7 @@
    },
    // 多选框选中数据
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.orderNumber)
      this.ids = selection.map(item => item.id)
      this.single = selection.length!==1
      this.multiple = !selection.length
    },
@@ -361,8 +534,8 @@
    /** 修改按钮操作 */
    handleUpdate(row) {
      this.reset();
      const orderNumber = row.orderNumber || this.ids
      getOrderScheduling(orderNumber).then(response => {
      const id = row.id || this.ids
      getOrderScheduling(id).then(response => {
        this.form = response.data;
        this.open = true;
        this.titleName = "修改订单排产";
@@ -372,7 +545,7 @@
    submitForm() {
      this.$refs["form"].validate(valid => {
        if (valid) {
          if (this.form.orderNumber != null) {
          if (this.form.id != null) {
            updateOrderScheduling(this.form).then(response => {
              this.$modal.msgSuccess("修改成功");
              this.open = false;
@@ -390,9 +563,9 @@
    },
    /** 删除按钮操作 */
    handleDelete(row) {
      const orderNumbers = row.orderNumber || this.ids;
      this.$modal.confirm('是否确认删除订单排产编号为"' + orderNumbers + '"的数据项？').then(function() {
        return delOrderScheduling(orderNumbers);
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除订单排产编号为"' + ids + '"的数据项？').then(function() {
        return delOrderScheduling(ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");