Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

ZengTao

2023-12-04 ff6fd31ba5a4b6a6e74096786ff6d61293d15c73

 CanadaMes-ui/src/views/home/index.vue

@@ -204,24 +204,23 @@
                    </label>

                </div>

            </div>

            <div style="display:flex;justify-content: space-around;width: 95%;margin: 0 auto;">

            <div style="display:flex;justify-content: space-around;width: 9zz5%;margin: 0 auto;">

                <el-input style="width:15%;" :placeholder="$t('Enter the glass barcode')" v-model="glassid1"></el-input>

                <el-button type="primary" @click="SelectGlassByGlassIDs(2)">{{ $t('Manually Infeed Glass') }}</el-button>

                <el-input style="width:15%;" :placeholder="$t('Enter the Order No')" v-model="order"></el-input>

                <el-button type="warning" @click="showform1();">{{ $t('Exit the glass by order number') }}</el-button>

                <!-- <el-input style="width:15%;" :placeholder="$t('Enter the Order No')" v-model="order"></el-input>

                <el-button type="warning" @click="showform1();">{{ $t('Exit the glass by order number') }}</el-button> -->

            </div>

            <div>

                <el-table :data="this.tasklist1" border style="width: 100%">

                    <el-table-column :width="130" prop="cage" :label="$t('Cage No')"></el-table-column>

                    <el-table-column :width="130" prop="cell" :label="$t('Slot No')"></el-table-column>

                    <el-table-column :width="180" prop="glassId" :label="$t('Outfeed glass barcode')"></el-table-column>

                    <el-table-column :width="130" prop="orderId"

                        :label="$t('Order No')"></el-table-column>

                    <el-table-column :width="130" prop="orderId" :label="$t('Order No')"></el-table-column>

                    <el-table-column prop="orderId" :label="$t('List No')"></el-table-column>

                    <el-table-column prop="orderId" :label="$t('Box No')"></el-table-column>

                    <el-table-column :width="130" prop="lengthWidth" :label="$t('Dim')">

                        <template slot-scope='scope'>

                            {{ scope.row.glasswidthmm }}*1{{ scope.row.glassheightmm }}

                            {{ scope.row.glasswidthmm }}*{{ scope.row.glassheightmm }}

                        </template>

                    </el-table-column>

                    <el-table-column :label="$t('Terminate Task')">

@@ -236,13 +235,12 @@
                    <el-table-column :width="130" prop="cage" :label="$t('Cage No')"></el-table-column>

                    <el-table-column :width="130" prop="cell" :label="$t('Slot No')"></el-table-column>

                    <el-table-column :width="180" prop="glassId" :label="$t('Infeed glass barcode')"></el-table-column>

                    <el-table-column :width="130" prop="orderId"

                        :label="$t('Order No')"></el-table-column>

                    <el-table-column :width="130" prop="orderId" :label="$t('Order No')"></el-table-column>

                    <el-table-column prop="orderId" :label="$t('List No')"></el-table-column>

                    <el-table-column prop="orderId" :label="$t('Box No')"></el-table-column>

                    <el-table-column :width="130" prop="lengthWidth" :label="$t('Dim')">

                        <template slot-scope='scope'>

                            {{ scope.row.glasswidthmm }}*1{{ scope.row.glassheightmm }}

                            {{ scope.row.glasswidthmm }}*{{ scope.row.glassheightmm }}

                        </template>

                    </el-table-column>



