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

wu

2023-12-08 31101f632c27c05d15f30ca3084e3ed3da2a29af

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

@@ -104,7 +104,7 @@
    position: absolute;

    background-image: url('../../img/dipan.png');

    background-size: 70px 85px;

    left: 654px;

    left: 501px;

    top: 333px;

    /* background-size: 85px 100px;

    left: 912px;

@@ -132,7 +132,7 @@
    position: absolute;

    background-image: url('../../img/taimian.png');

    background-size: 120px 30px;

    left: 630px;

    left: 477px;

    top: 420px;

    /* background-size: 160px 40px;

    left: 875px;

@@ -238,9 +238,9 @@
            </div>

            <div>

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

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

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

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

@@ -258,9 +258,9 @@
                    </el-table-column>

                </el-table>

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

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

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

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

@@ -628,7 +628,11 @@
        </el-dialog>



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

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

            <el-button type="primary" @click="isAllowQueueState()" :disabled="!this.isAllowReordering">{{ this.isAllowQueue

                == true ? $t('Start') : $t('Stop')

            }}</el-button>

            <el-button type="primary" @click="isAllowReorderingState()" :disabled="this.isAllowQueue">{{

                this.isAllowReordering == true ? $t('Not Allow') : $t('Allow')

            }}</el-button>

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

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

@@ -640,27 +644,34 @@
                <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" }}

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

                    </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 prop="barcode" :label="$t('Complete')">

                    <template slot-scope='scope'>

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

                            @click="CompleteQueue(scope.row.id,scope.row.barcode)">{{ $t('Complete') }}</el-button>

                    </template>

                </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)"

                            style="font-size: 15px;"

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

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

                            {{ $t('Top') }}

                        </el-button>

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

                            style="font-size: 15px;"

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

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

                            {{ $t('Up') }}

                        </el-button>

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

                            style="font-size: 15px;"

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

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

                            {{ $t('Down') }}

                        </el-button>

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

@@ -714,7 +725,7 @@
import {

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

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

    SelectAluminumFrameInfoById, DeleteProductionQueueGlass, AddOutSliceS, isAllowQueues, isConfirmStates, SelectPermissionByUserName, currentUsername

    SelectAluminumFrameInfoById, DeleteProductionQueueGlass, AddOutSliceS, isAllowQueues, isConfirmStates, SelectPermissionByUserName, currentUsername, CompleteQueue

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





@@ -785,7 +796,6 @@
            currentPage: 1,  //默认初始页

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

            pageCount: 0,



            currentPages: 1,  //默认初始页

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

            pageCounts: 0,

@@ -793,6 +803,7 @@
            AluminumFrame: [],

            framebarcode: "",

            isAllowQueue: true,

            isAllowReordering: true,

            FrameNoFlag: "",

            isConfirm: true,

            ManuallyInfeedGlass: true,

@@ -847,7 +858,7 @@
                    //是否允许出片

                    this.isAllowQueue = obj.isAllowQueue[0];

                    //出片队列

                    if (this.isAllowQueue == true) {

                    if (this.isAllowReordering == true) {

                        this.OutSlice = obj.listoutslice[0];

                    }

                    //获取上片位玻璃信息

@@ -1234,8 +1245,14 @@
                if (this.password == value) {

                    if (state == 1) {

                        OutByGlassID(glassid).then(res => {

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

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

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

                            }

                            else if (res.data.message2 == 300) {

                                this.$message.error(this.$t('Unable to find the placement method of the aluminum frame'));

                            }

                            else if (res.data.message2 == 400) {

                                this.$message.error(this.$t('Unable to find whether the aluminum frame is flipped or not'));

                            }

                            else if (res.data.message2 == 500) {

                                this.$message.error(this.$t('This glass is already in the Queue'));

@@ -1348,7 +1365,7 @@
        //手动添加扫码位玻璃

        InsertQueueGlass(parameter) {

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

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

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

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

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

                            this.form5 = {};

@@ -1361,7 +1378,7 @@
                    this.$message.error(this.$t('The glass ID already exists in the loading queue'));

                }

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

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

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

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

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

                            this.form4 = {};

@@ -1382,14 +1399,14 @@
            if (parameter == 1) {

                DeleteQueueGlass(1).then(res => {

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

                        this.form2 = {};

                        this.form3 = {};

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

                    }

                });

            } else {

                DeleteQueueGlass(2).then(res => {

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

                        this.form3 = {};

                        this.form2 = {};

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

                    }

                });

@@ -1545,6 +1562,10 @@
                }

            })

        },

        //

        isAllowReorderingState() {

            this.isAllowReordering = !this.isAllowReordering;

        },

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

        isConfirmState() {

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

@@ -1568,7 +1589,7 @@
            if (rowIndex != 0) {

                barcode2 = arrOutSlice[rowIndex - 1].barcode;

            }

            if (columnIndex === 10) {

            if (columnIndex === 11) {

                if (barcode != barcode2) {

                    // this.FrameNoFlag = barcode;

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

@@ -1628,6 +1649,14 @@
        //清空待确认玻璃信息

        DeleteBarcodeGlass() {

            this.form5 = {};

        },

        //手动完成出片任务

        CompleteQueue(id,frameid) {

            CompleteQueue(id,frameid).then(res => {

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

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

                }

            });

        }

    }

}