380新产品,优化

yyt

2024-05-23 04b8eff075a04db23e6f908855699b4d2954588c

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

@@ -145,6 +145,15 @@
              v-hasPermi="['bs:orderScheduling:export']"
            >导出</el-button>
          </el-col>
          <el-col :span="1.5">
            <el-button
              type="warning"
              plain
              icon="el-icon-close"
              size="mini"
              @click="handleClose"
            >关闭</el-button>
          </el-col>
          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
        </el-row>

@@ -194,64 +203,44 @@
          <el-table-column label="CVT报工" align="center" prop="report30">

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

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

          </el-table-column>
          <el-table-column label="操作人" align="center" prop="operator">

          </el-table-column>
          <el-table-column label="操作时间" align="center" prop="operateTime" width="160">

          </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">
          <el-table-column label="合箱上线时间" align="center" prop="boxClosingOnlineTime" width="160">
            <template slot-scope="scope">
              <el-button
                size="mini"
                type="success"
                plain
                style="width: 72px"
                icon="el-icon-edit"
                @click="handleUpdate(scope.row)"
                v-hasPermi="['bs:orderScheduling:edit']"
              >修改</el-button>
              <el-button
                size="mini"
                type="danger"
                plain
                style="width: 72px"
                icon="el-icon-delete"
                @click="handleDelete(scope.row)"
                v-hasPermi="['bs:orderScheduling:remove']"
              >删除</el-button>
              <span>{{ parseTime(scope.row.boxClosingOnlineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
            </template>
          </el-table-column>
          <el-table-column label="合箱下线时间" align="center" prop="closingBoxOfflineTime" width="160">
            <template slot-scope="scope">
              <span>{{ parseTime(scope.row.closingBoxOfflineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
            </template>
          </el-table-column>
          <el-table-column label="总装上线时间" align="center" prop="finalAssemblyLaunchTime" width="160">
            <template slot-scope="scope">
              <span>{{ parseTime(scope.row.finalAssemblyLaunchTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
            </template>
          </el-table-column>
          <el-table-column label="总装下线时间" align="center" prop="finalAssemblyOfflineTime" width="160">
            <template slot-scope="scope">
              <span>{{ parseTime(scope.row.finalAssemblyOfflineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
            </template>
          </el-table-column>
          <el-table-column label="CVT上线时间" align="center" prop="cvtLaunchTime" width="160">
            <template slot-scope="scope">
              <span>{{ parseTime(scope.row.cvtLaunchTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
            </template>
          </el-table-column>
          <el-table-column label="CVT下线时间" align="center" prop="cvtOfflineTime" width="160">
            <template slot-scope="scope">
              <span>{{ parseTime(scope.row.cvtOfflineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
            </template>
          </el-table-column>
          <el-table-column label="操作人" align="center" prop="operator">
          </el-table-column>
          <el-table-column label="操作时间" align="center" prop="operateTime" width="160">
            <template slot-scope="scope">
              <span>{{ parseTime(scope.row.operateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
            </template>
          </el-table-column>

        </el-table>
    </el-card>

@@ -264,12 +253,12 @@
    />

    <!-- 添加或修改订单排产对话框 -->
    <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="500px" append-to-body>
    <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="700px" append-to-body>
      <span slot="title">
        <i class="el-icon-s-order"></i>
        {{titleName}}
      </span>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
      <el-form ref="form" inline :model="form" :rules="rules" label-width="80px">
        <el-form-item label="订单编号" prop="orderNo">
          <el-input v-model="form.orderNo" placeholder="请输入订单编号" />
        </el-form-item>
@@ -278,44 +267,24 @@
        </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="请输入是否打印" />
        </el-form-item>

        <el-form-item label="合箱报工" prop="report10">
          <el-input v-model="form.report10" placeholder="请输入合箱报工" />
        </el-form-item>
@@ -337,27 +306,7 @@
<!--            >{{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>
@@ -516,7 +465,13 @@
        updateUser: null,
        updateTime: null,
        remarks: null,
        report30: null
        report30: null,
        boxClosingOnlineTime: null,
        closingBoxOfflineTime: null,
        finalAssemblyLaunchTime: null,
        finalAssemblyOfflineTime: null,
        cvtLaunchTime: null,
        cvtOfflineTime: null
      };
      this.resetForm("form");
    },
@@ -587,6 +542,11 @@
      this.download('bs/orderScheduling/export', {
        ...this.queryParams
      }, `orderScheduling_${new Date().getTime()}.xlsx`)
    },
    /** 返回按钮操作 */
    handleClose() {
      const obj = { path: "/main/om/productionOrde" };
      this.$tab.closeOpenPage(obj);
    }
  }
};