From 786e1baffb99aef7c8f62cfc5e4f660260923ace Mon Sep 17 00:00:00 2001 From: red-deng-deng <1924913374@qq.com> Date: Wed, 24 Nov 2021 17:08:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 5 + package.json | 1 + src/assets/api.js | 3 +- .../adddistributorinfo/adddistributorinfo.js | 2 +- src/pages/order/list/list.js | 113 ++++++++++-------- .../account/add/adduserinfo/adduserinfo.js | 1 + 6 files changed, 75 insertions(+), 50 deletions(-) diff --git a/package-lock.json b/package-lock.json index c69b12f3..b0fd7523 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10611,6 +10611,11 @@ "minimist": "^1.2.5" } }, + "moment": { + "version": "2.29.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", + "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==" + }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", diff --git a/package.json b/package.json index dbee28c3..c42f91b7 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "less-loader": "^4.1.0", "lodash": "^4.17.21", "mini-css-extract-plugin": "0.11.3", + "moment": "^2.29.1", "optimize-css-assets-webpack-plugin": "5.0.4", "pnp-webpack-plugin": "1.6.4", "postcss-flexbugs-fixes": "4.2.1", diff --git a/src/assets/api.js b/src/assets/api.js index 27b8a2ea..448e50a1 100644 --- a/src/assets/api.js +++ b/src/assets/api.js @@ -30,8 +30,7 @@ const upload = (method, url, params, responseType) => { } } let http = fetch(url, obj).then(res =>{ - window.timeshow=res.headers.get('Date-Time'); - return res.json() + return res.blob() } ); return http.then(response => response).catch(error => console.error('Error:', error)); } diff --git a/src/pages/distributor/adddistributorinfo/adddistributorinfo.js b/src/pages/distributor/adddistributorinfo/adddistributorinfo.js index 6c04a3d8..d20f4e95 100644 --- a/src/pages/distributor/adddistributorinfo/adddistributorinfo.js +++ b/src/pages/distributor/adddistributorinfo/adddistributorinfo.js @@ -227,7 +227,7 @@ export default class adduserinfo extends React.Component{ getPersonnel().then(res=>{ handelResponse(res,(response,msg)=>{ let personnelList=response.map(item=>{ - return {key:item.id,text:item.user_name} + return {key:item.id,text:item.real_name} }); _self.setState({personnelList}); },(err)=>{ diff --git a/src/pages/order/list/list.js b/src/pages/order/list/list.js index 8f07bf06..9a6ba744 100644 --- a/src/pages/order/list/list.js +++ b/src/pages/order/list/list.js @@ -10,10 +10,10 @@ import TabPage from "../../../components/tabPage/main.js" import Filterbar from "../../../components/filterbar/main.js" import menu from "../../../assets/enum.js" import { nowMonth, nowDay } from "../../../assets/comm.js"; -import {getOrderList,handelResponse,putOrderSuccess,putOrderCancel} from "../../../assets/api.js" -// var moment = require("moment"); -// let day = moment(nowDay()).format("YYYY-MM-DD"); -// let tomonth = moment(nowMonth()).format("YYYY-MM-DD"); +import {getOrderList,getOrderExport,handelResponse,putOrderSuccess,putOrderCancel} from "../../../assets/api.js" +var moment = require("moment"); +let day = moment(nowDay()).format("YYYY-MM-DD"); +let tomonth = moment(nowMonth()).format("YYYY-MM-DD"); const Column = [ { title: '订单号', @@ -135,6 +135,7 @@ export default class orderlist extends React.Component{ key_word:'', officialprice:0,contractprice:0,costprice:0,totalprice:0 } + this.onChangeCombinedDate=this.onChangeCombinedDate.bind(this); } //选中表格的选框 selection(selection){ @@ -193,8 +194,8 @@ export default class orderlist extends React.Component{ //导出订单 exportFn(){ let _self=this; - let {page,limit,key_word}=_self.state; - let data={page,limit} + let {key_word}=_self.state; + let data={} if(this.state.combinedValue&&this.state.combinedValue[0]){ data.begin_time=this.state.combinedValue[0]; data.end_time=this.state.combinedValue[1]; @@ -209,12 +210,29 @@ export default class orderlist extends React.Component{ title:'确认操作', content:

是否导出订单?

