Merge branch 'dev_KTHG' of http://114.132.189.42:9002/r/product-inventory-m...

spring

2026-03-19 ccb00a17b9119200b8c8d29a177bcc129dd4c982

 src/views/consumablesLogistics/receiptManagement/Record.vue

@@ -15,16 +15,16 @@
                  style="width: 240px"
                  placeholder="请输入"
                  clearable/>
        <span class="search_title ml10">来源：</span>
        <el-select v-model="searchForm.recordType"
                  style="width: 240px"
                  placeholder="请选择"
                  clearable>
          <el-option v-for="item in stockRecordTypeOptions"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"/>
        </el-select>
<!--        <span class="search_title ml10">来源：</span>-->
<!--        <el-select v-model="searchForm.recordType"-->
<!--                  style="width: 240px"-->
<!--                  placeholder="请选择"-->
<!--                  clearable>-->
<!--          <el-option v-for="item in stockRecordTypeOptions"-->
<!--                     :key="item.value"-->
<!--                     :label="item.label"-->
<!--                     :value="item.value"/>-->
<!--        </el-select>-->
        <el-button type="primary"
                   @click="handleQuery"
                   style="margin-left: 10px">搜索
@@ -92,13 +92,13 @@
        <el-table-column label="入库人"
                         prop="createBy"
                         show-overflow-tooltip/>
        <el-table-column label="来源"
        <!-- <el-table-column label="来源"
                         prop="recordType"
                         show-overflow-tooltip>
          <template #default="scope">
            {{ getRecordType(scope.row.recordType) }}
          </template>
        </el-table-column>
        </el-table-column> -->
        <el-table-column label="过磅日期"
                         prop="weighingDate"
                         v-if="type === '0'"
@@ -117,12 +117,14 @@
          </template>
        </el-table-column>
      </el-table>
      <pagination v-show="total > 0"
                  :total="total"
                  layout="total, sizes, prev, pager, next, jumper"
                  :page="page.current"
                  :limit="page.size"
                  @pagination="pageProductChange"/>
      <div style="margin-top: 12px; display: flex; justify-content: flex-end;">
        <pagination v-show="total > 0"
                    :total="total"
                    layout="total, sizes, prev, pager, next, jumper"
                    :page="page.current"
                    :limit="page.size"
                    @pagination="pageProductChange"/>
      </div>
    </div>
  </div>
</template>
@@ -161,7 +163,7 @@
const stockRecordTypeOptions = ref([]);
const page = reactive({
  current: 1,
  size: 100,
  size: 10,
});
const total = ref(0);