VueUi.git - Gitblit

			@@ -1,26 +1,28 @@
			<template>
			<div>
			<div class="body" style="padding: 0;height: 100%" :style="{height:mainHeight+'px'}">
			<div class="body" style="padding-top: 10px;" :style="{height:mainHeight+'px'}">
			<el-tabs ref="elTabs" v-model="activeName" type="border-card" @tab-click="tabClick">
			<el-tab-pane label="生产列表">
			<div style="margin-left: 10px;margin-top:10px;display: flex;justify-content: space-between">
			<div style="display: flex;align-items: center">
			<div style="width: 90px">扫描条码：</div>
			<!-- oninput="value=value.replace(/[^0-9a-zA-Z;_]/g,'')"-->

			<el-input
			id="keyWords"
			v-model="form.orderstepqrcode"
			name="produceCode"
			style="width: 300px"
			@keyup.enter.native="val=>enterNative(val,'produceCode')"
			/>
			<!-- @keyup.native="e=>judgeIsScanning(e,'produceCode')"-->

			</div>
			<div v-if="false" style="display: flex;padding-right: 10px">
			<el-button @click="ZZstart">
			<el-button v-waves @click="ZZstart">
			<svg-icon icon-class="start_time" style="margin-right: 2px" />
			开始
			</el-button>
			<el-button @click="ZZreport">
			<el-button v-waves @click="ZZreport">
			<svg-icon icon-class="report_work" style="margin-right: 2px" />
			报工
			</el-button>
			@@ -29,29 +31,18 @@
			<el-divider />
			<div class="elTableDiv">
			<el-table
			ref="tableDataRef"
			class="tableFixed"
			:data="tableData"
			:height="tableHeight+'px'"
			:height="isIpad? (tableHeight+50):tableHeight"
			border
			stripe
			:row-class-name="tableRowClassName"
			:style="{width: 100+'%',height:tableHeight+'px',}"
			highlight-current-row
			:header-cell-style="this.$headerCellStyle"
			:cell-style="this.$cellStyle"
			@sort-change="sortChange"
			>
			<!-- <el-table-column-->
			<!-- width="50"-->
			<!-- fixed-->
			<!-- >-->
			<!-- <template slot-scope="{row}">-->
			<!-- <el-radio-->
			<!-- v-model="radioSelected"-->
			<!-- :label="row.wo"-->
			<!-- style="color: #fff;padding-left: 10px; margin-right: -25px;"-->
			<!-- @change.native="getCurrentRow(row.wo)"-->
			<!-- />-->
			<!-- </template>-->
			<!-- </el-table-column>-->
			<el-table-column
			prop="RowNum"
			width="50"
			@@ -60,21 +51,25 @@
			/>
			<el-table-column
			prop="status"
			show-tooltip-when-overflow
			label="状态"
			sortable="custom"
			width="110"
			width="80"
			>
			<template slot-scope="{row}">
			<div v-if="row.status==='NEW'">新订单</div>
			<div v-if="row.status==='ALLO'">已派发</div>
			<div v-if="row.status==='START'">开工</div>
			<div v-if="row.status==='CLOSED'">完工</div>
			<div v-if="row.status==='NOSCHED'">待排程</div>
			<div v-if="row.status==='SCHED'">已排程</div>
			</template>
			</el-table-column>
			<el-table-column
			prop="wo_code"
			label="工单号"
			min-width="160"
			width="160"
			show-tooltip-when-overflow
			sortable="custom"
			/>
			<el-table-column
			@@ -82,50 +77,96 @@
			label="产品编码"
			min-width="110"
			sortable="custom"
			show-tooltip-when-overflow
			/>
			<el-table-column
			prop="partname"
			min-width="110"
			width="160"
			show-tooltip-when-overflow
			label="产品名称"
			sortable="custom"
			/>
			<el-table-column
			prop="stepname"
			label="工序"
			min-width="80"
			show-tooltip-when-overflow
			width="120"
			sortable="custom"
			/>
			<el-table-column
			prop="descr"
			label="工序描述"
			min-width="150"
			sortable="custom"
			/>
			<!-- <el-table-column-->
			<!-- prop="descr"-->
			<!-- label="工序描述"-->
			<!-- min-width="150"-->
			<!-- sortable="custom"-->
			<!-- >-->
			<!-- <template slot-scope="{row}">-->
			<!-- <div v-if="row.descr">{{ row.descr }}</div>-->
			<!-- <div v-else>/</div>-->
			<!-- </template>-->
			<!-- </el-table-column>-->
			<el-table-column
			prop="plan_qty"
			label="任务数量"
			width="110"
			sortable="custom"
			show-tooltip-when-overflow
			/>
			<el-table-column
			label="未报工数量"
			width="120"
			show-tooltip-when-overflow
			>
			<!-- sortable="custom"-->
			<template slot-scope="{row}">
			<div>{{ row.plan_qty - row.good_qty - row.ng_qty }}</div>
			</template>
			</el-table-column>
			<el-table-column
			prop="good_qty"
			label="已报工数量(良品)"
			show-tooltip-when-overflow
			label="已报工数量"
			sortable="custom"
			width="160"
			/>
			<el-table-column
			prop="ng_qty"
			label="不良数量"
			show-tooltip-when-overflow
			width="150"

			sortable="custom"
			/>
			<el-table-column
			prop="bad_qty"
			label="已报废数量"
			width="120"
			show-tooltip-when-overflow
			sortable="custom"
			/>
			<el-table-column
			prop="plan_startdate"
			label="计划开工日期"
			width="185"
			show-tooltip-when-overflow
			width="150"
			sortable="custom"
			/>
			>
			<template slot-scope="{row}">
			<div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>
			<div v-else>/</div>
			</template>
			</el-table-column>
			<el-table-column
			prop="plan_enddate"
			label="计划完工日期"
			width="150"
			sortable="custom"
			show-tooltip-when-overflow
			fixed="right"
			>
			<template slot-scope="{row}">
			<div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>
			<div v-else>/</div>
			</template>
			</el-table-column>
			<!-- <el-table-column-->
			<!-- label="操作"-->
			<!-- width="150"-->
			@@ -133,8 +174,8 @@
			<!-- >-->
			<!-- <template slot-scope="{row}">-->
			<!-- <div class="operationClass">-->
			<!-- <el-button type="text" @click="edit('edit',row)">编辑</el-button>-->
			<!-- <el-button type="text" @click="del(row)">删除</el-button>-->
			<!-- <el-button v-waves type="text" @click="edit('edit',row)">编辑</el-button>-->
			<!-- <el-button v-waves type="text" @click="del(row)">删除</el-button>-->
			<!-- </div>-->
			<!-- </template>-->
			<!-- </el-table-column>-->
			@@ -142,12 +183,11 @@
			</div>
			<!--分页-->
			<pagination
			v-show="total>0"
			:total="total"
			:page.sync="form.page"
			:limit.sync="form.rows"
			align="right"
			layout="prev, pager, next,sizes"
			layout="total,prev, pager, next,sizes"
			popper-class="select_bottom"
			@pagination="getMesOrderStepSearch"
			/>
			@@ -176,13 +216,15 @@
			style="width: 300px"
			@keyup.enter.native="val=>enterNative(val,'WXproduceCode')"
			/>
			<!-- @keyup.native="e=>judgeIsScanning(e,'WXproduceCode')"-->

			</div>
			<div v-if="false" style="display: flex;padding-right: 10px">
			<el-button @click="WXsend">
			<el-button v-waves @click="WXsend">
			<svg-icon icon-class="start_time" style="margin-right: 2px" />
			发料
			</el-button>
			<el-button @click="WXback">
			<el-button v-waves @click="WXback">
			<svg-icon icon-class="report_work" style="margin-right: 2px" />
			收料
			</el-button>
			@@ -191,29 +233,18 @@
			<el-divider />
			<div class="elTableDiv">
			<el-table
			ref="tableDataRef"
			class="tableFixed"
			:data="WXtableData"
			:height="tableHeight+'px'"
			:height="isIpad? (tableHeight+50):tableHeight"
			border
			stripe
			:row-class-name="tableRowClassName"
			:style="{width: 100+'%',height:tableHeight+'px',}"
			highlight-current-row
			:header-cell-style="this.$headerCellStyle"
			:cell-style="this.$cellStyle"
			@sort-change="WXsortChange"
			>
			<!-- <el-table-column-->
			<!-- width="50"-->
			<!-- fixed-->
			<!-- >-->
			<!-- <template slot-scope="{row}">-->
			<!-- <el-radio-->
			<!-- v-model="radioSelected"-->
			<!-- :label="row.wo_code"-->
			<!-- style="color: #fff;padding-left: 10px; margin-right: -25px;"-->
			<!-- @change.native="getWXCurrentRow(row.wo_code)"-->
			<!-- />-->
			<!-- </template>-->
			<!-- </el-table-column>-->
			<el-table-column
			prop="RowNum"
			width="50"
			@@ -223,8 +254,9 @@
			<el-table-column
			prop="status"
			label="状态"
			show-tooltip-when-overflow
			sortable="custom"
			width="110"
			width="80"
			>
			<template slot-scope="{row}">
			<div v-if="row.status==='NEW'">新订单</div>
			@@ -236,57 +268,105 @@
			<el-table-column
			prop="wo_code"
			label="工单号"
			min-width="160"
			width="160"
			show-tooltip-when-overflow
			sortable="custom"
			/>
			<el-table-column
			prop="partcode"
			label="产品编码"
			min-width="110"
			show-tooltip-when-overflow
			width="110"
			sortable="custom"
			/>
			<el-table-column
			prop="partname"
			label="产品名称"
			min-width="110"
			width="160"
			show-tooltip-when-overflow
			sortable="custom"
			/>
			<el-table-column
			prop="stepname"
			label="工序"
			min-width="80"
			width="120"
			show-tooltip-when-overflow
			sortable="custom"
			/>
			<el-table-column
			prop="descr"
			label="工序描述"
			min-width="150"
			sortable="custom"
			/>
			<!-- <el-table-column-->
			<!-- prop="descr"-->
			<!-- label="工序描述"-->
			<!-- min-width="150"-->
			<!-- sortable="custom"-->
			<!-- >-->
			<!-- <template slot-scope="{row}">-->
			<!-- <div v-if="row.descr">{{ row.descr }}</div>-->
			<!-- <div v-else>/</div>-->
			<!-- </template>-->
			<!-- </el-table-column>-->
			<el-table-column
			prop="plan_qty"
			label="任务数量"
			show-tooltip-when-overflow
			width="110"
			sortable="custom"
			/>
			<el-table-column
			label="未收料数量"
			width="120"
			show-tooltip-when-overflow
			>
			<!-- sortable="custom"-->
			<template slot-scope="{row}">
			<div>{{ row.plan_qty - row.good_qty - row.ng_qty }}</div>
			</template>
			</el-table-column>
			<el-table-column
			prop="good_qty"
			label="已收料数量(良品)"
			label="已收料数量"
			show-tooltip-when-overflow
			sortable="custom"
			width="160"
			/>
			<el-table-column
			prop="ng_qty"
			label="不良数量"
			show-tooltip-when-overflow
			width="150"
			sortable="custom"
			/>
			<el-table-column
			prop="bad_qty"
			label="已报废数量"
			min-width="120"
			sortable="custom"
			show-tooltip-when-overflow
			/>
			<el-table-column
			prop="plan_startdate"
			label="计划开工日期"
			width="185"
			show-tooltip-when-overflow
			width="150"
			sortable="custom"
			/>
			>
			<template slot-scope="{row}">
			<div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>
			<div v-else>/</div>
			</template>
			</el-table-column>
			<el-table-column
			prop="plan_enddate"
			label="计划完工日期"
			show-tooltip-when-overflow
			width="150"
			sortable="custom"
			fixed="right"
			>
			<template slot-scope="{row}">
			<div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>
			<div v-else>/</div>
			</template>
			</el-table-column>
			<!-- <el-table-column-->
			<!-- label="操作"-->
			<!-- width="150"-->
			@@ -294,8 +374,8 @@
			<!-- >-->
			<!-- <template slot-scope="{row}">-->
			<!-- <div class="operationClass">-->
			<!-- <el-button type="text" @click="edit('edit',row)">编辑</el-button>-->
			<!-- <el-button type="text" @click="del(row)">删除</el-button>-->
			<!-- <el-button v-waves type="text" @click="edit('edit',row)">编辑</el-button>-->
			<!-- <el-button v-waves type="text" @click="del(row)">删除</el-button>-->
			<!-- </div>-->
			<!-- </template>-->
			<!-- </el-table-column>-->
			@@ -303,14 +383,131 @@
			</div>
			<!--分页-->
			<pagination
			v-show="WXtotal>0"
			:total="WXtotal"
			:page.sync="WXform.page"
			:limit.sync="WXform.rows"
			align="right"
			layout="prev, pager, next,sizes"
			layout="total,prev, pager, next,sizes"
			popper-class="select_bottom"
			@pagination="getMesOrderStepSearch"
			/>
			</el-tab-pane>
			<el-tab-pane label="不良待处理列表">
			<div style="margin-left: 10px;margin-top:10px;display: flex;justify-content: space-between">
			<div style="display: flex;align-items: center">
			<div style="width: 90px">扫描条码：</div>
			<!-- oninput="value=value.replace(/[^0-9a-zA-Z;_]/g,'')"-->

			<el-input
			v-model="badForm.orderstepqrcode"
			name="badProduceCode"
			style="width: 300px"
			@keyup.enter.native="val=>enterNative(val,'badProduceCode')"
			/>
			<!-- @keyup.native="e=>judgeIsScanning(e,'badProduceCode')"-->

			</div>
			</div>
			<el-divider />
			<div class="elTableDiv">
			<el-table
			ref="tableDataRef"
			class="tableFixed"
			:data="badTableData"
			:height="isIpad? (tableHeight+50):tableHeight"
			border
			:row-class-name="tableRowClassName"
			:style="{width: 100+'%',height:tableHeight+'px',}"
			highlight-current-row
			:header-cell-style="this.$headerCellStyle"
			:cell-style="this.$cellStyle"
			@sort-change="badSortChange"
			>
			<el-table-column
			prop="RowNum"
			width="50"
			label="序号"
			fixed
			/>
			<el-table-column
			show-tooltip-when-overflow
			prop="wo_code"
			label="工单号"
			min-width="160"
			sortable="custom"
			/>
			<el-table-column
			show-tooltip-when-overflow
			prop="partcode"
			label="产品编码"
			min-width="110"
			sortable="custom"
			/>
			<el-table-column
			show-tooltip-when-overflow
			prop="partname"
			min-width="160"
			label="产品名称"
			sortable="custom"
			/>
			<el-table-column
			prop="stepname"
			label="工序"
			show-tooltip-when-overflow
			min-width="120"
			sortable="custom"
			/>
			<el-table-column
			prop="plan_qty"
			label="任务数量"
			width="110"
			show-tooltip-when-overflow
			sortable="custom"
			/>
			<el-table-column
			prop="good_qty"
			label="已报工数量"
			sortable="custom"
			min-width="160"
			show-tooltip-when-overflow
			/>
			<el-table-column
			prop="ng_qty"
			label="不良数量"
			width="150"
			show-tooltip-when-overflow
			sortable="custom"
			/>
			<el-table-column
			prop="bad_qty"
			label="已报废数量"
			width="120"
			sortable="custom"
			show-tooltip-when-overflow
			/>
			<el-table-column
			label="操作"
			width="120"
			fixed="right"
			>
			<template slot-scope="{row}">
			<div class="operationClass">
			<el-button v-waves type="text" @click="repairHandle(row)">维修处理</el-button>
			</div>
			</template>
			</el-table-column>

			</el-table>
			</div>
			<!--分页-->
			<pagination
			:total="badTotal"
			:page.sync="badForm.page"
			:limit.sync="badForm.rows"
			align="right"
			layout="total,prev, pager, next,sizes"
			popper-class="select_bottom"
			@pagination="getBadList"
			/>
			</el-tab-pane>
			</el-tabs>
			@@ -318,9 +515,10 @@
			</div>

			<el-dialog
			v-el-drag-dialog
			:title="dialogTitle"
			:visible.sync="dialogVisible"
			width="800"
			width="850px"
			class="dialogVisible"
			:top="dialogTitle==='自制报工'?'5vh':'15vh'"
			:close-on-click-modal="false"
			@@ -334,42 +532,42 @@
			:model="dialogForm"
			label-width="110px"
			>
			<el-form-item label="工单编号：">
			<el-form-item label="工单编号：" style="margin: 0 10px 0 0">
			<div style="width: 200px">{{ dialogForm.wo_code }}</div>
			</el-form-item>
			<el-form-item label="产品编码：">
			<el-form-item label="产品编码：" style="margin: 0 10px 0 0">
			<div style="width: 200px">{{ dialogForm.partcode }}</div>
			</el-form-item>
			<el-form-item label="产品名称：">
			<el-form-item label="产品名称：" style="margin: 0 10px 0 0">
			<div style="width: 200px">{{ dialogForm.partname }}</div>
			</el-form-item>
			<el-form-item label="产品规格：">
			<el-form-item label="产品规格：" style="margin: 0 10px 0 0">
			<div style="width: 200px">{{ dialogForm.partspec }}</div>
			</el-form-item>
			<el-form-item label="当前工序：">
			<el-form-item label="当前工序：" style="margin: 0 10px 0 0">
			<div style="width: 200px">{{ dialogForm.stepname }}</div>
			</el-form-item>
			<el-form-item label="工序描述：">
			<el-form-item v-if="false" label="工序描述：">
			<!-- <el-tooltip class="item" effect="dark" content="原材料切按材料切按材料切按时打卡数据的卡" placement="top-start">-->
			<div style="width: 200px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;">
			{{ dialogForm.stepdesc }}
			</div>
			<!-- </el-tooltip>-->
			</el-form-item>
			<el-form-item label="任务数量：">
			<el-form-item label="任务数量：" style="margin: 0 10px 0 0">
			<div style="width: 200px">{{ dialogForm.planqty }}</div>
			</el-form-item>

			<el-form-item v-if="dialogTitle==='自制开始'" label="未开/已开：">
			<el-form-item v-if="dialogTitle==='自制开始'" label="未开/已开：" style="margin: 0 10px 0 0">
			<div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
			</el-form-item>
			<el-form-item v-if="dialogTitle==='自制报工'" label="未报/已报：">
			<el-form-item v-if="dialogTitle==='自制报工'" label="未报/已报：" style="margin: 0 10px 0 0">
			<div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
			</el-form-item>
			<el-form-item v-if="dialogTitle==='外协发料'" label="未发/已发：">
			<el-form-item v-if="dialogTitle==='外协发料'" label="未发/已发：" style="margin: 0 10px 0 0">
			<div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
			</el-form-item>
			<el-form-item v-if="dialogTitle==='外协收料'" label="未收/已收：">
			<el-form-item v-if="dialogTitle==='外协收料'" label="未收/已收：" style="margin: 0 10px 0 0">
			<div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
			</el-form-item>
			<!--自制开始-->
			@@ -392,10 +590,19 @@
			</el-select>
			</el-form-item>
			<!-- 自制报工 -->
			<el-form-item v-if="dialogTitle==='自制报工'" label="下道工序：">
			<el-form-item v-if="dialogTitle==='自制报工'" label="下道工序：" style="margin: 0 10px 0 0">
			<div style="width: 200px">{{ dialogForm.nextstepname }}</div>
			</el-form-item>
			<el-form-item v-if="dialogTitle==='自制报工'" prop="usergroupcode" label="生产班组：">

			<el-form-item v-if="dialogTitle==='自制报工'" prop="reckway" label="计件方式：">

			<el-radio-group v-model="dialogForm.reckway" style="width: 200px;" @change="reckwayChange">
			<el-radio label="group">班组</el-radio>
			<el-radio label="person">个人</el-radio>
			</el-radio-group>
			</el-form-item>

			<el-form-item v-if="dialogTitle==='自制报工'&&dialogForm.reckway==='group'" prop="usergroupcode" label="生产班组：">
			<el-select
			v-model="dialogForm.usergroupcode"
			style="width: 200px;"
			@@ -410,6 +617,23 @@
			/>
			</el-select>
			</el-form-item>

			<el-form-item v-if="dialogTitle==='自制报工'&&dialogForm.reckway==='person'" prop="operation" label="报工人员：">
			<el-select
			v-model="dialogForm.operation"
			style="width: 200px;"
			placeholder="请选择"
			@change="usergroupChange"
			>
			<el-option
			v-for="item in OperationArr"
			:key="item.usercode"
			:label="item.username"
			:value="item.usercode"
			/>
			</el-select>
			</el-form-item>

			<el-form-item v-if="dialogTitle==='自制报工'" label="设备名称：" prop="eqpcode">
			<el-select
			v-model="dialogForm.eqpcode"
			@@ -438,6 +662,7 @@
			placeholder="请选择"
			:disabled="parseFloat(dialogForm.noputqty)===0\|\|dialogForm.noputqty.trim()===''"
			multiple
			collapse-tags
			>
			<el-option
			v-for="item in badArr"
			@@ -447,16 +672,42 @@
			/>
			</el-select>
			</el-form-item>
			<div v-if="dialogTitle==='自制报工'">
			<i class="el-icon-s-operation" style="color:#42b983;" /> 人员列表
			<el-button type="primary" style="margin: 10px 0" @click="userAdd">增行</el-button>
			<!-- <el-form-item v-if="dialogTitle==='自制报工'" label="报工人员：">-->
			<!-- <el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />-->
			<!-- </el-form-item>-->
			<!-- 注释-->
			<!-- <el-form-item v-if="dialogTitle==='自制报工'" label="报工人：">-->
			<!-- <el-select-->
			<!-- v-model="dialogForm.operation"-->
			<!-- style="width: 200px;"-->
			<!-- placeholder="请选择"-->
			<!-- >-->
			<!-- <el-option-->
			<!-- v-for="item in OperationArr"-->
			<!-- :key="item.usercode"-->
			<!-- :label="item.username"-->
			<!-- :value="item.usercode"-->
			<!-- />-->
			<!-- </el-select>-->
			<!-- </el-form-item>-->
			<el-form-item v-if="dialogTitle==='自制报工'" label="备注：">
			<el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />
			</el-form-item>
			<div v-if="dialogTitle==='自制报工'&&dialogForm.reckway==='group'">
			<div style="display: flex;align-items:center;height: 40px;margin-bottom: 10px">
			<i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" />
			<div style="margin: 0 15px 0 5px;">人员列表</div>
			<el-button v-waves type="primary" style="margin: 10px 0" @click="userAdd">增行</el-button>
			</div>
			<el-table
			ref="userTableDataRef"
			:data="userTableData"
			border
			stripe
			class="tableFixed"
			:row-class-name="tableRowClassName"
			:header-cell-style="this.$headerCellStyle"
			:cell-style="this.$cellStyle"
			height="180"
			height="188"
			highlight-current-row
			style="width: 100%"
			>
			@@ -464,13 +715,15 @@
			width="100"
			label="序号"
			type="index"
			fixed
			/>
			<el-table-column
			prop="username"
			label="人员名称"
			show-tooltip-when-overflow
			>
			<template slot-scope="{row}">
			<div v-if="row.isVisible===0">{{ row.username }}</div>

			<el-select
			v-if="row.isVisible===1"
			v-model="row.username"
			@@ -485,29 +738,53 @@
			:value="item.usercode"
			/>
			</el-select>
			<div v-else>{{ row.username }}</div>
			</template>
			</el-table-column>
			<el-table-column
			prop="ratio"
			label="分配比例(%)"
			show-tooltip-when-overflow
			>
			<template slot-scope="{row}">
			<el-input
			v-if="row.isVisible===1\|\|row.isVisible===2"
			v-model="row.ratio"
			oninput="value=value.replace(/[^0-9.]/g,'')"
			placeholder="请输入"
			/>
			<div v-else> {{ row.ratio }}</div>
			</template>
			</el-table-column>

			<el-table-column
			prop="RowNum"
			label="操作"
			fixed="right"
			>
			<template slot-scope="{row}">
			<div class="operationClass">
			<el-button v-if="row.isVisible===0" type="text" @click="userDel(row)">删除</el-button>
			<el-button v-if="row.isVisible===1&&!userIsSave" type="text" @click="userSave(row)">保存</el-button>
			<el-button v-if="row.isVisible===1" type="text" @click="userCancel(row)">取消</el-button>
			<el-button
			v-if="(row.isVisible===1&&!userIsSave)\|\|row.isVisible===2"
			v-waves
			type="text"
			@click="userSave(row)"
			>保存
			</el-button>
			<el-button v-if="row.isVisible===1" v-waves type="text" @click="userCancel(row)">取消</el-button>
			<el-button v-if="row.isVisible===0" v-waves type="text" @click="userDel(row)">删除</el-button>
			<el-button v-if="row.isVisible===0" v-waves type="text" @click="editRatio(row)">修改比例</el-button>
			</div>
			</template>
			</el-table-column>
			</el-table>
			<!--分页-->
			<pagination
			v-show="UserTotal>0"
			:total="UserTotal"
			:page.sync="Userform.page"
			:limit.sync="Userform.rows"
			align="right"
			layout="prev, pager, next,sizes"
			layout="total,prev, pager, next,sizes"
			popper-class="select_bottom"
			@pagination="getMesOrderStepSearch"
			/>
			@@ -626,12 +903,13 @@
			<el-form-item
			v-if="dialogTitle==='外协收料'"
			label="不良原因："
			prop="badcode"
			>
			<!-- prop="badcode"-->
			<el-select
			v-model="dialogForm.badcode"
			style="width: 200px;"
			multiple
			collapse-tags
			:disabled="parseFloat(dialogForm.noputqty)===0\|\|dialogForm.noputqty.trim()===''"
			placeholder="请选择"
			>
			@@ -643,18 +921,328 @@
			/>
			</el-select>
			</el-form-item>

			<!-- <el-form-item v-if="dialogTitle==='外协收料'" label="收料人：">-->
			<!-- <el-select-->
			<!-- v-model="dialogForm.operation"-->
			<!-- style="width: 200px;"-->
			<!-- placeholder="请选择"-->
			<!-- >-->
			<!-- <el-option-->
			<!-- v-for="item in OperationArr"-->
			<!-- :key="item.usercode"-->
			<!-- :label="item.username"-->
			<!-- :value="item.usercode"-->
			<!-- />-->
			<!-- </el-select>-->
			<!-- </el-form-item>-->
			<el-form-item v-if="dialogTitle==='外协收料'" label="备注：">
			<el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />
			</el-form-item>
			</el-form>
			<span slot="footer" class="dialog-footer">
			<div class="footerButton">
			<el-button @click="dialogVisibleCancel">取消</el-button>
			<el-button v-if="dialogTitle==='自制开始'" type="primary" @click="dialogVisibleConfirm">开工</el-button>
			<el-button v-if="dialogTitle==='自制报工'" type="primary" @click="dialogVisibleConfirm">提交/打印</el-button>
			<el-button v-if="dialogTitle==='外协发料'" type="primary" @click="dialogVisibleConfirm">发料</el-button>
			<el-button v-if="dialogTitle==='外协收料'" type="primary" @click="dialogVisibleConfirm">收料/打印</el-button>
			<el-button v-waves @click="dialogVisibleCancel">取消</el-button>
			<el-button
			v-if="dialogTitle==='自制开始'"
			v-waves
			:loading="$store.state.app.buttonIsDisabled"
			:disabled="$store.state.app.buttonIsDisabled"
			type="primary"
			@click="dialogVisibleConfirm"
			>开工</el-button>
			<el-button
			v-if="dialogTitle==='自制报工'&&dialogForm.nextstepname===''"
			v-waves
			:loading="$store.state.app.buttonIsDisabled"
			:disabled="$store.state.app.buttonIsDisabled"
			type="primary"
			@click="dialogVisibleConfirm"
			>提交/打印</el-button>
			<el-button
			v-if="dialogTitle==='自制报工'&&dialogForm.nextstepname!==''"
			v-waves
			:loading="$store.state.app.buttonIsDisabled"
			:disabled="$store.state.app.buttonIsDisabled"
			type="primary"
			@click="dialogVisibleConfirm"
			>提交</el-button>
			<el-button
			v-if="dialogTitle==='外协发料'"
			v-waves
			:loading="$store.state.app.buttonIsDisabled"
			:disabled="$store.state.app.buttonIsDisabled"
			type="primary"
			@click="dialogVisibleConfirm"
			>发料</el-button>
			<el-button
			v-if="dialogTitle==='外协收料'&&dialogForm.nextstepname===''"
			v-waves
			:loading="$store.state.app.buttonIsDisabled"
			:disabled="$store.state.app.buttonIsDisabled"
			type="primary"
			@click="dialogVisibleConfirm"
			>收料/打印</el-button>
			<el-button
			v-if="dialogTitle==='外协收料'&&dialogForm.nextstepname!==''"
			v-waves
			:loading="$store.state.app.buttonIsDisabled"
			:disabled="$store.state.app.buttonIsDisabled"
			type="primary"
			@click="dialogVisibleConfirm"
			>收料</el-button>
			</div>
			</span>
			</el-dialog>

			<!--打印预览页面小标签-->
			<el-dialog
			v-el-drag-dialog
			title="预览"
			:visible.sync="dialogVisible2"
			width="1140"
			top="10vh"
			:close-on-click-modal="false"
			@close="dialogVisible2Close"
			>
			<!-- 要打印的区域 -->
			<div id="printMe2" style="padding: 30px;">
			<div
			style="display: flex;width: 280px;height: 150px;border: 1px solid #000;text-align: center;font-size: 10px;"
			>

			<div style="width: 90px;display: flex;flex-direction: column;border-right: 1px solid #000">
			<div
			style="display: flex;height: 90px;border-bottom:1px solid #000;
			justify-content: center;align-items: center;position: relative"
			>
			<div id="qrCode2" ref="qrCodeDiv2" style="overflow-y: hidden;height:60px;position: absolute;left: 14px;" />
			</div>
			<div
			style="display: flex;height: 30px;justify-content: flex-start;border-bottom:1px solid #000;align-items: center"
			>
			<div style="margin-left: 5px;width: 28px">数量:</div>
			{{ qrForm.startqty }}
			</div>
			<div style="display: flex;height: 30px;justify-content: flex-start;align-items: center">
			<div style="margin-left: 5px;width: 42px">处理人:</div>
			{{ qrForm.operator }}
			</div>
			</div>

			<div style="width:190px;display: flex;flex-direction: column">
			<div
			style="display: flex;height: 20%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center;text-align: left"
			>
			<div style="width: 60px;margin-left: 5px;">工单编号:</div>
			<div>{{ qrForm.wo_code }}</div>
			</div>
			<div
			style="display: flex;height: 20%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center ;text-align: left"
			>
			<div style="width: 60px;margin-left: 5px;">产品编码:</div>
			<div>{{ qrForm.partcode }}</div>
			</div>
			<div
			style="display: flex;height: 20%;border-bottom:1px solid #000 ;justify-content: flex-start;align-items: center;text-align: left"
			>
			<div style="width:60px;margin-left: 5px;">产品名称:</div>
			<div>{{ qrForm.partname }}</div>
			</div>
			<div
			style="display: flex;height: 20%;border-bottom:1px solid #000 ;justify-content: flex-start;align-items: center;text-align: left"
			>
			<div style="width:60px;margin-left: 5px;">下道工序:</div>
			<div>{{ qrForm.nextstepname }}</div>
			</div>
			<div style="display: flex;height: 20%;justify-content: flex-start;align-items: center;text-align: left">
			<div style="width: 60px;margin-left: 5px;">处理时间:</div>
			<div>{{ qrForm.operatorTime }}</div>
			</div>

			</div>

			</div>
			</div>
			<span slot="footer" class="dialog-footer">
			<div class="footerButton">
			<el-button v-waves @click="dialogVisible2 = false">取消</el-button>
			<el-button v-waves v-print="printObj2" type="primary">确定</el-button>
			</div>
			</span>
			</el-dialog>

			<!-- 不良处理列表对话框-->
			<el-dialog
			v-el-drag-dialog
			title="维修处理"
			:visible.sync="badDialogVisible"
			width="990px"
			class="badDialogVisible"
			top="10vh"
			:close-on-click-modal="false"
			@close="handleCloseBad"
			@closed="handleCloseBad"
			>
			<el-form
			inline
			:model="badDialogForm"
			label-width="110px"
			>
			<el-form-item label="工单编号：">
			<div style="width: 200px">{{ badDialogForm.wo_code }}</div>
			</el-form-item>
			<el-form-item label="产品编码：">
			<div style="width: 200px">{{ badDialogForm.partcode }}</div>
			</el-form-item>
			<el-form-item label="产品名称：">
			<div style="width: 200px">{{ badDialogForm.partname }}</div>
			</el-form-item>
			<el-form-item label="产品规格：">
			<div style="width: 200px">{{ badDialogForm.partspec }}</div>
			</el-form-item>
			<el-form-item label="当前工序：">
			<div style="width: 200px">{{ badDialogForm.stepname }}</div>
			</el-form-item>
			<el-form-item label="下道工序：">
			<div style="width: 200px">{{ badDialogForm.nextstepname }}</div>
			</el-form-item>
			<el-form-item label="任务数量：">
			<div style="width: 200px">{{ badDialogForm.plan_qty }}</div>
			</el-form-item>
			<el-form-item label="报工数量：">
			<div style="width: 200px">{{ badDialogForm.good_qty }}</div>
			</el-form-item>
			<el-form-item label="不良数量：">
			<div style="width: 200px">{{ badDialogForm.ng_qty }}</div>
			</el-form-item>

			<!-- 注释-->
			<!-- <el-form-item label="维修人员：">-->
			<!-- <el-select-->
			<!-- v-model="badDialogForm.operation"-->
			<!-- style="width: 200px;"-->
			<!-- placeholder="请选择"-->
			<!-- >-->
			<!-- <el-option-->
			<!-- v-for="item in OperationArr"-->
			<!-- :key="item.usercode"-->
			<!-- :label="item.username"-->
			<!-- :value="item.usercode"-->
			<!-- />-->
			<!-- </el-select>-->
			<!-- </el-form-item>-->

			</el-form>
			<div style="margin-bottom:20px">
			<i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 不良信息明细：
			</div>
			<div class="elTableDiv">
			<el-table
			:data="badTableDataDialog"
			:height="isIpad? (tableHeight-350):(tableHeight-400)"
			border
			:row-class-name="tableRowClassName"
			:style="{width: 100+'%',height:(tableHeight-400)+'px',}"
			highlight-current-row
			:header-cell-style="this.$headerCellStyle"
			:cell-style="this.$cellStyle"
			>
			<el-table-column
			type="index"
			width="50"
			label="序号"
			fixed
			/>
			<el-table-column
			prop="step_code"
			label="工序编码"
			min-width="80"
			/>
			<el-table-column
			prop="stepname"
			label="工序名称"
			min-width="80"
			/>

			<el-table-column
			prop="plan_qty"
			label="任务数量"
			width="80"
			/>
			<el-table-column
			label="报工数量"
			width="80"
			prop="report_qty"
			/>
			<el-table-column
			prop="ng_qty"
			label="不良数量"
			width="80"
			/>
			<el-table-column
			prop="badqty"
			label="已报废数量"
			width="100"
			/>
			<el-table-column
			prop="defect_name"
			label="不良原因"
			show-tooltip-when-overflow
			width="80"
			/>
			<el-table-column
			prop="repair_qty"
			label="维修合格数量"
			width="110"
			>
			<template slot-scope="{row}">
			<!-- {{ row.repair_qty }}-->
			<div v-if="row.isVisible===0">{{ row.repair_qty }}</div>
			<el-input v-if="row.isVisible===1" v-model="row.repair_qty" oninput="value=value.replace(/[^0-9]/g,'')" />
			</template>
			</el-table-column>
			<el-table-column
			prop="bad_qty"
			label="报废数量"
			width="90"
			>
			<!-- oninput="value=value.replace(/[0-9]/g,'')"-->
			<template slot-scope="{row}">
			<div v-if="row.isVisible===0">{{ row.bad_qty }}</div>
			<el-input v-if="row.isVisible===1" v-model="row.bad_qty" oninput="value=value.replace(/[^0-9]/g,'')" />
			</template>
			</el-table-column>
			<el-table-column
			label="操作"
			width="100"
			>
			<template slot-scope="{row}">
			<div class="operationClass">
			<el-button v-if="row.isVisible===0" v-waves type="text" @click="badEdit(row)">编辑</el-button>
			<el-button v-if="row.isVisible===0" v-waves type="text" @click="badDel(row)">删除</el-button>

			<el-button v-if="row.isVisible===1" v-waves type="text" @click="badSave(row)">确认</el-button>
			<el-button v-if="row.isVisible===1" v-waves type="text" @click="badCancel(row)">取消</el-button>
			</div>
			</template>
			</el-table-column>

			</el-table>
			</div>
			<span slot="footer" class="dialog-footer">
			<div class="footerButton">
			<el-button v-waves @click="badDialogVisibleCancel">取消</el-button>
			<el-button
			v-waves
			type="primary"
			:loading="$store.state.app.buttonIsDisabled"
			:disabled="$store.state.app.buttonIsDisabled"
			@click="badDialogVisibleConfirm "
			>保存/打印</el-button>
			</div>
			</span>
			</el-dialog>

			</div>
			</template>

			@@ -674,9 +1262,14 @@
			MesOrderStepSelectCause,
			SavaMesOrderStepIn,
			SavaMesOrderStepStart,
			SavaMesOrderStepReport
			SavaMesOrderStepReport, MesOrderNgStepSearch, MesOrderNgSubStepSearch, EditOrderNgStepSeave
			} from '@/api/scgl'
			import { urlAddRandomNo, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'
			import QRCode from 'qrcodejs2'
			import { getCookie } from '@/utils/auth'
			import { handleDatetime2 } from '@/utils/global'
			import elDragDialog from '@/directive/el-drag-dialog'
			import waves from '@/directive/waves'

			const SER_HZ = /^[\u4e00-\u9fa5]+$/
			export default {
			@@ -684,6 +1277,7 @@
			components: {
			Pagination
			},
			directives: { elDragDialog, waves },
			data() {
			const validateName = (rule, value, callback) => {
			if (!value) {
			@@ -706,6 +1300,7 @@
			return {
			mainHeight: 0,
			tableHeight: 0,
			isIpad: false,
			// produceCode: '', // 工序码
			// WXproduceCode: '', // 外协工序码
			radioSelected: '', // 工序选中
			@@ -756,7 +1351,7 @@
			taskqty: '', // 任务数量
			fqty: '', // 发料数量

			inuser: '', // 收料人员
			inuser: getCookie('navTabId'), // 收料人员
			sqty: '', // 收料数量
			ngqty: '', // 不良数量
			badcode: '', // 不良原因编码
			@@ -768,7 +1363,12 @@
			usergroupcode: '', // 班组编码
			reportuser: '', // 报工人员

			startqtySum: '' // 不能超过的数值
			startqtySum: '', // 不能超过的数值

			reckway: 'group', // 计件方式

			operation: getCookie('navTabId'), // 报工人（收料人）
			remarks: ''// 备注

			},
			ZZuserArr: [], // 自制用户所有
			@@ -811,11 +1411,91 @@
			],
			startqty: [
			{ required: true, message: '请输入报工数量', trigger: ['blur', 'change'] }
			],
			operation: [
			{ required: true, message: '请选择报工人员', trigger: ['blur', 'change'] }
			]
			},
			activeName: ''
			activeName: '',
			dialogVisible2: false,
			printObj2: {
			id: 'printMe2',
			popTitle: '打印模板',
			preview: false,
			extraHead: '<meta http-equiv="Content-Language" content="zh-cn"/>',
			closeCallback(vue) { // 关闭打印的回调事件（无法确定点击的是确认还是取消）
			console.log('11212', vue)
			// vue.dialogVisible = false
			vue.dialogVisible2 = false
			vue.dialogVisible = false
			},
			beforeOpenCallback(vue) {
			vue.printLoading = true
			console.log('打开之前')
			console.log()
			},
			openCallback(vue) {
			vue.printLoading = false
			console.log('执行了打印')
			}
			},
			qrForm: { // 打印内容
			qrvalue: '',
			startqty: '',
			wo_code: '',
			partcode: '',
			partname: '',
			nextstepname: '',
			operator: '', // 操作人
			operatorTime: ''// 操作时间
			},
			badForm: {
			orderstepqrcode: '', // 扫描的二维码
			prop: 'wo_code',
			order: 'asc',
			page: 1,
			rows: 20
			},
			badTableData: [], // 不良处理列表table数据
			badTotal: 0,
			badDialogVisible: false,
			badDialogForm: {
			operation: getCookie('navTabId')
			},
			badTableDataDialog: [], // 不良对话框table表格
			OperationArr: [], // 人员数组
			sendButtonIsDisabled: false, // 下达按钮是否可点击
			judgeIsScanningArr: [], // 判断是否扫码数组
			countJudgeIsScanningInput: 0 // 判断扫码框的个数
			}
			},
			watch: {
			// 'form.orderstepqrcode': {
			// handler(newValue) {
			// this.form.orderstepqrcode = newValue
			//
			// // 在这里调用，并执行this.fnThrottle(this.search, 500, 2000)();
			// this.fnThrottle(this.enterNative, 500, 2000, 'produceCode')()
			// }
			// },
			// 'WXform.orderstepqrcode': {
			// handler(newValue) {
			// this.form.orderstepqrcode = newValue
			//
			// // 在这里调用，并执行this.fnThrottle(this.search, 500, 2000)();
			// this.fnThrottle(this.enterNative, 500, 2000, 'WXproduceCode')()
			// }
			// },
			// 'badForm.orderstepqrcode': {
			// handler(newValue) {
			// this.form.orderstepqrcode = newValue
			//
			// // 在这里调用，并执行this.fnThrottle(this.search, 500, 2000)();
			// this.fnThrottle(this.enterNative, 500, 2000, 'badProduceCode')()
			// }
			// }
			},

			created() {
			this.getMesOrderStepSearch()
			this.tabClick()
			@@ -825,12 +1505,28 @@
			this.getHeight()

			this.$nextTick(() => {
			$("input[name='produceCode']")[0].focus()
			$('input[name=\'produceCode\']')[0].focus()
			// this.bindQRCode('10001;001')
			})
			// webapp_urlprotocol_startup()
			webapp_ws_autoupdate(true)
			// webapp_ws_autoupdate(true)

			this.getMesOrderSelectUserAll() // 获取所有人员
			},
			methods: {
			// 计件方式值改变时
			reckwayChange() {
			this.dialogForm.usergroupcode = ''
			this.dialogForm.operation = ''
			this.userTableData = []
			// console.log(this.$refs.dialogForm, 'log')
			// this.$nextTick(() => {
			// this.$refs.dialogForm.resetFields()
			// })
			},
			tableRowClassName({ row, rowIndex }) {
			return 'custom-row'
			},
			async getMesOrderStepSearch() {
			const res = await MesOrderStepSearch(this.form)
			if (res.code === '200') {
			@@ -870,6 +1566,18 @@
			this.WXform.prop = prop
			this.getMesOrderWxStepSearch()
			},
			badSortChange({ column, prop, order }) {
			if (order === 'descending') {
			order = 'desc'
			} else if (order === 'ascending') {
			order = 'asc'
			} else {
			order = 'desc'
			}
			this.badForm.order = order
			this.badForm.prop = prop
			this.getBadList()
			},
			// 自制页签原点点击
			getCurrentRow(val) {

			@@ -884,21 +1592,127 @@
			if (this.$refs.elTabs.currentName === '0') {
			this.$nextTick(() => {
			this.getMesOrderStepSearch()
			$("input[name='produceCode']")[0].focus()
			$('input[name=\'produceCode\']')[0].focus()
			this.WXform.orderstepqrcode = ''
			})
			}
			if (this.$refs.elTabs.currentName === '1') {
			this.$nextTick(() => {
			this.getMesOrderWxStepSearch()
			$("input[name='WXproduceCode']")[0].focus()
			$('input[name=\'WXproduceCode\']')[0].focus()
			this.form.orderstepqrcode = ''
			})
			}
			if (this.$refs.elTabs.currentName === '2') {
			this.$nextTick(() => {
			this.getBadList()
			$('input[name=\'badProduceCode\']')[0].focus()
			this.badForm.orderstepqrcode = ''
			})
			}
			},
			// 防抖 //扫码用的是防抖
			fnThrottle(method, delay, duration, belong) {
			var that = this
			var timer = this.timer
			var begin = new Date().getTime()
			return function() {
			var current = new Date().getTime()
			clearTimeout(timer)
			if (current - begin >= duration) {
			// method()
			// that.VALUE()
			begin = current
			} else {
			that.timer = setTimeout(function() {
			// method()
			if (belong === 'produceCode') {
			that.enterNative(that.form.orderstepqrcode, belong)
			}
			if (belong === 'WXproduceCode') {
			that.enterNative(that.WXform.orderstepqrcode, belong)
			}
			if (belong === 'badProduceCode') {
			that.enterNative(that.badForm.orderstepqrcode, belong)
			}
			}, delay)
			}
			}
			},
			// 判断是否是扫码枪扫码
			judgeIsScanning2(e, belong) {
			if (belong === 'produceCode' && this.form.orderstepqrcode.toString().length === 0) {
			this.judgeIsScanningArr = []
			this.countJudgeIsScanningInput = 0
			}
			if (belong === 'WXproduceCode' && this.WXform.orderstepqrcode.toString().length === 0) {
			this.judgeIsScanningArr = []
			this.countJudgeIsScanningInput = 0
			}
			const timenow = e.timeStamp
			// console.log(timenow, 1)
			// let flag = true
			let flag = false
			this.judgeIsScanningArr.push(timenow)
			let i

			for (i in this.judgeIsScanningArr) {
			console.log(Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]))
			// flag = Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]) < 0.1
			if (Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]) < 0.1) {
			this.countJudgeIsScanningInput++
			}
			if (this.countJudgeIsScanningInput >= 3) {
			flag = true
			}
			if (i > 0 && this.judgeIsScanningArr.length === parseInt(i) + 1) {
			if (flag) {
			console.log(flag, 1)
			this.fnThrottle(this.enterNative, 500, 2000, belong)()
			return
			}
			}
			}

			// // for (i in this.judgeIsScanningArr) {
			// // console.log(i)
			// // console.log( this.judgeIsScanningArr)
			// console.log(Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]))
			// if (Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]) < 10) {
			// this.countJudgeIsScanningInput++
			// }
			// if (this.countJudgeIsScanningInput > this.judgeIsScanningArr.length / 2) {
			// flag = true
			// }
			// // flag = Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]) < 0.1
			// // if (i > 0 && this.judgeIsScanningArr.length === parseInt(i) + 1) {
			// if (flag) {
			// console.log(flag, 2)
			// this.fnThrottle(this.enterNative, 500, 2000, belong)()
			// return
			// }
			// // }
			// // }
			},
			// 判断是否是扫码枪扫码
			judgeIsScanning(e, belong) {
			const timenow = e.timeStamp
			let flag = true
			this.judgeIsScanningArr.push(timenow)
			let i
			for (i in this.judgeIsScanningArr) {
			flag = Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]) < 0.1
			if (i > 0 && this.judgeIsScanningArr.length === parseInt(i) + 1) {
			if (flag) {
			this.fnThrottle(this.enterNative, 500, 2000, belong)()
			return
			}
			}
			}
			},
			// 扫码键盘回车事件
			async enterNative(val, belong) {
			console.log(val, belong)
			console.log(val, belong, 89898989)
			// 开工：code="200" count=0
			// 报工：code="200" count=1
			// 发料：code="200" count=2
			@@ -933,6 +1747,13 @@
			if (res.code === '200' && res.count === 3) {
			await this.WXback(res.data)
			}
			}

			if (belong === 'badProduceCode') {
			// this.badForm.orderstepqrcode=
			await this.getBadList()
			await this.repairHandle(this.badForm.orderstepqrcode)
			this.badDialogVisible = true
			}
			},
			// 查询
			@@ -989,15 +1810,12 @@
			// this.dialogForm.startqty = obj.startqty
			this.dialogForm.startqty = obj.noreportqty

			if (obj.nextstepname === null \|\| obj.nextstepcode === '') {
			this.dialogForm.nextstepname = obj.stepname
			this.dialogForm.nextstepcode = obj.stepcode
			} else {
			this.dialogForm.nextstepname = obj.nextstepname
			this.dialogForm.nextstepcode = obj.nextstepcode
			}
			this.dialogForm.nextstepname = obj.nextstepname
			this.dialogForm.nextstepcode = obj.nextstepcode ? obj.nextstepcode : obj.stepcode

			this.dialogForm.startqtySum = obj.noreportqty

			this.$refs.userTableDataRef.doLayout()
			})

			await this.getMesOrderStepStartSelectEqp()
			@@ -1054,13 +1872,10 @@
			this.dialogForm.reportqty = obj.reportqty
			this.dialogForm.noreportqty = obj.noreportqty
			this.dialogForm.stepcode = obj.stepcode
			if (obj.nextstepname === null \|\| obj.nextstepcode === '') {
			this.dialogForm.nextstepname = obj.stepname
			this.dialogForm.nextstepcode = obj.stepcode
			} else {
			this.dialogForm.nextstepname = obj.nextstepname
			this.dialogForm.nextstepcode = obj.nextstepcode
			}

			this.dialogForm.nextstepname = obj.nextstepname
			this.dialogForm.nextstepcode = obj.nextstepcode ? obj.nextstepcode : obj.stepcode

			this.dialogForm.noputqty = obj.noputqty
			this.dialogForm.stepseq = obj.seq
			this.dialogForm.sqty = obj.startqty
			@@ -1074,7 +1889,7 @@
			// 生产班组下拉改变
			usergroupChange(val) {
			this.dialogForm.usergroupcode = val
			this.getUserTableData()
			this.getMesOrderSelectUserZZ2()
			},
			// 获取自制报工生产班组下拉列表
			async getMesOrderStepReportSelectUserGroup() {
			@@ -1085,6 +1900,11 @@
			async getMesOrderSelectUserZZ() {
			const { data: res } = await MesOrderSelectUser({ usercode: this.dialogForm.usergroupcode })
			this.ZZuserArr = res
			},
			async getMesOrderSelectUserZZ2() {
			const { data: res } = await MesOrderSelectUser({ usercode: '' })
			this.ZZuserArr = res
			await this.getUserTableData()
			},
			// 获取自制生产设备下拉
			async getMesOrderStepStartSelectEqp() {
			@@ -1122,25 +1942,92 @@
			number = number === 0 ? (10 + Math.random()) : number
			item.isVisible = 0
			item.number = number
			// item.ratio = parseFloat((100 / this.userTableData.length).toFixed(2))
			})

			this.ZZuserArr = [...this.ZZuserArr].filter(x => [...this.userTableData].every(y => y.usercode !== x.usercode))

			this.calculatedValue()
			this.$nextTick(() => {
			this.$refs.tableDataRef.doLayout()
			this.$refs.userTableDataRef.doLayout()
			})
			},
			calculatedValue() {
			const total = 100
			let value = 0
			this.userTableData.forEach(item => {
			item.ratio = parseFloat((100 / this.userTableData.length).toFixed(2))
			value += item.ratio
			})
			console.log(value, 1)
			if (value !== total) {
			// let temp = this.userTableData
			// temp[temp.length-1].ratio=temp[temp.length-1].ratio+(total-value)
			this.userTableData[this.userTableData.length - 1].ratio = parseFloat((this.userTableData[this.userTableData.length - 1].ratio + (total - value)).toFixed(2))
			}
			},
			// 修改分配比列
			editRatio(row) {
			// console.log(row, 'row')
			this.userTableData.forEach((item, index) => {
			if (item.number === row.number) {
			const number = Math.random() * Math.random()// 作为删除时的标识符

			this.userTableData.splice(index, 1, {
			usercode: row.usercode,
			username: row.username,
			ratio: row.ratio,
			isVisible: 2,
			number: number === 0 ? (10 + Math.random()) : number

			})
			}
			})
			},

			// 用户添加
			userAdd() {
			if (this.userTableData.find(i => i.isVisible === 1)) {
			return this.$message.info('请先保存当前行信息！')
			}
			let number = Math.random() * Math.random()// 作为删除时的标识符
			number = number === 0 ? (10 + Math.random()) : number
			console.log(this.userTableData, 6)
			this.userTableData.unshift({ usercode: '', username: '', isVisible: 1, number: number })
			this.userTableData.unshift({ usercode: '', username: '', isVisible: 1, number: number, ratio: 0 })
			this.calculatedValue()
			},
			// 用户列表删除
			userDel(row) {
			this.ZZuserArr.splice(0, 0, {
			usercode: row.usercode,
			username: row.username
			})

			this.userTableData.forEach((item, index) => {
			if (item.number === row.number) {
			this.userTableData.splice(index, 1)
			}
			})

			this.calculatedValue()
			},
			// 用户列表保存
			userSave(row) {
			console.log(row, 123)
			if (row.usercode === '') {
			return this.$message.info('人员名称不能为空！')
			}
			if (row.ratio === '') {
			return this.$message.info('分配比列不能为空！')
			}

			this.ZZuserArr.forEach((item, index) => {
			if (item.usercode === row.usercode) {
			this.ZZuserArr.splice(index, 1)
			}
			})

			this.userTableData.forEach(item => {
			if (item.number === row.number) {
			item.isVisible = 0
			@@ -1171,6 +2058,11 @@
			},
			// 对话框关闭事件
			handleClose() {
			this.judgeIsScanningArr = []
			this.form.orderstepqrcode = ''
			this.WXform.orderstepqrcode = ''
			this.badForm.orderstepqrcode = ''

			this.dialogForm.wo_code = '', // 工单编号
			this.dialogForm.partcode = '', // 产品编码
			this.dialogForm.partname = '', // 产品名称
			@@ -1190,7 +2082,7 @@
			this.dialogForm.taskqty = '', // 任务数量
			this.dialogForm.fqty = '', // 发料数量

			this.dialogForm.inuser = '', // 收料人员
			this.dialogForm.inuser = getCookie('navTabId'), // 收料人员默认登录人员
			this.dialogForm.sqty = '', // 收料数量
			this.dialogForm.ngqty = '', // 不良数量
			this.dialogForm.badcode = '', // 不良原因编码
			@@ -1203,6 +2095,16 @@
			this.dialogForm.reportuser = '', // 报工人员

			this.dialogForm.startqtySum = '' // 不能超过的数值

			this.dialogForm.reckway = '' // 计件方式

			this.dialogForm.nextstepcode = '' // 下道工序编码

			this.dialogForm.reckway = 'group'

			this.dialogForm.remarks = '' // 备注
			this.dialogForm.operation = getCookie('navTabId') // 报工人（收料人）
			this.userTableData = [] // 人员列表

			this.$refs.dialogForm.clearValidate()
			},
			@@ -1229,11 +2131,13 @@
			taskqty: this.dialogForm.planqty, // 任务数量
			fqty: this.dialogForm.fqty // 发料数量
			}
			this.$store.state.app.buttonIsDisabled = true
			SavaMesOrderStepOut(data).then(res => {
			if (res.code === '200') {
			this.$message.success('发料成功！')
			this.dialogVisible = false
			this.$message.success('发料成功！')
			this.tabClick()
			this.$store.state.app.buttonIsDisabled = false
			} else {
			this.$message.error('发料失败!')
			}
			@@ -1260,15 +2164,22 @@
			inuser: this.dialogForm.inuser, // 发料人员
			taskqty: this.dialogForm.planqty, // 任务数量
			sqty: this.dialogForm.sqty, // 收料数量
			remarks: this.dialogForm.remarks, // 备注
			ngqty: this.dialogForm.noputqty === '' ? 0 : this.dialogForm.noputqty, // 不良数量
			badcode: this.dialogForm.badcode.length < 1 ? '' : this.dialogForm.badcode.join(';')// 不良原因
			}
			this.$store.state.app.buttonIsDisabled = true
			SavaMesOrderStepIn(data).then(res => {
			if (res.code === '200') {
			this.WXprint()
			this.$message.success('收料成功！')
			this.dialogVisible = false
			this.$message.success('收料成功！')
			// if (this.dialogForm.nextstepcode === '') {
			// this.WXprint2(this.OperationArr.find(item => item.usercode === this.dialogForm.inuser).username)
			this.WXprint2(this.OperationArr.find(item => item.usercode === getCookie('navTabId')).username)
			this.dialogVisible2 = true
			// }
			this.tabClick()
			this.$store.state.app.buttonIsDisabled = false
			} else {
			this.$message.error('收料失败!')
			}
			@@ -1285,11 +2196,13 @@
			taskqty: this.dialogForm.planqty, // 任务数量
			startqty: this.dialogForm.startqty// 开始数量
			}
			this.$store.state.app.buttonIsDisabled = true
			SavaMesOrderStepStart(data).then(res => {
			if (res.code === '200') {
			this.$message.success('开工成功！')
			this.dialogVisible = false
			this.$message.success('开工成功！')
			this.tabClick()
			this.$store.state.app.buttonIsDisabled = false
			} else {
			this.$message.error('开工失败!')
			}
			@@ -1300,8 +2213,24 @@
			if (parseFloat(this.dialogForm.startqtySum) < parseFloat(this.dialogForm.startqty) + parseFloat(this.dialogForm.noputqty)) {
			return this.$message.info('报工数量加不良数量不能大于了未报数量!')
			}
			if (this.userTableData.length < 1) {
			if (this.userTableData.length < 1 && this.dialogForm.reckway === 'group') {
			return this.$message.info('人员列表不能为空!')
			}
			// this.userTableData = [...new Set(this.userTableData)]// 数组去重
			this.userTableData = this.userTableData.filter(item => item.usercode !== '')
			// 数组中对象相同的去重
			this.userTableData = this.userTableData.filter((currentValue, currentIndex, selfArr) => {
			return selfArr.findIndex(item => item.usercode === currentValue.usercode) === currentIndex
			})

			if (this.dialogForm.reckway === 'group') {
			let sum = 0
			this.userTableData.forEach(item => {
			sum += parseFloat(item.ratio)
			})
			if (Math.round(sum * 100) / 100 !== 100) {
			return this.$message.info('分配比例总和必须为100！')
			}
			}

			if (parseFloat(this.dialogForm.noputqty) > 0) {
			@@ -1310,7 +2239,9 @@
			}
			}

			const reportuser = this.userTableData.map(item => item.usercode).join(';')
			// console.log(this.userTableData, 1)
			// const reportuser = this.userTableData.map(item => item.usercode).join(';')// 主要改的是这里的格式
			console.log(this.dialogForm.operation, 'dialogForm.operation')
			const data = {
			mesordercode: this.dialogForm.wo_code, // 工单编号
			partcode: this.dialogForm.partcode, // 产品编码
			@@ -1318,21 +2249,35 @@
			stepcode: this.dialogForm.stepcode, // 工序编码
			eqpcode: this.dialogForm.eqpcode, // 设备编码
			usergroupcode: this.dialogForm.usergroupcode, // 班组编码
			reportuser: reportuser, // 报工人员
			// reportuser: reportuser, // 报工人员
			reportuser: this.dialogForm.reckway === 'group' ? this.userTableData : [{
			usercode: this.dialogForm.operation,
			ratio: 100
			}],
			taskqty: this.dialogForm.planqty, // 任务数量
			// startqty: this.dialogForm.startqty, // 开工数量
			startqty: this.dialogForm.reportqty, // 开工数量
			// reportqty: this.dialogForm.reportqty, // 报工数量
			reportqty: this.dialogForm.startqty, // 报工数量
			remarks: this.dialogForm.remarks, // 备注
			reckway: this.dialogForm.reckway, // 计件方式
			ngqty: this.dialogForm.noputqty === '' ? 0 : this.dialogForm.noputqty, // 不良数量
			badcode: this.dialogForm.badcode.length < 1 ? '' : this.dialogForm.badcode.join(';')// 不良原因
			}

			// console.log(JSON.stringify(data), 'data')
			console.log(data, 'data')
			this.$store.state.app.buttonIsDisabled = true
			SavaMesOrderStepReport(data).then(res => {
			if (res.code === '200') {
			this.ZZprint()
			this.$message.success('报工成功！')
			this.dialogVisible = false
			this.$message.success('报工成功！')
			// if (this.dialogForm.nextstepcode === '') {
			this.ZZprint2(this.OperationArr.find(item => item.usercode === getCookie('navTabId')).username)
			this.dialogVisible2 = true
			// }
			this.tabClick()
			this.$store.state.app.buttonIsDisabled = false
			} else {
			this.$message.error('报工失败!')
			}
			@@ -1341,57 +2286,249 @@
			}
			})
			},
			async ZZprint() {
			const obj = {
			recordset: [
			{
			wo_code: this.dialogForm.wo_code, // 工单编号
			partcode: this.dialogForm.partcode, // 产品编码
			partname: this.dialogForm.partname, // 产品名称
			next_stepname: this.dialogForm.nextstepname, // 下道工序
			qty: this.dialogForm.startqty, // 数量
			// qrcode: this.form.orderstepqrcode// 二维码
			qrcode: this.dialogForm.wo_code + ';' + this.dialogForm.nextstepcode // 二维码
			}
			]
			}
			const args = {
			type: 'print', // preview print
			showOptionDlg: false, // 如果不显示打印对话框而直接打印，将此行注释去掉即可
			report: urlAddRandomNo('./static/grf/报工产出标签.grf'),
			data: obj
			}
			webapp_ws_ajax_run(args)
			// 生成二维码
			bindQRCode(text) {
			new QRCode(this.$refs.qrCodeDiv2, {
			text: text,
			// width: 50,
			width: 60,
			// height: 50,
			height: 60,
			colorDark: '#000', // 二维码颜色
			colorLight: '#ffffff', // 二维码背景色
			correctLevel: QRCode.CorrectLevel.L// 容错率，L/M/H
			})
			},
			// 外协收料打印
			WXprint() {
			// 参数具体说明请参考帮助文档中的“WEB报表(B/S报表)->WEB报表客户端->启动参数说明”部分
			const obj = {
			recordset: [
			{
			wo_code: this.dialogForm.wo_code, // 工单编号
			partcode: this.dialogForm.partcode, // 产品编码
			partname: this.dialogForm.partname, // 产品名称
			next_stepname: this.dialogForm.nextstepname, // 下道工序
			qty: this.dialogForm.sqty, // 数量
			// qrcode: this.WXform.orderstepqrcode// 二维码
			qrcode: this.dialogForm.wo_code + ';' + this.dialogForm.nextstepcode// 二维码
			}
			]
			}
			const args = {
			type: 'print', // preview print
			showOptionDlg: false, // 如果不显示打印对话框而直接打印，将此行注释去掉即可
			report: urlAddRandomNo('./static/grf/外协收料标签.grf'),
			data: obj
			}
			webapp_ws_ajax_run(args)
			ZZprint2(username) {
			this.qrForm.qrvalue = this.dialogForm.wo_code + ';' + this.dialogForm.nextstepcode
			this.qrForm.startqty = this.dialogForm.startqty
			this.qrForm.wo_code = this.dialogForm.wo_code
			this.qrForm.partcode = this.dialogForm.partcode
			this.qrForm.partname = this.dialogForm.partname
			this.qrForm.nextstepname = this.dialogForm.nextstepname
			this.qrForm.operator = username
			this.qrForm.operatorTime = handleDatetime2(new Date())
			this.$nextTick(() => {
			this.bindQRCode(this.qrForm.qrvalue)
			})
			},
			WXprint2(username) {
			this.qrForm.qrvalue = this.dialogForm.wo_code + ';' + this.dialogForm.nextstepcode
			this.qrForm.startqty = this.dialogForm.sqty
			this.qrForm.wo_code = this.dialogForm.wo_code
			this.qrForm.partcode = this.dialogForm.partcode
			this.qrForm.partname = this.dialogForm.partname
			this.qrForm.nextstepname = this.dialogForm.nextstepname
			this.qrForm.operator = username
			this.qrForm.operatorTime = handleDatetime2(new Date())
			this.$nextTick(() => {
			this.bindQRCode(this.qrForm.qrvalue)
			})
			},
			dialogVisible2Close() {
			this.qrForm.qrvalue = ''
			this.qrForm.startqty = ''
			this.qrForm.wo_code = ''
			this.qrForm.partcode = ''
			this.qrForm.partname = ''
			this.qrForm.nextstepname = ''
			this.qrForm.operator = ''
			this.qrForm.operatorTime = ''
			// this.$refs.qrCodeDiv2 = ''
			},

			// 获取页面高度
			getHeight() {
			this.$nextTick(() => {
			this.mainHeight = window.innerHeight - 250
			this.tableHeight = this.mainHeight - 80
			this.mainHeight = window.innerHeight - 85
			this.tableHeight = this.mainHeight - 220
			this.isIpad = window.innerHeight < 769
			if (window.innerHeight < 769) {
			this.tableHeight = this.tableHeight - 50
			}
			this.$refs.tableDataRef.doLayout()
			})
			},

			// 获取不良处理列表
			async getBadList() {
			const res = await MesOrderNgStepSearch(this.badForm)
			this.badTableData = res.data
			this.badTotal = res.count
			},
			badDialogVisibleCancel() {
			this.badDialogVisible = false
			},
			badDialogVisibleConfirm() {
			const data = {
			Data: this.badTableDataDialog
			}
			this.$store.state.app.buttonIsDisabled = true
			EditOrderNgStepSeave(data, getCookie('navTabId')).then(res => {
			if (res.code === '200' \|\| res.code === '301') {
			this.getBadList()
			this.badDialogVisible = false
			this.badPrint(this.OperationArr.find(item => item.usercode === getCookie('navTabId')).username)
			this.dialogVisible2 = true
			this.$message.success('保存成功！')

			this.$store.state.app.buttonIsDisabled = false
			}
			})
			},
			badPrint(username) {
			this.qrForm.qrvalue = this.badDialogForm.wo_code + ';' + this.badDialogForm.nextstepcode
			this.qrForm.startqty = this.badDialogForm.plan_qty
			this.qrForm.wo_code = this.badDialogForm.wo_code
			this.qrForm.partcode = this.badDialogForm.partcode
			this.qrForm.partname = this.badDialogForm.partname
			this.qrForm.nextstepname = this.badDialogForm.nextstepname
			this.qrForm.operator = username
			this.qrForm.operatorTime = handleDatetime2(new Date())

			this.$nextTick(() => {
			this.bindQRCode(this.qrForm.qrvalue)
			})
			},

			handleCloseBad() {
			this.badDialogForm = {}
			this.badDialogForm.operation = getCookie('navTabId')
			this.badTableDataDialog = []
			this.judgeIsScanningArr = []
			},
			async getMesOrderSelectUserAll() {
			const { data: res } = await MesOrderSelectUser({ usercode: '' })
			this.OperationArr = res
			},
			// 点击维修处理按钮或扫描条码的扫描回车事件
			async repairHandle(row) {
			let data
			if (row.wo_code) {
			data = {
			orderstepqrcode: row.wo_code + ';' + row.stepcode
			}
			} else {
			data = {
			orderstepqrcode: row
			}
			}

			const { data: res } = await MesOrderNgSubStepSearch(data)

			this.$nextTick(() => {
			this.badDialogForm.wo_code = res.data1.wo_code
			this.badDialogForm.partcode = res.data1.partnumber
			this.badDialogForm.partname = res.data1.partname
			this.badDialogForm.partspec = res.data1.partspec
			this.badDialogForm.stepname = res.data1.stepname
			this.badDialogForm.nextstepcode = res.data1.nextstepcode
			this.badDialogForm.nextstepname = res.data1.nextstepname
			this.badDialogForm.plan_qty = res.data1.planqty
			this.badDialogForm.good_qty = res.data1.noreportqty // 报工数量
			this.badDialogForm.ng_qty = res.data1.noputqty // 不良数量

			this.badTableDataDialog = res.data2

			this.badTableDataDialog.forEach(item => {
			item.repair_qty = 0
			item.bad_qty = 0
			item.isVisible = 0
			// item.defect_code = [...new Set(item.defect_code.split(','))].join(',')
			// item.defect_name = [...new Set(item.defect_name.split(','))].join(',')
			})
			console.log(this.badTableDataDialog, 321)
			this.badDialogVisible = true
			})
			},
			badEdit(row) {
			console.log(row)
			this.badTableDataDialog.forEach((item, index) => {
			if (item.id === row.id && item.m_id === row.m_id) {
			this.badTableDataDialog.splice(index, 1, {
			bad_qty: row.bad_qty,
			repair_qty: row.repair_qty,
			isVisible: 1,
			defect_code: row.defect_code,
			defect_name: row.defect_name,
			badqty: row.badqty,
			id: row.id,
			m_id: row.m_id,
			materiel_code: row.materiel_code,
			ng_qty: row.ng_qty,
			plan_qty: row.plan_qty,
			report_qty: row.report_qty,
			seq: row.seq,
			step_code: row.step_code,
			stepname: row.stepname,
			style: row.style,
			wo_code: row.wo_code
			})
			}
			})
			},
			badSave(row) {
			if (parseFloat(row.bad_qty) + parseFloat(row.repair_qty) > parseFloat(row.ng_qty)) {
			this.badCancel(row)
			return this.$message.info('维修数量与报废数量之和不能大于不良数量！')
			}
			this.badTableDataDialog.forEach((item, index) => {
			if (item.id === row.id && item.m_id === row.m_id) {
			this.badTableDataDialog.splice(index, 1, {
			bad_qty: parseFloat(row.bad_qty),
			repair_qty: parseFloat(row.repair_qty),
			isVisible: 0,
			defect_code: row.defect_code,
			defect_name: row.defect_name,
			id: row.id,
			m_id: row.m_id,
			badqty: row.badqty,
			materiel_code: row.materiel_code,
			ng_qty: row.ng_qty,
			plan_qty: row.plan_qty,
			report_qty: row.report_qty,
			seq: row.seq,
			step_code: row.step_code,
			stepname: row.stepname,
			style: row.style,
			wo_code: row.wo_code
			})
			}
			})
			},
			badCancel(row) {
			this.badTableDataDialog.forEach((item, index) => {
			if (item.id === row.id && item.m_id === row.m_id) {
			this.badTableDataDialog.splice(index, 1, {
			// bad_qty: row.bad_qty,
			// repair_qty: row.repair_qty,
			bad_qty: 0,
			repair_qty: 0,
			isVisible: 0,
			defect_code: row.defect_code,
			defect_name: row.defect_name,
			id: row.id,
			m_id: row.m_id,
			badqty: row.badqty,
			materiel_code: row.materiel_code,
			ng_qty: row.ng_qty,
			plan_qty: row.plan_qty,
			report_qty: row.report_qty,
			seq: row.seq,
			step_code: row.step_code,
			stepname: row.stepname,
			style: row.style,
			wo_code: row.wo_code
			})
			}
			})
			},

			badDel(row) {
			this.badTableDataDialog.forEach((item, index) => {
			if (item.id === row.id && item.m_id === row.m_id) {
			this.badTableDataDialog.splice(index, 1)
			}
			})
			}
			}
			@@ -1400,92 +2537,7 @@

			<style lang="scss" scoped>
			$main_color: #42b983;
			::v-deep .el-button--primary {
			background-color: $main_color !important;
			height: 30px;
			display: flex;
			align-items: center;
			//border: 1px solid $main_color;
			border: none;
			padding: 0 20px;
			}

			::v-deep .el-button--primary:hover {
			border: none;
			}

			::v-deep .el-button--info {
			height: 30px;
			display: flex;
			align-items: center;
			padding: 0 20px;
			}

			::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
			background-color: $main_color !important;
			}

			::v-deep .el-dialog__footer {
			display: flex;
			justify-content: flex-end;
			}

			.footerButton {
			display: flex;
			justify-content: end;
			}

			::v-deep .el-button--default {
			background-color: #ffffff !important;
			height: 30px;
			display: flex;
			align-items: center;
			padding: 0 20px;
			}

			::v-deep .el-button--default:hover {
			color: #606266;
			}

			::v-deep .el-dialog__body {
			padding: 20px 100px !important;
			}

			::v-deep .el-radio__input.is-checked .el-radio__inner {
			background-color: $main_color;
			border-color: $main_color;
			}

			::v-deep .el-radio__input.is-checked + .el-radio__label {
			color: $main_color !important;
			}

			::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
			border-color: $main_color;
			background-color: $main_color;
			}

			::v-deep .el-input__inner {
			height: 30px;
			line-height: 30px;
			}

			::v-deep .el-input__inner:focus {
			border-color: $main_color;
			}

			::v-deep .el-table .caret-wrapper {
			transform: scale(0.8);
			}

			::v-deep .cell {
			display: flex !important;
			align-items: center !important;
			justify-content: space-between !important;
			}

			::v-deep .el-button--text {
			color: $main_color;
			.el-button--text {
			font-size: 14px;
			cursor: pointer;
			}
			@@ -1495,29 +2547,6 @@
			display: flex;
			justify-content: space-between;
			align-items: center;
			}

			.el-icon-share {
			color: $main_color;
			cursor: pointer;
			}

			.el-checkbox.is-bordered.is-checked {
			border-color: $main_color;
			}

			::v-deep .el-radio__input.is-checked .el-radio__inner {
			border-color: $main_color;
			background: $main_color;
			}

			::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
			border-color: $main_color;
			background: $main_color;
			}

			::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
			color: $main_color !important;
			}

			::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
			@@ -1532,36 +2561,6 @@
			margin: 10px 30px 0px 0;
			}

			.body ::v-deep .el-divider {
			border: 1px solid #eee;
			width: 99%;
			margin: 10px auto;
			}

			.body ::v-deep .el-form-item {
			margin-bottom: 0;
			}

			::v-deep .el-input__inner:focus {
			border-color: $main_color;
			}

			::v-deep .el-select .el-input__inner:focus {
			border-color: $main_color;
			}

			::v-deep .el-select-dropdown__item.selected {
			color: $main_color;
			}

			::v-deep .el-checkbox__inner:hover {
			border-color: $main_color;
			}

			::v-deep .el-textarea__inner:focus {
			border-color: $main_color;
			}

			//.dialogVisible{
			::v-deep .el-select .el-input .el-select__caret {
			display: flex;
			@@ -1576,3 +2575,124 @@
			}
			}
			</style>
			<style media="print">
			/@media print {/
			@page {
			size: auto;
			margin: 3mm;
			font-size: 10px;
			}

			</style>
			<!--公共页面样式-->
			<style lang="scss" scoped>
			$main_color: #42b983;
			::v-deep .el-button--text {
			font-size: 14px;
			cursor: pointer;
			}

			.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
			color: $main_color;
			cursor: pointer;
			}

			.el-icon-edit-outline {
			margin-right: 15px;
			}

			::v-deep .el-button--primary, .el-button--default, .el-button--info {
			height: 34px;
			display: flex;
			align-items: center;
			padding: 0 15px;
			}

			::v-deep .el-button--primary {
			//background-color: $main_color !important;
			}

			::v-deep .el-button--default {
			background-color: #f8f8fa;
			border: none;
			}

			::v-deep .el-input__inner {
			height: 34px;
			line-height: 34px;
			//color: #a7a7a7;
			}

			::v-deep .el-dialog__body {
			padding: 20px 100px !important;
			}

			::v-deep .dialogVisibleRoles .el-dialog__body {
			padding: 20px 20px !important;
			}

			::v-deep .importPickerClass .el-dialog__body {
			padding: 20px 20px !important;
			}

			::v-deep .badDialogVisible .el-dialog__body {
			padding: 20px 20px !important;
			}

			::v-deep .el-dialog__footer {
			display: flex;
			justify-content: flex-end;
			}

			::v-deep .el-table .caret-wrapper {
			transform: scale(0.8);
			}

			::v-deep .cell {
			display: flex;
			align-items: center;
			justify-content: space-between;
			}

			::v-deep .el-table::before {
			height: 0;
			}

			::v-deep .el-table__body-wrapper {
			background-color: #f8f8fa;
			}

			::v-deep .el-table__body .el-table__row.hover-row td {
			background-color: #eaecef;
			}

			::v-deep .el-form--inline .el-form-item__label {
			color: #a7a7a7;
			}

			.body ::v-deep .el-divider {
			border: 1px solid #eee;
			width: 99%;
			margin: 10px auto;
			}

			.body ::v-deep .el-form-item {
			margin-bottom: 0;
			}

			.tableFixed {
			::v-deep .el-table__fixed-right {
			height: 100% !important;
			}

			::v-deep .el-table__fixed {
			height: 100% !important;
			}
			}
			</style>
			<style>

			.el-table .custom-row {
			background: #f8f8fa;
			}
			</style>