Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
2885ef21 2 parents a6d7a22c a2e362d7

Merge branch 'et86-black' into et86

Inline Side-by-side
Showing 6 changed files with 50 additions and 175 deletions
......@@ -8,7 +8,6 @@
:queryForm="queryForm"
:inline="false"
formWidth="auto"
@blur="blurEvent"
/>
</el-col>
</el-row>
......@@ -22,7 +21,6 @@
@search="searchBtn"
@download="downloadTemplate"
@upload="toUpload"
@rmfile="onRemoveUpload"
@export="exportTemplate"
@delete="deleteData"
@sizeChange="handleSizeChange"
......@@ -30,62 +28,11 @@
@selectionEvent="tableSelectionChange"
>
</yl-table>
<!-- <modle-view
ref="modleViewRef"
width="30%"
title="导入Excel"
confirmBtnName="导入Excel"
@confirm="dialogConfirm"
>
<el-form
:model="paramsForm"
:rules="rules"
ref="ruleForm"
label-width="80px"
>
<el-row>
<el-col :span="20">
<el-form-item
label="商品名称"
prop="skuName"
size="small"
label-position="left"
>
<el-input
v-model="paramsForm.skuName"
placeholder="请输入商品名称"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item prop="file">
<el-upload
ref="upload"
action="/goods/uploadGoodsExcel"
name="file"
:http-request="toUpload"
:on-remove="onRemoveUpload"
:limit="1"
accept=".xlsx"
class="upload"
>
<el-button type="primary" icon="el-icon-upload2" size="small"
>选择文件</el-button
>
</el-upload>
</el-form-item>
</el-col>
</el-row>
</el-form>
</modle-view> -->
</div>
</template>
<script>
import YlForm from "@/components/YlForm";
import YlTable from "@/components/YlTable";
import ModleView from "./components/ModleView";
import { formConfig } from "./formConfig";
import { tableAttr, columnHeader } from "./tableConfig";
import { restTableHeight } from "@/utils";
......@@ -101,7 +48,6 @@ export default {
components: {
YlForm,
YlTable,
ModleView,
},
data() {
return {
......@@ -109,15 +55,6 @@ export default {
queryForm: {
searchValue: "",
}, // 表单参数
paramsForm: {
skuName: "",
file: null,
},
rules: {
skuName: [
{ required: true, message: "请输入商品名称", trigger: "blur" },
],
},
pageConfig: {
// 分页配置项
isPagination: true,
......@@ -128,7 +65,7 @@ export default {
},
},
tableAttr: tableAttr, // table配置项
columns: columnHeader(this.deleteRow), // 表头
columns: columnHeader(this.indexAdd, this.deleteRow), // 表头
tableData: [], // 表格数据
multipleSelection: [],
};
......@@ -180,8 +117,6 @@ export default {
})
.catch(() => {});
},
// 失焦事件
blurEvent() {},
// 选择上传【HScode黑名单导入】
toUpload({ file }) {
const formData = new FormData();
......@@ -206,20 +141,6 @@ export default {
})
.catch(() => {});
},
//移除上传
onRemoveUpload(options) {
console.log(options);
},
// 搜索
searchBtn() {
this.pageConfig.pageData.page = 1;
this.pageConfig.pageData.size = 10;
this.$refs.ruleForm.handleSearch("ruleForm", (val) => {
this.queryFindHsCodeList();
});
},
// 确认对话框
dialogConfirm() {},
// 下载【HScode黑名单下载模板】
downloadTemplate() {
downLoadTemplate("hsCode")
......@@ -240,10 +161,6 @@ export default {
})
.catch(() => {});
},
// 上传
upLoadTemplate() {
// console.log(this.$refs.modleViewRef);
},
// 导出
exportTemplate(row, i) {
this.tableAttr.btnCofig.btnGroup[i].loading = true;
......@@ -276,6 +193,20 @@ export default {
this.$message.error("请勾选一条或者多条数据再操作！");
}
},
// 搜索
searchBtn() {
this.pageConfig.pageData.page = 1;
this.pageConfig.pageData.size = 10;
this.$refs.ruleForm.handleSearch("ruleForm", (val) => {
this.queryFindHsCodeList();
});
},
// 翻页序号递增
indexAdd(index){
const page = this.pageConfig.pageData.page // 当前页码
const pagesize = this.pageConfig.pageData.size // 每页条数
return index + 1 + (page - 1) * pagesize
},
//条数变化
handleSizeChange(e) {
this.pageConfig.pageData.size = e;
......
......@@ -58,7 +58,7 @@ export const tableAttr = {
],
},
};
export const columnHeader = (deleteRow) => [
export const columnHeader = (indexAdd, deleteRow) => [
{
type: "selection",
align: "center",
......@@ -71,6 +71,7 @@ export const columnHeader = (deleteRow) => [
prop: "id",
align: "center",
width: "50",
index: indexAdd,
},
{
label: "HSCODE",
......
......@@ -59,7 +59,7 @@ export default {
},
},
tableAttr: tableAttr, // table配置项
columns: columnHeader(this.viewRow, this.editRow, this.deleteRow), // 表头
columns: columnHeader(this.indexAdd, this.viewRow, this.editRow, this.deleteRow), // 表头
tableData: [], // 表格数据
};
},
......@@ -123,6 +123,12 @@ export default {
this.queryFindAllEtesRules();
});
},
// 翻页序号递增
indexAdd(index){
const page = this.pageConfig.pageData.page // 当前页码
const pagesize = this.pageConfig.pageData.size // 每页条数
return index + 1 + (page - 1) * pagesize
},
//条数变化
handleSizeChange(e) {
this.pageConfig.pageData.size = e;
......
......@@ -32,13 +32,14 @@ export const tableAttr = {
],
},
};
export const columnHeader = (viewRow, editRow, deleteRow) => [
export const columnHeader = (indexAdd, viewRow, editRow, deleteRow) => [
{
type: "index",
label: "序号",
prop: "id",
align: "center",
width: "50",
index: indexAdd,
},
{
label: "原航班",
......@@ -89,7 +90,7 @@ export const columnHeader = (viewRow, editRow, deleteRow) => [
minWidth: 90,
fixed: "right",
render: (h, params) => {
let operateData = []
let operateData = [];
if (params.row.status == "1") {
operateData = [
h(
......@@ -144,7 +145,7 @@ export const columnHeader = (viewRow, editRow, deleteRow) => [
"删除"
),
];
}else{
} else {
operateData = [
h(
"el-button",
......
......@@ -8,7 +8,6 @@
:queryForm="queryForm"
:inline="false"
formWidth="auto"
@blur="blurEvent"
/>
</el-col>
</el-row>
......@@ -21,7 +20,6 @@
:pageConfig="pageConfig"
@search="searchBtn"
@upload="toUpload"
@rmfile="onRemoveUpload"
@export="exportTemplate"
@delete="deleteData"
@sizeChange="handleSizeChange"
......@@ -29,62 +27,11 @@
@selectionEvent="tableSelectionChange"
>
</yl-table>
<!-- <modle-view
ref="modleViewRef"
width="30%"
title="导入Excel"
confirmBtnName="导入Excel"
@confirm="dialogConfirm"
>
<el-form
:model="paramsForm"
:rules="rules"
ref="ruleForm"
label-width="80px"
>
<el-row>
<el-col :span="20">
<el-form-item
label="商品名称"
prop="skuName"
size="small"
label-position="left"
>
<el-input
v-model="paramsForm.skuName"
placeholder="请输入商品名称"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item prop="file">
<el-upload
ref="upload"
action="/goods/uploadGoodsExcel"
name="file"
:http-request="toUpload"
:on-remove="onRemoveUpload"
:limit="1"
accept=".xlsx"
class="upload"
>
<el-button type="primary" icon="el-icon-upload2" size="small"
>选择文件</el-button
>
</el-upload>
</el-form-item>
</el-col>
</el-row>
</el-form>
</modle-view> -->
</div>
</template>
<script>
import YlForm from "@/components/YlForm";
import YlTable from "@/components/YlTable";
import ModleView from "./components/ModleView";
import { formConfig } from "./formConfig";
import { tableAttr, columnHeader } from "./tableConfig";
import { restTableHeight } from "@/utils";
......@@ -99,7 +46,6 @@ export default {
components: {
YlForm,
YlTable,
ModleView,
},
data() {
return {
......@@ -107,15 +53,6 @@ export default {
queryForm: {
searchValue: "",
}, // 表单参数
paramsForm: {
skuName: "",
file: null,
},
rules: {
skuName: [
{ required: true, message: "请输入ShipmentDesc", trigger: "blur" },
],
},
pageConfig: {
// 分页配置项
isPagination: true,
......@@ -126,7 +63,7 @@ export default {
},
},
tableAttr: tableAttr, // table配置项
columns: columnHeader(this.deleteRow), // 表头
columns: columnHeader(this.indexAdd, this.deleteRow), // 表头
tableData: [], // 表格数据
multipleSelection: [],
};
......@@ -178,8 +115,6 @@ export default {
})
.catch(() => {});
},
// 失焦事件
blurEvent() {},
// 选择上传【HScode黑名单导入】
toUpload({ file }) {
const formData = new FormData();
......@@ -204,28 +139,14 @@ export default {
})
.catch(() => {});
},
//移除上传
onRemoveUpload(options) {
console.log(options);
},
// 搜索
searchBtn() {
this.pageConfig.pageData.page = 1;
this.pageConfig.pageData.size = 10;
this.$refs.ruleForm.handleSearch("ruleForm", (val) => {
this.queryFindShipmentDescList();
});
},
// 确认对话框
dialogConfirm() {},
// 上传
upLoadTemplate() {
// console.log(this.$refs.modleViewRef);
},
// 导出
exportTemplate(row, i) {
this.tableAttr.btnCofig.btnGroup[i].loading = true;
downLoadXlsx("/etes/exportShipmentDescList", this.queryForm, "HSCODE英文品名黑名单表")
downLoadXlsx(
"/etes/exportShipmentDescList",
this.queryForm,
"HSCODE英文品名黑名单表"
)
.then(() => {
this.tableAttr.btnCofig.btnGroup[i].loading = false;
})
......@@ -254,6 +175,20 @@ export default {
this.$message.error("请勾选一条或者多条数据再操作！");
}
},
// 搜索
searchBtn() {
this.pageConfig.pageData.page = 1;
this.pageConfig.pageData.size = 10;
this.$refs.ruleForm.handleSearch("ruleForm", (val) => {
this.queryFindShipmentDescList();
});
},
// 翻页序号递增
indexAdd(index){
const page = this.pageConfig.pageData.page // 当前页码
const pagesize = this.pageConfig.pageData.size // 每页条数
return index + 1 + (page - 1) * pagesize
},
//条数变化
handleSizeChange(e) {
this.pageConfig.pageData.size = e;
......
......@@ -49,7 +49,7 @@ export const tableAttr = {
],
},
};
export const columnHeader = (deleteRow) => [
export const columnHeader = (indexAdd, deleteRow) => [
{
type: "selection",
align: "center",
......@@ -62,6 +62,7 @@ export const columnHeader = (deleteRow) => [
prop: "id",
align: "center",
width: "50",
index: indexAdd,
},
{
label: "ShipmentDesc",
......