Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
210f9fd8 1 parent 3eea193d

feat: 自测更换新table组件

Expand all
Inline Side-by-side
Showing 7 changed files with 206 additions and 152 deletions
......@@ -6,7 +6,7 @@ VUE_APP_BASE_ENV = "dev"
VUE_APP_Version = '1.0.0'
# FedEx 在线申报工具/开发环境
VUE_APP_BASE_API = 'http://101.132.100.41:7008/EcomExp'
VUE_APP_BASE_API = 'http://101.132.100.41:7001/EcomExp'
VUE_APP_BASE_ROUTE = '/EcomDev'
......
......@@ -48,7 +48,8 @@
"vue": "2.6.14",
"vue-i18n": "^8.28.2",
"vue-router": "3.5.2",
"vuex": "3.6.2"
"vuex": "3.6.2",
"vxe-table": "^3.15.34"
},
"devDependencies": {
"@vue/cli-plugin-babel": "4.5.13",
......
......@@ -263,3 +263,7 @@ aside {
.el-checkbox__input.is-checked + .el-checkbox__label {
color: #333333 !important;
}
html {
--vxe-ui-font-primary-color: #007ab7 !important;
}
......
import Vue from 'vue'
import Element from 'element-ui'
import './assets/styles/element-variables.scss'
import '@/assets/styles/index.scss' // global css
import '@/assets/styles/iClearExp.scss' // iClearExp css
import '@/assets/styles/variables.scss'
import '@/assets/styles/fedex.scss'
import App from './App'
import store from './store'
import router from './router'
import i18n from '@/assets/languages'
import permission from './directive/permission'
import './assets/icons' // icon
import './permission' // permission control
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree, hscodeElementInfo, elementTostring, numberRound, detailUnitConversion, setDict, sendNotificationHandler, promptMessage, upDateTokenTime, sreachEntryLock, tableFixedTypeChange, getDownLoadFileStatus, approvalPortType, getSystemOption, currencySystemDisableType, imageTaskStatusShowType } from "@/utils/iClearExp";
import { formatDate, debounce, alertWarningMsg, alertSuccessMsg, alertErrorMsg, alertInfoMsg, toHead, compare, createRandom, ctho, base64ConvertFile } from "@/utils/index";
import * as fileDownload from '@/utils/zipdownload.js'
import * as filters from '@/utils/filters.js'
import dictData from '@/utils/dict.js'
import regExp from '@/utils/regExp.js'
import Vue from "vue";
import Element from "element-ui";
import "./assets/styles/element-variables.scss";
import "@/assets/styles/index.scss"; // global css
import "@/assets/styles/iClearExp.scss"; // iClearExp css
import "@/assets/styles/variables.scss";
import "@/assets/styles/fedex.scss";
import App from "./App";
import store from "./store";
import router from "./router";
import i18n from "@/assets/languages";
import permission from "./directive/permission";
import "./assets/icons"; // icon
import "./permission"; // permission control
import {
parseTime,
resetForm,
addDateRange,
selectDictLabel,
selectDictLabels,
download,
handleTree,
hscodeElementInfo,
elementTostring,
numberRound,
detailUnitConversion,
setDict,
sendNotificationHandler,
promptMessage,
upDateTokenTime,
sreachEntryLock,
tableFixedTypeChange,
getDownLoadFileStatus,
approvalPortType,
getSystemOption,
currencySystemDisableType,
imageTaskStatusShowType,
} from "@/utils/iClearExp";
import {
formatDate,
debounce,
alertWarningMsg,
alertSuccessMsg,
alertErrorMsg,
alertInfoMsg,
toHead,
compare,
createRandom,
ctho,
base64ConvertFile,
} from "@/utils/index";
import * as fileDownload from "@/utils/zipdownload.js";
import * as filters from "@/utils/filters.js";
import dictData from "@/utils/dict.js";
import regExp from "@/utils/regExp.js";
import Pagination from "@/components/Pagination";
// 自定义表格工具扩展
import RightToolbar from "@/components/RightToolbar"
import Table from "@/components/Table"
import Formitem from "@/components/Formitem"
import EditStep from "@/components/EditStep"
import FedexAlert from "@/components/FedexAlert"
import FedexEdit from "@/components/FedexEdit"
import Tooltip from "@/components/Tooltip"
import InputNodes from '@/components/InputNodes'
import AlterDialog from '@/components/AlterDialog'
import CustomTransfer from '@/components/CustomTransfer'
import CustomForm from '@/components/CustomForm'
import CustomTable from '@/components/CustomTable'
import EditTag from '@/components/EditTag'
import TablePopover from '@/components/TablePopover'
import FormTextareaInput from '@/components/FormTextareaInput'
import RightToolbar from "@/components/RightToolbar";
import Table from "@/components/Table";
import Formitem from "@/components/Formitem";
import EditStep from "@/components/EditStep";
import FedexAlert from "@/components/FedexAlert";
import FedexEdit from "@/components/FedexEdit";
import Tooltip from "@/components/Tooltip";
import InputNodes from "@/components/InputNodes";
import AlterDialog from "@/components/AlterDialog";
import CustomTransfer from "@/components/CustomTransfer";
import CustomForm from "@/components/CustomForm";
import CustomTable from "@/components/CustomTable";
import EditTag from "@/components/EditTag";
import TablePopover from "@/components/TablePopover";
import FormTextareaInput from "@/components/FormTextareaInput";
import VxeUITable from "vxe-table";
import "vxe-table/lib/style.css";
(function () {
if (typeof EventTarget !== "undefined") {
let func = EventTarget.prototype.addEventListener;
......@@ -49,89 +88,87 @@ import FormTextareaInput from '@/components/FormTextareaInput'
}
this.func(type, fn, capture);
};
};
}());
}
})();
// 全局方法挂载
Vue.prototype.parseTime = parseTime
Vue.prototype.resetForm = resetForm
Vue.prototype.addDateRange = addDateRange
Vue.prototype.selectDictLabel = selectDictLabel
Vue.prototype.selectDictLabels = selectDictLabels
Vue.prototype.download = download
Vue.prototype.handleTree = handleTree
Vue.prototype.hscodeElementInfo = hscodeElementInfo
Vue.prototype.elementTostring = elementTostring
Vue.prototype.formatDate = formatDate
Vue.prototype.debounce = debounce
Vue.prototype.regExp = regExp
Vue.prototype.numberRound = numberRound
Vue.prototype.detailUnitConversion = detailUnitConversion
Vue.prototype.fileDownload = fileDownload
Vue.prototype.alertWarningMsg = alertWarningMsg
Vue.prototype.alertSuccessMsg = alertSuccessMsg
Vue.prototype.alertErrorMsg = alertErrorMsg
Vue.prototype.alertInfoMsg = alertInfoMsg
Vue.prototype.toHead = toHead
Vue.prototype.setDict = setDict
Vue.prototype.compare = compare
Vue.prototype.sendNotificationHandler = sendNotificationHandler
Vue.prototype.promptMessage = promptMessage
Vue.prototype.createRandom = createRandom
Vue.prototype.upDateTokenTime = upDateTokenTime
Vue.prototype.sreachEntryLock = sreachEntryLock
Vue.prototype.tableFixedTypeChange = tableFixedTypeChange
Vue.prototype.ctho = ctho
Vue.prototype.getDownLoadFileStatus = getDownLoadFileStatus
Vue.prototype.base64ConvertFile = base64ConvertFile
Vue.prototype.approvalPortType = approvalPortType
Vue.prototype.getSystemOption = getSystemOption
Vue.prototype.currencySystemDisableType = currencySystemDisableType
Vue.prototype.imageTaskStatusShowType = imageTaskStatusShowType
Vue.prototype.dictData = dictData
Vue.prototype.parseTime = parseTime;
Vue.prototype.resetForm = resetForm;
Vue.prototype.addDateRange = addDateRange;
Vue.prototype.selectDictLabel = selectDictLabel;
Vue.prototype.selectDictLabels = selectDictLabels;
Vue.prototype.download = download;
Vue.prototype.handleTree = handleTree;
Vue.prototype.hscodeElementInfo = hscodeElementInfo;
Vue.prototype.elementTostring = elementTostring;
Vue.prototype.formatDate = formatDate;
Vue.prototype.debounce = debounce;
Vue.prototype.regExp = regExp;
Vue.prototype.numberRound = numberRound;
Vue.prototype.detailUnitConversion = detailUnitConversion;
Vue.prototype.fileDownload = fileDownload;
Vue.prototype.alertWarningMsg = alertWarningMsg;
Vue.prototype.alertSuccessMsg = alertSuccessMsg;
Vue.prototype.alertErrorMsg = alertErrorMsg;
Vue.prototype.alertInfoMsg = alertInfoMsg;
Vue.prototype.toHead = toHead;
Vue.prototype.setDict = setDict;
Vue.prototype.compare = compare;
Vue.prototype.sendNotificationHandler = sendNotificationHandler;
Vue.prototype.promptMessage = promptMessage;
Vue.prototype.createRandom = createRandom;
Vue.prototype.upDateTokenTime = upDateTokenTime;
Vue.prototype.sreachEntryLock = sreachEntryLock;
Vue.prototype.tableFixedTypeChange = tableFixedTypeChange;
Vue.prototype.ctho = ctho;
Vue.prototype.getDownLoadFileStatus = getDownLoadFileStatus;
Vue.prototype.base64ConvertFile = base64ConvertFile;
Vue.prototype.approvalPortType = approvalPortType;
Vue.prototype.getSystemOption = getSystemOption;
Vue.prototype.currencySystemDisableType = currencySystemDisableType;
Vue.prototype.imageTaskStatusShowType = imageTaskStatusShowType;
Vue.prototype.dictData = dictData;
Vue.prototype.msgSuccess = function (msg) {
this.$message({ showClose: true, message: msg, type: "success" });
}
};
Vue.prototype.msgError = function (msg) {
this.$message({ showClose: true, message: msg, type: "error" });
}
};
Vue.prototype.msgWarning = function (msg) {
this.$message({ showClose: true, message: msg, type: "warning" });
}
};
Vue.prototype.msgInfo = function (msg) {
this.$message.info(msg);
}
};
// 全局组件挂载
Vue.component('Pagination', Pagination)
Vue.component('RightToolbar', RightToolbar)
Vue.component('InputNodes', InputNodes)
Vue.component('Table', Table)
Vue.component('Formitem', Formitem)
Vue.component('EditStep', EditStep)
Vue.component('FedexAlert', FedexAlert)
Vue.component('FedexEdit', FedexEdit)
Vue.component('Tooltip', Tooltip)
Vue.component('AlterDialog', AlterDialog)
Vue.component('CustomTransfer', CustomTransfer)
Vue.component('CustomForm', CustomForm)
Vue.component('CustomTable', CustomTable)
Vue.component('EditTag', EditTag)
Vue.component('TablePopover', TablePopover)
Vue.component('FormTextareaInput', FormTextareaInput)
Vue.use(permission)
Object.keys(filters).forEach(key => {
Vue.filter(key, filters[key])
})
Vue.component("Pagination", Pagination);
Vue.component("RightToolbar", RightToolbar);
Vue.component("InputNodes", InputNodes);
Vue.component("Table", Table);
Vue.component("Formitem", Formitem);
Vue.component("EditStep", EditStep);
Vue.component("FedexAlert", FedexAlert);
Vue.component("FedexEdit", FedexEdit);
Vue.component("Tooltip", Tooltip);
Vue.component("AlterDialog", AlterDialog);
Vue.component("CustomTransfer", CustomTransfer);
Vue.component("CustomForm", CustomForm);
Vue.component("CustomTable", CustomTable);
Vue.component("EditTag", EditTag);
Vue.component("TablePopover", TablePopover);
Vue.component("FormTextareaInput", FormTextareaInput);
Vue.use(permission);
Vue.use(VxeUITable);
Object.keys(filters).forEach((key) => {
Vue.filter(key, filters[key]);
});
// window.addEventListener('resize', () => {
// // 获取当前的缩放级别
......@@ -154,15 +191,15 @@ Object.keys(filters).forEach(key => {
*/
Vue.use(Element, {
size: localStorage.getItem('size') || 'medium' // set element-ui default size
})
size: localStorage.getItem("size") || "medium", // set element-ui default size
});
Vue.config.productionTip = false
Vue.config.productionTip = false;
new Vue({
el: '#app',
el: "#app",
router,
store,
i18n,
render: h => h(App)
})
render: (h) => h(App),
});
......
......@@ -532,43 +532,43 @@ export default {
export const receiptStatus = () => {
return [
{
text: "未提交",
label: "未提交",
value: "99999",
},
{
text: "已提交",
label: "已提交",
value: "0",
},
{
text: "xml报文加签失败",
label: "xml报文加签失败",
value: "-2",
},
{
text: "xml报文上传失败",
label: "xml报文上传失败",
value: "-3",
},
{
text: "电子口岸申报中",
label: "电子口岸申报中",
value: "2",
},
{
text: "发送海关成功",
label: "发送海关成功",
value: "3",
},
{
text: "发送海关失败",
label: "发送海关失败",
value: "4",
},
{
text: "海关退单",
label: "海关退单",
value: "100",
},
{
text: "海关入库",
label: "海关入库",
value: "120",
},
{
text: "回执异常",
label: "回执异常",
value: "-1",
},
];
......@@ -577,55 +577,55 @@ export const receiptStatus = () => {
export const listStatus = () => {
return [
{
text: "未提交",
label: "未提交",
value: "99999",
},
{
text: "已提交",
label: "已提交",
value: "0",
},
{
text: "xml报文加签失败",
label: "xml报文加签失败",
value: "-2",
},
{
text: "xml报文上传失败",
label: "xml报文上传失败",
value: "-3",
},
{
text: "电子口岸申报中",
label: "电子口岸申报中",
value: "2",
},
{
text: "发送海关成功",
label: "发送海关成功",
value: "3",
},
{
text: "发送海关失败",
label: "发送海关失败",
value: "4",
},
{
text: "海关退单",
label: "海关退单",
value: "100",
},
{
text: "海关入库",
label: "海关入库",
value: "120",
},
{
text: "海关审结",
label: "海关审结",
value: "399",
},
{
text: "放行",
label: "放行",
value: "800",
},
{
text: "结关",
label: "结关",
value: "899",
},
{
text: "回执异常",
label: "回执异常",
value: "-1",
},
];
......@@ -634,35 +634,35 @@ export const listStatus = () => {
export const totalScoreStatus = () => {
return [
{
text: "未提交",
label: "未提交",
value: "99999",
},
{
text: "已提交",
label: "已提交",
value: "0",
},
{
text: "xml报文加签失败",
label: "xml报文加签失败",
value: "-2",
},
{
text: "xml报文上传失败",
label: "xml报文上传失败",
value: "-3",
},
{
text: "电子口岸申报中",
label: "电子口岸申报中",
value: "2",
},
{
text: "发送海关成功",
label: "发送海关成功",
value: "3",
},
{
text: "发送海关失败",
label: "发送海关失败",
value: "4",
},
{
text: "海关退单",
label: "海关退单",
value: "100",
},
// {
......@@ -670,19 +670,19 @@ export const totalScoreStatus = () => {
// value: "120",
// },
{
text: "海关审结",
label: "海关审结",
value: "399",
},
{
text: "放行",
label: "放行",
value: "800",
},
{
text: "结关",
label: "结关",
value: "899",
},
{
text: "回执异常",
label: "回执异常",
value: "-1",
},
];
......
......@@ -170,11 +170,23 @@
</el-col>
<!-- new 申报业务类型-->
<el-col :span="8">
<Formitem
label="申报业务类型"
prop="declareBusinessType"
type="edit"
<Formitem prop="declareBusinessType" type="edit">
<template slot="title">
<span
>申报业务类型
<el-tooltip
class="item"
effect="dark"
content="如模板中含此字段，则选用模板数据，此处填写无效"
placement="top"
>
<i
class="el-icon-question"
style="cursor: pointer; font-size: 14px"
></i>
</el-tooltip>
</span>
</template>
<el-select
type="text"
id="inputInner-edit-declareBusinessType"
......
This diff is collapsed. Click to expand it.