Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web

lzhe

2024-05-15 55900c9b6519dbe3d0f02f914a1cb2b2be22a6a9

 src/views/mdc/status-record.vue

@@ -72,7 +72,7 @@
                                </div>
                            </div>
                            <!-- setWork 入参 -->
                            <record-charts-by-workstation :setWork="setWork" :select="select" :collectionstatus="collectionstatus" v-if="!isshowempty"></record-charts-by-workstation>
                            <record-charts-by-workstation :setWork="setWork" :select="select" :achievements="achievements" v-if="!isshowempty"></record-charts-by-workstation>
                        </div>
                    </div>
                    <save-dialog v-if="dialog.save" ref="saveDialog"  @success="addfeedbackSuccess" :workstationId="lastLevelId" @closed="dialog.save=false"></save-dialog>
@@ -166,12 +166,19 @@
    },
    methods: {
        addfeedbackSuccess() {
            var workstationName = "";
            this.btnGongweiList.forEach(item=> {
                if(item.id == this.btnGongweiListActive) {
                    workstationName = item.name;
                }
            })
            this.setWork = {
                endDate: this.time[1],
                startDate: this.time[0],
                humanFeedback: true,
                machineFeedback: true,
                workstationId: this.lastLevelId
                workstationId: this.lastLevelId,
                workstationName: workstationName
            }
        },
        table_edit(){
@@ -206,12 +213,19 @@
        changeTabGongwei(item) {  //按工位查询
            this.btnGongweiListActive = item.id;
            this.lastLevelId = this.btnGongweiListActive;
            var workstationName = "";
            this.btnGongweiList.forEach(item=> {
                if(item.id == this.btnGongweiListActive) {
                    workstationName = item.name;
                }
            })
            this.setWork = {
                endDate: this.time[1],
                startDate: this.time[0],
                humanFeedback: true,
                machineFeedback: true,
                workstationId: item.id
                workstationId: item.id,
                workstationName: workstationName
            }
        },
        getachievements() { //班次状态记录采集状态
@@ -272,7 +286,8 @@
                    startDate: this.time[0],
                    humanFeedback: true,
                    machineFeedback: true,
                    workstationId: this.select[0].id
                    workstationId: this.select[0].id,
                    workstationName: this.btnGongweiList[0].name
                }
                this.isshowempty = false;
            }