Skip to content

H
haoban-3
Commit dca1bdc1 by fairyly
Options

fix: 修改接口

parent 3c474d14
Showing with 76 additions and 29 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.ae4163de1639f3da092a3eae6275c20d.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.95d3f6e785589194ab2b.js></script><script type=text/javascript src=./static/js/vendor.2cff6c68669f76f7bb26.js></script><script type=text/javascript src=./static/js/app.4ad545414a2bd6f8aef7.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.22658b4a1e557461fb3e18f6fb227255.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.79dd755af0a2a9561ab9.js></script><script type=text/javascript src=./static/js/vendor.2cff6c68669f76f7bb26.js></script><script type=text/javascript src=./static/js/app.4ad545414a2bd6f8aef7.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/css/app.22658b4a1e557461fb3e18f6fb227255.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.ae4163de1639f3da092a3eae6275c20d.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.785eef5b66707ef6f90b.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.ffd68481b94b1600361d.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/3.dae2125b16d290c1fb11.js → dist/static/js/3.20d1761e07019549d17c.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.95d3f6e785589194ab2b.js → dist/static/js/manifest.79dd755af0a2a9561ab9.js
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,o){for(var f,d,i,u=0,b=[];u<r.length;u++)d=r[u],t[d]&&b.push(t[d][0]),t[d]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,o);b.length;)b.shift()();if(o)for(u=0;u<o.length;u++)i=c(c.s=o[u]);return i};var r={},t={21:0};function c(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,c),t.l=!0,t.exports}c.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,c){n=t[e]=[r,c]});n[2]=r;var a=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,c.nc&&o.setAttribute("nonce",c.nc),o.src=c.p+"static/js/"+e+"."+{0:"dd15fc8f789c4a23939c",1:"9a1776fdc262362d75b8",2:"785eef5b66707ef6f90b",3:"dae2125b16d290c1fb11",4:"397d2b5066a8e689096c",5:"afc7b726a46486df899a",6:"9e12ea68528f2ad5f9a5",7:"4c95fe66c59573d7da03",8:"c2a3c1c2b9ffb4687826",9:"4b8efecc95608bc88200",10:"9c5ebbe659b7a663ddb3",11:"29941951e052f4942eca",12:"c95e6e2e763aa2d73679",13:"610798bb673465353c40",14:"5d02db8ed545dbc606d9",15:"b2964c8a20328a2a5e5f",16:"188fa59e318626239ae8",17:"51b70d6c25a1be5ec7ba",18:"b918fbf8403d96eac90a"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=d,a.appendChild(o),r},c.m=e,c.c=r,c.d=function(e,n,r){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},c.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(n,"a",n),n},c.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},c.p="./",c.oe=function(e){throw console.error(e),e}}([]); !function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,a){for(var f,d,i,u=0,b=[];u<r.length;u++)d=r[u],t[d]&&b.push(t[d][0]),t[d]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(n&&n(r,o,a);b.length;)b.shift()();if(a)for(u=0;u<a.length;u++)i=c(c.s=a[u]);return i};var r={},t={21:0};function c(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,c),t.l=!0,t.exports}c.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,c){n=t[e]=[r,c]});n[2]=r;var o=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,c.nc&&a.setAttribute("nonce",c.nc),a.src=c.p+"static/js/"+e+"."+{0:"dd15fc8f789c4a23939c",1:"9a1776fdc262362d75b8",2:"ffd68481b94b1600361d",3:"20d1761e07019549d17c",4:"397d2b5066a8e689096c",5:"afc7b726a46486df899a",6:"9e12ea68528f2ad5f9a5",7:"4c95fe66c59573d7da03",8:"c2a3c1c2b9ffb4687826",9:"4b8efecc95608bc88200",10:"9c5ebbe659b7a663ddb3",11:"29941951e052f4942eca",12:"c95e6e2e763aa2d73679",13:"610798bb673465353c40",14:"5d02db8ed545dbc606d9",15:"b2964c8a20328a2a5e5f",16:"188fa59e318626239ae8",17:"51b70d6c25a1be5ec7ba",18:"b918fbf8403d96eac90a"}[e]+".js";var f=setTimeout(d,12e4);function d(){a.onerror=a.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=d,o.appendChild(a),r},c.m=e,c.c=r,c.d=function(e,n,r){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},c.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(n,"a",n),n},c.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},c.p="./",c.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file \ No newline at end of file
src/components/company/contact-tree.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-08-14 16:51:07 * @Date: 2019-08-14 16:51:07
* @LastEditors : 无尘 * @LastEditors : 无尘
* @LastEditTime : 2020-02-20 14:43:35 * @LastEditTime : 2020-02-20 19:37:19
--> -->
<!-- <!--
<contact-tree :itemData="itemData" v-model="itemData" ></contact-tree> <contact-tree :itemData="itemData" v-model="itemData" ></contact-tree>
...@@ -80,7 +80,7 @@ export default { ...@@ -80,7 +80,7 @@ export default {
const that = this; const that = this;
// console.log(item); // console.log(item);
item.expand = item.expand ? false : true; item.expand = item.expand ? false : true;
if (!item.children.length) { if (item.isStore == 0 && !item.children.length) {
item.children = await that.getChildData(item); item.children = await that.getChildData(item);
} }
if (item.expand) { if (item.expand) {
...@@ -111,19 +111,18 @@ export default { ...@@ -111,19 +111,18 @@ export default {
keyword: '' // keyword: '' //
}; };
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
getRequest('/haoban-manage3-web/department-list', para) getRequest('/haoban-manage3-web/department-list-level', para)
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
if (resData.result.list.length) { if (resData.result.length) {
resData.result.list.forEach(ele => { resData.result.forEach(ele => {
ele.expand = false; ele.expand = false;
ele.children = []; ele.children = [];
ele.label = ele.departmentName; ele.label = ele.departmentName;
}); });
} }
resolve(resData.result.list || []); resolve(resData.result || []);
return false; return false;
} }
resolve([]); resolve([]);
......
src/components/company/depart-list.vue
...@@ -3,16 +3,16 @@ ...@@ -3,16 +3,16 @@
* @Author : 无尘 * @Author : 无尘
* @Date : 2020-02-13 14:02:22 * @Date : 2020-02-13 14:02:22
* @LastEditors : 无尘 * @LastEditors : 无尘
* @LastEditTime : 2020-02-19 15:34:38 * @LastEditTime : 2020-02-20 17:05:33
* @FilePath : \Hapi-demoj:\公司\haoban-3\src\components\company\depart-list.vue * @FilePath : \Hapi-demoj:\公司\haoban-3\src\components\company\depart-list.vue
--> -->
<!-- <!--
<depart-list :departObj="departObj" @resetData="resetData"></depart-list> <depart-list :departObj="departObj" @resetData="resetData" @addDepart="addDepart"></depart-list>
import departList from '@/components/company/depart-list.vue'; import departList from '@/components/company/depart-list.vue';
--> -->
<template> <template>
<div class="depart-list-body"> <div class="depart-list-body">
<div class="depart-name-wrap"> <div class="depart-name-wrap m-b-20">
<div class="depart-name"> <div class="depart-name">
<span class="font-16 color-303133 font-w-600">{{ departObj.departmentName }}</span> <span class="font-16 color-303133 font-w-600">{{ departObj.departmentName }}</span>
<el-popover placement="top" style="min-width: 192px" v-model="nameVisible"> <el-popover placement="top" style="min-width: 192px" v-model="nameVisible">
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<span slot="reference"><span class="cursor-pointer iconfont iconchangyongicon- color-909399"></span></span> <span slot="reference"><span class="cursor-pointer iconfont iconchangyongicon- color-909399"></span></span>
</el-popover> </el-popover>
</div> </div>
<div class="depart-id font-12 color-909399">门店 code：{{ departObj.departmentId }}</div> <div class="depart-id font-12 color-909399">ID：{{ departObj.departmentId }}</div>
</div> </div>
<div class="depart-children-list border-box m-t-18"> <div class="depart-children-list border-box m-t-18">
<div class="depart-children-title"><span class="iconfont iconbumen color-303133"></span><span class="font-16 color-303133 font-w-600 p-l-5">下级部门</span></div> <div class="depart-children-title"><span class="iconfont iconbumen color-303133"></span><span class="font-16 color-303133 font-w-600 p-l-5">下级部门</span></div>
...@@ -128,17 +128,50 @@ export default { ...@@ -128,17 +128,50 @@ export default {
that.departmentName = ''; that.departmentName = '';
that.nameVisible = false; that.nameVisible = false;
}, },
toMod() { async toMod() {
const that = this; const that = this;
if (!that.departmentName) { if (!that.departmentName) {
showMsg.showmsg('请输入部门名称！', 'warning'); showMsg.showmsg('请输入部门名称！', 'warning');
return false; return false;
} }
let obj = JSON.parse(JSON.stringify(that.departObj)); // let obj = JSON.parse(JSON.stringify(that.departObj));
obj.departmentName = that.departmentName; // obj.departmentName = that.departmentName;
that.$emit('resetData', obj); const flag = await that.postMod();
if (!flag) {
return false;
}
that.$emit('resetData', that.departmentName);
that.nameVisible = false; that.nameVisible = false;
}, },
postMod() {
const that = this;
let params = {
parentId: that.departObj.parentDepartmentId,
departmentId: that.departObj.departmentId,
departmentName: that.departmentName
};
return new Promise((resolve, reject) => {
postRequest('/haoban-manage3-web/department-edit', params)
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
resolve(true);
showMsg.showmsg('修改成功！', 'success');
return false;
}
resolve(false);
errMsg.errorMsg(resData);
})
.catch(function(error) {
resolve(false);
that.$message.error({
duration: 1000,
message: error.message
});
});
});
},
/** /**
* 输入 * 输入
...@@ -198,7 +231,7 @@ export default { ...@@ -198,7 +231,7 @@ export default {
const that = this; const that = this;
let params = { let params = {
parentId: that.departObj.departmentId, parentId: that.departObj.departmentId,
departmentName: that.form.departmentName departmentName: that.partForm.departmentName
}; };
postRequest('/haoban-manage3-web/department-add', params) postRequest('/haoban-manage3-web/department-add', params)
.then(res => { .then(res => {
...@@ -290,6 +323,9 @@ export default { ...@@ -290,6 +323,9 @@ export default {
} }
.depart-list-body { .depart-list-body {
.depart-id {
margin-top: 2px;
}
.depart-children-list { .depart-children-list {
padding: 16px 10px; padding: 16px 10px;
background: #f5f7fa; background: #f5f7fa;
......
src/components/company/store-member.vue
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<div class="depart-name"> <div class="depart-name">
<span class="font-16 color-303133 font-w-600">{{ departObj.departmentName }}</span> <span class="font-16 color-303133 font-w-600">{{ departObj.departmentName }}</span>
</div> </div>
<div class="depart-id font-12 color-909399">{{ departObj.departmentId }}</div> <div class="depart-id font-12 color-909399">门店code：{{ departObj.departmentId }}</div>
</div> </div>
<div class="depart-children-list m-t-20"> <div class="depart-children-list m-t-20">
<div class="depart-children-title"><span class="iconfont iconchengyuan color-303133"></span><span class="font-16 color-303133 font-w-600 p-l-5">门店成员</span></div> <div class="depart-children-title"><span class="iconfont iconchengyuan color-303133"></span><span class="font-16 color-303133 font-w-600 p-l-5">门店成员</span></div>
......
src/views/business/contacts.vue
...@@ -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 : 2020-02-20 14:52:09 * @LastEditTime : 2020-02-20 16:34:51
--> -->
<template> <template>
<div class="contacts-wrap common-set-wrap"> <div class="contacts-wrap common-set-wrap">
...@@ -99,6 +99,15 @@ export default { ...@@ -99,6 +99,15 @@ export default {
computed: {}, computed: {},
methods: { methods: {
/** /**
* 修改部门名称触发
*/
resetData(name) {
const that = this;
that.selectData.departmentName = name;
that.departObj.departmentName = name;
},
/**
* 组织架构管理 * 组织架构管理
*/ */
toManage() { toManage() {
...@@ -106,6 +115,7 @@ export default { ...@@ -106,6 +115,7 @@ export default {
that.$router.push('/orgStructSet'); that.$router.push('/orgStructSet');
}, },
/** /**
* 每次选中一个树中节点，把当前数据返回，
* 获取选中部门/门店数据 * 获取选中部门/门店数据
*/ */
getSelectData(obj) { getSelectData(obj) {
...@@ -113,6 +123,7 @@ export default { ...@@ -113,6 +123,7 @@ export default {
// console.log(obj); // console.log(obj);
// obj.label = '测试'; // obj.label = '测试';
that.selectData = obj; that.selectData = obj;
that.departObj = obj;
}, },
/** /**
* 路由跳转 * 路由跳转
...@@ -145,18 +156,19 @@ export default { ...@@ -145,18 +156,19 @@ export default {
isStore: 0, // 当前页 isStore: 0, // 当前页
parentId: '' // 一页显示个数 parentId: '' // 一页显示个数
}; };
getRequest('/haoban-manage3-web/department-list', para) getRequest('/haoban-manage3-web/department-list-level', para)
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
if (!!resData.result.list && resData.result.list.length) { if (!!resData.result && resData.result.length) {
resData.result.list.forEach(ele => { resData.result.forEach(ele => {
ele.expand = false; ele.expand = false;
ele.children = []; ele.children = [];
ele.label = ele.departmentName; ele.label = ele.departmentName;
}); });
} }
that.wxData = resData.result.list || []; that.wxData = resData.result || [];
// console.log(that.wxData);
return false; return false;
} }
errMsg.errorMsg(resData); errMsg.errorMsg(resData);
......
src/views/business/orgStructSet.vue
...@@ -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 : 2020-02-20 10:01:12 * @LastEditTime : 2020-02-20 16:05:41
--> -->
<template> <template>
<div class="my-customer-wrap common-set-wrap"> <div class="my-customer-wrap common-set-wrap">
...@@ -156,11 +156,11 @@ export default { ...@@ -156,11 +156,11 @@ export default {
wxEnterpriseId: item.wxEnterpriseId, // wxEnterpriseId: item.wxEnterpriseId, //
version: item.version version: item.version
}; };
getRequest('/haoban-manage3-web/wx-enterprise-bind', para) getRequest('/haoban-manage3-web/unbind-department-list', para)
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
that.tableData = resData.result.list || []; that.gicData = resData.result.list || [];
return false; return false;
} }
errMsg.errorMsg(resData); errMsg.errorMsg(resData);
......
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