-
diff --git a/src/views/modules/base/calendar.vue b/src/views/modules/base/calendar.vue
new file mode 100644
index 0000000..b94af77
--- /dev/null
+++ b/src/views/modules/base/calendar.vue
@@ -0,0 +1,1176 @@
+
+
-
{
if (data && data.code === 0) {
+ this.scheduledModelData.schedulingSize = data.schedulingSize
+ this.scheduledModelData.unSchedulingSize = this.scheduledingData.lotSize - data.schedulingSize
+ let data1 = {orderNo: this.scheduledModelData.orderNo}
+ getWorkPlanData(data1).then(({data}) => {
+ this.scheduleTableData = data.rows
+ })
+ this.scheduledingData.orderDate = this.getNextDay(this.scheduledingData.orderDate)
+ this.getData()
getShiftData().then(({data}) => {
this.shiftData = data.rows
})
@@ -660,36 +668,45 @@
}
})
},
- savePlansModal(){
- if(this.dataListSelections.length ==0){
+ savePlansModal () {
+ if (this.dataListSelections.length == 0) {
this.$alert('请选择订单！', '错误', {
confirmButtonText: '确定'
})
return false
}
- this.schedulingModalData.orderDate='';
- this.schedulingModalData.shiftId='';
- this.savePlansModalFlag=true;
+ this.schedulingModalData.orderDate = ''
+ this.schedulingModalData.shiftId = ''
+ this.savePlansModalFlag = true
},
- savePlans() {
- if( this.schedulingModalData.orderDate==''){
+ getNextDay (dateTime) {
+ var dd = new Date(dateTime)
+ dd.setDate(dd.getDate() + 1)//获取1天后的日期
+ var y = dd.getFullYear()
+ var m = (dd.getMonth() + 1) < 10 ? '0' + (dd.getMonth() + 1) : (dd.getMonth() + 1)//获取当前月份的日期，不足10补0
+ var d = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate()//获取当前几号，不足10补0
+ // let haha= new Date(y+"-"+m+"-"+d);
+ return y + '-' + m + '-' + d
+ },
+ savePlans () {
+ if (this.schedulingModalData.orderDate == '') {
this.$alert('请选择排产日期！', '错误', {
confirmButtonText: '确定'
})
return false
}
- if( this.schedulingModalData.shiftId==''){
+ if (this.schedulingModalData.shiftId == '') {
this.$alert('请选择班次！', '错误', {
confirmButtonText: '确定'
})
return false
}
- let inList=[];
- for(let i = this.dataListSelections.length - 1; i >= 0; i--){
- let newlist={
+ let inList = []
+ for (let i = this.dataListSelections.length - 1; i >= 0; i--) {
+ let newlist = {
orderNo: this.dataListSelections[i].orderNo,
orderDate: this.schedulingModalData.orderDate,
- orderQty: this.dataListSelections[i].lotSize-this.dataListSelections[i].schedulingSize,
+ orderQty: this.dataListSelections[i].lotSize - this.dataListSelections[i].schedulingSize,
shiftId: this.schedulingModalData.shiftId,
userName: this.$store.state.user.name,
lotSize: this.dataListSelections[i].lotSize,
@@ -698,14 +715,14 @@
site: this.$store.state.user.site,
productionType: '生产订单',
planAdd: 0,
- partNo: this.dataListSelections[i].partNo
- };
- inList.push(newlist);
+ partNo: this.dataListSelections[i].partNo
+ }
+ inList.push(newlist)
}
console.log(JSON.parse(JSON.stringify(inList)))
savePlans(JSON.parse(JSON.stringify(inList))).then(({data}) => {
if (data && data.code === 0) {
- this.savePlansModalFlag = false;
+ this.savePlansModalFlag = false
this.getData()
this.$message({
message: '操作成功',
diff --git a/src/views/modules/sys/shiftData.vue b/src/views/modules/sys/shiftData.vue
index d6f62a5..8694046 100644
--- a/src/views/modules/sys/shiftData.vue
+++ b/src/views/modules/sys/shiftData.vue
@@ -212,7 +212,6 @@ export default {
message: '操作成功',
type: 'success',
duration: 1500,
-
onClose: () => {
}
})
-
+
+
+
+
xujie-fast-vue
-xujie-fast-vue基于vue、element-ui构建开发，实现xujie-fast后台管理前端功能，提供一套更优的前端解决方案。
-管理员登录
+
+
+
+
+
+
+
+
+ {{'查询'}}
+ {{'新增工作日历'}}
+ {{'批量维护工作日历'}}
+
+ {{ buttons.download }}
+
+
+
+
+
+
+
+ {{scope.row[item.columnProp]}}
+ ![]()
+
+
+
+
+ 编辑
+ 工作日历例外
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 关闭
+
+
+
+
+
+
+
+
+
+
+ {{ buttons.download2 }}
+
+
+
+
+
+
+ {{scope.row[item.columnProp]}}
+ ![]()
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{'查询'}}
+ {{'保存日历'}}
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/base/calendarDatetype.vue b/src/views/modules/base/calendarDatetype.vue
new file mode 100644
index 0000000..3b50cb2
--- /dev/null
+++ b/src/views/modules/base/calendarDatetype.vue
@@ -0,0 +1,1057 @@
+
+
+
+
+
+ {{scope.row[item.columnProp]}}
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{buttons.newData}}
+ {{buttons.searchList}}
+
+ {{ buttons.download }}
+
+
+
+
+
+
+ 编辑
+ 删除
+ 班次信息
+
+
+
+
+ {{scope.row[item.columnProp]}}
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 关闭
+
+
+
+
+ 新增班次
+
+ {{ buttons.download2 }}
+
+
+
+
+
+ {{scope.row[item.columnProp]}}
+ ![]()
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 关闭
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/production/dailyPlan.vue b/src/views/modules/production/dailyPlan.vue
index 182d90d..afdc594 100644
--- a/src/views/modules/production/dailyPlan.vue
+++ b/src/views/modules/production/dailyPlan.vue
@@ -324,7 +324,7 @@