diff --git a/src/api/system/sysDataAuditCfg.js b/src/api/system/sysDataAuditCfg.js new file mode 100644 index 00000000..15e1bc6d --- /dev/null +++ b/src/api/system/sysDataAuditCfg.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询表数据监控记录配置列表 +export function listSysDataAuditCfg(query) { + return request({ + url: '/system/sysDataAuditCfg/list', + method: 'get', + params: query + }) +} + +// 查询表数据监控记录配置详细 +export function getSysDataAuditCfg(id) { + return request({ + url: '/system/sysDataAuditCfg/' + id, + method: 'get' + }) +} + +// 新增表数据监控记录配置 +export function addSysDataAuditCfg(data) { + return request({ + url: '/system/sysDataAuditCfg', + method: 'post', + data: data + }) +} + +// 修改表数据监控记录配置 +export function updateSysDataAuditCfg(data) { + return request({ + url: '/system/sysDataAuditCfg', + method: 'put', + data: data + }) +} + +// 删除表数据监控记录配置 +export function delSysDataAuditCfg(id) { + return request({ + url: '/system/sysDataAuditCfg/' + id, + method: 'delete' + }) +} diff --git a/src/api/system/sysDataAuditRecord.js b/src/api/system/sysDataAuditRecord.js new file mode 100644 index 00000000..a9ace026 --- /dev/null +++ b/src/api/system/sysDataAuditRecord.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询数据修改记录表列表 +export function listSysDataAuditRecord(query) { + return request({ + url: '/system/sysDataAuditRecord/list', + method: 'get', + params: query + }) +} + +// 查询数据修改记录表详细 +export function getSysDataAuditRecord(id) { + return request({ + url: '/system/sysDataAuditRecord/' + id, + method: 'get' + }) +} + +// 新增数据修改记录表 +export function addSysDataAuditRecord(data) { + return request({ + url: '/system/sysDataAuditRecord', + method: 'post', + data: data + }) +} + +// 修改数据修改记录表 +export function updateSysDataAuditRecord(data) { + return request({ + url: '/system/sysDataAuditRecord', + method: 'put', + data: data + }) +} + +// 删除数据修改记录表 +export function delSysDataAuditRecord(id) { + return request({ + url: '/system/sysDataAuditRecord/' + id, + method: 'delete' + }) +} diff --git a/src/components/DatePickerAdv/elDate7DayPicker.vue b/src/components/DatePickerAdv/elDate7DayPicker.vue index 7533dfae..8c048a7d 100644 --- a/src/components/DatePickerAdv/elDate7DayPicker.vue +++ b/src/components/DatePickerAdv/elDate7DayPicker.vue @@ -1,20 +1,30 @@ diff --git a/src/components/DatePickerAdv/elDate7DaySimplePicker.vue b/src/components/DatePickerAdv/elDate7DaySimplePicker.vue new file mode 100644 index 00000000..0878545e --- /dev/null +++ b/src/components/DatePickerAdv/elDate7DaySimplePicker.vue @@ -0,0 +1,331 @@ + + + + + diff --git a/src/components/PdfViewer/A4Viewer.vue b/src/components/PdfViewer/A4Viewer.vue index b932bf12..47568452 100644 --- a/src/components/PdfViewer/A4Viewer.vue +++ b/src/components/PdfViewer/A4Viewer.vue @@ -184,8 +184,8 @@ export default { }, showFirstFile(){ if(this.isA4){ - this.scale=75; - this.preScale=75; + this.scale=50; + this.preScale=50; this.pageCount=this.cacheA4FileList.length; setTimeout( this.showA4Page(this.cacheA4FileList.length),3000); }else{ @@ -409,8 +409,9 @@ export default { .grid2 { height: 200px; - background-image: radial-gradient(circle, rgb(165, 165, 165) 1px, #fff 1px); - background-size: 20px 20px; + // background-image: radial-gradient(circle, rgb(165, 165, 165) 1px, #fff 1px); + background-image: radial-gradient(circle, #4a4a4a 1px, #3f3f3f 1px); + background-size: 15px 15px; background-position: center center; } diff --git a/src/components/PdfViewer/viewer.vue b/src/components/PdfViewer/viewer.vue index 5b2bfdb6..78642f22 100644 --- a/src/components/PdfViewer/viewer.vue +++ b/src/components/PdfViewer/viewer.vue @@ -39,8 +39,6 @@
- -
-
@@ -103,9 +100,8 @@ export default { cacheA4FileList:[], thisPageCount:1, - - scale: 20, - preScale: 20, + scale: 30, + preScale: 30, pdfUtils:new PdfUtils(), @@ -134,7 +130,7 @@ export default { if(this.isA4){ this.doScale(75); }else{ - this.doScale(20); + this.doScale(30); } }, isLoadComplete(newVal,oldVal){ @@ -191,8 +187,8 @@ export default { this.pageCount=this.cacheA4FileList.length; setTimeout( this.showA4Page(this.cacheA4FileList.length),3000); }else{ - this.scale=20; - this.preScale=20; + this.scale=30; + this.preScale=30; this.pageCount=this.cacheFileList.length; setTimeout( this.showSinglePage(1),2000); } @@ -420,8 +416,9 @@ export default { .grid2 { height: 200px; - background-image: radial-gradient(circle, rgb(165, 165, 165) 1px, #fff 1px); - background-size: 20px 20px; + // background-image: radial-gradient(circle, rgb(165, 165, 165) 1px, #fff 1px); + background-image: radial-gradient(circle, #4a4a4a 1px, #3f3f3f 1px); + background-size: 15px 15px; background-position: center center; } diff --git a/src/views/emis/customerService/waybillTracking.vue b/src/views/emis/customerService/waybillTracking.vue index 857593cf..ff2ead65 100644 --- a/src/views/emis/customerService/waybillTracking.vue +++ b/src/views/emis/customerService/waybillTracking.vue @@ -20,7 +20,7 @@ - 显示子单 + 显示子单 @@ -39,11 +39,21 @@
- - - + +
+ + + + + + + +
+
@@ -70,13 +80,13 @@ export default { resetRefreshId:null, // 运单列表表格数据 emisWaybillList: [], - + blSubBill:0, // 查询参数 queryParams: { pageNum: 1, pageSize: 20, billCode: null, - blSubBill:0, + }, }; }, diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue index 82912761..d8f0270a 100644 --- a/src/views/emis/emisWaybill/sendWaybillListNew.vue +++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue @@ -31,7 +31,7 @@ 发货时间
- + 超时未签收 @@ -589,7 +589,7 @@ import elDate7DayPicker from '@/components/DatePickerAdv/elDate7DayPicker'; // import emisWaybillView from '@/views/emis/emisWaybill/emisWaybillView'; import emisWaybillForm from '@/views/emis/emisWaybill/emisWaybillForm'; -import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker'; +import elDate7DaySimplePicker from '@/components/DatePickerAdv/elDate7DaySimplePicker'; import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue'; @@ -635,7 +635,8 @@ export default { components: { TraceWaybillDetailView, EmisMonthpayAccountPicker, - elDate7DayPicker,emisWaybillForm, + elDate7DaySimplePicker, + emisWaybillForm, CountryPicker1, CountryPicker2,ProvincePicker2, TransLinePicker,TransProductPicker, diff --git a/src/views/system/sysDataAuditCfg/index.vue b/src/views/system/sysDataAuditCfg/index.vue new file mode 100644 index 00000000..c497aea2 --- /dev/null +++ b/src/views/system/sysDataAuditCfg/index.vue @@ -0,0 +1,422 @@ + + + + + diff --git a/src/views/system/sysDataAuditCfg/sysDataAuditCfgForm.vue b/src/views/system/sysDataAuditCfg/sysDataAuditCfgForm.vue new file mode 100644 index 00000000..43d07ecd --- /dev/null +++ b/src/views/system/sysDataAuditCfg/sysDataAuditCfgForm.vue @@ -0,0 +1,200 @@ + + + diff --git a/src/views/system/sysDataAuditRecord/index.vue b/src/views/system/sysDataAuditRecord/index.vue new file mode 100644 index 00000000..edf986e8 --- /dev/null +++ b/src/views/system/sysDataAuditRecord/index.vue @@ -0,0 +1,328 @@ + + + + + diff --git a/src/views/system/sysDataAuditRecord/sysDataAuditRecordForm.vue b/src/views/system/sysDataAuditRecord/sysDataAuditRecordForm.vue new file mode 100644 index 00000000..09cfc274 --- /dev/null +++ b/src/views/system/sysDataAuditRecord/sysDataAuditRecordForm.vue @@ -0,0 +1,218 @@ + + +