|
@@ -15,7 +15,7 @@
|
|
|
type="primary"
|
|
|
size="mini"
|
|
|
@click="updateOrderData"
|
|
|
- >保存修改
|
|
|
+ >保存修改
|
|
|
</el-button>
|
|
|
<!-- <el-button
|
|
|
:disabled="tableData.length != 1"
|
|
@@ -40,14 +40,14 @@
|
|
|
>
|
|
|
</el-switch>
|
|
|
<el-button type="primary" size="mini" @click="readStateChange"
|
|
|
- >{{ isStartReadNum ? "停止读数" : "开始读数" }}
|
|
|
+ >{{ isStartReadNum ? "停止读数" : "开始读数" }}
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
v-show="!printAuto"
|
|
|
type="success"
|
|
|
size="mini"
|
|
|
@click="printBtnHandler"
|
|
|
- >打印
|
|
|
+ >打印
|
|
|
</el-button>
|
|
|
</div>
|
|
|
<div class="weightWrap" v-show="excuteType == 1">
|
|
@@ -121,7 +121,7 @@
|
|
|
size="mini"
|
|
|
:disabled="chooseState"
|
|
|
@click="handleSaveOne(scope.row)"
|
|
|
- >保存修改
|
|
|
+ >保存修改
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
v-else-if="excuteType == 3"
|
|
@@ -129,7 +129,7 @@
|
|
|
size="mini"
|
|
|
:disabled="chooseState"
|
|
|
@click="handleSuppleOne(scope.row)"
|
|
|
- >打印
|
|
|
+ >打印
|
|
|
</el-button>
|
|
|
|
|
|
<el-button
|
|
@@ -138,7 +138,7 @@
|
|
|
size="mini"
|
|
|
:disabled="chooseState"
|
|
|
@click="handleDeleteOne(scope.$index, scope.row)"
|
|
|
- >删除
|
|
|
+ >删除
|
|
|
</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -224,11 +224,11 @@
|
|
|
:value="item.id"
|
|
|
>
|
|
|
<span class="discribe" style="float: left">{{
|
|
|
- item.productionLineName
|
|
|
- }}</span>
|
|
|
+ item.productionLineName
|
|
|
+ }}</span>
|
|
|
<span
|
|
|
style="float: right; color: #8492a6; font-size: 13px"
|
|
|
- >{{ item.productionLineDepartment }}</span
|
|
|
+ >{{ item.productionLineDepartment }}</span
|
|
|
>
|
|
|
</el-option>
|
|
|
</el-select>
|
|
@@ -489,8 +489,8 @@ import {
|
|
|
removeProductCodeASInventory,
|
|
|
} from "@/api/codeListManage/productCodeList";
|
|
|
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 {
|
|
|
name: "ProductCodeList",
|
|
@@ -562,36 +562,36 @@ export default {
|
|
|
},
|
|
|
rules: {
|
|
|
grossWeight: [
|
|
|
- {required: true, message: "请输入重量", trigger: "change"},
|
|
|
+ { required: true, message: "请输入重量", trigger: "change" },
|
|
|
],
|
|
|
packaging: [
|
|
|
- {required: true, message: "请选择包装", trigger: "change"},
|
|
|
+ { required: true, message: "请选择包装", trigger: "change" },
|
|
|
],
|
|
|
machineTool: [
|
|
|
- {required: true, message: "请选择机台", trigger: "change"},
|
|
|
+ { required: true, message: "请选择机台", trigger: "change" },
|
|
|
],
|
|
|
workShifts: [
|
|
|
- {required: true, message: "请选择班次", trigger: "change"},
|
|
|
+ { required: true, message: "请选择班次", trigger: "change" },
|
|
|
],
|
|
|
productionDate: [
|
|
|
- {required: true, message: "请选择生产日期", trigger: "change"},
|
|
|
+ { required: true, message: "请选择生产日期", trigger: "change" },
|
|
|
],
|
|
|
- levels: [{required: true, message: "请选择等级", trigger: "change"}],
|
|
|
+ levels: [{ required: true, message: "请选择等级", trigger: "change" }],
|
|
|
// foreignTradeNumber: [
|
|
|
// { required: true, message: "请输入外贸号", trigger: "blur" },
|
|
|
// ],
|
|
|
canisterWeight: [
|
|
|
- {required: true, message: "请选择筒重", trigger: "change"},
|
|
|
+ { required: true, message: "请选择筒重", trigger: "change" },
|
|
|
],
|
|
|
boxWeight: [
|
|
|
- {required: true, message: "请选择箱重/车重", trigger: "change"},
|
|
|
+ { required: true, message: "请选择箱重/车重", trigger: "change" },
|
|
|
],
|
|
|
tubeColor: [
|
|
|
- {required: true, message: "请选择管色", trigger: "change"},
|
|
|
+ { required: true, message: "请选择管色", trigger: "change" },
|
|
|
],
|
|
|
- comPort: [{required: true, message: "请选择端口", trigger: "change"}],
|
|
|
+ comPort: [{ required: true, message: "请选择端口", trigger: "change" }],
|
|
|
printFormat: [
|
|
|
- {required: true, message: "请选择格式", trigger: "change"},
|
|
|
+ { required: true, message: "请选择格式", trigger: "change" },
|
|
|
],
|
|
|
},
|
|
|
dropDownData: {},
|
|
@@ -654,7 +654,7 @@ export default {
|
|
|
suttle: null,
|
|
|
},
|
|
|
waiting: 0, // 等待次数 不论时间
|
|
|
- confirmPrinting: false,// 确认打印
|
|
|
+ confirmPrinting: false, // 确认打印
|
|
|
lastWeight: 0, // 上次得到的重量
|
|
|
};
|
|
|
},
|
|
@@ -694,7 +694,7 @@ export default {
|
|
|
mounted() {
|
|
|
// console.log(this.dict.type.packaging_type);
|
|
|
console.log("mounted");
|
|
|
- let {excuteType, qrCode} = this.$route.query;
|
|
|
+ let { excuteType, qrCode } = this.$route.query;
|
|
|
if (excuteType == 2) {
|
|
|
//修改
|
|
|
this.handleUpdate(qrCode);
|
|
@@ -807,7 +807,6 @@ export default {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
const weightDifference = Math.abs(weight - initialWeight);
|
|
|
if (weightDifference > weightChangeThreshold) {
|
|
|
initialWeight = weight;
|
|
@@ -815,7 +814,11 @@ export default {
|
|
|
shouldPrint = true;
|
|
|
} else {
|
|
|
this.waiting++;
|
|
|
- if (this.waiting == frequency && shouldPrint && this.confirmPrinting) {
|
|
|
+ if (
|
|
|
+ this.waiting == frequency &&
|
|
|
+ shouldPrint &&
|
|
|
+ this.confirmPrinting
|
|
|
+ ) {
|
|
|
// 只有在应该打印且等待计数达标时才打印qwe
|
|
|
this.waiting = 0;
|
|
|
this.confirmPrinting = false;
|
|
@@ -1011,7 +1014,7 @@ export default {
|
|
|
// 毛重改变回调
|
|
|
changeGrossWeight(row) {
|
|
|
console.log(row);
|
|
|
- let {boxWeight, grossWeight, canisterWeight, canisterNum} = row;
|
|
|
+ let { boxWeight, grossWeight, canisterWeight, canisterNum } = row;
|
|
|
if (!Number(grossWeight)) {
|
|
|
row.suttle = 0;
|
|
|
return;
|
|
@@ -1047,7 +1050,7 @@ export default {
|
|
|
// 确认保存修改一条数据
|
|
|
async handleSaveOne(row) {
|
|
|
try {
|
|
|
- let {sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight} =
|
|
|
+ let { sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight } =
|
|
|
this.count;
|
|
|
let rowData = JSON.parse(JSON.stringify(row));
|
|
|
|
|
@@ -1094,14 +1097,14 @@ export default {
|
|
|
});
|
|
|
this.changeGrossWeight(this.printTableData[0]);
|
|
|
// 前端打印
|
|
|
- // codeListPrint(this.printTableData, "printDom");
|
|
|
+ codeListPrint(this.printTableData, "printDom");
|
|
|
|
|
|
- // if (this.excuteType == 1) {
|
|
|
- // this.tableData.push(this.printTableData[0]);
|
|
|
- // }
|
|
|
+ if (this.excuteType == 1) {
|
|
|
+ this.tableData.push(this.printTableData[0]);
|
|
|
+ }
|
|
|
// 后端打印
|
|
|
console.log("newPrintHandler");
|
|
|
- this.newPrintHandler();
|
|
|
+ // this.newPrintHandler();
|
|
|
},
|
|
|
// 获取机台选项数据
|
|
|
async getLineOptionLsit() {
|
|
@@ -1130,7 +1133,7 @@ export default {
|
|
|
this.$refs.form.validate(async (valid) => {
|
|
|
if (valid) {
|
|
|
try {
|
|
|
- let {sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight} =
|
|
|
+ let { sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight } =
|
|
|
this.count;
|
|
|
let rowData = newData.machineTool
|
|
|
? JSON.parse(JSON.stringify(newData))
|
|
@@ -1188,7 +1191,7 @@ export default {
|
|
|
this.$refs.form.validate(async (valid) => {
|
|
|
if (valid) {
|
|
|
try {
|
|
|
- let {sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight} =
|
|
|
+ let { sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight } =
|
|
|
this.count;
|
|
|
let rowData = JSON.parse(JSON.stringify(this.tableData[0]));
|
|
|
this.printTableData = [rowData];
|
|
@@ -1332,7 +1335,7 @@ export default {
|
|
|
},
|
|
|
// 计算净重
|
|
|
getSuttle() {
|
|
|
- let {boxWeight, canisterWeight, canisterNum} = this.form;
|
|
|
+ let { boxWeight, canisterWeight, canisterNum } = this.form;
|
|
|
return (Number(boxWeight) - canisterWeight * canisterNum).toFixed(2);
|
|
|
},
|
|
|
// 表格点击回调
|
|
@@ -1375,7 +1378,7 @@ export default {
|
|
|
this.$refs.form.validate(async (valid) => {
|
|
|
if (valid) {
|
|
|
try {
|
|
|
- let {sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight} =
|
|
|
+ let { sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight } =
|
|
|
this.count;
|
|
|
let rowData = JSON.parse(JSON.stringify(row));
|
|
|
this.printTableData = [rowData];
|
|
@@ -1427,7 +1430,7 @@ export default {
|
|
|
// 获取所有批次数据
|
|
|
async getAllBatchData(id) {
|
|
|
try {
|
|
|
- let payload = {machineTool: id};
|
|
|
+ let payload = { machineTool: id };
|
|
|
let res = await finishedProductList(payload);
|
|
|
if (res.code == 200) {
|
|
|
this.batchData = res.data;
|
|
@@ -1456,8 +1459,7 @@ export default {
|
|
|
if (res.code == 200) {
|
|
|
this.dropDownData = res.data;
|
|
|
}
|
|
|
- } catch (error) {
|
|
|
- }
|
|
|
+ } catch (error) {}
|
|
|
},
|
|
|
/** 查询产品码单列表 */
|
|
|
getList() {
|
|
@@ -1658,8 +1660,7 @@ export default {
|
|
|
this.getList();
|
|
|
this.$modal.msgSuccess("删除成功");
|
|
|
})
|
|
|
- .catch(() => {
|
|
|
- });
|
|
|
+ .catch(() => {});
|
|
|
},
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|