Skip to content

O
office-web
Commit 9a7cd6ab by 无尘
Options

fix: 修改样式和bug

parent b228d75d
Showing with 17 additions and 12 deletions
config/index.js
...@@ -10,7 +10,7 @@ module.exports = { ...@@ -10,7 +10,7 @@ module.exports = {
// Paths // Paths
assetsSubDirectory: 'static', assetsSubDirectory: 'static',
assetsPublicPath: '/', assetsPublicPath: '/',
proxyTable: {},//proxyConfig.proxyList, proxyTable: proxyConfig.proxyList,
// Various Dev Server settings // Various Dev Server settings
// host: '0.0.0.0', // can be overwritten by process.env.HOST // host: '0.0.0.0', // can be overwritten by process.env.HOST
......
config/proxyList.js
module.exports = { module.exports = {
proxyList: { proxyList: {
'/api-auth/': { '/haoban-manage-web/': {
target: 'http://gicdev.demogic.com/api-auth/', target: 'https://www.gicdev.com/haoban-manage-web/',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/api-auth': '' '^/haoban-manage-web': ''
} }
}, },
'/api-admin/': { '/api-admin/': {
......
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link href=./static/css/app.52e8641459134e5ba069a3277de408b1.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.9b1e4bb94dc95351954d.js></script><script type=text/javascript src=./static/js/vendor.fe563ee1a7b37e2ffba9.js></script><script type=text/javascript src=./static/js/app.bea79e4d35b85719c4de.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.7f025a684d12e4246a555c261ed0f3c9.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.9694efd06783188973e1.js></script><script type=text/javascript src=./static/js/vendor.fe563ee1a7b37e2ffba9.js></script><script type=text/javascript src=./static/js/app.bea79e4d35b85719c4de.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/manifest.9b1e4bb94dc95351954d.js → dist/static/js/manifest.9694efd06783188973e1.js
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,b,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[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(a&&a(c,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var c={},f={82:0};function d(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,d){a=f[e]=[c,d]});a[2]=c;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:"52553b96345dd3750f43",1:"0ebe3ead93207dc78a78",2:"d3c62c00c91d9891f916",3:"a43577b9e52a5719a124",4:"18929084ede2c2225e24",5:"baa22d481d8bbd83425c",6:"864d62ab6b379f7b0f55",7:"8f462a353a2ce9c0c116",8:"02a2bbb61efe1946f33b",9:"860dbe8cf83334f9e3c0",10:"a2aa031ae677b8acbf17",11:"e34a64dea1b7a059dcfd",12:"bdcf26a1bcccf7e0239b",13:"6c87f5cefdf77374932d",14:"8a2d85b6cc3b95b868d9",15:"ed6f2f9ae725367ccfc3",16:"c4ebe5ae46670e5c0754",17:"43a28ed857836d70649f",18:"ca2eb072a4ce38f9e487",19:"7971a9a5d92fefa82083",20:"75e0997b94e5d6294ec8",21:"58c0c6a374fc0ec6158e",22:"047f5bba500bca0d62fe",23:"9efbbc6dd315a676ce09",24:"4637a4566383d6e864cf",25:"a579fe9e82eab9ece806",26:"8f0bb144b5e757399727",27:"b5f0e5bd5920771b58af",28:"140ad99228544036c969",29:"36261093da9264fa5f33",30:"0d4999d53befa8fd9eaa",31:"8baa6bca929d1c9a38f6",32:"836f4d0e323c721473e9",33:"7b62b2ff369669fe322c",34:"f9d53c31059aaff9b360",35:"c75699cc6fe47597f200",36:"031f3a5aae4656aba067",37:"8016d3ac07df8acaf73d",38:"23b83bd7920693bc35c6",39:"d17e2c61f3cc8d6972fa",40:"56797b378549955e7f19",41:"78d64ae1581e8ea232cc",42:"61ae052e4f4fc3284000",43:"9d05f4d2f06b9c6bba0e",44:"96d0b6e88fc87f60bac7",45:"0fe24e1d16072c526787",46:"d3a9c6eba924ac8207b3",47:"c8b46666a5089512baa4",48:"854c6c054adb5cba1f06",49:"33530ea069fc872b0d5f",50:"331006123edd2049b7d9",51:"244dc6f576a64b7c174b",52:"43d3ca00e0c9087e4956",53:"9dce74b07cc47cdf56db",54:"1503b643475934e2b5e1",55:"c423570fcbf037d349d9",56:"94bbfa32e0086c5f0bbc",57:"a5308ec502fd9436e4d8",58:"78fea9e14de750887bf1",59:"e232c753f68c56d9e59c",60:"2a9bebb0261ef9a7a939",61:"8833a156f1e38036fb28",62:"44d1241f8d57451d0c10",63:"25cb3ac91e9616a47dde",64:"ebc341a9017c4b2c1112",65:"afcb60484e7a9ec39f28",66:"0c2656f4decfecb59972",67:"d7e3675c4b4931db738d",68:"13404d9aa7a460952885",69:"ff1445c96fd757245229",70:"3720d31e136a7f99a873",71:"458af30d30795059cdbe",72:"cba3aa56f0a846445e33",73:"dc84bab89c2090b47673",74:"a9dae9c87c825ba65aa1",75:"29e0d3d537fd9fa5eabc",76:"e24f155e1168c927ee44",77:"9f7ea81c191a5e1bbaa2",78:"51dbc832d510b2a1c0a3",81:"be325ddaae712f760e1a"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),c},d.m=e,d.c=c,d.d=function(e,a,c){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},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:"52553b96345dd3750f43",1:"0ebe3ead93207dc78a78",2:"d3c62c00c91d9891f916",3:"a43577b9e52a5719a124",4:"18929084ede2c2225e24",5:"baa22d481d8bbd83425c",6:"a833ce8868ce70c6219e",7:"8f462a353a2ce9c0c116",8:"4210ed7b336c1bcfc531",9:"860dbe8cf83334f9e3c0",10:"a2aa031ae677b8acbf17",11:"e34a64dea1b7a059dcfd",12:"bdcf26a1bcccf7e0239b",13:"6c87f5cefdf77374932d",14:"8a2d85b6cc3b95b868d9",15:"92854409541cf66d1361",16:"c4ebe5ae46670e5c0754",17:"43a28ed857836d70649f",18:"ca2eb072a4ce38f9e487",19:"7971a9a5d92fefa82083",20:"75e0997b94e5d6294ec8",21:"58c0c6a374fc0ec6158e",22:"047f5bba500bca0d62fe",23:"9efbbc6dd315a676ce09",24:"4637a4566383d6e864cf",25:"a579fe9e82eab9ece806",26:"8f0bb144b5e757399727",27:"b5f0e5bd5920771b58af",28:"140ad99228544036c969",29:"36261093da9264fa5f33",30:"0d4999d53befa8fd9eaa",31:"8baa6bca929d1c9a38f6",32:"836f4d0e323c721473e9",33:"7b62b2ff369669fe322c",34:"f9d53c31059aaff9b360",35:"c75699cc6fe47597f200",36:"031f3a5aae4656aba067",37:"8016d3ac07df8acaf73d",38:"23b83bd7920693bc35c6",39:"d17e2c61f3cc8d6972fa",40:"56797b378549955e7f19",41:"78d64ae1581e8ea232cc",42:"61ae052e4f4fc3284000",43:"9d05f4d2f06b9c6bba0e",44:"96d0b6e88fc87f60bac7",45:"0fe24e1d16072c526787",46:"d3a9c6eba924ac8207b3",47:"c8b46666a5089512baa4",48:"854c6c054adb5cba1f06",49:"33530ea069fc872b0d5f",50:"331006123edd2049b7d9",51:"244dc6f576a64b7c174b",52:"43d3ca00e0c9087e4956",53:"9dce74b07cc47cdf56db",54:"1503b643475934e2b5e1",55:"c423570fcbf037d349d9",56:"94bbfa32e0086c5f0bbc",57:"a5308ec502fd9436e4d8",58:"78fea9e14de750887bf1",59:"e232c753f68c56d9e59c",60:"2a9bebb0261ef9a7a939",61:"8833a156f1e38036fb28",62:"44d1241f8d57451d0c10",63:"25cb3ac91e9616a47dde",64:"ebc341a9017c4b2c1112",65:"afcb60484e7a9ec39f28",66:"0c2656f4decfecb59972",67:"d7e3675c4b4931db738d",68:"13404d9aa7a460952885",69:"ff1445c96fd757245229",70:"3720d31e136a7f99a873",71:"458af30d30795059cdbe",72:"cba3aa56f0a846445e33",73:"dc84bab89c2090b47673",74:"a9dae9c87c825ba65aa1",75:"29e0d3d537fd9fa5eabc",76:"e24f155e1168c927ee44",77:"9f7ea81c191a5e1bbaa2",78:"51dbc832d510b2a1c0a3",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
src/components/contacts/storeFrame/clerkView.vue
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<el-option label="已使用好办" :value="1"></el-option> <el-option label="已使用好办" :value="1"></el-option>
<el-option label="未使用好办" :value="0"></el-option> <el-option label="未使用好办" :value="0"></el-option>
</el-select> </el-select>
<span style="vertical-align: middle;margin-right: 0" class="J_show-children el-button" size="small"> <el-checkbox class="m-r-10" v-model="showChildMember" @change="setChildMemberShow">显示子分组门店</el-checkbox><a class="a-href"></a> </span> <span style="vertical-align: middle;margin-right: 0" class="J_show-children el-button" size="small"> <el-checkbox class="m-r-10" v-model="showChildMember" @change="setChildMemberShow">显示子分组成员</el-checkbox><a class="a-href"></a> </span>
<el-button class="vertical-middle" plain @click="exportClerk">批量导出</el-button> <el-button class="vertical-middle" plain @click="exportClerk">批量导出</el-button>
</div> </div>
<el-table ref="clerkViewTable" class="diy-table" :data="tableData"> <el-table ref="clerkViewTable" class="diy-table" :data="tableData">
...@@ -43,7 +43,9 @@ ...@@ -43,7 +43,9 @@
<ul> <ul>
<li v-for="(clerk, index) in scope.row.clerks" :key="clerk.employeeClerkId" class="clerk-obj-li"> <li v-for="(clerk, index) in scope.row.clerks" :key="clerk.employeeClerkId" class="clerk-obj-li">
<div class="clerk-name clerk-cell"> <div class="clerk-name clerk-cell">
<el-radio :value="1" :label="clerk.isManager" @change="changeManager(scope.row, clerk)">{{ clerk.name }}</el-radio> <el-radio :value="1" :label="clerk.isManager"
><span style="display: inline-block" @click="changeManager(scope.row, clerk)">{{ clerk.name }}</span></el-radio
>
<span class="manager" v-if="clerk.isManager == 1">店长</span> <span class="manager" v-if="clerk.isManager == 1">店长</span>
</div> </div>
<div class="clerk-cell clerk-phone">{{ clerk.nationcode == '86' ? clerk.phoneNumber : '+' + clerk.nationcode + '-' + clerk.phoneNumber }}</div> <div class="clerk-cell clerk-phone">{{ clerk.nationcode == '86' ? clerk.phoneNumber : '+' + clerk.nationcode + '-' + clerk.phoneNumber }}</div>
...@@ -180,6 +182,9 @@ export default { ...@@ -180,6 +182,9 @@ export default {
*/ */
changeManager(row, clerk) { changeManager(row, clerk) {
let that = this; let that = this;
if (clerk.isManager == 1) {
return false;
}
that that
.$confirm('确定设置为店长?', '提示', { .$confirm('确定设置为店长?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
...@@ -275,7 +280,7 @@ export default { ...@@ -275,7 +280,7 @@ export default {
let params = { let params = {
groupId: that.clerkStoreId, groupId: that.clerkStoreId,
type: that.storeType || '', type: that.storeType || '',
status: that.storeStatus || '', activationStatus: that.activationStatus || '',
showChild: !!that.showChildMember ? 1 : 0 showChild: !!that.showChildMember ? 1 : 0
}; };
postExcel('/haoban-manage-web/store/clerk-batch-export', params) postExcel('/haoban-manage-web/store/clerk-batch-export', params)
......
src/components/employeeRecord/employeeList.vue
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<span class="demonstration">离职日期</span> <span class="demonstration">离职日期</span>
<el-date-picker v-model="fireDate" type="daterange" align="right" value-format="yyyy-MM-dd" unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="selectDate" :picker-options="pickerOptions2"> </el-date-picker> <el-date-picker v-model="fireDate" type="daterange" align="right" value-format="yyyy-MM-dd" unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="selectDate" :picker-options="pickerOptions2"> </el-date-picker>
</div> </div>
<el-input v-model="searchParam" placeholder="请输入姓名/手机号/员工code" style="width: 218px;margin-left:10px;" @keyup.enter.native="searchFn" clearable @clear="searchFn"></el-input> <el-input v-model="searchParam" placeholder="请输入姓名/手机号/员工code" style="width: 240px;margin-left:10px;" @keyup.enter.native="searchFn" clearable @clear="searchFn"></el-input>
</div> </div>
<el-button type="primary" @click="showExportSet"><i class="iconfont icon-icon_yunxiazai p-r-6"></i>导出</el-button> <el-button type="primary" @click="showExportSet"><i class="iconfont icon-icon_yunxiazai p-r-6"></i>导出</el-button>
</div> </div>
......
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