diff --git a/src/components/setting/SettingDrawer.vue b/src/components/setting/SettingDrawer.vue index 11c4b11..ea106a2 100644 --- a/src/components/setting/SettingDrawer.vue +++ b/src/components/setting/SettingDrawer.vue @@ -144,14 +144,14 @@ -
- - - 配置栏只在开发环境用于预览，生产环境不会展现，请手动修改配置文件 - src/defaultSettings.js - - -
+ + + + + + + +
diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue index 237d303..a5088f9 100644 --- a/src/views/dashboard/Analysis.vue +++ b/src/views/dashboard/Analysis.vue @@ -4,9 +4,11 @@ - + + + @@ -25,6 +27,7 @@ import NewHomePage from '@views/dashboard/NewHomePage' import FileMangement from "@/extends/FileMangement/fileMangement"; import BPdf from "@/extends/Bpdf/Bpdf"; + import HomePage from '@views/dashboard/HomePage' export default { name: "Analysis", @@ -34,7 +37,8 @@ IndexChart, IndexTask, IndexBdc, - NewHomePage + NewHomePage, + HomePage }, data() { return { diff --git a/src/views/dashboard/HomePage.vue b/src/views/dashboard/HomePage.vue new file mode 100644 index 0000000..63fef8c --- /dev/null +++ b/src/views/dashboard/HomePage.vue @@ -0,0 +1,115 @@ + + + + + + \ No newline at end of file diff --git a/src/views/dashboard/NewHomePage.vue b/src/views/dashboard/NewHomePage.vue index 8b5b85d..9484631 100644 --- a/src/views/dashboard/NewHomePage.vue +++ b/src/views/dashboard/NewHomePage.vue @@ -162,6 +162,7 @@ name: "NewHomePage", // bottom: '3%', // containLabel: true // }, + // // toolbox: { // // feature: { // // saveAsImage: {} diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue index cd19c1a..62a41ff 100644 --- a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue +++ b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue @@ -35,7 +35,6 @@
- 新增 导出 导入 diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue index 7cacc54..d864867 100644 --- a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue +++ b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue @@ -14,7 +14,7 @@ - + - - + + @@ -50,8 +55,13 @@ - - + + @@ -66,10 +76,6 @@
- 导出 - - 导入 - 查询 重置 @@ -293,6 +299,14 @@ }, dictOptions:{}, superFieldList:[], + labelCol: { + xs: { span: 4 }, + sm: { span: 4 }, + }, + wrapperCol: { + xs: { span: 20 }, + sm: { span: 20 }, + }, } }, created() { @@ -312,6 +326,14 @@ }, }, methods: { + onDateChange: function (value, dateString) { + this.queryParam.productDateBegin=dateString[0]; + this.queryParam.productDateEnd=dateString[1]; + }, + onDateChangeinboundTime: function (value, dateString) { + this.queryParam.inboundDateBegin=dateString[0]; + this.queryParam.inboundDateEnd=dateString[1]; + }, searchReset(){ this.queryParam = { supplier: null, diff --git a/src/views/waste/ProcessWasteList.vue b/src/views/waste/ProcessWasteList.vue index 7cd5a30..9232d9b 100644 --- a/src/views/waste/ProcessWasteList.vue +++ b/src/views/waste/ProcessWasteList.vue @@ -4,76 +4,41 @@
- + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - + - + - + - - - - - - - - - - - - - - - - - -
@@ -89,8 +54,6 @@ 导入 - - 删除 @@ -200,11 +163,6 @@ return parseInt(index)+1; } }, - // { - // title:'创建人', - // align:"center", - // dataIndex: 'createBy_dictText' - // }, { title:'物料码', align:"center", @@ -257,15 +215,7 @@ customRender:function (text) { return !text?"":(text.length>10?text.substr(0,10):text) } - }, - // { - // title: '操作', - // dataIndex: 'action', - // align:"center", - // fixed:"right", - // width:147, - // scopedSlots: { customRender: 'action' } - // } + } ], url: { list: "/waste/processWaste/list", @@ -273,10 +223,18 @@ deleteBatch: "/waste/processWaste/deleteBatch", exportXlsUrl: "/waste/processWaste/exportXls", importExcelUrl: "waste/processWaste/importExcel", - + }, dictOptions:{}, superFieldList:[], + labelCol: { + xs: { span: 4 }, + sm: { span: 4 }, + }, + wrapperCol: { + xs: { span: 20 }, + sm: { span: 20 }, + }, } }, created() { @@ -288,6 +246,10 @@ }, }, methods: { + onDateChange: function (value, dateString) { + this.queryParam.scrapDateBegin=dateString[0]; + this.queryParam.scrapDateEnd=dateString[1]; + }, initDictConfig(){ }, getSuperFieldList(){ diff --git a/src/views/wastematerials/ProcessWasteMaterialsLists.vue b/src/views/wastematerials/ProcessWasteMaterialsLists.vue index c2b1057..16eed68 100644 --- a/src/views/wastematerials/ProcessWasteMaterialsLists.vue +++ b/src/views/wastematerials/ProcessWasteMaterialsLists.vue @@ -20,7 +20,7 @@ - + - - - + + + @@ -46,8 +51,13 @@ - - + + @@ -260,6 +270,14 @@ }, dictOptions:{}, superFieldList:[], + labelCol: { + xs: { span: 4 }, + sm: { span: 4 }, + }, + wrapperCol: { + xs: { span: 20 }, + sm: { span: 20 }, + }, } }, created() { @@ -279,6 +297,14 @@ }, }, methods: { + onDateChange: function (value, dateString) { + this.queryParam.productDateBegin=dateString[0]; + this.queryParam.productDateEnd=dateString[1]; + }, + onDateChangeinboundTime: function (value, dateString) { + this.queryParam.inboundDateBegin=dateString[0]; + this.queryParam.inboundDateEnd=dateString[1]; + }, judgeRouterParam(){ if (this.$route.params.material == null){ this.$router.go(-1);