From 64d8e875bde46e191b790686143c4815cd69bf7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sun, 30 May 2021 07:31:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8F=B7=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=82=B9=E5=BC=80=EF=BC=8C=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jshERP-web/public/index.html | 10 ++++ jshERP-web/src/main.js | 2 +- jshERP-web/src/mixins/JeecgListMixin.js | 4 +- jshERP-web/src/permission.js | 6 ++- jshERP-web/src/views/bill/SaleBackList.vue | 8 +++ jshERP-web/src/views/system/CustomerList.vue | 3 +- jshERP-web/src/views/system/MemberList.vue | 7 +-- .../src/views/system/SerialNumberList.vue | 24 +++++++-- jshERP-web/src/views/system/VendorList.vue | 3 +- .../src/views/system/modules/MemberModal.vue | 53 +------------------ 10 files changed, 50 insertions(+), 70 deletions(-) diff --git a/jshERP-web/public/index.html b/jshERP-web/public/index.html index 18b44139..78b9bbed 100644 --- a/jshERP-web/public/index.html +++ b/jshERP-web/public/index.html @@ -255,6 +255,7 @@ ajax.send(null); window.SYS_TITLE = sysTitle; document.title = window.SYS_TITLE; + var _hmt = _hmt || []; @@ -270,5 +271,14 @@ + diff --git a/jshERP-web/src/main.js b/jshERP-web/src/main.js index b3f369cd..c41179aa 100644 --- a/jshERP-web/src/main.js +++ b/jshERP-web/src/main.js @@ -67,4 +67,4 @@ new Vue({ store.commit('SET_MULTI_PAGE',Vue.ls.get(DEFAULT_MULTI_PAGE,config.multipage)) }, render: h => h(App) -}).$mount('#app') +}).$mount('#app') \ No newline at end of file diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js index f3dcf3a4..3c0d70f6 100644 --- a/jshERP-web/src/mixins/JeecgListMixin.js +++ b/jshERP-web/src/mixins/JeecgListMixin.js @@ -58,7 +58,7 @@ export const JeecgListMixin = { }, created() { if(!this.disableMixinCreated){ - console.log(' -- mixin created -- ') + //console.log(' -- mixin created -- ') this.loadData(); //初始化字典配置 在自己页面定义 this.initDictConfig(); @@ -90,7 +90,7 @@ export const JeecgListMixin = { }) }, initDictConfig(){ - console.log("--这是一个假的方法!") + //console.log("--这是一个假的方法!") }, handleSuperQuery(params, matchType) { //高级查询方法 diff --git a/jshERP-web/src/permission.js b/jshERP-web/src/permission.js index d69a370b..948531fb 100644 --- a/jshERP-web/src/permission.js +++ b/jshERP-web/src/permission.js @@ -46,6 +46,11 @@ router.beforeEach((to, from, next) => { }) }) } else { + if (to.path) { + if (window._hmt) { + window._hmt.push(['_trackPageview', '/#' + to.fullPath]) + } + } next() } } @@ -59,7 +64,6 @@ router.beforeEach((to, from, next) => { } } }) - router.afterEach(() => { NProgress.done() // finish progress bar }) diff --git a/jshERP-web/src/views/bill/SaleBackList.vue b/jshERP-web/src/views/bill/SaleBackList.vue index 9a096150..91dafbae 100644 --- a/jshERP-web/src/views/bill/SaleBackList.vue +++ b/jshERP-web/src/views/bill/SaleBackList.vue @@ -103,6 +103,14 @@ subType: "销售退货", roleType: Vue.ls.get('roleType') }, + labelCol: { + xs: { span: 24 }, + sm: { span: 8 }, + }, + wrapperCol: { + xs: { span: 24 }, + sm: { span: 16 }, + }, // 表头 columns: [ { diff --git a/jshERP-web/src/views/system/CustomerList.vue b/jshERP-web/src/views/system/CustomerList.vue index ec35c56b..9c1dd059 100644 --- a/jshERP-web/src/views/system/CustomerList.vue +++ b/jshERP-web/src/views/system/CustomerList.vue @@ -35,7 +35,7 @@ 导入 @@ -120,7 +120,6 @@ { title: '联系人', dataIndex: 'contacts',width:70,align:"center"}, { title: '手机号码', dataIndex: 'telephone',width:100,align:"center"}, { title: '联系电话', dataIndex: 'phoneNum',width:100,align:"center"}, - { title: '预付款',dataIndex: 'advanceIn',width:70,align:"center"}, { title: '期初应收',dataIndex: 'beginNeedGet',width:80,align:"center"}, { title: '期初应付',dataIndex: 'beginNeedPay',width:80,align:"center"}, { title: '期末应收',dataIndex: 'allNeedGet',width:80,align:"center"}, diff --git a/jshERP-web/src/views/system/MemberList.vue b/jshERP-web/src/views/system/MemberList.vue index ee7e75cb..110cafed 100644 --- a/jshERP-web/src/views/system/MemberList.vue +++ b/jshERP-web/src/views/system/MemberList.vue @@ -35,7 +35,7 @@ 导入 @@ -121,11 +121,6 @@ { title: '手机号码', dataIndex: 'telephone',width:110,align:"center"}, { title: '联系电话', dataIndex: 'phoneNum',width:100,align:"center"}, { title: '预付款',dataIndex: 'advanceIn',width:70,align:"center"}, - { title: '期初应收',dataIndex: 'beginNeedGet',width:80,align:"center"}, - { title: '期初应付',dataIndex: 'beginNeedPay',width:80,align:"center"}, - { title: '期末应收',dataIndex: 'allNeedGet',width:80,align:"center"}, - { title: '期末应付',dataIndex: 'allNeedPay',width:80,align:"center"}, - { title: '税率(%)', dataIndex: 'taxRate',width:80,align:"center"}, { title: '状态',dataIndex: 'enabled',width:70,align:"center", scopedSlots: { customRender: 'customRenderFlag' } }, diff --git a/jshERP-web/src/views/system/SerialNumberList.vue b/jshERP-web/src/views/system/SerialNumberList.vue index 29bb1e15..905d3a4a 100644 --- a/jshERP-web/src/views/system/SerialNumberList.vue +++ b/jshERP-web/src/views/system/SerialNumberList.vue @@ -57,6 +57,9 @@ 删除 + + {{record.depotHeadNumber}} +