@@ -399,40 +397,54 @@
        </el-dialog>



        <el-dialog :visible.sync="dialogFormVisible3" :title="$t('Cage Details')" top="5vh">

            <el-table :data="this.cageinfo" :height="700" border style="width: 100%;overflow: auto;">

            <el-input style="width:15%;" :placeholder="$t('Enter the glass barcode')" v-model="cageglassid"></el-input>

            <el-button type="primary" @click="showcageinfo(1)">{{ $t('Query') }}</el-button>

            <el-table :data="cageinfo.slice((currentPages - 1) * pagesizes, currentPages * pagesizes)" :height="700" border

                style="width: 100%;overflow: auto;">

                <el-table-column :width="90" prop="cage" :label="$t('Cage No')"></el-table-column>

                <el-table-column :width="90" prop="cell" :label="$t('Slot No')"></el-table-column>

                <el-table-column :width="55" prop="tier" :label="$t('The Side')"></el-table-column>

                <el-table-column :width="145" prop="glassId" :label="$t('Barcode')"></el-table-column>

                <el-table-column :width="100" prop="orderId" :label="$t('Order No')"></el-table-column>

                <el-table-column :width="80" prop="listId"

                    :label="$t('List No')"></el-table-column>

                <el-table-column :width="80" prop="listId" :label="$t('List No')"></el-table-column>

                <el-table-column :width="100" prop="boxId" :label="$t('Box No')"></el-table-column>

                <el-table-column :width="100" prop="state" :label="$t('State')">

                    <template slot-scope='scope'>

                        {{ scope.row.state==1?$t('Normal'):scope.row.state==2?$t('Entering'):scope.row.state==3?$t('Outing'):"" }}

                        {{

                            scope.row.state == 1 ? $t('Normal') : scope.row.state == 2 ? $t('Entering') : scope.row.state == 3 ?

                                $t('Outing') : ""

                        }}

                    </template>

                </el-table-column>

                <el-table-column :width="150" prop="lengthWidth" :label="$t('Dim')">

                    <template slot-scope='scope'>

                        {{ scope.row.glassWidthMm }}{{scope.row.glassWidthMm>0?"*":""}}{{ scope.row.glassHeightMm }}

                        {{ scope.row.glassWidthMm }}{{ scope.row.glassWidthMm > 0 ? "*" : "" }}{{ scope.row.glassHeightMm }}

                    </template>

                </el-table-column>

                <el-table-column :width="280" :label="$t('Operate')">

                    <template slot-scope='scope'>

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

                            @click="deleteglass(scope.row.glassId, scope.row.state)">{{ $t('Delete') }}</el-button>

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="scope.row.state==1?false:true"

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

                            :disabled="scope.row.state == 1 ? false : true"

                            @click="outglass(scope.row.glassId, scope.row.state)">{{ $t('Out') }}</el-button>

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

                            @click="UpdateDisabled(scope.row.cage, scope.row.cell, scope.row.disabled == 0 ? 1 : 0)">

                            {{ scope.row.disabled == 0 ? $t('Enable') : $t('Disable') }}</el-button>

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="scope.row.glassId!=null?true:false"

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

                            :disabled="scope.row.glassId != null ? true : false"

                            @click="insertglass(scope.row.cage, scope.row.cell, scope.row.tier)">{{ $t('Increase')

                            }}</el-button>

                    </template>

                </el-table-column>

            </el-table>



            <el-pagination :style="'margin-top:-2px'" @size-change="handleSizeChanges"

                @current-change="handleCurrentChanges" :pager-count="7" :current-page="currentPages"

                :page-sizes="[21, 42, 84, 420]" :page-size="pagesizes" layout="total, sizes, prev, pager, next, jumper"

                :total="cageinfo.length > 0 ? cageinfo.length : null" background style="float: right; margin-top: 20px">

            </el-pagination>



        </el-dialog>



        <el-dialog :visible.sync="dialogFormVisible4" :title="$t('OrderInfo')" top="5vh">

@@ -457,10 +469,10 @@
        <el-dialog :visible.sync="dialogFormVisible5" :title="$t('Please confirm the glass information')">

            <el-form :model="form" label-width="100px" style="padding-right: 30px">

                <div style="display: flex;justify-content: space-around;">

                    <el-form-item>

                        <label for="">{{ $t('Upper film position') }}</label>

                        <label for="">{{ $t('Scan Code Point') }}</label>

                    </el-form-item>

                    <label for="">{{ $t('Upper film position') }}</label>

                    <el-button type="primary" @click="isConfirmState()">

                        {{ this.isConfirm == true ? "Allow" : "Not Allow" }}</el-button>

                    <label for="">{{ $t('Scan Code Point') }}</label>

                </div>

                <div style="display: flex;justify-content: space-around;height: 40px;">

                    <label for="">{{ $t('current Information') }}</label>

