Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

klp-ui/src/components/CoilSelector/index.vue

@@ -18,7 +18,7 @@
     <el-dialog title="选择钢卷" :visible.sync="dialogVisible" width="900px" :close-on-click-modal="false"
       @close="handleClose" append-to-body>
       <!-- 搜索区域 -->
-      <el-form :inline="true" :model="queryParams" class="search-form">
+      <el-form v-if="!rangeMode" :inline="true" :model="queryParams" class="search-form">
         <el-form-item label="卷号">
           <el-input v-model="queryParams.currentCoilNo" placeholder="请输入卷号" clearable size="small"
             @keyup.enter.native="handleQuery" />
@@ -47,7 +47,7 @@
       </el-table>
 
       <!-- 分页 -->
-      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      <pagination v-if="!rangeMode" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
         @pagination="getList" />
 
       <div slot="footer" class="dialog-footer">
@@ -91,6 +91,15 @@ export default {
       type: Object,
       default: null
     },
+    rangeMode: {
+      type: Boolean,
+      default: false
+    },
+    // 返回选择模式，不再通过list借口获取，而是传入可以选择的钢卷数据
+    rangeData: {
+      type: Array,
+      default: () => []
+    }
   },
   data() {
     return {
@@ -178,6 +187,12 @@ export default {
   methods: {
     // 获取钢卷列表
     async getList() {
+      // 如果是范围模式，直接使用传入数据
+      if (this.rangeMode) {
+        this.coilList = this.rangeData || [];
+        this.total = this.coilList.length;
+        return;
+      }
       try {
         this.loading = true;
         const params = { ...this.queryParams, ...this.filters };