Commit bd009714 by fairyly

fix: 修改接口

parent c6ba86cc
<!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.deb5ed2dec3c70981224607519b2c068.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.651e7320353bc151ec04.js></script><script type=text/javascript src=./static/js/vendor.74aa0a1e6f16f3fa6e13.js></script><script type=text/javascript src=./static/js/app.fe2c173d5100cf1457ea.js></script></body></html>
\ No newline at end of file
<!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.93d0a30762f971c735c49c4dad48f3da.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.700819f272e905aa7254.js></script><script type=text/javascript src=./static/js/vendor.74aa0a1e6f16f3fa6e13.js></script><script type=text/javascript src=./static/js/app.99808e71ca29e4f28ade.js></script></body></html>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
!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],d[t]&&u.push(d[t][0]),d[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=f(f.s=n[i]);return o};var c={},d={58:0};function f(a){if(c[a])return c[a].exports;var d=c[a]={i:a,l:!1,exports:{}};return e[a].call(d.exports,d,d.exports,f),d.l=!0,d.exports}f.e=function(e){var a=d[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,f){a=d[e]=[c,f]});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,f.nc&&n.setAttribute("nonce",f.nc),n.src=f.p+"static/js/"+e+"."+{0:"b89d55a821e058e442e6",1:"d0085d480a91874b22b9",2:"7da0edead0a41264f643",3:"982b9d8b54d1e3026574",4:"2b7439800676f0a08efe",5:"9419cb558fb17180b897",6:"1652b797b42aff4d8fa7",7:"a503f0226879ce6761e9",8:"56d34d3d5e0cd8d49ef8",9:"f5d07f82245c910a4f5c",10:"1535250b4a5651bb7107",11:"f9e9346337a76aa24154",12:"7e71a8f1716a9509b3ab",13:"a0fd8ec56e220b02ce56",14:"0212bcf7eec0cbbfeff9",15:"077d072d7d6111724b5c",16:"303ce62730727c639a9a",17:"b0388162acfec78199c5",18:"945bdf7e2e8dfa6e4a77",19:"73c4b497781002da7c14",20:"254d1e3881312f11913a",21:"6642c494272c09edb15f",22:"5f6b2941759798d0b7cd",23:"625e2fda7003ebaabc5b",24:"30d93c7efdf57c76b10f",25:"db198c98626c54aa65c5",26:"5b2aa2e605354e980cb4",27:"e401a20804ba96c7aa0e",28:"eceb67d553b28740da67",29:"edbb76c5b6c294e1cdd4",30:"cea1178db76af32d35bb",31:"4f03e5fe15199de55246",32:"22fcab94d4b8d6c87e72",33:"ce60b73928c3efb457aa",34:"1fe9298f420b5ce2461a",35:"4a15da14c5a042b2d797",36:"ade76cb00edeacc12428",37:"b51ae44ee9de580b4465",38:"11fa4a08a95df9d72fdb",39:"7dfcaaab2bdeab04f8e8",40:"6b5d65f44a4e41b22884",41:"90b7ef55e72733928087",42:"2cfce841db9441d2c3d5",43:"cdc1add10cb6ff87d206",44:"730cbc4fc2d8db734d3b",45:"7f089f6c7c5949d2c388",46:"b346043383a87073ba59",47:"ad5e2fbda1bf611c49c8",48:"649482d5d895c8a20723",49:"97bb2c21e5988f7d8d6a",50:"7c8279ef4aa549e52821",51:"7fcbc515e6f85be020f9",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 a=d[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),c},f.m=e,f.c=c,f.d=function(e,a,c){f.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},f.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(a,"a",a),a},f.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},f.p="./",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,f,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],d[t]&&u.push(d[t][0]),d[t]=0;for(r in f)Object.prototype.hasOwnProperty.call(f,r)&&(e[r]=f[r]);for(c&&c(a,f,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var a={},d={58:0};function b(c){if(a[c])return a[c].exports;var d=a[c]={i:c,l:!1,exports:{}};return e[c].call(d.exports,d,d.exports,b),d.l=!0,d.exports}b.e=function(e){var c=d[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,b){c=d[e]=[a,b]});c[2]=a;var f=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+e+"."+{0:"b89d55a821e058e442e6",1:"d0085d480a91874b22b9",2:"7da0edead0a41264f643",3:"982b9d8b54d1e3026574",4:"2b7439800676f0a08efe",5:"d57d993d10aade6bcbce",6:"cf8a1b04ed1e50b9b566",7:"f8bb22e8f029fd6f6dc1",8:"978299e0317ce032bfd4",9:"f5d07f82245c910a4f5c",10:"1535250b4a5651bb7107",11:"f9e9346337a76aa24154",12:"7e71a8f1716a9509b3ab",13:"a0fd8ec56e220b02ce56",14:"0212bcf7eec0cbbfeff9",15:"077d072d7d6111724b5c",16:"303ce62730727c639a9a",17:"b0388162acfec78199c5",18:"945bdf7e2e8dfa6e4a77",19:"73c4b497781002da7c14",20:"254d1e3881312f11913a",21:"6642c494272c09edb15f",22:"5f6b2941759798d0b7cd",23:"625e2fda7003ebaabc5b",24:"30d93c7efdf57c76b10f",25:"db198c98626c54aa65c5",26:"5b2aa2e605354e980cb4",27:"e401a20804ba96c7aa0e",28:"eceb67d553b28740da67",29:"edbb76c5b6c294e1cdd4",30:"cea1178db76af32d35bb",31:"4f03e5fe15199de55246",32:"22fcab94d4b8d6c87e72",33:"ce60b73928c3efb457aa",34:"1fe9298f420b5ce2461a",35:"4a15da14c5a042b2d797",36:"ade76cb00edeacc12428",37:"b51ae44ee9de580b4465",38:"11fa4a08a95df9d72fdb",39:"7dfcaaab2bdeab04f8e8",40:"6b5d65f44a4e41b22884",41:"90b7ef55e72733928087",42:"2cfce841db9441d2c3d5",43:"cdc1add10cb6ff87d206",44:"730cbc4fc2d8db734d3b",45:"7f089f6c7c5949d2c388",46:"b346043383a87073ba59",47:"ad5e2fbda1bf611c49c8",48:"649482d5d895c8a20723",49:"97bb2c21e5988f7d8d6a",50:"7c8279ef4aa549e52821",51:"7fcbc515e6f85be020f9",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=d[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return n.onerror=n.onload=t,f.appendChild(n),a},b.m=e,b.c=a,b.d=function(e,c,a){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="./",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
......@@ -100,7 +100,7 @@ export default {
checkParent(obj) {
const that = this;
console.log(that.itemObj, obj);
console.log('检查父级:', that.itemObj, obj);
},
/**
* 触发父级
......@@ -156,8 +156,9 @@ export default {
// 判断中间是否存在父级
console.log(evt, originalEvent);
console.log(that.itemObj, that.itemData);
console.log('move:', that.itemObj, that.itemData);
if (!that.itemObj.children.length) {
that.$set(that.itemObj, 'hasSonNode', false);
that.itemObj.hasSonNode = false;
}
// 为了改变level
......
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2018-10-10 14:44:45
* @LastEditors : 无尘
* @LastEditTime : 2020-03-31 09:41:04
* @LastEditTime : 2020-03-31 10:24:03
-->
<template>
<div class="reviewed-wrap common-set-wrap">
......@@ -44,17 +44,17 @@
{{ scope.row.commitStaffName }}
<i :class="[scope.row.sex == 2 ? 'icon-xingbienv color-FF585C' : 'icon-xingbienan color-508CEE', 'iconfont']"></i>
</div>
<div class="apply-info-code">
<!-- <div class="apply-info-code">
<span class="w-80">员工代码:</span><span class="w-130">{{ scope.row.code }}</span>
</div>
<div class="apply-info-phone">
</div> -->
<!-- <div class="apply-info-phone">
<span class="w-80">手机号:</span><span class="w-130">{{ scope.row.nationcode == '86' ? scope.row.phoneNumber : '+' + scope.row.nationcode + '-' + scope.row.phoneNumber }}</span>
</div>
<div class="apply-info-job">
<span class="w-80">职位:</span><span class="w-130">{{ scope.row.positionName }}</span>
</div>
</div> -->
<div class="apply-info-store">
<span class="w-80">所属门店</span><span class="w-130">{{ scope.row.commitStoreName }}</span>
<span class="w-80">所属部门</span><span class="w-130">{{ scope.row.commitStoreName }}</span>
</div>
</div>
</div>
......@@ -75,8 +75,8 @@
</el-table-column>
<el-table-column label="详情" show-overflow-tooltip>
<template slot-scope="scope">
<span v-if="scope.row.auditType != 0 || (scope.row.auditType == 0 && scope.row.auditingUpdateType != 1)">{{ scope.row.detail }}</span>
<div class="line-hidden-2" v-if="scope.row.auditingUpdateType == 1">
<span v-if="scope.row.auditType != 1">{{ scope.row.detail }}</span>
<div class="line-hidden-2" v-if="scope.row.auditType == 1">
<!-- <span> {{ scope.row.auditType == 0? '门店信息变更': scope.row.auditType == 0? '新增成员': '成员离职'}}</span> -->
<span>{{ scope.row.detail }}</span>
<el-button type="text" @click="showStoreChange(scope.row)">查看详情</el-button>
......@@ -264,8 +264,8 @@ export default {
};
that.showStoreDialog = true;
that.storeChangeData = {
beforeContent: item.beforeContent != '' ? JSON.parse(item.beforeContent) : [],
afterContent: item.afterContent != '' ? JSON.parse(item.afterContent) : []
beforeContent: item.oldValue != '' ? JSON.parse(item.oldValue) : [],
afterContent: item.newValue != '' ? JSON.parse(item.newValue) : []
};
},
/**
......
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2018-10-10 14:44:45
* @LastEditors : 无尘
* @LastEditTime : 2020-03-31 09:47:33
* @LastEditTime : 2020-03-31 10:23:27
-->
<template>
<div class="unreview-wrap common-set-wrap">
......@@ -48,17 +48,17 @@
{{ scope.row.commitStaffName }}
<i :class="[scope.row.sex == 2 ? 'icon-xingbienv color-FF585C' : 'icon-xingbienan color-508CEE', 'iconfont']"></i>
</div>
<div class="apply-info-code">
<!-- <div class="apply-info-code">
<span class="w-80">员工代码:</span><span class="w-130">{{ scope.row.code }}</span>
</div>
<div class="apply-info-phone">
</div> -->
<!-- <div class="apply-info-phone">
<span class="w-80">手机号:</span><span class="w-130">{{ scope.row.nationcode == '86' ? scope.row.phoneNumber : '+' + scope.row.nationcode + '-' + scope.row.phoneNumber }}</span>
</div>
<div class="apply-info-job">
<span class="w-80">职位:</span><span class="w-130">{{ scope.row.positionName }}</span>
</div>
</div> -->
<div class="apply-info-store">
<span class="w-80">所属门店</span><span class="w-130">{{ scope.row.commitStoreName }}</span>
<span class="w-80">所属部门</span><span class="w-130">{{ scope.row.commitStoreName }}</span>
</div>
</div>
</div>
......@@ -79,8 +79,8 @@
</el-table-column>
<el-table-column label="详情" show-overflow-tooltip>
<template slot-scope="scope">
<span v-if="scope.row.auditType != 0 || (scope.row.auditType == 0 && scope.row.auditUpdateType != 1)">{{ scope.row.detail }}</span>
<div class="line-hidden-2" v-if="scope.row.auditUpdateType == 1">
<span v-if="scope.row.auditType != 1">{{ scope.row.detail }}</span>
<div class="line-hidden-2" v-if="scope.row.auditType == 1">
<!-- <span> {{ scope.row.auditType == 0? '门店信息变更': scope.row.auditType == 0? '新增成员': '成员离职'}}</span> -->
<span>{{ scope.row.detail }}</span>
<el-button type="text" @click="showStoreChange(scope.row)">查看详情</el-button>
......@@ -457,8 +457,8 @@ export default {
};
that.showStoreDialog = true;
that.storeChangeData = {
beforeContent: item.beforeContent != '' ? JSON.parse(item.beforeContent) : [],
afterContent: item.afterContent != '' ? JSON.parse(item.afterContent) : []
beforeContent: item.oldValue != '' ? JSON.parse(item.oldValue) : [],
afterContent: item.newValue != '' ? JSON.parse(item.newValue) : []
};
},
/**
......
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