|
@@ -48,10 +48,10 @@
|
|
icon="el-icon-search"
|
|
icon="el-icon-search"
|
|
size="mini"
|
|
size="mini"
|
|
@click="handleQuery"
|
|
@click="handleQuery"
|
|
- >搜索
|
|
|
|
|
|
+ >搜索
|
|
</el-button>
|
|
</el-button>
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
|
- >重置
|
|
|
|
|
|
+ >重置
|
|
</el-button>
|
|
</el-button>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-form>
|
|
</el-form>
|
|
@@ -65,7 +65,7 @@
|
|
size="mini"
|
|
size="mini"
|
|
@click="printHandler"
|
|
@click="printHandler"
|
|
v-hasPermi="['system:productCodeList:add']"
|
|
v-hasPermi="['system:productCodeList:add']"
|
|
- >打印
|
|
|
|
|
|
+ >打印
|
|
</el-button>
|
|
</el-button>
|
|
</el-col>
|
|
</el-col>
|
|
<!-- <el-col :span="1.5">
|
|
<!-- <el-col :span="1.5">
|
|
@@ -89,7 +89,7 @@
|
|
:disabled="multiple"
|
|
:disabled="multiple"
|
|
@click="handleDelete"
|
|
@click="handleDelete"
|
|
v-hasPermi="['system:productCodeList:remove']"
|
|
v-hasPermi="['system:productCodeList:remove']"
|
|
- >删除
|
|
|
|
|
|
+ >删除
|
|
</el-button>
|
|
</el-button>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="1.5">
|
|
<el-col :span="1.5">
|
|
@@ -100,7 +100,7 @@
|
|
size="mini"
|
|
size="mini"
|
|
@click="handleExport"
|
|
@click="handleExport"
|
|
v-hasPermi="['system:productCodeList:export']"
|
|
v-hasPermi="['system:productCodeList:export']"
|
|
- >导出
|
|
|
|
|
|
+ >导出
|
|
</el-button>
|
|
</el-button>
|
|
</el-col>
|
|
</el-col>
|
|
<right-toolbar
|
|
<right-toolbar
|
|
@@ -114,22 +114,22 @@
|
|
:data="productCodeListList"
|
|
:data="productCodeListList"
|
|
@selection-change="handleSelectionChange"
|
|
@selection-change="handleSelectionChange"
|
|
>
|
|
>
|
|
- <el-table-column type="selection" width="55" align="center" />
|
|
|
|
- <el-table-column label="码单号" align="center" prop="qrCode" />
|
|
|
|
- <el-table-column label="品名" align="center" prop="productName" />
|
|
|
|
|
|
+ <el-table-column type="selection" width="55" align="center"/>
|
|
|
|
+ <el-table-column label="码单号" align="center" prop="qrCode"/>
|
|
|
|
+ <el-table-column label="品名" align="center" prop="productName"/>
|
|
<el-table-column
|
|
<el-table-column
|
|
label="规格"
|
|
label="规格"
|
|
align="center"
|
|
align="center"
|
|
prop="productSpecifications"
|
|
prop="productSpecifications"
|
|
/>
|
|
/>
|
|
- <el-table-column label="批号" align="center" prop="lotNum" />
|
|
|
|
- <el-table-column label="色泽" align="center" prop="productColor" />
|
|
|
|
|
|
+ <el-table-column label="批号" align="center" prop="lotNum"/>
|
|
|
|
+ <el-table-column label="色泽" align="center" prop="productColor"/>
|
|
<!-- <el-table-column label="货品编号" align="center" prop="productId" /> -->
|
|
<!-- <el-table-column label="货品编号" align="center" prop="productId" /> -->
|
|
- <el-table-column label="等级" align="center" prop="levels" />
|
|
|
|
- <el-table-column label="筒数" align="center" prop="totalCanisterNum" />
|
|
|
|
- <el-table-column label="箱数" align="center" prop="totalBoxNum" />
|
|
|
|
- <el-table-column label="净重" align="center" prop="totalSuttle" />
|
|
|
|
- <el-table-column label="备注" align="center" prop="remark" />
|
|
|
|
|
|
+ <el-table-column label="等级" align="center" prop="levels"/>
|
|
|
|
+ <el-table-column label="筒数" align="center" prop="totalCanisterNum"/>
|
|
|
|
+ <el-table-column label="箱数" align="center" prop="totalBoxNum"/>
|
|
|
|
+ <el-table-column label="净重" align="center" prop="totalSuttle"/>
|
|
|
|
+ <el-table-column label="备注" align="center" prop="remark"/>
|
|
<el-table-column
|
|
<el-table-column
|
|
label="操作"
|
|
label="操作"
|
|
align="center"
|
|
align="center"
|
|
@@ -148,7 +148,7 @@
|
|
icon="el-icon-edit"
|
|
icon="el-icon-edit"
|
|
@click="handleUpdate(scope.row)"
|
|
@click="handleUpdate(scope.row)"
|
|
v-hasPermi="['system:productCodeList:edit']"
|
|
v-hasPermi="['system:productCodeList:edit']"
|
|
- >修改
|
|
|
|
|
|
+ >修改
|
|
</el-button>
|
|
</el-button>
|
|
</el-dropdown-item>
|
|
</el-dropdown-item>
|
|
<el-dropdown-item>
|
|
<el-dropdown-item>
|
|
@@ -157,7 +157,7 @@
|
|
type="text"
|
|
type="text"
|
|
icon="el-icon-circle-plus-outline"
|
|
icon="el-icon-circle-plus-outline"
|
|
@click="supplementCode(scope.row)"
|
|
@click="supplementCode(scope.row)"
|
|
- >补码
|
|
|
|
|
|
+ >补码
|
|
</el-button>
|
|
</el-button>
|
|
</el-dropdown-item>
|
|
</el-dropdown-item>
|
|
<el-dropdown-item>
|
|
<el-dropdown-item>
|
|
@@ -167,7 +167,7 @@
|
|
icon="el-icon-delete"
|
|
icon="el-icon-delete"
|
|
@click="handleDelete(scope.row)"
|
|
@click="handleDelete(scope.row)"
|
|
v-hasPermi="['system:productCodeList:remove']"
|
|
v-hasPermi="['system:productCodeList:remove']"
|
|
- >删除
|
|
|
|
|
|
+ >删除
|
|
</el-button>
|
|
</el-button>
|
|
</el-dropdown-item>
|
|
</el-dropdown-item>
|
|
</el-dropdown-menu>
|
|
</el-dropdown-menu>
|
|
@@ -193,25 +193,25 @@
|
|
>
|
|
>
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
<el-form-item label="码单号" prop="qrCode">
|
|
<el-form-item label="码单号" prop="qrCode">
|
|
- <el-input v-model="form.qrCode" placeholder="请输入码单号" />
|
|
|
|
|
|
+ <el-input v-model="form.qrCode" placeholder="请输入码单号"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="批号" prop="lotNum">
|
|
<el-form-item label="批号" prop="lotNum">
|
|
- <el-input v-model="form.lotNum" placeholder="请输入批号" />
|
|
|
|
|
|
+ <el-input v-model="form.lotNum" placeholder="请输入批号"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="货品编号" prop="productId">
|
|
<el-form-item label="货品编号" prop="productId">
|
|
- <el-input v-model="form.productId" placeholder="请输入货品编号" />
|
|
|
|
|
|
+ <el-input v-model="form.productId" placeholder="请输入货品编号"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="等级" prop="levels">
|
|
<el-form-item label="等级" prop="levels">
|
|
- <el-input v-model="form.levels" placeholder="请输入等级" />
|
|
|
|
|
|
+ <el-input v-model="form.levels" placeholder="请输入等级"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="筒数" prop="canisterNum">
|
|
<el-form-item label="筒数" prop="canisterNum">
|
|
- <el-input v-model="form.canisterNum" placeholder="请输入筒数" />
|
|
|
|
|
|
+ <el-input v-model="form.canisterNum" placeholder="请输入筒数"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="箱数" prop="boxNum">
|
|
<el-form-item label="箱数" prop="boxNum">
|
|
- <el-input v-model="form.boxNum" placeholder="请输入箱数" />
|
|
|
|
|
|
+ <el-input v-model="form.boxNum" placeholder="请输入箱数"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="净重" prop="suttle">
|
|
<el-form-item label="净重" prop="suttle">
|
|
- <el-input v-model="form.suttle" placeholder="请输入净重" />
|
|
|
|
|
|
+ <el-input v-model="form.suttle" placeholder="请输入净重"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="生产日期" prop="productionDate">
|
|
<el-form-item label="生产日期" prop="productionDate">
|
|
<el-date-picker
|
|
<el-date-picker
|
|
@@ -224,16 +224,16 @@
|
|
</el-date-picker>
|
|
</el-date-picker>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="机台" prop="machineTool">
|
|
<el-form-item label="机台" prop="machineTool">
|
|
- <el-input v-model="form.machineTool" placeholder="请输入机台" />
|
|
|
|
|
|
+ <el-input v-model="form.machineTool" placeholder="请输入机台"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="毛重" prop="grossWeight">
|
|
<el-form-item label="毛重" prop="grossWeight">
|
|
- <el-input v-model="form.grossWeight" placeholder="请输入毛重" />
|
|
|
|
|
|
+ <el-input v-model="form.grossWeight" placeholder="请输入毛重"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="包装" prop="packaging">
|
|
<el-form-item label="包装" prop="packaging">
|
|
- <el-input v-model="form.packaging" placeholder="请输入包装" />
|
|
|
|
|
|
+ <el-input v-model="form.packaging" placeholder="请输入包装"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="班次" prop="workShifts">
|
|
<el-form-item label="班次" prop="workShifts">
|
|
- <el-input v-model="form.workShifts" placeholder="请输入班次" />
|
|
|
|
|
|
+ <el-input v-model="form.workShifts" placeholder="请输入班次"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="外贸号" prop="foreignTradeNumber">
|
|
<el-form-item label="外贸号" prop="foreignTradeNumber">
|
|
<el-input
|
|
<el-input
|
|
@@ -242,22 +242,22 @@
|
|
/>
|
|
/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="筒重" prop="canisterWeight">
|
|
<el-form-item label="筒重" prop="canisterWeight">
|
|
- <el-input v-model="form.canisterWeight" placeholder="请输入筒重" />
|
|
|
|
|
|
+ <el-input v-model="form.canisterWeight" placeholder="请输入筒重"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="箱重/车重" prop="boxWeight">
|
|
<el-form-item label="箱重/车重" prop="boxWeight">
|
|
- <el-input v-model="form.boxWeight" placeholder="请输入箱重/车重" />
|
|
|
|
|
|
+ <el-input v-model="form.boxWeight" placeholder="请输入箱重/车重"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="管色" prop="tubeColor">
|
|
<el-form-item label="管色" prop="tubeColor">
|
|
- <el-input v-model="form.tubeColor" placeholder="请输入管色" />
|
|
|
|
|
|
+ <el-input v-model="form.tubeColor" placeholder="请输入管色"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="端口" prop="comPort">
|
|
<el-form-item label="端口" prop="comPort">
|
|
- <el-input v-model="form.comPort" placeholder="请输入端口" />
|
|
|
|
|
|
+ <el-input v-model="form.comPort" placeholder="请输入端口"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="打印格式" prop="printFormat">
|
|
<el-form-item label="打印格式" prop="printFormat">
|
|
- <el-input v-model="form.printFormat" placeholder="请输入打印格式" />
|
|
|
|
|
|
+ <el-input v-model="form.printFormat" placeholder="请输入打印格式"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="库位" prop="storageLocation">
|
|
<el-form-item label="库位" prop="storageLocation">
|
|
- <el-input v-model="form.storageLocation" placeholder="请输入库位" />
|
|
|
|
|
|
+ <el-input v-model="form.storageLocation" placeholder="请输入库位"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="区域编号" prop="warehouseregionId">
|
|
<el-form-item label="区域编号" prop="warehouseregionId">
|
|
<el-input
|
|
<el-input
|
|
@@ -273,7 +273,7 @@
|
|
/>
|
|
/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="删除标志" prop="delFlag">
|
|
<el-form-item label="删除标志" prop="delFlag">
|
|
- <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
|
|
|
|
|
|
+ <el-input v-model="form.delFlag" placeholder="请输入删除标志"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="创建者编号" prop="createById">
|
|
<el-form-item label="创建者编号" prop="createById">
|
|
<el-input
|
|
<el-input
|
|
@@ -316,7 +316,7 @@
|
|
type="primary"
|
|
type="primary"
|
|
size="mini"
|
|
size="mini"
|
|
@click="updateOrderData"
|
|
@click="updateOrderData"
|
|
- >保存修改
|
|
|
|
|
|
+ >保存修改
|
|
</el-button>
|
|
</el-button>
|
|
<!-- <el-button
|
|
<!-- <el-button
|
|
:disabled="tableData.length != 1"
|
|
:disabled="tableData.length != 1"
|
|
@@ -341,14 +341,14 @@
|
|
>
|
|
>
|
|
</el-switch>
|
|
</el-switch>
|
|
<el-button type="primary" size="mini" @click="readStateChange"
|
|
<el-button type="primary" size="mini" @click="readStateChange"
|
|
- >{{ isStartReadNum ? "停止读数" : "开始读数" }}
|
|
|
|
|
|
+ >{{ isStartReadNum ? "停止读数" : "开始读数" }}
|
|
</el-button>
|
|
</el-button>
|
|
<el-button
|
|
<el-button
|
|
v-show="!printAuto"
|
|
v-show="!printAuto"
|
|
type="success"
|
|
type="success"
|
|
size="mini"
|
|
size="mini"
|
|
@click="printBtnHandler"
|
|
@click="printBtnHandler"
|
|
- >打印
|
|
|
|
|
|
+ >打印
|
|
</el-button>
|
|
</el-button>
|
|
</div>
|
|
</div>
|
|
<div class="weightWrap" v-show="excuteType == 1">
|
|
<div class="weightWrap" v-show="excuteType == 1">
|
|
@@ -426,7 +426,7 @@
|
|
size="mini"
|
|
size="mini"
|
|
:disabled="chooseState"
|
|
:disabled="chooseState"
|
|
@click="handleSaveOne(scope.row)"
|
|
@click="handleSaveOne(scope.row)"
|
|
- >保存修改
|
|
|
|
|
|
+ >保存修改
|
|
</el-button>
|
|
</el-button>
|
|
<el-button
|
|
<el-button
|
|
v-else-if="excuteType == 3"
|
|
v-else-if="excuteType == 3"
|
|
@@ -434,7 +434,7 @@
|
|
size="mini"
|
|
size="mini"
|
|
:disabled="chooseState"
|
|
:disabled="chooseState"
|
|
@click="handleSuppleOne(scope.row)"
|
|
@click="handleSuppleOne(scope.row)"
|
|
- >打印
|
|
|
|
|
|
+ >打印
|
|
</el-button>
|
|
</el-button>
|
|
|
|
|
|
<el-button
|
|
<el-button
|
|
@@ -443,7 +443,7 @@
|
|
size="mini"
|
|
size="mini"
|
|
:disabled="chooseState"
|
|
:disabled="chooseState"
|
|
@click="handleDeleteOne(scope.$index)"
|
|
@click="handleDeleteOne(scope.$index)"
|
|
- >删除
|
|
|
|
|
|
+ >删除
|
|
</el-button>
|
|
</el-button>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
@@ -679,7 +679,6 @@
|
|
<el-input
|
|
<el-input
|
|
v-model="form.grossWeight"
|
|
v-model="form.grossWeight"
|
|
@input="changeGrossWeightForm"
|
|
@input="changeGrossWeightForm"
|
|
- oninput="value=value.replace(/[^0-9.]/g,'')"
|
|
|
|
size="mini"
|
|
size="mini"
|
|
clearable
|
|
clearable
|
|
></el-input>
|
|
></el-input>
|
|
@@ -791,8 +790,8 @@ import {
|
|
getPrintDataNew,
|
|
getPrintDataNew,
|
|
} from "@/api/codeListManage/productCodeList";
|
|
} from "@/api/codeListManage/productCodeList";
|
|
import codeListPrint from "@/utils/print/codeListPrint";
|
|
import codeListPrint from "@/utils/print/codeListPrint";
|
|
-import { getServerPrintData } from "@/utils/print/printUtils";
|
|
|
|
-import { v4 as uuidv4 } from "uuid";
|
|
|
|
|
|
+import {getServerPrintData} from "@/utils/print/printUtils";
|
|
|
|
+import {v4 as uuidv4} from "uuid";
|
|
|
|
|
|
export default {
|
|
export default {
|
|
name: "ProductCodeList",
|
|
name: "ProductCodeList",
|
|
@@ -863,36 +862,36 @@ export default {
|
|
},
|
|
},
|
|
rules: {
|
|
rules: {
|
|
grossWeight: [
|
|
grossWeight: [
|
|
- { required: true, message: "请输入重量", trigger: "change" },
|
|
|
|
|
|
+ {required: true, message: "请输入重量", trigger: "change"},
|
|
],
|
|
],
|
|
packaging: [
|
|
packaging: [
|
|
- { required: true, message: "请选择包装", trigger: "change" },
|
|
|
|
|
|
+ {required: true, message: "请选择包装", trigger: "change"},
|
|
],
|
|
],
|
|
machineTool: [
|
|
machineTool: [
|
|
- { required: true, message: "请选择机台", trigger: "change" },
|
|
|
|
|
|
+ {required: true, message: "请选择机台", trigger: "change"},
|
|
],
|
|
],
|
|
workShifts: [
|
|
workShifts: [
|
|
- { required: true, message: "请选择班次", trigger: "change" },
|
|
|
|
|
|
+ {required: true, message: "请选择班次", trigger: "change"},
|
|
],
|
|
],
|
|
productionDate: [
|
|
productionDate: [
|
|
- { required: true, message: "请选择生产日期", trigger: "change" },
|
|
|
|
|
|
+ {required: true, message: "请选择生产日期", trigger: "change"},
|
|
],
|
|
],
|
|
- levels: [{ required: true, message: "请选择等级", trigger: "change" }],
|
|
|
|
|
|
+ levels: [{required: true, message: "请选择等级", trigger: "change"}],
|
|
// foreignTradeNumber: [
|
|
// foreignTradeNumber: [
|
|
// { required: true, message: "请输入外贸号", trigger: "blur" },
|
|
// { required: true, message: "请输入外贸号", trigger: "blur" },
|
|
// ],
|
|
// ],
|
|
canisterWeight: [
|
|
canisterWeight: [
|
|
- { required: true, message: "请选择筒重", trigger: "change" },
|
|
|
|
|
|
+ {required: true, message: "请选择筒重", trigger: "change"},
|
|
],
|
|
],
|
|
boxWeight: [
|
|
boxWeight: [
|
|
- { required: true, message: "请选择箱重/车重", trigger: "change" },
|
|
|
|
|
|
+ {required: true, message: "请选择箱重/车重", trigger: "change"},
|
|
],
|
|
],
|
|
tubeColor: [
|
|
tubeColor: [
|
|
- { required: true, message: "请选择管色", trigger: "change" },
|
|
|
|
|
|
+ {required: true, message: "请选择管色", trigger: "change"},
|
|
],
|
|
],
|
|
- comPort: [{ required: true, message: "请选择端口", trigger: "change" }],
|
|
|
|
|
|
+ comPort: [{required: true, message: "请选择端口", trigger: "change"}],
|
|
printFormat: [
|
|
printFormat: [
|
|
- { required: true, message: "请选择格式", trigger: "change" },
|
|
|
|
|
|
+ {required: true, message: "请选择格式", trigger: "change"},
|
|
],
|
|
],
|
|
},
|
|
},
|
|
dropDownData: {},
|
|
dropDownData: {},
|
|
@@ -977,7 +976,6 @@ export default {
|
|
this.count.sumCanisterNum += Number(item.canisterNum);
|
|
this.count.sumCanisterNum += Number(item.canisterNum);
|
|
}
|
|
}
|
|
if (item.suttle) {
|
|
if (item.suttle) {
|
|
- console.log(Number(item.suttle));
|
|
|
|
this.count.sumSuttle += Number(item.suttle);
|
|
this.count.sumSuttle += Number(item.suttle);
|
|
}
|
|
}
|
|
if (item.grossWeight) {
|
|
if (item.grossWeight) {
|
|
@@ -1032,12 +1030,24 @@ export default {
|
|
initWebSocket() {
|
|
initWebSocket() {
|
|
// console.log("开始连接ws", process.env.VUE_APP_BASE_WS_API);
|
|
// console.log("开始连接ws", process.env.VUE_APP_BASE_WS_API);
|
|
let automatis_printing = this.dict.type.automatic_printing;
|
|
let automatis_printing = this.dict.type.automatic_printing;
|
|
- let frequency = automatis_printing.find(
|
|
|
|
|
|
+ let frequency = automatis_printing.find( // 等到稳定次数
|
|
(item) => item.label == "frequency"
|
|
(item) => item.label == "frequency"
|
|
)?.value;
|
|
)?.value;
|
|
if (frequency == undefined) {
|
|
if (frequency == undefined) {
|
|
frequency = 30;
|
|
frequency = 30;
|
|
}
|
|
}
|
|
|
|
+ let minimumWeight = automatis_printing.find( // 打印最小值
|
|
|
|
+ (item) => item.label == "minimumWeight"
|
|
|
|
+ )?.value;
|
|
|
|
+ if (minimumWeight == undefined) {
|
|
|
|
+ minimumWeight = 5;
|
|
|
|
+ }
|
|
|
|
+ let antishake = automatis_printing.find( // 防抖
|
|
|
|
+ (item) => item.label == "antishake"
|
|
|
|
+ )?.value;
|
|
|
|
+ if (antishake == undefined) {
|
|
|
|
+ antishake = 3;
|
|
|
|
+ }
|
|
const wsUrl = "ws:" + process.env.VUE_APP_BASE_WS_API + "/currentWeight";
|
|
const wsUrl = "ws:" + process.env.VUE_APP_BASE_WS_API + "/currentWeight";
|
|
this.websocket = new WebSocket(wsUrl);
|
|
this.websocket = new WebSocket(wsUrl);
|
|
this.websocket.addEventListener("open", (event) => {
|
|
this.websocket.addEventListener("open", (event) => {
|
|
@@ -1046,7 +1056,7 @@ export default {
|
|
this.$message.success("已开启读数");
|
|
this.$message.success("已开启读数");
|
|
});
|
|
});
|
|
let initialWeight = null; // 初始化基准重量
|
|
let initialWeight = null; // 初始化基准重量
|
|
- const weightChangeThreshold = 0.001; // 定义重量变化阈值x
|
|
|
|
|
|
+ const weightChangeThreshold = antishake; // 定义重量变化阈值x
|
|
let shouldPrint = false; // 用于控制是否应该打印
|
|
let shouldPrint = false; // 用于控制是否应该打印
|
|
this.websocket.addEventListener("message", async (event) => {
|
|
this.websocket.addEventListener("message", async (event) => {
|
|
console.log(event);
|
|
console.log(event);
|
|
@@ -1061,12 +1071,17 @@ export default {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if (weight <= minimumWeight) {
|
|
|
|
+ this.resetWeightStatus();
|
|
|
|
+ shouldPrint = false; // 重量未满足打印条件,重置打印标志
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
if (initialWeight === null) {
|
|
if (initialWeight === null) {
|
|
initialWeight = weight;
|
|
initialWeight = weight;
|
|
shouldPrint = true; // 第一次有效重量,允许打印
|
|
shouldPrint = true; // 第一次有效重量,允许打印
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
-
|
|
|
|
const weightDifference = Math.abs(weight - initialWeight);
|
|
const weightDifference = Math.abs(weight - initialWeight);
|
|
if (weightDifference > weightChangeThreshold) {
|
|
if (weightDifference > weightChangeThreshold) {
|
|
initialWeight = weight;
|
|
initialWeight = weight;
|
|
@@ -1079,8 +1094,6 @@ export default {
|
|
this.waiting = 0;
|
|
this.waiting = 0;
|
|
shouldPrint = false; // 打印后禁止下一次打印,直到重量再次变化
|
|
shouldPrint = false; // 打印后禁止下一次打印,直到重量再次变化
|
|
const isValidate = await this.validateAndPrint(weight);
|
|
const isValidate = await this.validateAndPrint(weight);
|
|
-
|
|
|
|
- console.log("isValidate", isValidate);
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
});
|
|
});
|
|
@@ -1267,7 +1280,7 @@ export default {
|
|
// 毛重改变回调
|
|
// 毛重改变回调
|
|
changeGrossWeight(row) {
|
|
changeGrossWeight(row) {
|
|
console.log(row);
|
|
console.log(row);
|
|
- let { boxWeight, grossWeight, canisterWeight, canisterNum } = row;
|
|
|
|
|
|
+ let {boxWeight, grossWeight, canisterWeight, canisterNum} = row;
|
|
if (!Number(grossWeight)) {
|
|
if (!Number(grossWeight)) {
|
|
row.suttle = 0;
|
|
row.suttle = 0;
|
|
return;
|
|
return;
|
|
@@ -1291,7 +1304,7 @@ export default {
|
|
// 确认保存修改一条数据
|
|
// 确认保存修改一条数据
|
|
async handleSaveOne(row) {
|
|
async handleSaveOne(row) {
|
|
try {
|
|
try {
|
|
- let { sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight } =
|
|
|
|
|
|
+ let {sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight} =
|
|
this.count;
|
|
this.count;
|
|
let rowData = JSON.parse(JSON.stringify(row));
|
|
let rowData = JSON.parse(JSON.stringify(row));
|
|
let payLoad = {
|
|
let payLoad = {
|
|
@@ -1373,7 +1386,7 @@ export default {
|
|
this.$refs.form.validate(async (valid) => {
|
|
this.$refs.form.validate(async (valid) => {
|
|
if (valid) {
|
|
if (valid) {
|
|
try {
|
|
try {
|
|
- let { sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight } =
|
|
|
|
|
|
+ let {sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight} =
|
|
this.count;
|
|
this.count;
|
|
let rowData = newData.machineTool
|
|
let rowData = newData.machineTool
|
|
? JSON.parse(JSON.stringify(newData))
|
|
? JSON.parse(JSON.stringify(newData))
|
|
@@ -1430,7 +1443,7 @@ export default {
|
|
this.$refs.form.validate(async (valid) => {
|
|
this.$refs.form.validate(async (valid) => {
|
|
if (valid) {
|
|
if (valid) {
|
|
try {
|
|
try {
|
|
- let { sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight } =
|
|
|
|
|
|
+ let {sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight} =
|
|
this.count;
|
|
this.count;
|
|
let rowData = JSON.parse(JSON.stringify(this.tableData[0]));
|
|
let rowData = JSON.parse(JSON.stringify(this.tableData[0]));
|
|
this.printTableData = [rowData];
|
|
this.printTableData = [rowData];
|
|
@@ -1574,7 +1587,7 @@ export default {
|
|
},
|
|
},
|
|
// 计算净重
|
|
// 计算净重
|
|
getSuttle() {
|
|
getSuttle() {
|
|
- let { boxWeight, canisterWeight, canisterNum } = this.form;
|
|
|
|
|
|
+ let {boxWeight, canisterWeight, canisterNum} = this.form;
|
|
return (Number(boxWeight) - canisterWeight * canisterNum).toFixed(2);
|
|
return (Number(boxWeight) - canisterWeight * canisterNum).toFixed(2);
|
|
},
|
|
},
|
|
// 表格点击回调
|
|
// 表格点击回调
|
|
@@ -1617,7 +1630,7 @@ export default {
|
|
this.$refs.form.validate(async (valid) => {
|
|
this.$refs.form.validate(async (valid) => {
|
|
if (valid) {
|
|
if (valid) {
|
|
try {
|
|
try {
|
|
- let { sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight } =
|
|
|
|
|
|
+ let {sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight} =
|
|
this.count;
|
|
this.count;
|
|
let rowData = JSON.parse(JSON.stringify(row));
|
|
let rowData = JSON.parse(JSON.stringify(row));
|
|
this.printTableData = [rowData];
|
|
this.printTableData = [rowData];
|
|
@@ -1697,7 +1710,8 @@ export default {
|
|
if (res.code == 200) {
|
|
if (res.code == 200) {
|
|
this.dropDownData = res.data;
|
|
this.dropDownData = res.data;
|
|
}
|
|
}
|
|
- } catch (error) {}
|
|
|
|
|
|
+ } catch (error) {
|
|
|
|
+ }
|
|
},
|
|
},
|
|
/** 查询产品码单列表 */
|
|
/** 查询产品码单列表 */
|
|
getList() {
|
|
getList() {
|
|
@@ -1897,7 +1911,8 @@ export default {
|
|
this.getList();
|
|
this.getList();
|
|
this.$modal.msgSuccess("删除成功");
|
|
this.$modal.msgSuccess("删除成功");
|
|
})
|
|
})
|
|
- .catch(() => {});
|
|
|
|
|
|
+ .catch(() => {
|
|
|
|
+ });
|
|
},
|
|
},
|
|
/** 导出按钮操作 */
|
|
/** 导出按钮操作 */
|
|
handleExport() {
|
|
handleExport() {
|