, onConfirm(){ - if(data.key_word){ - window.location.href=window.baseurl+'/order/export?page='+data.page+'&limit='+data.limit+'&key_word='+data.key_word; + getOrderExport(data).then(res=>{ + if(res.type=='application/json'){ + const reader = new FileReader(); //创建一个FileReader实例 + reader.readAsText(res, 'utf-8'); //读取文件,结果用字符串形式表示 + reader.onload=function(){ + const obj = JSON.parse(reader.result); + Notify.clear() + Notify.error(obj.message) + } }else{ - window.location.href=window.baseurl+'/order/export?page='+data.page+'&limit='+data.limit; + let bl = new Blob([res]); + console.log(bl); + let fileName = '订单管理'+_self.getnow()+ ".xlsx"; //设置文件名 + var link = document.createElement('a');//创建标签 + link.href = window.URL.createObjectURL(bl); + link.download = fileName;//下载的文件名 + link.click(); + window.URL.revokeObjectURL(link.href);//清除URL } + }).catch(err=>{ + }); }, + onCancel(){ console.log('点击了取消按钮'); }, @@ -222,8 +240,24 @@ export default class orderlist extends React.Component{ parentComponent: this }); } + //获取当前时间 + getnow() { + var now = new Date(); + var year = now.getFullYear(); + var month = + now.getMonth() + 1 <= 9 + ? "0" + (now.getMonth() + 1) + : now.getMonth() + 1; + var day = now.getDate() <= 9 ? "0" + now.getDate() : now.getDate(); + var tt = now.getHours() <= 9 ? "0" + now.getHours() : now.getHours(); + var mm = + now.getMinutes() <= 9 ? "0" + now.getMinutes() : now.getMinutes(); + var ss = + now.getSeconds() <= 9 ? "0" + now.getSeconds() : now.getSeconds(); + let datelist = [year, month, day, tt, mm, ss]; + return datelist.join(""); + } componentWillMount(){ - window.time='2021-11-14 15:02:02' this.setState({tableHeight:window.innerHeight-430}); } @@ -308,23 +342,7 @@ export default class orderlist extends React.Component{ this.setState({allcheck:false}) this.setState({itemcheck:false}) } - //获取当前时间 - getnow() { - var now = new Date(); - var year = now.getFullYear(); - var month = - now.getMonth() + 1 <= 9 - ? "0" + (now.getMonth() + 1) - : now.getMonth() + 1; - var day = now.getDate() <= 9 ? "0" + now.getDate() : now.getDate(); - var tt = now.getHours() <= 9 ? "0" + now.getHours() : now.getHours(); - var mm = - now.getMinutes() <= 9 ? "0" + now.getMinutes() : now.getMinutes(); - var ss = - now.getSeconds() <= 9 ? "0" + now.getSeconds() : now.getSeconds(); - let datelist = [year, month, day, tt, mm, ss]; - return datelist.join(""); -} + //选择时间 onChangeCombinedDate(e){ this.setState({combinedValue:e}); @@ -366,10 +384,9 @@ export default class orderlist extends React.Component{ data.key_word=key_word; } if(time&&time[0]==null&&time.length>1){ - if( data.begin_time){ - delete data.begin_time; - delete data.end_time; - } + delete data.begin_time; + delete data.end_time; + } getOrderList(data).then(res=>{ @@ -386,12 +403,12 @@ export default class orderlist extends React.Component{ }); } componentWillMount(){ - // let datetime = [ - // tomonth + " " + "00:00:00", - // day + " " + "23:59:59" - // ]; - // this.setState({combinedValue:datetime}); - this.getOrderFn(); + let datetime = [ + tomonth + " " + "00:00:00", + day + " " + "23:59:59" + ]; + this.setState({combinedValue:datetime}); + this.getOrderFn(datetime); } // 监听组件内部状态的变化: componentDidUpdate(prevProps,prevState){ @@ -403,16 +420,18 @@ componentDidUpdate(prevProps,prevState){ //过滤表格枚举状态 render(){ - const date = {this.onChangeCombinedDate(e)}} - /> + value={this.state.combinedValue} + showTime={{ + format: 'HH:mm:ss', + defaultTime: ['12:00:00', '23:59:59'], + }} + format="YYYY-MM-DD HH:mm:ss" + onChange={this.onChangeCombinedDate} + /> + + const { current, pageSize } = this.state; return(
@@ -421,7 +440,7 @@ componentDidUpdate(prevProps,prevState){

{/* */} - +

{/* */} diff --git a/src/pages/system/account/add/adduserinfo/adduserinfo.js b/src/pages/system/account/add/adduserinfo/adduserinfo.js index dc1c6bcc..472ce43b 100644 --- a/src/pages/system/account/add/adduserinfo/adduserinfo.js +++ b/src/pages/system/account/add/adduserinfo/adduserinfo.js @@ -196,6 +196,7 @@ export default class adduserinfo extends React.Component{ handelResponse(res,(response,msg)=>{ let departmentList=response.map(item=>{ return {key:item.id,text:item.department_name} + _self.setState({deparment:''}); }); _self.setState({departmentList}); },(err)=>{ From b32506ec68fb3dc7b1ac6001aa561f96ef59e43a Mon Sep 17 00:00:00 2001 From: red-deng-deng <1924913374@qq.com> Date: Wed, 24 Nov 2021 17:08:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=88=86=E9=94=80?= =?UTF-8?q?=E5=95=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/distributor/adddistributorinfo/adddistributorinfo.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/distributor/adddistributorinfo/adddistributorinfo.js b/src/pages/distributor/adddistributorinfo/adddistributorinfo.js index d20f4e95..cbdb2309 100644 --- a/src/pages/distributor/adddistributorinfo/adddistributorinfo.js +++ b/src/pages/distributor/adddistributorinfo/adddistributorinfo.js @@ -229,6 +229,7 @@ export default class adduserinfo extends React.Component{ let personnelList=response.map(item=>{ return {key:item.id,text:item.real_name} }); + _self.setState({personnelList}); },(err)=>{ From eb135e3457447dc35ea8b993a16e5dce46c835f9 Mon Sep 17 00:00:00 2001 From: red-deng-deng <1924913374@qq.com> Date: Wed, 24 Nov 2021 17:38:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=B2=97=E4=BD=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/add/adduserinfo/adduserinfo.js | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/pages/system/account/add/adduserinfo/adduserinfo.js b/src/pages/system/account/add/adduserinfo/adduserinfo.js index 472ce43b..a2b60716 100644 --- a/src/pages/system/account/add/adduserinfo/adduserinfo.js +++ b/src/pages/system/account/add/adduserinfo/adduserinfo.js @@ -38,6 +38,7 @@ export default class adduserinfo extends React.Component{ componentDidMount(e){ } componentWillMount(){ + console.log(this.state); let _self=this; let companys=JSON.parse(sessionStorage.getItem('company')); this.getCompanyFn();//获取公司 @@ -192,6 +193,13 @@ export default class adduserinfo extends React.Component{ }); //调部门的数据 if(e){ + let model3=this.state.model; + model3.deparment="" + model3.post="" + _self.setState({departmentList:[]}); + _self.setState({departmentJob:[]}); + _self.setState({model:model3}); + getDepartment({company_id:e.key}).then(res=>{ handelResponse(res,(response,msg)=>{ let departmentList=response.map(item=>{ @@ -206,6 +214,7 @@ export default class adduserinfo extends React.Component{ }); }else{ _self.setState({departmentList:[]}); + _self.setState({departmentJob:[]}); } }; onDepartmentChange(e){ @@ -223,6 +232,7 @@ export default class adduserinfo extends React.Component{ this.setState({ model:model2 }); + _self.setState({departmentJob:[]}); if(e){ //调岗位 getDepartmentJob({department_id:e.key}).then(res=>{ @@ -231,6 +241,9 @@ export default class adduserinfo extends React.Component{ return {key:item.id,text:item.job_name} }); _self.setState({departmentJob}); + let model3=this.state.model; + model3.post="" + _self.setState({model:model3}); },(err)=>{ }) @@ -302,6 +315,13 @@ export default class adduserinfo extends React.Component{ parentComponent: this }); } + // 监听组件内部状态的变化: +// componentDidUpdate(prevProps,prevState){ +// // 参数分别为改变之前的数据状态对象 +// if(prevState.department!=this.state.department){ +// this.setState({post:{}}); +// } +// } render(){ //校验规则 const rules = {