Commit 54b8f717 authored by zhanglw's avatar zhanglw

修复bug

parent 77350747
...@@ -238,7 +238,7 @@ function CRUD(options) { ...@@ -238,7 +238,7 @@ function CRUD(options) {
if (!valid) { if (!valid) {
return return
} }
if (!callVmHook(crud, CRUD.HOOK.afterValidateCU)) { if (!callVmHook(crud, CRUD.HOOK.afterValidateCU)) {
return return
} }
...@@ -311,12 +311,16 @@ function CRUD(options) { ...@@ -311,12 +311,16 @@ function CRUD(options) {
if (!delAll) { if (!delAll) {
dataStatus.delete = CRUD.STATUS.PROCESSING dataStatus.delete = CRUD.STATUS.PROCESSING
} }
return crud.crudMethod.del(ids).then(() => { return crud.crudMethod.del(ids).then((res) => {
if (delAll) { if (delAll) {
crud.delAllLoading = false crud.delAllLoading = false
} else dataStatus.delete = CRUD.STATUS.PREPARED } else {
dataStatus.delete = CRUD.STATUS.PREPARED
}
crud.dleChangePage(1) crud.dleChangePage(1)
crud.delSuccessNotify() if(!res.status){
crud.delSuccessNotify()
}
callVmHook(crud, CRUD.HOOK.afterDelete, data) callVmHook(crud, CRUD.HOOK.afterDelete, data)
crud.refresh() crud.refresh()
}).catch(() => { }).catch(() => {
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
实际产出:<span style="font-size:18px;font-weight:400;color:#356eec">{{ day.totalProduce }}</span><br> 实际产出:<span style="font-size:18px;font-weight:400;color:#356eec">{{ day.totalProduce }}</span><br>
</div> </div>
</div> </div>
<div style="width:100%;font-size:12px;padding-left:5px;">采点分配概览:</div> <!-- <div style="width:100%;font-size:12px;padding-left:5px;">采点分配概览:</div>-->
<div class="fbListBox"> <div class="fbListBox">
<div v-for="item in day.sumList" :style="{width:item.pv+'%',height:'2px',margin:'2px',background:'#8fbc8f'}"> <div v-for="item in day.sumList" :style="{width:item.pv+'%',height:'2px',margin:'2px',background:'#8fbc8f'}">
<div :style="{width:item.av+'%',height:'2px',background:'#00a0e9'}"></div> <div :style="{width:item.av+'%',height:'2px',background:'#00a0e9'}"></div>
...@@ -157,8 +157,12 @@ export default { ...@@ -157,8 +157,12 @@ export default {
}, },
submitPlanView(){ submitPlanView(){
const This = this; const This = this;
this.planSDate = this.planSDate.toJSON?this.planSDate.toJSON().substr(0,10):this.planSDate; let d = new Date(this.planSDate);
this.planEDate = this.planEDate.toJSON?this.planEDate.toJSON().substr(0,10):this.planEDate; // this.planSDate = this.planSDate.toJSON?this.planSDate.toJSON().substr(0,10):this.planSDate;
// this.planEDate = this.planEDate.toJSON?this.planEDate.toJSON().substr(0,10):this.planEDate;
this.planSDate=`${d.getFullYear()}-${('0' + (d.getMonth() + 1)).substr(-2)}-${('0' + (d.getDate())).substr(-2)}`;
d = new Date(this.planEDate);
this.planEDate=`${d.getFullYear()}-${('0' + (d.getMonth() + 1)).substr(-2)}-${('0' + (d.getDate())).substr(-2)}`;
if(this.planSDate>this.planEDate){ if(this.planSDate>this.planEDate){
This.$notify({ This.$notify({
title: '注意:计划开始时间不能大于结束时间!', title: '注意:计划开始时间不能大于结束时间!',
......
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