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

zhuo

2025-03-07 8314c2943734770c6a38e67147e6367f683df8d1

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

@@ -7,7 +7,7 @@
            <el-input size="small" placeholder="请输入" clearable v-model="searchForm.name"
                      @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>
          </el-form-item>
@@ -41,7 +41,7 @@
    return {
      searchForm: {
        name: '',
        factoryManufacturer: '',
        model: '',
      },
      tableColumn: [
        {
@@ -138,6 +138,10 @@
}
</script>
<style scoped>
.capacity-scope {
  padding: 20px !important;
}

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