Skip to content

H
haoban-3
Commit f415a695 by fairyly
Options

fix: 修改日报

parent 1414a0d9
Showing with 61 additions and 20 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.24.css><link href=./static/css/app.9685a0b37ec2d4cb672aa3e182f7008e.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.5111388b38ceefad6b8a.js></script><script type=text/javascript src=./static/js/vendor.74aa0a1e6f16f3fa6e13.js></script><script type=text/javascript src=./static/js/app.b41724cf1d0ca8d6468a.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.24.css><link href=./static/css/app.b0e250701a6d68215bb1524f8166bb15.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.2aad640761faedcb3d14.js></script><script type=text/javascript src=./static/js/vendor.74aa0a1e6f16f3fa6e13.js></script><script type=text/javascript src=./static/js/app.b41724cf1d0ca8d6468a.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/css/app.9685a0b37ec2d4cb672aa3e182f7008e.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.b0e250701a6d68215bb1524f8166bb15.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.5111388b38ceefad6b8a.js → dist/static/js/manifest.2aad640761faedcb3d14.js
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var a={},f={58:0};function d(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,d){c=f[e]=[a,d]});c[2]=a;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+e+"."+{0:"267295c2be814bdb62ce",1:"d0085d480a91874b22b9",2:"3a3205ea7c26e287a11a",3:"d224bdf103d4e1c8d0c1",4:"2b7439800676f0a08efe",5:"e3b192eee9635f32589d",6:"2b6a6928584a59864cc7",7:"a503f0226879ce6761e9",8:"a75781a0e825f45aaeff",9:"dc3f759d7630734b2c5a",10:"8f034eddadaa388a28ca",11:"a3403df65debec63bcd3",12:"54283d72bc4fed4902ae",13:"69e85e05d57d4ca46dc9",14:"0212bcf7eec0cbbfeff9",15:"077d072d7d6111724b5c",16:"303ce62730727c639a9a",17:"b0388162acfec78199c5",18:"945bdf7e2e8dfa6e4a77",19:"73c4b497781002da7c14",20:"fda35a4d69d05751b28e",21:"79ed58e953d2b40d179f",22:"908f6189217c5474f224",23:"625e2fda7003ebaabc5b",24:"30d93c7efdf57c76b10f",25:"db198c98626c54aa65c5",26:"5b2aa2e605354e980cb4",27:"e401a20804ba96c7aa0e",28:"eceb67d553b28740da67",29:"edbb76c5b6c294e1cdd4",30:"cea1178db76af32d35bb",31:"4f03e5fe15199de55246",32:"22fcab94d4b8d6c87e72",33:"246dc93853dc131fba0f",34:"6cfbb247fbb23212e1ea",35:"c7bf4b07bf71e62b8284",36:"ade76cb00edeacc12428",37:"33bf206b6498b57b92ad",38:"c8919a915129e9c3b36f",39:"13770623cd0155327e56",40:"f6ef482085cccdca5f67",41:"fc1cf1c2a982a5411de8",42:"6e7fb90b461387ee9051",43:"1a78699f42edc31fbe79",44:"925b1c27f2857fcb7773",45:"779a749f328ebdad6494",46:"eeff6b459a1362f128c4",47:"40147835d3cd2c0b3eb9",48:"7924df130d5da2e421e2",49:"b1efe971ddf591c2ca9c",50:"c98f1071344ca078d41b",51:"9f9365ec7757a5521f42",52:"430cd7d5ca507f1b9672",53:"bdf7402197597faaef29",54:"11c51117145fec9ab9ac",55:"3eb14ebc1e3a0ca8a2c3"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},d.m=e,d.c=a,d.d=function(e,c,a){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},d.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]); !function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var a={},f={58:0};function d(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,d){c=f[e]=[a,d]});c[2]=a;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+e+"."+{0:"267295c2be814bdb62ce",1:"d0085d480a91874b22b9",2:"f575b6b8939d0fa14241",3:"d224bdf103d4e1c8d0c1",4:"221a3d30b855736c0423",5:"e3b192eee9635f32589d",6:"4eb86b87ca22b6a2134d",7:"a503f0226879ce6761e9",8:"a75781a0e825f45aaeff",9:"dc3f759d7630734b2c5a",10:"8f034eddadaa388a28ca",11:"a3403df65debec63bcd3",12:"54283d72bc4fed4902ae",13:"69e85e05d57d4ca46dc9",14:"0212bcf7eec0cbbfeff9",15:"077d072d7d6111724b5c",16:"303ce62730727c639a9a",17:"b0388162acfec78199c5",18:"945bdf7e2e8dfa6e4a77",19:"73c4b497781002da7c14",20:"fda35a4d69d05751b28e",21:"79ed58e953d2b40d179f",22:"908f6189217c5474f224",23:"625e2fda7003ebaabc5b",24:"30d93c7efdf57c76b10f",25:"db198c98626c54aa65c5",26:"5b2aa2e605354e980cb4",27:"e401a20804ba96c7aa0e",28:"eceb67d553b28740da67",29:"edbb76c5b6c294e1cdd4",30:"cea1178db76af32d35bb",31:"4f03e5fe15199de55246",32:"22fcab94d4b8d6c87e72",33:"246dc93853dc131fba0f",34:"6cfbb247fbb23212e1ea",35:"c7bf4b07bf71e62b8284",36:"ade76cb00edeacc12428",37:"33bf206b6498b57b92ad",38:"c8919a915129e9c3b36f",39:"13770623cd0155327e56",40:"f6ef482085cccdca5f67",41:"fc1cf1c2a982a5411de8",42:"6e7fb90b461387ee9051",43:"1a78699f42edc31fbe79",44:"925b1c27f2857fcb7773",45:"779a749f328ebdad6494",46:"eeff6b459a1362f128c4",47:"40147835d3cd2c0b3eb9",48:"7924df130d5da2e421e2",49:"b1efe971ddf591c2ca9c",50:"c98f1071344ca078d41b",51:"9f9365ec7757a5521f42",52:"430cd7d5ca507f1b9672",53:"bdf7402197597faaef29",54:"11c51117145fec9ab9ac",55:"3eb14ebc1e3a0ca8a2c3"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},d.m=e,d.c=a,d.d=function(e,c,a){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},d.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file \ No newline at end of file
src/views/apps/cloudDaily/customReportSet.vue
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
</div> </div>
</div> </div>
<!-- 右侧 --> <!-- 右侧 -->
<div class="template-cell template-cell-r define-template-tab"> <div class="template-cell template-cell-r define-template-tab" :style="{ right: rightWidth }">
<div class="template-cell-title font-14 color-303133">控件设置</div> <div class="template-cell-title font-14 color-303133">控件设置</div>
<div label="" name="first"> <div label="" name="first">
<div id="edit-box"> <div id="edit-box">
...@@ -432,6 +432,7 @@ export default { ...@@ -432,6 +432,7 @@ export default {
activeName: 'first', activeName: 'first',
enterpriseId: this.brandId, // 品牌 Id(即：商户 id) enterpriseId: this.brandId, // 品牌 Id(即：商户 id)
// right tab // right tab
rightWidth: '-350px',
rightName: 'second', rightName: 'second',
dialogVisible: false, dialogVisible: false,
bodyHeight: (document.documentElement.clientHeight || document.body.clientHeight) - 277 + 'px', bodyHeight: (document.documentElement.clientHeight || document.body.clientHeight) - 277 + 'px',
...@@ -440,12 +441,20 @@ export default { ...@@ -440,12 +441,20 @@ export default {
delayedDragging: false, delayedDragging: false,
// leftOption // leftOption
leftOption: { leftOption: {
group: { name: 'people', pull: 'clone', put: false }, group: {
name: 'people',
pull: 'clone',
put: false
},
sort: false, sort: false,
disabled: false disabled: false
}, },
leftDefineOption: { leftDefineOption: {
group: { name: 'people', pull: 'clone', put: false }, group: {
name: 'people',
pull: 'clone',
put: false
},
sort: false, sort: false,
disabled: false disabled: false
}, },
...@@ -674,6 +683,7 @@ export default { ...@@ -674,6 +683,7 @@ export default {
*/ */
selectItem(key, index) { selectItem(key, index) {
const that = this; const that = this;
that.rightWidth = '0';
that.currentIndex = index; // 父级：当前选中的索引 that.currentIndex = index; // 父级：当前选中的索引
that.currentChildIndex = null; // 子级未有选中 that.currentChildIndex = null; // 子级未有选中
}, },
...@@ -774,7 +784,10 @@ export default { ...@@ -774,7 +784,10 @@ export default {
}); });
return; return;
} else { } else {
item.list.push({ value: '选项' + (ind + 2), key: ind + 2 }); item.list.push({
value: '选项' + (ind + 2),
key: ind + 2
});
// 判断重复字段 // 判断重复字段
let arrValues = item.list.map(item => item.value); // 返回对象中键值集合的数组 let arrValues = item.list.map(item => item.value); // 返回对象中键值集合的数组
if (that.isRepeat(arrValues)) { if (that.isRepeat(arrValues)) {
...@@ -1034,7 +1047,9 @@ export default { ...@@ -1034,7 +1047,9 @@ export default {
*/ */
getHasStores() { getHasStores() {
let that = this; let that = this;
postRequest('/haoban-app-daily-three-web/daily/has-defined-template-store-type', { enterpriseId: that.enterpriseId }) postRequest('/haoban-app-daily-three-web/daily/has-defined-template-store-type', {
enterpriseId: that.enterpriseId
})
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
...@@ -1063,7 +1078,10 @@ export default { ...@@ -1063,7 +1078,10 @@ export default {
*/ */
getAllFields(type) { getAllFields(type) {
let that = this; let that = this;
postRequest('/haoban-app-daily-three-web/daily/get-template-items', { enterpriseId: that.enterpriseId, type: type }) postRequest('/haoban-app-daily-three-web/daily/get-template-items', {
enterpriseId: that.enterpriseId,
type: type
})
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
...@@ -1136,7 +1154,9 @@ export default { ...@@ -1136,7 +1154,9 @@ export default {
*/ */
getInfo() { getInfo() {
let that = this; let that = this;
postRequest('/haoban-app-daily-three-web/daily/get-define-template', { templateId: that.templateId }) postRequest('/haoban-app-daily-three-web/daily/get-define-template', {
templateId: that.templateId
})
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
...@@ -1392,7 +1412,7 @@ export default { ...@@ -1392,7 +1412,7 @@ export default {
}, },
destroyed() { destroyed() {
document.documentElement.style.backgroundColor = '#fff'; document.documentElement.style.backgroundColor = '#fff';
}, }
}; };
</script> </script>
<style type="text/less" lang="less" scoped> <style type="text/less" lang="less" scoped>
......
src/views/apps/cloudDaily/template/template.less
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
* @version: 1.0.0 * @version: 1.0.0
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-03-20 14:36:37 * @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘 * @LastEditors : 无尘
* @LastEditTime: 2020-03-16 16:29:21 * @LastEditTime : 2020-04-07 09:17:08
*/ */
.template-wrap { .template-wrap {
width: 100%; width: 100%;
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
float: left; float: left;
height: calc(100vh - 191px); height: calc(100vh - 191px);
padding-top: 16px; padding-top: 16px;
border-right: 2px solid #E4E7ED; // border-right: 2px solid #E4E7ED;
.template-cell-title { .template-cell-title {
font-weight: bold; font-weight: bold;
padding-left: 20px; padding-left: 20px;
...@@ -350,11 +350,11 @@ ...@@ -350,11 +350,11 @@
float: left; float: left;
width: 410px; width: 410px;
min-width: 33%; min-width: 33%;
height: calc(100vh - 224px); // height: calc(100vh - 224px);
margin: 0 auto; margin: 0 auto;
position: relative; position: relative;
padding-top: 50px; padding-top: 50px;
border-right: 2px solid #E4E7ED; border-left: 2px solid #E4E7ED;
.view-content { .view-content {
position: relative; position: relative;
} }
...@@ -656,9 +656,17 @@ ...@@ -656,9 +656,17 @@
/* 右侧 */ /* 右侧 */
.template-cell-r { .template-cell-r {
width: 344px; width: 344px;
float: left; // float: left;
overflow: hidden; overflow: hidden;
padding: 16px 0 0 20px; padding: 16px 0 0 20px;
position: absolute;
top: 0;
bottom: 0;
right: -350px;
-webkit-transition: all 0.3s;
-moz-transition: all 0.3s;
transition: all 0.3s;
box-shadow: -4px 0 9px rgba(125,137,125,0.08);
.input-line-cell { .input-line-cell {
.tip { .tip {
......
src/views/reviewCenter/unreview.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2018-10-10 14:44:45 * @Date: 2018-10-10 14:44:45
* @LastEditors : 无尘 * @LastEditors : 无尘
* @LastEditTime : 2020-04-01 14:46:40 * @LastEditTime : 2020-04-07 10:04:30
--> -->
<template> <template>
<div class="unreview-wrap common-set-wrap"> <div class="unreview-wrap common-set-wrap">
...@@ -320,7 +320,20 @@ export default { ...@@ -320,7 +320,20 @@ export default {
handleClick(index, item, flag) { handleClick(index, item, flag) {
const that = this; const that = this;
that.selectId = item.auditId; that.selectId = item.auditId;
!!flag ? (that.refuseVisible = true) : (that.approveVisible = true); !!flag ? (that.refuseVisible = true) : '';
that
.$confirm('是否确认同意?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
that.sendApprove();
})
.catch(() => {
that.selectId = '';
});
}, },
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment