Commit 7bc012d0 by 无尘

fix: 修改行政架构添加分组

parent 4f6f945e
/*
* @Descripttion: 当前组件信息
* @version: 1.0.0
* @Author: 无尘
* @Date: 2018-10-10 14:44:45
* @LastEditors: 无尘
* @LastEditTime: 2018-10-10 14:44:45
*/
module.exports = { module.exports = {
proxyList: { proxyList: {
'/haoban-manage-web/': { '/haoban-manage-web/': {
...@@ -14,11 +22,11 @@ module.exports = { ...@@ -14,11 +22,11 @@ module.exports = {
'^/haoban-app-member-web': '' '^/haoban-app-member-web': ''
} }
}, },
'/api-plug/': { '/haoban-app-announcement-web/': {
target: 'http://gicdev.demogic.com/api-plug/', target: 'https://www.gicdev.com/haoban-app-announcement-web/',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/api-plug': '' '^/haoban-app-announcement-web': ''
} }
}, },
'/api-mall/': { '/api-mall/': {
......
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link href=./static/css/app.5958cfb74b6085e500440c39622a04de.css rel=stylesheet></head><body style="min-width: 1400px;"><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>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.d26fa0a3a9fb6e375766.js></script><script type=text/javascript src=./static/js/vendor.edfe69b49db0b6363a08.js></script><script type=text/javascript src=./static/js/app.127602c296ca2f7b8473.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link href=./static/css/app.f252735c27c389ef43d02c3a8e5c3e67.css rel=stylesheet></head><body style="min-width: 1400px;"><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>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.c6154b896065df841e83.js></script><script type=text/javascript src=./static/js/vendor.edfe69b49db0b6363a08.js></script><script type=text/javascript src=./static/js/app.4f98369f556c0b8d8cb6.js></script></body></html>
\ No newline at end of file \ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,b,n){for(var r,t,o,i=0,u=[];i<f.length;i++)t=f[i],a[t]&&u.push(a[t][0]),a[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(f,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var f={},a={82:0};function d(c){if(f[c])return f[c].exports;var a=f[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,d),a.l=!0,a.exports}d.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,d){c=a[e]=[f,d]});c[2]=f;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:"83ade80277f3bfb0294e",1:"fe9dec1f31b04053fd7e",2:"7bd6c9bef4c2979d0399",3:"b7e6d57d97174b75b050",4:"11254d7e3a102121b8ec",5:"8cb2253bec2fe1b1350c",6:"124ad8222f7b043b44ae",7:"ebad93a8c5bffffd9e98",8:"f1c9fb5c9212483138d8",9:"b5aae16b3951516573ad",10:"ebbed2d956a1376f014a",11:"59c7813cc972f62b1d18",12:"a986df17f75afd60381e",13:"c2a8c3f846f25822ca33",14:"354e10af70665365afca",15:"cf460d3bbf68d0ec7cb3",16:"a60a9b59e9c08bb8f9fa",17:"5df1837bc44567b0b747",18:"5514800e35b0e73e70c0",19:"c00bf60c8a9d892ddc2b",20:"3b3584307ac3ff46beef",21:"c50987389f9771604c9c",22:"f08c872fb1b9438d09ff",23:"9efbbc6dd315a676ce09",24:"6cacb2ce8b746af3e668",25:"4f9db49437ea94436d03",26:"e84283c3a6efdbdd121d",27:"f9eb8425e9bc9c62cc23",28:"140ad99228544036c969",29:"637858f60fa225939020",30:"6e2da48a6aaee90e7b58",31:"d81ddf1fefcc1d3a47a7",32:"703e6cead57d8645a1e8",33:"a005885d35e6836f2cff",34:"c2b31f09ecae60447e9c",35:"6eb8644b657d22563a2c",36:"cd9960391bdc89961cf8",37:"8016d3ac07df8acaf73d",38:"b47a47139aff7916772e",39:"3f8eedf5c702b56e0cdf",40:"746b55942406ca95839c",41:"d78ec401ec32765990b9",42:"369be84226d0cc93dbe5",43:"0aee10370c42e21e3e22",44:"7551d839084cf2a421ea",45:"ac1ff54b32307e685b9c",46:"e6f423ebf4226dde651c",47:"dbc0fd458f7c7b8e1aec",48:"1445c7854ea4a5c457d9",49:"cd83d27020ca5d8278b5",50:"32fb6cb43801e6a80082",51:"785653c63d27cffad313",52:"9eae6e8918eb55593535",53:"691b37ea66a7d1045f01",54:"6fcfa7c3e0c269d06e47",55:"d9617fb11eb15186b28e",56:"b89876f59d4e4966e655",57:"281970fcbb06c8d23158",58:"3f72f09028b158b7f7ac",59:"97c0928ecf7d700fac50",60:"4f9030e3af3934cbac98",61:"ce5cc85910d90395ac98",62:"bc0ef8af781d2f3dccf4",63:"381d21d79f828f5fddaf",64:"8b5fc1c8c05aa1919bc1",65:"a571e51a93be459cb498",66:"300208375cdaa5f37ae1",67:"d15b34d21a04863a7254",68:"bad812977f20be800fbd",69:"043a9ff888724ef485e5",70:"9ffcb72c8aefa5c915ca",71:"a38c486f70c59aa0a9a9",72:"1431b2e1d9e1729c7db1",73:"34ecad0968f6bfde9506",74:"b59dd56e7fc8a428c6ff",75:"dfa5e44e866b0ede9d07",76:"bb2c379aaf0457df7d9d",77:"a7085591a8256fc5abef",78:"e0c61a4d30aa1232772c",81:"b70a353b3c794793e525"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),f},d.m=e,d.c=f,d.d=function(e,c,f){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},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={82: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:"1fea5797850d693a9c21",1:"fe9dec1f31b04053fd7e",2:"b31856e6a091b3fba584",3:"b7e6d57d97174b75b050",4:"11254d7e3a102121b8ec",5:"8cb2253bec2fe1b1350c",6:"124ad8222f7b043b44ae",7:"ebad93a8c5bffffd9e98",8:"f1c9fb5c9212483138d8",9:"b5aae16b3951516573ad",10:"ebbed2d956a1376f014a",11:"59c7813cc972f62b1d18",12:"6ef9d18a1d3b8e72f4a6",13:"c2a8c3f846f25822ca33",14:"354e10af70665365afca",15:"0b0d85c57e5b2968a45e",16:"2ee1cd09e02cae2867cf",17:"78c6d10043e3245cbd2a",18:"ac84911777adc84db747",19:"d857e84723b588b3f07f",20:"641f715dd76416608684",21:"1aa6bc5390d968d5982f",22:"f08c872fb1b9438d09ff",23:"9efbbc6dd315a676ce09",24:"6cacb2ce8b746af3e668",25:"4f9db49437ea94436d03",26:"e84283c3a6efdbdd121d",27:"f9eb8425e9bc9c62cc23",28:"140ad99228544036c969",29:"8dbb56ba55a9a1a39b4a",30:"6e2da48a6aaee90e7b58",31:"d81ddf1fefcc1d3a47a7",32:"703e6cead57d8645a1e8",33:"a005885d35e6836f2cff",34:"c2b31f09ecae60447e9c",35:"6eb8644b657d22563a2c",36:"cd9960391bdc89961cf8",37:"8016d3ac07df8acaf73d",38:"b47a47139aff7916772e",39:"3f8eedf5c702b56e0cdf",40:"746b55942406ca95839c",41:"d78ec401ec32765990b9",42:"369be84226d0cc93dbe5",43:"0aee10370c42e21e3e22",44:"7551d839084cf2a421ea",45:"ac1ff54b32307e685b9c",46:"e6f423ebf4226dde651c",47:"dbc0fd458f7c7b8e1aec",48:"1445c7854ea4a5c457d9",49:"cd83d27020ca5d8278b5",50:"32fb6cb43801e6a80082",51:"785653c63d27cffad313",52:"9eae6e8918eb55593535",53:"691b37ea66a7d1045f01",54:"6fcfa7c3e0c269d06e47",55:"d9617fb11eb15186b28e",56:"b89876f59d4e4966e655",57:"281970fcbb06c8d23158",58:"3f72f09028b158b7f7ac",59:"97c0928ecf7d700fac50",60:"4f9030e3af3934cbac98",61:"ce5cc85910d90395ac98",62:"bc0ef8af781d2f3dccf4",63:"381d21d79f828f5fddaf",64:"8b5fc1c8c05aa1919bc1",65:"a571e51a93be459cb498",66:"300208375cdaa5f37ae1",67:"d15b34d21a04863a7254",68:"bad812977f20be800fbd",69:"043a9ff888724ef485e5",70:"9ffcb72c8aefa5c915ca",71:"a38c486f70c59aa0a9a9",72:"1431b2e1d9e1729c7db1",73:"34ecad0968f6bfde9506",74:"b59dd56e7fc8a428c6ff",75:"dfa5e44e866b0ede9d07",76:"bb2c379aaf0457df7d9d",77:"a7085591a8256fc5abef",78:"e0c61a4d30aa1232772c",81:"be325ddaae712f760e1a"}[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
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-03-20 14:36:37 * @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-10-17 17:37:55 * @LastEditTime: 2019-10-21 14:04:16
--> -->
<!-- <!--
...@@ -51,6 +51,10 @@ ...@@ -51,6 +51,10 @@
<el-checkbox v-model="myCustomData.allowGuideMessage" @change="changeContact">短信</el-checkbox> <el-checkbox v-model="myCustomData.allowGuideMessage" @change="changeContact">短信</el-checkbox>
<el-checkbox v-model="myCustomData.allowGuideOnlineChat" @change="changeContact">消息</el-checkbox> <el-checkbox v-model="myCustomData.allowGuideOnlineChat" @change="changeContact">消息</el-checkbox>
</div> </div>
<div class="m-b-20">
<el-checkbox class="w-195" v-model="myCustomData.openCardStoreFlag">展示已认证会员</el-checkbox>
<span class="font-14 color-909399">注:保存勾选项后,门店导购和店长可查看本门店已认证会员</span>
</div>
<div class="m-t-46"> <div class="m-t-46">
<el-button type="primary" @click="submit('showFlag')">保 存</el-button> <el-button type="primary" @click="submit('showFlag')">保 存</el-button>
</div> </div>
......
<!--
* @Descripttion: 当前组件信息
* @version: 1.0.0
* @Author: 无尘
* @Date: 2019-10-21 14:27:29
* @LastEditors: 无尘
* @LastEditTime: 2019-10-21 15:25:02
-->
<!--
<review-result-detail
:detailShow="detailShow"
@hideRecordDialog="hideRecordDialog">
</review-result-detail>
import reviewResultDetail from '@/components/review/review-result-detail.vue'
-->
<template>
<div v-show="customDialog">
<el-dialog class="edit-dialog" title="审核详情" :visible.sync="customDialog" width="600px" :before-close="handleClose">
<div class="edit-dialog-body">
<el-table :data="tableData" style="width: 100%">
<el-table-column prop="publishRecordId" label="审核事项" show-overflow-tooltip> </el-table-column>
<el-table-column label="品牌" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.remark }}
</template>
</el-table-column>
<el-table-column label="提交人" show-overflow-tooltip>
<template slot-scope="scope">
<div class="flex">
<div class="flex flex-align-center flex-pack-center bg-82C5FF table-head-pic">
<i v-if="!scope.row.headPic" class="iconfont icon-yewuduanmorentouxian"></i>
<img v-else :src="scope.row.headPic" alt="img" />
</div>
<div class="flex flex-column apply-info">
<span>{{ scope.row.applyName }}</span>
<span class="font-13">{{ scope.row.storeName }}</span>
</div>
</div>
</template>
</el-table-column>
<el-table-column label="提交时间" show-overflow-tooltip>
<template slot-scope="scope">
<div class="color-606266 line-18">{{ scope.row.publishTime | timeStampToYmd }}</div>
<div class="color-606266 line-18">{{ scope.row.publishTime | timeStampToHms }}</div>
</template>
</el-table-column>
<el-table-column label="审核结果" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.remark }}
</template>
</el-table-column>
</el-table>
<div class="pagination text-right m-t-14" v-if="!!totalCount">
<el-pagination small :page-size="pageSize" :current-page="currentPage" layout="prev, pager, next" :total="totalCount" @size-change="handleSizeChange" @current-change="handleCurrentChange"> </el-pagination>
</div>
</div>
</el-dialog>
</div>
</template>
<script>
import { getRequest } from '@/api/api';
import errMsg from '@/common/js/error';
export default {
name: 'record-list',
props: {
detailShow: {
type: Boolean,
default: false
}
},
data() {
return {
customDialog: false, // 弹框显示
tableData: [
/* {
interfaceVersionId: '1',
version: '测试',
remark: '描述内容',
createTime: 1564455643252
} */
],
pageSize: 5,
currentPage: 1,
totalCount: 0
};
},
methods: {
/**
* 关闭
*/
handleClose(done) {
const that = this;
done();
that.hideDialog();
},
/**
* 取消
*/
customCancel() {
const that = this;
that.hideDialog();
},
hideDialog() {
const that = this;
that.customDialog = false;
that.$emit('hideDetailDialog');
},
/**
* 分页
*/
handleSizeChange(val) {
this.pageSize = val;
this.getData();
},
handleCurrentChange(val) {
this.currentPage = val;
this.getData();
},
/**
* 查看定义详情页
*/
handleShow(index, row) {
const that = this;
that.$router.push(`/apiListManageShow?editFlag=0&interfaceId=${row.interfaceId}&interfaceName=${row.interfaceName}&interfaceVersionId=${row.interfaceVersionId}&publishRecordId=${row.publishRecordId}&projectId=${row.projectId}&projectName=${that.$route.query.projectName}&interfaceGroupId=${row.interfaceGroupId}&interfaceGroupName=${that.$route.query.interfaceGroupName}`);
},
/**
* 获取数据
*/
getData() {
const that = this;
let para = {
pageNum: that.currentPage,
pageSize: that.pageSize,
version: that.formData.version,
sceneCode: that.formData.sceneCode,
interfaceId: that.formData.interfaceId
};
getRequest('/gateway-manage/page-api-publish-record', para)
.then(res => {
let resData = res.data;
if (resData.code == '0000') {
that.tableData = resData.result.result || [];
that.totalCount = resData.result.totalCount;
return;
}
errMsg.errorMsg(resData);
})
.catch(function(error) {
that.$message.error({
duration: 1000,
message: error.message
});
});
}
},
watch: {
detailShow: function(newData, oldData) {
const that = this;
that.customDialog = newData;
}
},
/* 接收数据 */
mounted() {
const that = this;
that.customDialog = that.publishShow;
}
};
</script>
<style lang="less" scoped>
.bg-82C5FF {
background: #82c5ff;
}
.edit-dialog {
/deep/ .el-dialog__body {
padding: 25px 20px 17px 20px;
min-height: 352px;
}
/deep/ .el-dialog__footer {
border: none;
padding-top: 3px;
}
&__title {
width: 100%;
height: 38px;
padding: 12px 15px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
background: rgba(235, 238, 245, 1);
}
.el-alert--info {
width: 400px;
font-size: 14px;
color: #606266;
background: #e6f7ff;
border: 1px solid rgba(145, 213, 255, 1);
}
.el-icon-info {
width: 12px;
font-size: 12px;
color: #1890ff;
}
.el-form {
margin-top: 40px;
}
}
</style>
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-06-11 17:29:53 * @Date: 2019-06-11 17:29:53
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-10-17 17:28:06 * @LastEditTime: 2019-10-18 10:36:44
--> -->
<!-- <!--
备注:由于使用拖拽上传图片,超过限制的图片不上传不显示,暂时修改了源码的的方法,增加了一个判断, 备注:由于使用拖拽上传图片,超过限制的图片不上传不显示,暂时修改了源码的的方法,增加了一个判断,
...@@ -114,8 +114,8 @@ export default { ...@@ -114,8 +114,8 @@ export default {
this.handleImgUpload(blobInfo, success, failure); this.handleImgUpload(blobInfo, success, failure);
}, },
// 添加插件 // 添加插件
plugins: 'preview link image colorpicker textcolor paste ', // paste media plugins: 'preview link image colorpicker textcolor paste media ', // paste media
toolbar: 'bold italic underline strikethrough | fontsizeselect | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist | outdent indent blockquote | undo redo | link unlink image code | removeformat | preview', toolbar: 'bold italic underline strikethrough | fontsizeselect | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist | outdent indent blockquote | undo redo | link unlink image code media | removeformat | preview',
branding: false, branding: false,
paste_data_images: true, paste_data_images: true,
paste_image_maxsize: 5, paste_image_maxsize: 5,
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2018-12-13 19:18:26 * @Date: 2018-12-13 19:18:26
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2018-12-13 19:18:26 * @LastEditTime: 2019-10-21 15:41:04
--> -->
<template> <template>
<div class="common-set-wrap" :style="{ height: windowH }"> <div class="common-set-wrap" :style="{ height: windowH }">
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</ul> </ul>
</el-form-item> </el-form-item>
<el-form-item label="部门排序调整" prop="chainName"> <el-form-item label="部门排序调整" prop="chainName">
<el-input :disabled="disabled" v-model="departInfo.chainName" @focus="callGroupSelector" suffix-icon="el-icon-arrow-down"></el-input> <el-input :disabled="disabled" readonly v-model="departInfo.chainName" @focus="callGroupSelector" suffix-icon="el-icon-arrow-down"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -388,7 +388,9 @@ export default { ...@@ -388,7 +388,9 @@ export default {
that.departInfo = { that.departInfo = {
name: '', name: '',
parentName: '', parentName: '',
parentId: '' chainName: '',
parentId: '',
managerClerkList: []
}; };
that.disabled = true; that.disabled = true;
that.getGroupData(); that.getGroupData();
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-02-25 17:24:09 * @Date: 2019-02-25 17:24:09
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-09-25 17:03:56 * @LastEditTime: 2019-10-21 14:12:05
--> -->
<template> <template>
<div class="apps-wrap common-set-wrap"> <div class="apps-wrap common-set-wrap">
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
<div v-if="item.appUrl" class="app-detail-txt font-12 color-1890ff"><span>详情</span><i class="el-icon-arrow-right"></i></div>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -285,6 +286,11 @@ export default { ...@@ -285,6 +286,11 @@ export default {
top: 10px; top: 10px;
right: 10px; right: 10px;
} }
.app-detail-txt {
position: absolute;
bottom: 10px;
right: 10px;
}
.app-cell-dropdown { .app-cell-dropdown {
.el-dropdown-menu__item { .el-dropdown-menu__item {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-04-12 17:56:45 * @Date: 2019-04-12 17:56:45
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2019-09-25 17:05:36 * @LastEditTime: 2019-10-21 15:16:56
--> -->
<template> <template>
<div class="notice-list-wrap"> <div class="notice-list-wrap">
...@@ -76,7 +76,8 @@ ...@@ -76,7 +76,8 @@
<el-table-column prop="opr" label="操作"> <el-table-column prop="opr" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click="toSetTop(scope.row.announcementId, scope.row.pageTop)" type="text">{{ scope.row.pageTop == 1 ? '取消置顶' : '置顶' }}</el-button> <el-button @click="toSetTop(scope.row.announcementId, scope.row.pageTop)" type="text">{{ scope.row.pageTop == 1 ? '取消置顶' : '置顶' }}</el-button>
<el-button @click="handlePreview(scope.row.announcementId)" type="text">预览</el-button> <el-button @click="handleShow(scope.row.announcementId)" type="text">查看</el-button>
<!-- <el-button @click="handlePreview(scope.row.announcementId)" type="text">预览</el-button> -->
<el-button @click="delNotice(scope.row.announcementId, scope.$index)" type="text">删除</el-button> <el-button @click="delNotice(scope.row.announcementId, scope.$index)" type="text">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
...@@ -695,6 +696,10 @@ export default { ...@@ -695,6 +696,10 @@ export default {
this.$refs.qrcodePreview.qrcode(id, 'announcement'); this.$refs.qrcodePreview.qrcode(id, 'announcement');
this.dialogVisible = true; this.dialogVisible = true;
}, },
// 查看
handleShow(id) {
const that = this;
},
// 新建公告 // 新建公告
addNotice() { addNotice() {
this.$router.push(`/addNotice?appIcon=${this.$route.query.appIcon}`); this.$router.push(`/addNotice?appIcon=${this.$route.query.appIcon}`);
......
...@@ -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: 2019-10-08 11:43:31 * @LastEditTime: 2019-10-21 14:22:44
--> -->
<template> <template>
<div class="reviewed-wrap common-set-wrap"> <div class="reviewed-wrap common-set-wrap">
...@@ -90,6 +90,12 @@ ...@@ -90,6 +90,12 @@
<div class="line-h-18">{{ scope.row.createTime | formatTimeHMS }}</div> <div class="line-h-18">{{ scope.row.createTime | formatTimeHMS }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核时间" show-overflow-tooltip>
<template slot-scope="scope">
<div class="line-h-18">{{ scope.row.createTime | formatTimeYMD }}</div>
<div class="line-h-18">{{ scope.row.createTime | formatTimeHMS }}</div>
</template>
</el-table-column>
<el-table-column label="状态"> <el-table-column label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
<span :class="[scope.row.auditingStatus == 2 ? 'color-FF585C' : '']">{{ scope.row.auditingStatus == 1 ? '超级管理员已同意' : '超级管理员已拒绝' }}</span> <span :class="[scope.row.auditingStatus == 2 ? 'color-FF585C' : '']">{{ scope.row.auditingStatus == 1 ? '超级管理员已同意' : '超级管理员已拒绝' }}</span>
......
...@@ -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: 2019-10-08 11:44:00 * @LastEditTime: 2019-10-21 15:15:32
--> -->
<template> <template>
<div class="unreview-wrap common-set-wrap"> <div class="unreview-wrap common-set-wrap">
...@@ -136,11 +136,13 @@ ...@@ -136,11 +136,13 @@
<el-button type="primary" @click="sendRefuse('ruleForm')">确 定</el-button> <el-button type="primary" @click="sendRefuse('ruleForm')">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
<review-result-detail :detailShow="detailShow" @hideDetailDialog="hideDetailDialog"> </review-result-detail>
</div> </div>
</template> </template>
<script> <script>
import navCrumb from '@/components/nav/nav.vue'; import navCrumb from '@/components/nav/nav.vue';
import storeChange from '@/components/review/store-change.vue'; import storeChange from '@/components/review/store-change.vue';
import reviewResultDetail from '@/components/review/review-result-detail.vue';
import showMsg from '@/common/js/showmsg'; import showMsg from '@/common/js/showmsg';
import errMsg from '@/common/js/error'; import errMsg from '@/common/js/error';
import { formatDate, _debounce } from '@/common/js/public'; import { formatDate, _debounce } from '@/common/js/public';
...@@ -231,7 +233,9 @@ export default { ...@@ -231,7 +233,9 @@ export default {
}, },
approveVisible: false, approveVisible: false,
refuseVisible: false refuseVisible: false,
detailShow: false
}; };
}, },
filters: { filters: {
...@@ -249,6 +253,14 @@ export default { ...@@ -249,6 +253,14 @@ export default {
computed: {}, computed: {},
methods: { methods: {
/** /**
* 关闭详情
*
*/
hideDetailDialog() {
const that = this;
that.detailShow = true;
},
/**
* 表格---多选 * 表格---多选
*/ */
handleSelectionChange(val) { handleSelectionChange(val) {
...@@ -494,7 +506,8 @@ export default { ...@@ -494,7 +506,8 @@ export default {
}, },
components: { components: {
navCrumb, navCrumb,
storeChange storeChange,
reviewResultDetail
} }
}; };
</script> </script>
......
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