diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index ae2d244..0d86942 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -353,6 +353,7 @@ a:hover{ .inputTable input.el-input__inner { height: 14px !important; + border: 0px !important; } .inputTable .el-input--medium .el-input__icon { diff --git a/src/views/modules/base/calendar.vue b/src/views/modules/base/calendar.vue index f2d178b..400d6d8 100644 --- a/src/views/modules/base/calendar.vue +++ b/src/views/modules/base/calendar.vue @@ -72,7 +72,7 @@ - + @@ -410,6 +410,7 @@ }from "@/api/base.js" export default { name: "calendar", + data () { return { newShiftData:{ @@ -883,7 +884,7 @@ columnProp: "site", headerAlign: "center", align: "left", - columnLabel: "工厂编码", + columnLabel: "工厂编号", columnHidden: false, columnImage: false, columnSortable: false, @@ -968,6 +969,18 @@ if(localStorage.getItem('calendar')!=undefined){ this.jump(); } + }, + newCalendarData: { + deep: true, + handler: function (newV, oldV) { + this.newCalendarData.calendarId = this.newCalendarData.calendarId.toUpperCase() + } + }, + searchData: { + deep: true, + handler: function (newV, oldV) { + this.searchData.calendarId = this.searchData.calendarId.toUpperCase() + } } }, methods: { @@ -1010,6 +1023,25 @@ this.calendarModelFlag=true; }, calendarSave(){ + if(this.newCalendarData.site==''||this.newCalendarData.site==null){ + this.$alert("请输入工厂编号", '错误', { + confirmButtonText: '确定' + }) + return false; + } + if(this.newCalendarData.calendarId==''||this.newCalendarData.calendarId==null){ + this.$alert("请输入日历编号", '错误', { + confirmButtonText: '确定' + }) + return false; + } + if(this.newCalendarData.calendarId.length>4){ + this.$alert("日历编号最长4个字符！", '错误', { + confirmButtonText: '确定' + }) + return false; + } + saveCalendar(this.newCalendarData).then(({data}) => { if (data.code == 200) { this.getData() diff --git a/src/views/modules/base/maintainProductRouting.vue b/src/views/modules/base/maintainProductRouting.vue index c497209..6a65208 100644 --- a/src/views/modules/base/maintainProductRouting.vue +++ b/src/views/modules/base/maintainProductRouting.vue @@ -786,7 +786,7 @@ columnProp: "site", headerAlign: "center", align: "left", - columnLabel: "工厂编码", + columnLabel: "工厂编号", columnHidden: false, columnImage: false, columnSortable: false, diff --git a/src/views/modules/base/workCenter.vue b/src/views/modules/base/workCenter.vue index 0dec957..600d9c7 100644 --- a/src/views/modules/base/workCenter.vue +++ b/src/views/modules/base/workCenter.vue @@ -40,7 +40,7 @@ :before-finish="finishDownload2" worksheet="导出信息" class="el-button el-button--primary el-button--medium"> - {{ buttons.download }} + {{ buttons.download2 }} @@ -108,7 +108,7 @@ {{'新增'}} {{'编辑'}} {{'删除'}} - {{'设为虚拟/常规机台'}} + + + + + + + + + @@ -90,10 +108,11 @@ - - - - + + + + + @@ -135,7 +154,10 @@ searchData:{ palletNo:'', status:"('空置','已装货')", + date1:'', + date2:'', }, + addStatus:'', palletData:{ palletNo:'', palletDesc:'', @@ -180,6 +202,7 @@ this.palletData.site=this.$store.state.user.site; this.palletData.updateBy=this.$store.state.user.name; this.palletData.area=row.area; + this.addStatus=row.status; this.palletSelectFlag=false; this.palletInputFlag=true; this.palletModalFlag=true; @@ -227,6 +250,7 @@ }) return false } + this.addQty=''; this.addsModalFlag=true; }, @@ -237,6 +261,12 @@ }) return false } + if(this.addQty>200){ + this.$alert('批量新增数量上限为200！', '错误', { + confirmButtonText: '确定' + }) + return false + } let inData={ qty:this.addQty, area:this.palletData.area, diff --git a/src/views/modules/production/dailyPlan.vue b/src/views/modules/production/dailyPlan.vue index 432fdab..4b31d01 100644 --- a/src/views/modules/production/dailyPlan.vue +++ b/src/views/modules/production/dailyPlan.vue @@ -51,11 +51,12 @@
排序
- + 要求完工日期 订单号 产品编码 + 产品名称 @@ -124,15 +125,15 @@ @@ -172,7 +173,7 @@ @@ -341,7 +342,7 @@ @@ -575,7 +576,7 @@ 关闭 -
+
确定--> - + @@ -671,10 +672,24 @@ + + + + + + + +
@@ -718,7 +737,7 @@ @@ -775,6 +794,7 @@ }, data () { return { + sumTime:'', shiftNoList: [], tagNo:'', tagNo2:'', @@ -786,7 +806,7 @@ partNo:'', date3:'', date4:'', - sortField:'', + sortField:'order by needDate', scheduleDate:new Date(), site:this.$store.state.user.site, workCenterNo:'', @@ -836,6 +856,7 @@ getShiftData().then(({data}) => { let list = data.rows for (let i = 0; i < list.length; i++) { + this.allShiftNoList=[]; let resultData = { value: list[i].shiftno, label: list[i].shiftno+'('+list[i].shiftdesc+')' @@ -975,7 +996,7 @@ }) return false } - this.schedulingModalTableData.push({ scheduleQty:0, + this.schedulingModalTableData.push({ scheduleQty:'', resourceId:this.schedulingModalData.resourceId, shiftNo:this.schedulingModalData.shiftNo, scheduleDate:null, @@ -1053,13 +1074,22 @@ return false } let inData={ - site:row.site, + site:this.schedulingModalData.site, sResourceID:row.resourceId, sScheduledDate:row.scheduleDate, sShiftNo:row.shiftNo, } getHasScheduledData(inData).then(({data}) => { this.hasScheduledData = data.rows + let number=0; + if(this.hasScheduledData.length>0){ + for (let i = 0; i { if(data.code===0){ @@ -1192,6 +1223,7 @@ qtyToSchedule:this.schedulingModalTableData[i].scheduleQty, scheduleDate:this.schedulingModalTableData[i].scheduleDate, userId:this.$store.state.user.name, + shiftNo:this.schedulingModalTableData[i].shiftNo, } inList.push(thisData); }