物料转换bug修改

ruoyi-ui/src/views/system/supplies/indexupload.vue

@@ -3,6 +3,7 @@
         <el-form  ref="queryForm" size="small" :inline="true" >
             <el-form-item label="行" prop="row">
                 <el-input
+                    oninput="value=value.replace(/[^\d]/g,'')"
                     v-model="row"
                     placeholder="请输入开始行"
                     clearable
@@ -25,6 +26,7 @@
                     ref="upload"
                     :before-upload="handleFileChange"
                     action=''
+                    accept='.xlsx'
                     :limit="1"
                     :file-list="fileList"
                     :show-file-list=false
@@ -39,6 +41,7 @@
                     ref="upload"
                     :before-upload="handleFileChange1"
                     action=''
+                    accept='.xlsx'
                     :limit="1"
                     :file-list="fileList"
                     :disabled="disableNextButton"
@@ -57,10 +60,10 @@
                 >导出</el-button>
             </el-col>
             <el-col :span="1.5">
-                <el-button icon="el-icon-refresh" size="mini" @click="addToMap">生成</el-button>
-            </el-col><el-col :span="1.5">
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                <el-button icon="el-icon-s-opportunity
+" size="mini" @click="addToMap">生成</el-button>
             </el-col>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" class="right-float">重置</el-button>
         </el-row>
 
         <!-- luckysheet容器 -->
@@ -73,7 +76,11 @@
     </div>
 </template>
 
-
+<style>
+.right-float {
+    float: right;
+}
+</style>
 <script>
 
 /*import luckysheet from 'luckysheet'*/
@@ -92,7 +99,7 @@ export default {
     name: "Mymodule",
     data() {
         return {
-            row:'',
+            row:1,
             numm:false,
             //弹出页面的表名
             // 是否显示弹出层
@@ -127,7 +134,7 @@ export default {
             //刷新下拉选框内容
             fileName="新建XLSX工作表";
             this.disableNextButton='';
-            this.row="";
+            this.row=1;
             //刷新luckysheet表格
             this.init();
             map.clear();
@@ -282,13 +289,12 @@ export default {
                     }
                 }
                 let dfs=map.get(2);
-                debugger
+
                 let a=value.join("==");
                 luckysheet.setCellValue(j,cell,map);
                 luckysheet.setCellValue(j,cell+1 ,);
 
             }*/
-            let cell;
             let row;
             let num=luckysheet.getSheet().data[0].length;
             let data=luckysheet.getSheet().data;
@@ -363,12 +369,10 @@ export default {
                         });
                         return
                     }
-
                     let ddd=data1;
                     let as=0;
                     let d1=window.luckysheet.transToData(ddd.celldata);
                     let d2=window.luckysheet.transToData(exportJson.sheets[0].celldata);
-                    debugger
                     let fdbh=isNaN(d1[6][23].v);
                     let fdbh1=isNaN(d1[6][24].v);
                     let array=[];

ruoyi-ui/src/views/system/supplies/upload.vue

@@ -9,6 +9,7 @@
                     ref="upload"
                     :before-upload="handleFileChange"
                     action=''
+                    accept='.xlsx'
                     :limit="1"
                     :file-list="fileList"
                     :show-file-list=false
@@ -23,6 +24,7 @@
                     ref="upload"
                     :before-upload="handleFileChange1"
                     action=''
+                    accept='.xlsx'
                     :limit="1"
                     :file-list="fileList"
                     :disabled="disableNextButton"
@@ -39,16 +41,13 @@
                     size="mini"
                     @click="handleExport"
                 >导出</el-button>
+                <el-checkbox style="left: 15px" v-model="numm">是否只比较数值</el-checkbox>
             </el-col>
             <el-col :span="1.5">
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
 
-                <el-checkbox style="left: 20px" v-model="numm">是否只比较数值</el-checkbox>
-            </el-col>
-            <el-col :span="1.5">
-            </el-col>
-            <el-col :span="1.5">
             </el-col>
+
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" class="right-float">重置</el-button>
         </el-row>
 
         <!-- luckysheet容器 -->
@@ -61,7 +60,11 @@
     </div>
 </template>
 
-
+<style>
+.right-float {
+    float: right;
+}
+</style>
 <script>
 
 /*import luckysheet from 'luckysheet'*/
@@ -78,7 +81,6 @@ export default {
     name: "Mymodule",
     data() {
         return {
-            row:'',
             numm:false,
             //弹出页面的表名
             // 是否显示弹出层