Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/views/mes/qc/template/index.vue

@@ -9,8 +9,9 @@
               @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="方案单位" prop="templateUnit">
-            <el-input v-model="queryParams.templateUnit" placeholder="请输入方案单位" clearable
-              @keyup.enter.native="handleQuery" />
+            <el-select v-model="queryParams.templateUnit" placeholder="请选择方案单位" clearable filterable allow-create @keyup.enter.native="handleQuery">
+              <el-option v-for="unit in templateUnitOptions" :key="unit" :label="unit" :value="unit" />
+            </el-select>
           </el-form-item>
         </el-form>
 
@@ -44,9 +45,6 @@
           <el-empty v-if="inspectionItemTemplateList.length === 0" description="暂无数据" :image-size="100" />
         </div>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize" @pagination="getList" />
-
         <!-- 添加或修改待检项方案对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
           <el-form ref="form" :model="form" :rules="rules" label-width="80px">
@@ -54,7 +52,9 @@
               <el-input v-model="form.templateName" placeholder="请输入方案名称" />
             </el-form-item>
             <el-form-item label="方案单位" prop="templateUnit">
-              <el-input v-model="form.templateUnit" placeholder="请输入方案单位" />
+              <el-select v-model="form.templateUnit" placeholder="请选择方案单位" filterable allow-create>
+                <el-option v-for="unit in templateUnitOptions" :key="unit" :label="unit" :value="unit" />
+              </el-select>
             </el-form-item>
             <el-form-item label="方案描述" prop="templateDesc">
               <el-input v-model="form.templateDesc" type="textarea" placeholder="请输入内容" />
@@ -173,36 +173,34 @@ export default {
     CheckItemTransfer,
   },
   data() {
-    return {
-      // 按钮loading
-      buttonLoading: false,
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 待检项方案表格数据
-      inspectionItemTemplateList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        templateName: undefined,
-        templateUnit: undefined,
-        templateDesc: undefined,
-        inspectionItem: undefined,
-      },
+        return {
+          // 按钮loading
+          buttonLoading: false,
+          // 遮罩层
+          loading: true,
+          // 选中数组
+          ids: [],
+          // 非单个禁用
+          single: true,
+          // 非多个禁用
+          multiple: true,
+          // 显示搜索条件
+          showSearch: true,
+          // 待检项方案表格数据
+          inspectionItemTemplateList: [],
+          // 方案单位选项
+          templateUnitOptions: [],
+          // 弹出层标题
+          title: "",
+          // 是否显示弹出层
+          open: false,
+          // 查询参数
+          queryParams: {
+            templateName: undefined,
+            templateUnit: undefined,
+            templateDesc: undefined,
+            inspectionItem: undefined,
+          },
       // 表单参数
       form: {},
       // 表单校验
@@ -235,8 +233,9 @@ export default {
     getList() {
       this.loading = true;
       listInspectionItemTemplate(this.queryParams).then(response => {
-        this.inspectionItemTemplateList = response.rows;
-        this.total = response.total;
+        this.inspectionItemTemplateList = response.rows || response.data || response;
+        const units = [...new Set(this.inspectionItemTemplateList.map(item => item.templateUnit).filter(Boolean))];
+        this.templateUnitOptions = units.sort();
         this.loading = false;
       });
     },
@@ -369,7 +368,6 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */

klp-ui/src/views/mes/roll/grind/index.vue

@@ -426,7 +426,7 @@ export default {
 
 <style scoped>
 .grind-page   { background: #f4f5f7; height: 100%; }
-.grind-layout { display: flex; gap: 12px; height: 100%; align-items: flex-start; }
+.grind-layout { display: flex; gap: 12px; height: 100%; }
 
 /* 左侧 */
 .grind-left  { width: 240px; flex-shrink: 0; }
@@ -440,7 +440,11 @@ export default {
 
 /* 辊列表 */
 .roll-filter { padding: 0 0 4px; }
-.roll-list   { overflow-y: auto; flex: 1; margin: 0 -12px; }
+::v-deep .el-card .el-card__body {
+  overflow-y: scroll;
+  overflow-x: hidden;
+}
+.roll-list   { overflow-y: auto; flex: 1; min-height: 0; padding: 0; }
 .roll-item   { padding: 8px 12px; cursor: pointer; border-bottom: 1px solid #f0f2f5; }
 .roll-item:hover     { background: #f5f7fa; }
 .roll-item--active   { background: #e8f4ff !important; border-left: 3px solid #409eff; }