Skip to content

K
klck
Commit 422455dd authored by xiangjiaojunxp's avatar xiangjiaojunxp
Browse files
Options

物料转换bug修改

parent a5a25563
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 19 deletions
ruoyi-ui/src/views/system/supplies/indexupload.vue
View file @ 422455dd
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<el-form ref="queryForm" size="small" :inline="true" > <el-form ref="queryForm" size="small" :inline="true" >
<el-form-item label="行" prop="row"> <el-form-item label="行" prop="row">
<el-input <el-input
oninput="value=value.replace(/[^\d]/g,'')"
v-model="row" v-model="row"
placeholder="请输入开始行" placeholder="请输入开始行"
clearable clearable
...@@ -25,6 +26,7 @@ ...@@ -25,6 +26,7 @@
ref="upload" ref="upload"
:before-upload="handleFileChange" :before-upload="handleFileChange"
action='' action=''
accept='.xlsx'
:limit="1" :limit="1"
:file-list="fileList" :file-list="fileList"
:show-file-list=false :show-file-list=false
...@@ -39,6 +41,7 @@ ...@@ -39,6 +41,7 @@
ref="upload" ref="upload"
:before-upload="handleFileChange1" :before-upload="handleFileChange1"
action='' action=''
accept='.xlsx'
:limit="1" :limit="1"
:file-list="fileList" :file-list="fileList"
:disabled="disableNextButton" :disabled="disableNextButton"
...@@ -57,10 +60,10 @@ ...@@ -57,10 +60,10 @@
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button icon="el-icon-refresh" size="mini" @click="addToMap">生成</el-button> <el-button icon="el-icon-s-opportunity
</el-col><el-col :span="1.5"> " size="mini" @click="addToMap">生成</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-col> </el-col>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" class="right-float">重置</el-button>
</el-row> </el-row>
<!-- luckysheet容器 --> <!-- luckysheet容器 -->
...@@ -73,7 +76,11 @@ ...@@ -73,7 +76,11 @@
</div> </div>
</template> </template>
<style>
.right-float {
float: right;
}
</style>
<script> <script>
/*import luckysheet from 'luckysheet'*/ /*import luckysheet from 'luckysheet'*/
...@@ -92,7 +99,7 @@ export default { ...@@ -92,7 +99,7 @@ export default {
name: "Mymodule", name: "Mymodule",
data() { data() {
return { return {
row:'', row:1,
numm:false, numm:false,
//弹出页面的表名 //弹出页面的表名
// 是否显示弹出层 // 是否显示弹出层
...@@ -127,7 +134,7 @@ export default { ...@@ -127,7 +134,7 @@ export default {
//刷新下拉选框内容 //刷新下拉选框内容
fileName="新建XLSX工作表"; fileName="新建XLSX工作表";
this.disableNextButton=''; this.disableNextButton='';
this.row=""; this.row=1;
//刷新luckysheet表格 //刷新luckysheet表格
this.init(); this.init();
map.clear(); map.clear();
...@@ -282,13 +289,12 @@ export default { ...@@ -282,13 +289,12 @@ export default {
} }
} }
let dfs=map.get(2); let dfs=map.get(2);
debugger
let a=value.join("=="); let a=value.join("==");
luckysheet.setCellValue(j,cell,map); luckysheet.setCellValue(j,cell,map);
luckysheet.setCellValue(j,cell+1 ,); luckysheet.setCellValue(j,cell+1 ,);
}*/ }*/
let cell;
let row; let row;
let num=luckysheet.getSheet().data[0].length; let num=luckysheet.getSheet().data[0].length;
let data=luckysheet.getSheet().data; let data=luckysheet.getSheet().data;
...@@ -363,12 +369,10 @@ export default { ...@@ -363,12 +369,10 @@ export default {
}); });
return return
} }
let ddd=data1; let ddd=data1;
let as=0; let as=0;
let d1=window.luckysheet.transToData(ddd.celldata); let d1=window.luckysheet.transToData(ddd.celldata);
let d2=window.luckysheet.transToData(exportJson.sheets[0].celldata); let d2=window.luckysheet.transToData(exportJson.sheets[0].celldata);
debugger
let fdbh=isNaN(d1[6][23].v); let fdbh=isNaN(d1[6][23].v);
let fdbh1=isNaN(d1[6][24].v); let fdbh1=isNaN(d1[6][24].v);
let array=[]; let array=[];
......
ruoyi-ui/src/views/system/supplies/upload.vue
View file @ 422455dd
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
ref="upload" ref="upload"
:before-upload="handleFileChange" :before-upload="handleFileChange"
action='' action=''
accept='.xlsx'
:limit="1" :limit="1"
:file-list="fileList" :file-list="fileList"
:show-file-list=false :show-file-list=false
...@@ -23,6 +24,7 @@ ...@@ -23,6 +24,7 @@
ref="upload" ref="upload"
:before-upload="handleFileChange1" :before-upload="handleFileChange1"
action='' action=''
accept='.xlsx'
:limit="1" :limit="1"
:file-list="fileList" :file-list="fileList"
:disabled="disableNextButton" :disabled="disableNextButton"
...@@ -39,16 +41,13 @@ ...@@ -39,16 +41,13 @@
size="mini" size="mini"
@click="handleExport" @click="handleExport"
>导出</el-button> >导出</el-button>
<el-checkbox style="left: 15px" v-model="numm">是否只比较数值</el-checkbox>
</el-col> </el-col>
<el-col :span="1.5"> <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-col>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" class="right-float">重置</el-button>
</el-row> </el-row>
<!-- luckysheet容器 --> <!-- luckysheet容器 -->
...@@ -61,7 +60,11 @@ ...@@ -61,7 +60,11 @@
</div> </div>
</template> </template>
<style>
.right-float {
float: right;
}
</style>
<script> <script>
/*import luckysheet from 'luckysheet'*/ /*import luckysheet from 'luckysheet'*/
...@@ -78,7 +81,6 @@ export default { ...@@ -78,7 +81,6 @@ export default {
name: "Mymodule", name: "Mymodule",
data() { data() {
return { return {
row:'',
numm:false, numm:false,
//弹出页面的表名 //弹出页面的表名
// 是否显示弹出层 // 是否显示弹出层
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment