diff --git a/common/utils.js b/common/utils.js index 90f1139..eebd48a 100644 --- a/common/utils.js +++ b/common/utils.js @@ -191,7 +191,7 @@ function addUserBehavior(obj) { */ async function getFieldEnumByField(params) { if (!params.FieldExplainField) return null - // 缓存了上次请求的数据 如果字段一致 则直接返回缓存数据 否则请求 + // 缓存了上次请求的数据 如果字段一致 则直接返回缓存数据 否则请求 // 可优化:根据有效期判断是否再次请求 if (!this.dataMap) { this.dataMap = {} @@ -239,6 +239,8 @@ function getThisMonthDay(value){ return howDay } + + // 视频播放 const EZUIPlayer = require('./ezuikit.js'); diff --git a/components/warning.vue b/components/warning.vue index 736ae87..f434c28 100644 --- a/components/warning.vue +++ b/components/warning.vue @@ -1,15 +1,15 @@ @@ -17,10 +17,10 @@ import { mapGetters} from 'vuex' export default { props: ['noData','text'], - + data() { return { - + } }, computed:{ @@ -30,7 +30,7 @@ }) }, methods: { - + } } diff --git a/pages.json b/pages.json index ef0de3b..f3eff93 100644 --- a/pages.json +++ b/pages.json @@ -118,6 +118,12 @@ "navigationBarTitleText": "", "navigationStyle": "custom" } + }, + { + "path": "planMonth", + "style": { + "navigationBarTitleText": "" + } } ] }, @@ -198,39 +204,6 @@ } ] }, - { - "root": "pages/mbwa", - "pages": [ - { - "path": "mbwa", - "style": - { - "navigationBarTitleText": "走动式管理" - } - }, - { - "path": "mbwaUnCheck", - "style": - { - "navigationBarTitleText": "未检点位" - } - }, - { - "path": "mbwaDetail", - "style": - { - "navigationBarTitleText": "走动式管理" - } - }, - { - "path": "mbwaUpload", - "style": - { - "navigationBarTitleText": "上传走动式管理" - } - } - ] - }, { "root": "pages/serviceAreaReimbursement", "pages": [ @@ -280,74 +253,6 @@ } ] }, - { - "root": "pages/askForLeave", - "pages": [ - { - "path": "askForLeave", - "style": - { - "enablePullDownRefresh": true, - "navigationBarTitleText": "请假加班" - } - }, - { - "path": "detail", - "style": - { - "navigationBarTitleText": "请假详情" - } - }, - { - "path": "newLeave", - "style": - { - "navigationBarTitleText": "申请请假" - } - }, - { - "path": "newLeave2", - "style": - { - "navigationBarTitleText": "申请请假" - } - } - ] - }, - { - "root": "pages/officialDocManagement", - "pages": [ - { - "path": "officialDocManagement", - "style": - { - "enablePullDownRefresh": true, - "navigationBarTitleText": "公文阅办" - } - }, - { - "path": "detail", - "style": - { - "navigationBarTitleText": "公文阅办" - } - }, - { - "path": "readerList", - "style": - { - "navigationBarTitleText": "公文阅办" - } - }, - { - "path": "circulate", - "style": - { - "navigationBarTitleText": "阅办记录" - } - } - ] - }, { "root": "pages/businessApproval", "pages": [ @@ -508,26 +413,6 @@ } ] }, - { - "root": "pages/publicity", - "pages": [ - { - "path": "publicity", - "style": - { - "enablePullDownRefresh": true, - "navigationBarTitleText": "阳光公示" - } - }, - { - "path": "publicityDetail", - "style": - { - "navigationBarTitleText": "阳光公示" - } - } - ] - }, { "root": "pages/expenseApproval", "pages": [ @@ -569,146 +454,6 @@ } } ] - }, - { - "root": "pages/autoTest/serverpartshoptotalsummary", - "pages": [ - { - "path": "index", - "style": - { - "enablePullDownRefresh": true, - "navigationBarTitleText": "业主门店数量汇总" - } - }, - { - "path": "detail", - "style": - { - "navigationBarTitleText": "业主门店数量汇总详情" - } - } - ] - }, - { - "root": "pages/autoTest/shopmobilesummary", - "pages": [ - { - "path": "index", - "style": - { - "enablePullDownRefresh": true, - "navigationBarTitleText": "门店移动支付汇总" - } - }, - { - "path": "detail", - "style": - { - "navigationBarTitleText": "门店移动支付汇总详情" - } - } - ] - }, - { - "root": "pages/autoTest/endaccountreport", - "pages": [ - { - "path": "index", - "style": - { - "enablePullDownRefresh": true, - "navigationBarTitleText": "服务区营收数据汇总" - } - }, - { - "path": "detail", - "style": - { - "navigationBarTitleText": "服务区营收数据汇总详情" - } - } - ] - }, - { - "root": "pages/autoTest/abnormalauditreport", - "pages": [ - { - "path": "index", - "style": - { - "enablePullDownRefresh": true, - "navigationBarTitleText": "服务区现场稽核异常汇总" - } - }, - { - "path": "detail", - "style": - { - "navigationBarTitleText": "服务区现场稽核异常汇总详情" - } - } - ] - }, - { - "root": "pages/autoTest/serverpartreport", - "pages": [ - { - "path": "index", - "style": - { - "enablePullDownRefresh": true, - "navigationBarTitleText": "服务区营收汇总" - } - }, - { - "path": "detail", - "style": - { - "navigationBarTitleText": "服务区营收汇总详情" - } - } - ] - }, - { - "root": "pages/autoTest/abnormalauditsummary", - "pages": [ - { - "path": "index", - "style": - { - "enablePullDownRefresh": true, - "navigationBarTitleText": "现场稽核异常表服务区站点汇总" - } - }, - { - "path": "detail", - "style": - { - "navigationBarTitleText": "现场稽核异常表服务区站点汇总详情" - } - } - ] - }, - { - "root": "pages/autoTest/abnormalaudit", - "pages": [ - { - "path": "index", - "style": - { - "enablePullDownRefresh": true, - "navigationBarTitleText": "现场稽核异常表" - } - }, - { - "path": "detail", - "style": - { - "navigationBarTitleText": "现场稽核异常表详情" - } - } - ] } ], "globalStyle": { diff --git a/pages/authorityApproval/components/merchartInfoView.vue b/pages/authorityApproval/components/merchartInfoView.vue index 35871b9..f7095f7 100644 --- a/pages/authorityApproval/components/merchartInfoView.vue +++ b/pages/authorityApproval/components/merchartInfoView.vue @@ -5,7 +5,7 @@

日期:{{data.OPERATE_DATE}} {{stateEmun[data.PERMISSIONAPPLY_STATE]}} -

+

@@ -16,7 +16,7 @@ - + {{data.SERVERPART_NAME ||'-'}} @@ -24,13 +24,13 @@ - + {{data.APPLYSHOP_NAME||'-'}} - + @@ -51,7 +51,7 @@ - + @@ -68,21 +68,21 @@ - + - 审批意见 + 审批意见 {{$util.cutDate( data.APPOVED_DATE,'YYYY/MM/DD hh:ss')}} -