Merge remote-tracking branch 'origin/dev' into dev

gaoluyang

2025-03-07 fc3d463ad190220124a0134f5b0dd60a1b89ca50

Merge remote-tracking branch 'origin/dev' into dev

 src/api/monitor/job.js

ÎļþÒÑɾ³ý

 src/router/index.js

@@ -205,20 +205,6 @@
    hidden: true,
    permissions: ["customer:edit"],
  },
  {
    path: "/monitor/job-log",
    component: Layout,
    hidden: true,
    permissions: ["monitor:job:list"],
    children: [
      {
        path: "index/:jobId(\\d+)",
        component: () => import("@/views/monitor/job/log"),
        name: "JobLog",
        meta: { title: "调度日志", activeMenu: "/monitor/job" },
      },
    ],
  },
];

// é˜²æ­¢è¿žç»­ç‚¹å‡»å¤šæ¬¡è·¯ç”±æŠ¥é”™

 src/views/CNAS/resourceDemand/standardMaterailRequistion/index.vue

@@ -5,14 +5,14 @@
        <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
          <el-form-item label="标准物质名称" prop="name">
            <el-input size="small" placeholder="请输入" clearable v-model="searchForm.name"
                      @keyup.enter.native="searchList"></el-input>
              @keyup.enter.native="searchList"></el-input>
          </el-form-item>
          <el-form-item label="规格型号" prop="factoryManufacturer">
          <el-form-item label="规格型号" prop="model">
            <el-input size="small" placeholder="请输入" clearable v-model="searchForm.model"
                      @keyup.enter.native="searchList"></el-input>
              @keyup.enter.native="searchList"></el-input>
          </el-form-item>
          <el-form-item>
            <el-button size="medium"  @click="resetSearchForm">重 ç½®</el-button>
            <el-button size="medium" @click="resetSearchForm">重 ç½®</el-button>
            <el-button size="medium" type="primary" @click="searchList">查 è¯¢</el-button>
          </el-form-item>
        </el-form>
@@ -20,7 +20,7 @@
    </div>
    <div class="table">
      <lims-table :tableData="tableData" :column="tableColumn" :height="'calc(100vh - 250px)'" @pagination="pagination"
                  :page="page" :tableLoading="tableLoading"></lims-table>
        :page="page" :tableLoading="tableLoading"></lims-table>
    </div>
  </div>
</template>
@@ -41,7 +41,7 @@
    return {
      searchForm: {
        name: '',
        factoryManufacturer: '',
        model: '',
      },
      tableColumn: [
        {
@@ -106,16 +106,16 @@
  mounted() {
    this.searchList()
  },
  methods :{
  methods: {
    // æŸ¥è¯¢åˆ—表
    searchList () {
    searchList() {
      this.tableLoading = true
      getPageSubstanceRecord({
        ...this.page,
        ...this.searchForm
      }).then(res => {
        this.tableLoading = false
        if (res.code === 200){
        if (res.code === 200) {
          this.tableData = res.data.records
          this.page.total = res.data.total
        }
@@ -124,7 +124,7 @@
      })
    },
    // é‡ç½®æŸ¥è¯¢æ¡ä»¶
    resetSearchForm () {
    resetSearchForm() {
      this.searchForm.name = '';
      this.searchForm.model = '';
      this.searchList()
@@ -138,6 +138,10 @@
}
</script>
<style scoped>
.capacity-scope {
  padding: 20px !important;
}

.search {
  height: 46px;
  display: flex;

 src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue

@@ -4,7 +4,7 @@
      <div>
        <el-form :model="form" ref="form" size="small" :inline="true">
          <el-form-item label="物质名称">
            <el-input v-model="form.search"></el-input>
            <el-input v-model="form.name"></el-input>
          </el-form-item>
          <el-form-item>
            <el-button @click="reset">重 ç½®</el-button>
@@ -43,7 +43,7 @@
  data() {
    return {
      form: {
        search: undefined
        name: undefined
      },
      addRecordRef: false,
      columns: [
@@ -135,7 +135,7 @@
      })
    },
    reset() {
      this.form.search = undefined
      this.form.name = undefined
      this.getTableData()
    },
    async exportExcel() {
@@ -154,6 +154,10 @@
</script>

<style scoped>
.capacity-scope {
  padding: 20px !important;
}

.search {
  height: 46px;
  display: flex;

 src/views/monitor/job/index.vue

ÎļþÒÑɾ³ý

 src/views/monitor/job/log.vue

ÎļþÒÑɾ³ý