@@ -472,13 +484,13 @@
                    <el-form-item>

                        <el-input style="width:50%;margin-left: 20%;" :placeholder="$t('Enter the glass barcode')"

                            v-model="glassid2"></el-input>

                        <el-button type="primary" @click="SelectGlassByGlassIDs(1)" >{{ $t('Query')

                        <el-button type="primary" @click="SelectGlassByGlassIDs(1)">{{ $t('Query')

                        }}</el-button>

                    </el-form-item>

                    <el-form-item>

                        <el-input style="width:50%;margin-left: 20%;" :placeholder="$t('Enter the glass barcode')"

                            v-model="glassid1"></el-input>

                        <el-button type="primary" @click="SelectGlassByGlassIDs(2)" >{{ $t('Query')

                        <el-button type="primary" @click="SelectGlassByGlassIDs(2)">{{ $t('Query')

                        }}</el-button>

                    </el-form-item>

                </div>

@@ -567,11 +579,11 @@
                    </el-form-item>

                </div>

                <div style="display: flex;justify-content: space-around;">

                    <el-button @click="DeleteQueueGlasss(2)" type="primary" >{{ $t('Clear Current')

                    <el-button @click="DeleteQueueGlasss(2)" type="primary">{{ $t('Clear Current')

                    }}</el-button>

                    <el-button @click="InsertQueueGlass(2)" type="primary" :disabled="disabled">

                        {{ $t('Confirm Modification') }}</el-button>

                    <el-button @click="DeleteQueueGlasss(1)" type="primary" >{{ $t('Clear Current')

                    <el-button @click="DeleteQueueGlasss(1)" type="primary">{{ $t('Clear Current')

                    }}</el-button>

                    <el-button @click="InsertQueueGlass(1)" type="primary" :disabled="disabled1">

                        {{ $t('Confirm Modification') }}</el-button>

@@ -585,32 +597,41 @@
        </el-dialog>



        <el-dialog :visible.sync="dialogFormVisible6" :title="$t('Production queue')" top="5vh">

            <el-button type="primary" @click="showform7()">{{ $t('Increase') }}</el-button>

            <el-button type="primary" @click="isAllowQueueState()">{{ this.isAllowQueue==true?$t('Stop'):$t('Start') }}</el-button>

            
            <el-table :data="this.OutSlice" :height="700" border style="width: 100%;overflow: auto;">

            <!-- <el-button type="primary" @click="showform7()">{{ $t('Increase') }}</el-button> -->

            <el-button type="primary" @click="isAllowQueueState()">{{ this.isAllowQueue == true ? $t('Start') : $t('Stop')

            }}</el-button>



            <el-table :data="this.OutSlice" :height="700" :span-method="objectSpanMethod" border

                style="width: 100%;overflow: auto;">

                <el-table-column prop="glassId" :label="$t('Barcode')"></el-table-column>

                <el-table-column prop="storageCage.orderId" :label="$t('Order No')"></el-table-column>

                <el-table-column prop="storageCage.listId" :label="$t('List No')"></el-table-column>

                <el-table-column prop="storageCage.boxId" :label="$t('Box No')"></el-table-column>

                <el-table-column prop="barcode" :label="$t('Frame No')"></el-table-column>

                <el-table-column prop="storageCage.glasswidthmm" :label="$t('Length')"></el-table-column>

                <el-table-column prop="storageCage.glassheightmm" :label="$t('Width')"></el-table-column>

                <el-table-column prop="state" :label="$t('State')">

                    <template slot-scope='scope'>

                        {{ scope.row.state == 0 ? "Waiting" : "Outing" }}

                    </template>

                </el-table-column>

                <el-table-column prop="sequence" :label="$t('Sequence')"></el-table-column>

                <el-table-column prop="position" :label="$t('Position')"></el-table-column>

                <el-table-column prop="barcode" :label="$t('Frame No')"></el-table-column>

                <el-table-column :width="280" :label="$t('Operate')">

                    <template slot-scope='scope'>

                        <el-button type="text" size="small" @click="getTopMove(scope.row, scope.$index)"

                            :disabled="scope.$index == 0">

                            :disabled="(scope.$index == 0 || isAllowQueue == true || scope.row.state == 1)">

                            置顶

                        </el-button>

                        <el-button type="text" size="small" @click="getUpMove(scope.row, scope.$index)"

                            :disabled="scope.$index == 0">

                            :disabled="(scope.$index == 0 || isAllowQueue == true || scope.row.state == 1)">

                            上移

                        </el-button>

                        <el-button type="text" size="small" @click="getDownMove(scope.row, scope.$index)"

                            :disabled="OutSlice.length - 1 == scope.$index">下移

                            :disabled="(OutSlice.length - 1 == scope.$index || isAllowQueue == true || scope.row.state == 1)">下移

                        </el-button>

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

                            @click="deleteproductionqueueglass(scope.row.id)">{{ $t('Delete') }}</el-button>

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="isAllowQueue"

                            @click="deleteproductionqueueglass(scope.row.barcode)">{{ $t('Delete') }}</el-button>

                    </template>

                </el-table-column>

            </el-table>

@@ -662,7 +683,7 @@
import {

    home, home2, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist,

    SelectPassword, SelectGlassByGlassID, Disabled, Inglassid, SelectGlass, InsertQueueGlassId, UpdateQueueState, DeleteQueueGlass, SelectGlassNo,

    SelectAluminumFrameInfoById, SelectProductionqueue, DeleteProductionQueueGlass, AddOutSliceS, isAllowQueues

    SelectAluminumFrameInfoById, DeleteProductionQueueGlass, AddOutSliceS, isAllowQueues, isConfirmStates

} from "../../api/home";





@@ -712,6 +733,7 @@
            glassid: "",

            glassid1: "",

            glassid2: "",

            cageglassid: "",

            url: "../../img/bigcar01.png",

            car1: 145,

            car2: 210,

@@ -731,10 +753,17 @@
            currentPage: 1,  //默认初始页

            pagesize: 15,    //每页默认显示的数据

            pageCount: 0,



            currentPages: 1,  //默认初始页

            pagesizes: 21,    //每页默认显示的数据

            pageCounts: 0,



            OutSlice: [],

            AluminumFrame: [],

            framebarcode: "",

            isAllowQueue:true

            isAllowQueue: true,

            FrameNoFlag: "",

            isConfirm: true

        };

    },

    created() {

@@ -777,18 +806,28 @@
                    this.tasklist1 = obj.tasklist1[0];

                    this.tasklist2 = obj.tasklist2[0];

                    this.alarm = obj.alarmmg[0];

                    //铝框id提示



                    this.isAllowQueue=obj.isAllowQueue;

                    console.log(obj);



                    //是否允许出片

                    this.isAllowQueue = obj.isAllowQueue[0];

                    //出片队列

                    this.OutSlice = obj.listoutslice[0];

                    if (this.isAllowQueue == true) {

                        this.OutSlice = obj.listoutslice[0];

                    }

                    this.loadglassheight = obj.loadglassheight;

                    if (obj.zhuangtai != null) {

                        this.zhuangtai = obj.zhuangtai[0];

                    }

                    if (this.dialogFormVisible7 == true) {

                        this.showform7();

                    }

                    // if (this.dialogFormVisible7 == true) {

                    //     this.showform7();

                    // } else {

                    //     if (obj.FrameNo != null && obj.FrameNo != "") {

                    //         this.framebarcode = obj.FrameNo[0];

                    //         this.showform7();

                    //         this.addoutslice();

                    //     }

                    // }

                    if (obj.form2 != null && obj.form2 != "") {

                        this.form2 = obj.form2[0];

                    } else {

@@ -800,35 +839,24 @@
                    } else {

                        this.form3 = {};

                    }

                    this.isConfirm = obj.isConfirm[0];

                    if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 0) {

                        this.form5 = obj.form3[0];

                        this.showform3();

                        if (this.form5.glassheight < 380 || this.form5.glasswidth < 390 || this.form5.glassheight > 1810 || this.form5.glasswidth > 2760) {

                            if (this.disabled1 == false) {

                                this.disabled1 = true;

                                this.$message.error(this.$t('The glass size is not within the range'));

                            }

                        } else {

                            this.disabled1 = false;

                        }

                        this.Sizerange(this.form5);



                    } else {

                        if (this.form5.glassheight < 380 || this.form5.glasswidth < 390 || this.form5.glassheight > 1810 || this.form5.glasswidth > 2760) {

                            if (this.disabled1 == false) {

                                this.disabled1 = true;

                                // this.$message.error(this.$t('The glass size is not within the range'));

                            }

                        } else {

                            this.disabled1 = false;

                        }

                        this.Sizerange(this.form5);

                    }

                    //if (obj.dbconnected == "false") {

                    this.text = this.$t('DataBase Connection failed');

                    // }

                    if (obj.dbconnected == "false") {

                        this.text = this.$t('DataBase Connection failed');

                    }

                    if (this.dialogFormVisible3 == true) {

                        SelectCageInfo(this.cage).then(res => {

                        SelectCageInfo(this.cageglassid).then(res => {

                            this.cageinfo = res.data.cageinfo;

                        });

                    }





                    this.$forceUpdate();



@@ -946,7 +974,6 @@
            SelectGlassByGlassID(this.glassid).then(res => {

                if (res.data.form != null) {

                    this.form = res.data.form;

                    console.log(this.form);

                    this.dialogFormVisible = true;

                    this.$message.success(this.$t('query was successful'));

                } else {

@@ -971,20 +998,14 @@
        },

        //获取扫码位和上片位数据

        SelectGlassByGlassIDs(parameter) {



            this.showform3();

            if (parameter == 1) {

                SelectGlassByGlassID(this.glassid2).then(res => {

                    if (res.data.form != null) {

                        this.form4 = res.data.form;

                        this.$message.success(this.$t('query was successful'));

                        if (this.form4.glassheight < 380 || this.form4.glasswidth < 390 || this.form4.glassheight > 1810 || this.form4.glasswidth > 2760) {

                            if (this.disabled == false) {

                                this.disabled = true;

                                this.$message.error(this.$t('The glass size is not within the range'));

                            }

                        } else {

                            this.disabled = false;

                        }

                        this.Sizerange(this.form4);

                    } else {

                        this.$message.error(this.$t('There is no such glass'));

                    }

@@ -1002,14 +1023,7 @@
                    if (res.data.form != null) {

                        this.form5 = res.data.form;

                        this.$message.success(this.$t('query was successful'));

                        if (this.form5.glassheight < 380 || this.form5.glasswidth < 390 || this.form5.glassheight > 1810 || this.form5.glasswidth > 2760) {

                            if (this.disabled1 == false) {

                                this.disabled1 = true;

                                this.$message.error(this.$t('The glass size is not within the range'));

                            }

                        } else {

                            this.disabled1 = false;

                        }

                        this.Sizerange(this.form5);

                    } else {

                        this.$message.error(this.$t('There is no such glass'));

                    }

@@ -1038,14 +1052,17 @@
            this.dialogFormVisible4 = true;

        },

        showform6() {

            SelectProductionqueue().then(res => {

                this.OutSlice = res.data.listoutslice;

            });

            this.dialogFormVisible6 = true;

        },

        showform7() {

            //查询铝框id对应玻璃信息

            SelectAluminumFrameInfoById(this.framebarcode).then(res => {

                this.AluminumFrame = res.data.listAluminumFrame;

                this.AluminumFrame.sort(function (x, y) {

                    if (x['storageCage'] != null && y['storageCage'] != null) {

                        return y['storageCage']['tier'] - x['storageCage']['tier'];

                    }

                });

                this.AluminumFrame.forEach(item => {

                    if (item.storageCage != null && item.out_slice == null) {

                        item.isCheck = true;

@@ -1056,7 +1073,7 @@
                    item.FrameNo = this.framebarcode;

                });

            });

            this.dialogFormVisible7 = true;

            // this.dialogFormVisible7 = true;

        },

        //取消操作时关闭页面

        cancel() {

@@ -1104,9 +1121,11 @@
        },

        //显示理片笼详情信息

        showcageinfo(cage) {

            this.cage = cage;

            cage = this.cageglassid;

            SelectCageInfo(cage).then(res => {



                this.cageinfo = res.data.cageinfo;

                this.currentPages = 1;

                this.dialogFormVisible3 = true;

            });

        },

@@ -1257,11 +1276,19 @@
        handleCurrentChange: function (currentPage) {

            this.currentPage = currentPage;

        },

        //改变每页容纳的数据量

        handleSizeChanges: function (size) {

            this.pagesizes = size;

        },

        //切换页码

        handleCurrentChanges: function (currentPage) {

            this.currentPages = currentPage;

        },

        //手动添加扫码位玻璃

        InsertQueueGlass(parameter) {

            if (parameter == 1 && this.form5.glassId != "") {

                if (this.form5.glassId != this.form2.glassId) {

                    InsertQueueGlassId(1,this.form5).then(res => {

                    InsertQueueGlassId(1, this.form5).then(res => {

                        if (res.data.message == 200) {

                            this.form5 = {};

                            this.$message.success(this.$t('Operation successful'));

@@ -1274,7 +1301,7 @@
                }

            } else if (parameter == 2 && this.form4.glassId != "") {

                if (this.form4.glassId != this.form3.glassId) {

                    InsertQueueGlassId(2,this.form4).then(res => {

                    InsertQueueGlassId(2, this.form4).then(res => {

                        if (res.data.message == 200) {

                            this.form4 = {};

                            this.$message.success(this.$t('Operation successful'));

@@ -1294,12 +1321,14 @@
            if (parameter == 1) {

                DeleteQueueGlass(1).then(res => {

                    if (res.data.message == 200) {

                        this.form2 = {};

                        this.$message.success(this.$t('Operation successful'));

                    }

                });

            } else {

                DeleteQueueGlass(2).then(res => {

                    if (res.data.message == 200) {

                        this.form3 = {};

                        this.$message.success(this.$t('Operation successful'));

                    }

                });

@@ -1317,9 +1346,6 @@
            this.AluminumFrame.forEach(item => { item.barcode = glassid; item.isCheck = isChecked })

        },

        addoutslice() {

            // var AluminumFrames1=this.AluminumFrame.map(item=>{return item.barcode});

            // var AluminumFrames2=this.AluminumFrame.map(item=>{return item.isCheck});

            // var AluminumFrames3=this.AluminumFrame.map(item=>{return item.Flip});

            var dats_ = new Array();

            this.AluminumFrame.forEach(item => {

                var dats2_ = new Array();

@@ -1337,26 +1363,204 @@
                }

            });

        }, getTopMove(row, index) {

            this.OutSlice.splice(index, 1)

            this.OutSlice.unshift(row)

            let Sequence = [];

            this.OutSlice.forEach(item => {

                Sequence.push(item.sequence);

            });

            let OutSliceArr = [];

            OutSliceArr.push(row);

            let belowstop = 1;

            let hereframeno = this.OutSlice[index].barcode;

            let upperstop = 0;

            for (let i = index + 1; i < this.OutSlice.length; i++) {

                if (this.OutSlice[i].barcode == hereframeno) {

                    OutSliceArr.push(this.OutSlice[i]);

                    belowstop += 1;

                } else {

                    break;

                }

            }

            this.OutSlice.splice(index, belowstop);

            for (let i = 0; i < OutSliceArr.length; i++) {

                this.OutSlice.splice(upperstop, 0, OutSliceArr[i]);

                upperstop += 1;

            }

            this.UpdateSequence(Sequence);

        },

        //上移

        getUpMove(row, index) {

            let arr = this.OutSlice;

            arr.splice(index - 1, 1, ...arr.splice(index, 1, arr[index - 1]));

            let Sequence = [];

            this.OutSlice.forEach(item => {

                Sequence.push(item.sequence);

            });

            let OutSliceArr = [];

            OutSliceArr.push(row);

            let belowstop = 1;

            let upperstop = 0;

            let index_x = index - 1;

            let hereframeno = this.OutSlice[index].barcode;

            let upperframeno = this.OutSlice[index_x].barcode;

            for (let i = index + 1; i < this.OutSlice.length; i++) {

                if (this.OutSlice[i].barcode == hereframeno) {

                    OutSliceArr.push(this.OutSlice[i]);

                    belowstop += 1;

                } else {

                    break;

                }

            }

            this.OutSlice.splice(index, belowstop);

            for (let i = index_x; i >= 0; i--) {

                if (this.OutSlice[i].barcode != upperframeno) {

                    upperstop = i + 1;

                    break;

                }

            }

            for (let i = 0; i < OutSliceArr.length; i++) {

                this.OutSlice.splice(upperstop, 0, OutSliceArr[i]);

                upperstop += 1;

            }

            this.UpdateSequence(Sequence);

        },

        //下移

        getDownMove(row, index) {

            let arr = this.OutSlice;

            arr.splice(index, 1, ...arr.splice(index + 1, 1, arr[index]));

            let Sequence = [];

            this.OutSlice.forEach(item => {

                Sequence.push(item.sequence);

            });

            let OutSliceArr = [];

            OutSliceArr.push(row);



            let belowstop = 1;

            let upperstop = this.OutSlice.length - 1;

            let flag = 0;

            let hereframeno = this.OutSlice[index].barcode;

            let upperframeno;

            for (let i = index + 1; i < this.OutSlice.length; i++) {

                if (this.OutSlice[i].barcode == hereframeno) {

                    OutSliceArr.push(this.OutSlice[i]);

                    belowstop += 1;

                } else {

                    break;

                }

            }

            this.OutSlice.splice(index, belowstop);

            for (let i = index; i < this.OutSlice.length; i++) {

                if (this.OutSlice[i].barcode != hereframeno && this.OutSlice[i].barcode != upperframeno) {

                    upperframeno = this.OutSlice[i].barcode;

                    flag += 1;

                    upperstop = i;

                }

                if (i == this.OutSlice.length - 1 && flag == 1) {

                    flag += 1;

                    upperstop = i + 1;

                }

                if (flag == 2) {

                    break;

                }

            }

            for (let i = 0; i < OutSliceArr.length; i++) {

                this.OutSlice.splice(upperstop, 0, OutSliceArr[i]);

                upperstop += 1;

            }

            this.UpdateSequence(Sequence);

        },

        UpdateSequence(Sequence) {

            let i = 0;

            this.OutSlice.forEach(item => {

                item.sequence = Sequence[i];

                i++;

            });

        },

        //切换出片队列状态

        isAllowQueueState(){

            isAllowQueues(!this.isAllowQueue).then(res=>{

        isAllowQueueState() {

            isAllowQueues(!this.isAllowQueue, this.OutSlice).then(res => {

                if (res.data.message == 200) {

                    this.$message.success(this.$t('Operation successful'));

                }

            })

        },

        //切换上片是否需要确认玻璃信息

        isConfirmState() {

            isConfirmStates(!this.isConfirm).then(res => {

                if (res.data.message == 200) {

                    this.$message.success(this.$t('Operation successful'));

                }

            });

        }

        ,

        arraySpanMethod({ row, column, rowIndex, columnIndex }) {

            console.log(row, column);

            if (rowIndex % 2 === 0) {

                if (columnIndex === 0) {

                    return [1, 2];

                } else if (columnIndex === 1) {

                    return [0, 0];

                }

            }

        },

        //合并行

        objectSpanMethod({ row, column, rowIndex, columnIndex }) {

            // console.log(row, column, "ss");

            row = column;

            column = row

            let arrOutSlice = this.OutSlice;

            let rowspans = 0;

            let colspans = 1;

            let barcode = arrOutSlice[rowIndex].barcode;



            let barcode2;

            if (rowIndex != 0) {

                barcode2 = arrOutSlice[rowIndex - 1].barcode;

            }

            if (columnIndex === 9) {

                if (barcode != barcode2) {

                    // this.FrameNoFlag = barcode;

                    for (let i = rowIndex; i < this.OutSlice.length; i++) {

                        if (barcode == arrOutSlice[i].barcode) {

                            barcode = arrOutSlice[i].barcode;

                            rowspans += 1;

                        } else {



                            break;

                        }

                    }

                    return {

                        rowspan: rowspans,

                        colspan: colspans

                    };

                } else {

                    return {

                        rowspan: 0,

                        colspan: 0

                    };

                }

            }

        },

        //判断玻璃是否超出范围

        Sizerange(Glass) {

            if ((Glass.glassheight < 380 || Glass.glasswidth < 390 || Glass.glassheight > 1810 || Glass.glasswidth > 2760) || (Glass.glassheight < 390 || Glass.glasswidth < 380 || Glass.glassheight > 2760 || Glass.glasswidth > 1810)) {

                if (this.disabled == false) {

                    this.disabled = true;

                    this.$message.error(this.$t('The glass size is not within the range'));

                    this.$confirm(this.$t('The glass size is not within the range'), this.$t('confirm'), {

                        // confirmwidth: 7000,

                        // height: 8000,

                        // confirmButtonText: this.$t('Yes'),

                        // cancelButtonText: this.$t('No'),

                        type: 'warning'

                    }).then(() => {

                        this.$message.success(this.$t('Operation successful'));

                    }).catch(() => {

                        this.$message({

                            type: 'info',

                            message: this.$t('Operation canceled')

                        });

                    });

                }

                this.disabled1 = true;

            } else {

                this.disabled1 = false;

            }

        }

    }

}