Merge remote-tracking branch 'origin/master'

hdy

2024-11-27 c5f52fdfb3b6447a1f4f5f00f362e9654d70dfcc

 billion-ui/src/views/main/da/materialCollection/index.vue

@@ -9,14 +9,24 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="工位编码" prop="locationCode">
        <el-input
          v-model="queryParams.locationCode"
          placeholder="请输入工位编码"
          clearable
          @keyup.enter.native="handleQuery"
        />
      <el-form-item label-width="120" label="采集时间">
        <el-date-picker
          v-model="dateRange"
          type="datetimerange"
          range-separator="至"
          value-format="yyyy-MM-dd HH:mm:ss"
          start-placeholder="开始日期"
          end-placeholder="结束日期">
        </el-date-picker>
      </el-form-item>
<!--      <el-form-item label="工位编码" prop="locationCode">-->
<!--        <el-input-->
<!--          v-model="queryParams.locationCode"-->
<!--          placeholder="请输入工位编码"-->
<!--          clearable-->
<!--          @keyup.enter.native="handleQuery"-->
<!--        />-->
<!--      </el-form-item>-->
<!--      <el-form-item label="参数编码" prop="paramCode">-->
<!--        <el-input-->
<!--          v-model="queryParams.paramCode"-->
@@ -138,6 +148,8 @@
  name: "MaterialCollection",
  data() {
    return {
      // 日期范围
      dateRange: [],
      // 遮罩层
      loading: true,
      // 选中数组
@@ -179,7 +191,7 @@
    /** 查询物料采集列表 */
    getList() {
      this.loading = true;
      listMaterialCollection(this.queryParams).then(response => {
      listMaterialCollection(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
        this.materialCollectionList = response.rows;
        this.total = response.total;
        this.loading = false;
@@ -205,6 +217,7 @@
    },
    /** 搜索按钮操作 */
    handleQuery() {
      this.dateRange = [];
      this.queryParams.pageNum = 1;
      this.getList();
    },