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

wuyouming666

2024-01-11 5400d8b310ce6fe6919594a096f3a87307a66e61

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

@@ -245,13 +245,13 @@
            </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="130" prop="orderId" :label="$t('Order No')"></el-table-column>

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

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

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

                    <el-table-column :min-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')">

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

                        <template slot-scope='scope'>

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

                        </template>

@@ -265,13 +265,13 @@
                    </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="130" prop="orderId" :label="$t('Order No')"></el-table-column>

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

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

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

                    <el-table-column :min-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')">

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

                        <template slot-scope='scope'>

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

                        </template>

@@ -444,10 +444,10 @@
                <el-table-column :min-width="50" prop="cell" :label="$t('Slot No')"></el-table-column>

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

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

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

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

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

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

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

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

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

                    <template slot-scope='scope'>

                        {{

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

@@ -460,6 +460,12 @@
                        {{ scope.row.glassWidthMm }}{{ scope.row.glassWidthMm > 0 ? "*" : "" }}{{ scope.row.glassHeightMm }}

                    </template>

                </el-table-column>

                
                <el-table-column :min-width="80" prop="lengthWidth" :label="$t('State')">

                    <template slot-scope='scope'>

                        {{ scope.row.disabled == 0 ? $t('Enable') : $t('Disable') }}

                    </template>

                </el-table-column>

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

                    <template slot-scope='scope'>

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

@@ -470,7 +476,7 @@
                            @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>

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

                        <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('Add')

@@ -510,8 +516,11 @@
            <el-form :model="form" label-width="100px" style="padding-right: 30px">

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

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

                    <div>

                        {{ $t('Confirm State') }}:{{ this.isConfirm == true ? $t('Not Allow') : $t('Allow') }}

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

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

                        {{ this.isConfirm == true ? $t('Allow') : $t('Not Allow') }}</el-button>

                    </div>

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

                </div>

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

@@ -637,18 +646,31 @@
        </el-dialog>



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

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

            {{  $t('Queue State') }}:

            {{ this.isAllowQueue

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

            }}

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

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

            }}</el-button>

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

            {{  $t('Sorting State') }}:

            {{

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

            }}

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

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

            }}</el-button>

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

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

            <label style="background-color:yellow;font-size: 23px;" for="">{{ isQueueWarning== true ? $t('The cage is disabled') : "" }}</label>

            <!-- <span style="background-color:yellow;">

                {{ isQueueWarning== true ? $t('The cage is disabled') : $t('The cage is disabled') }}

            </span> -->

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

                style="width: 100%;overflow: auto;font-size: 18px;">

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

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

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

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

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

                <el-table-column :min-width="100" prop="glasswidthmm" :label="$t('Length')"></el-table-column>

@@ -670,12 +692,10 @@
                </el-table-column>

                <el-table-column :min-width="300" prop="position" :label="$t('Position')" style="font-size: 20px;">

                    <template slot-scope='scope'>

                        <!-- {{ scope.row.position == 1 ? "<>▄▄▄" : "▋" }} -->

                        <div

                            :style="'width:' + (scope.row.position == 1 ? '300' : '100') + 'px;height:' + (scope.row.position == 1 ? '100' : '200') + 'px;background-Color:gray;margin:0 auto;'">

                            <!-- <div :style="'width:100px;height:300px;background-Color:red;'"></div> -->

                            
                        </div>

                        <!-- {{ scope.row.position == 1 ? "<div></div>" : "<div></div>" }} -->

                    </template>

                </el-table-column>

                <el-table-column prop="position" :label="$t('Flipped')" :min-width="200">

@@ -685,9 +705,7 @@
                    </template>

                </el-table-column>

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





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

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

                    <template slot-scope='scope'>

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

                            style="font-size: 15px;"

@@ -706,6 +724,10 @@
                        </el-button>

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

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



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

                            @click="FrameStateUpdate(scope.row.barcode,scope.row.framestate)">{{

                            scope.row.framestate == 0 ? $t('Stop') : $t('Start') }}</el-button>

                    </template>

                </el-table-column>

            </el-table>

@@ -762,7 +784,7 @@
    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, CompleteQueue,

    isAllowReorderings

    isAllowReorderings, FrameStateUpdate

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





@@ -852,7 +874,8 @@
            D01RequestState: false,

            EmergencyStop: false,

            PromptSize: 250,

            reset: false

            reset: false,

            isQueueWarning: false

        };

    },

    created() {

@@ -933,6 +956,8 @@


                    //是否允许出片

                    this.isAllowQueue = obj.isAllowQueue[0];

                    //当前出片格子是否被禁用

                    this.isQueueWarning = obj.isQueueWarning[0];

                    //是否允许出片队列调序

                    this.isAllowReordering = obj.isAllowReordering[0];

                    //出片队列

@@ -1796,6 +1821,18 @@
                1000

            );



        },

        FrameStateUpdate(frameno,framestate){

            if(framestate == 1){

                framestate=0;

            }else{

                framestate=1;

            }

            FrameStateUpdate(frameno,framestate).then(res=>{

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

                    this.$message.success("Operation successful");

                }

            });

        }

    }

}