|
|
@@ -48,10 +48,10 @@
|
|
|
icon="el-icon-search"
|
|
|
size="mini"
|
|
|
@click="handleQuery"
|
|
|
- >搜索
|
|
|
+ >搜索
|
|
|
</el-button>
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
|
|
- >重置
|
|
|
+ >重置
|
|
|
</el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
@@ -65,7 +65,7 @@
|
|
|
size="mini"
|
|
|
@click="printHandler"
|
|
|
v-hasPermi="['system:productCodeList:add']"
|
|
|
- >打印
|
|
|
+ >打印
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
@@ -77,7 +77,7 @@
|
|
|
:disabled="single"
|
|
|
@click="handleUpdate"
|
|
|
v-hasPermi="['system:productCodeList:edit']"
|
|
|
- >修改
|
|
|
+ >修改
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
@@ -89,7 +89,7 @@
|
|
|
:disabled="multiple"
|
|
|
@click="handleDelete"
|
|
|
v-hasPermi="['system:productCodeList:remove']"
|
|
|
- >删除
|
|
|
+ >删除
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
@@ -100,7 +100,7 @@
|
|
|
size="mini"
|
|
|
@click="handleExport"
|
|
|
v-hasPermi="['system:productCodeList:export']"
|
|
|
- >导出
|
|
|
+ >导出
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
<right-toolbar
|
|
|
@@ -114,22 +114,22 @@
|
|
|
:data="productCodeListList"
|
|
|
@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
|
|
|
label="规格"
|
|
|
align="center"
|
|
|
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="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
|
|
|
label="操作"
|
|
|
align="center"
|
|
|
@@ -148,7 +148,7 @@
|
|
|
icon="el-icon-edit"
|
|
|
@click="handleUpdate(scope.row)"
|
|
|
v-hasPermi="['system:productCodeList:edit']"
|
|
|
- >修改
|
|
|
+ >修改
|
|
|
</el-button>
|
|
|
</el-dropdown-item>
|
|
|
<el-dropdown-item>
|
|
|
@@ -157,7 +157,7 @@
|
|
|
type="text"
|
|
|
icon="el-icon-circle-plus-outline"
|
|
|
@click="supplementCode(scope.row)"
|
|
|
- >补码
|
|
|
+ >补码
|
|
|
</el-button>
|
|
|
</el-dropdown-item>
|
|
|
<el-dropdown-item>
|
|
|
@@ -167,7 +167,7 @@
|
|
|
icon="el-icon-delete"
|
|
|
@click="handleDelete(scope.row)"
|
|
|
v-hasPermi="['system:productCodeList:remove']"
|
|
|
- >删除
|
|
|
+ >删除
|
|
|
</el-button>
|
|
|
</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
@@ -193,25 +193,25 @@
|
|
|
>
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
|
<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 label="批号" prop="lotNum">
|
|
|
- <el-input v-model="form.lotNum" placeholder="请输入批号"/>
|
|
|
+ <el-input v-model="form.lotNum" placeholder="请输入批号" />
|
|
|
</el-form-item>
|
|
|
<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 label="等级" prop="levels">
|
|
|
- <el-input v-model="form.levels" placeholder="请输入等级"/>
|
|
|
+ <el-input v-model="form.levels" placeholder="请输入等级" />
|
|
|
</el-form-item>
|
|
|
<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 label="箱数" prop="boxNum">
|
|
|
- <el-input v-model="form.boxNum" placeholder="请输入箱数"/>
|
|
|
+ <el-input v-model="form.boxNum" placeholder="请输入箱数" />
|
|
|
</el-form-item>
|
|
|
<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 label="生产日期" prop="productionDate">
|
|
|
<el-date-picker
|
|
|
@@ -224,16 +224,16 @@
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
<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 label="毛重" prop="grossWeight">
|
|
|
- <el-input v-model="form.grossWeight" placeholder="请输入毛重"/>
|
|
|
+ <el-input v-model="form.grossWeight" placeholder="请输入毛重" />
|
|
|
</el-form-item>
|
|
|
<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 label="班次" prop="workShifts">
|
|
|
- <el-input v-model="form.workShifts" placeholder="请输入班次"/>
|
|
|
+ <el-input v-model="form.workShifts" placeholder="请输入班次" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="外贸号" prop="foreignTradeNumber">
|
|
|
<el-input
|
|
|
@@ -242,22 +242,22 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
<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 label="箱重/车重" prop="boxWeight">
|
|
|
- <el-input v-model="form.boxWeight" placeholder="请输入箱重/车重"/>
|
|
|
+ <el-input v-model="form.boxWeight" placeholder="请输入箱重/车重" />
|
|
|
</el-form-item>
|
|
|
<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 label="端口" prop="comPort">
|
|
|
- <el-input v-model="form.comPort" placeholder="请输入端口"/>
|
|
|
+ <el-input v-model="form.comPort" placeholder="请输入端口" />
|
|
|
</el-form-item>
|
|
|
<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 label="库位" prop="storageLocation">
|
|
|
- <el-input v-model="form.storageLocation" placeholder="请输入库位"/>
|
|
|
+ <el-input v-model="form.storageLocation" placeholder="请输入库位" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="区域编号" prop="warehouseregionId">
|
|
|
<el-input
|
|
|
@@ -273,7 +273,7 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
<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 label="创建者编号" prop="createById">
|
|
|
<el-input
|
|
|
@@ -315,14 +315,14 @@
|
|
|
type="primary"
|
|
|
size="mini"
|
|
|
@click="updateOrderData"
|
|
|
- >保存修改
|
|
|
+ >保存修改
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
:disabled="tableData.length != 1"
|
|
|
type="primary"
|
|
|
size="mini"
|
|
|
@click="getOrderData"
|
|
|
- >箱单
|
|
|
+ >箱单
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
:disabled="tableData.length < 2"
|
|
|
@@ -330,7 +330,7 @@
|
|
|
type="primary"
|
|
|
size="mini"
|
|
|
@click="chooseOneToPrint"
|
|
|
- >{{ chooseState ? "退出批箱单" : "批箱单" }}
|
|
|
+ >{{ chooseState ? "退出批箱单" : "批箱单" }}
|
|
|
</el-button>
|
|
|
<el-switch
|
|
|
class="ml10 mr10"
|
|
|
@@ -340,7 +340,7 @@
|
|
|
>
|
|
|
</el-switch>
|
|
|
<el-button type="primary" size="mini" @click="readStateChange"
|
|
|
- >{{ isStartReadNum ? "停止读数" : "开始读数" }}
|
|
|
+ >{{ isStartReadNum ? "停止读数" : "开始读数" }}
|
|
|
</el-button>
|
|
|
</div>
|
|
|
<div class="weightWrap">
|
|
|
@@ -416,7 +416,7 @@
|
|
|
size="mini"
|
|
|
:disabled="chooseState"
|
|
|
@click="handleDeleteOne(scope.$index)"
|
|
|
- >删除
|
|
|
+ >删除
|
|
|
</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -629,17 +629,16 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
-
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item prop="comPort" label="端口">
|
|
|
+ <el-form-item prop="printFormat" label="格式">
|
|
|
<el-select
|
|
|
- v-model="form.comPort"
|
|
|
+ v-model="form.printFormat"
|
|
|
clearable
|
|
|
filterable
|
|
|
size="mini"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="item in dict.type.port"
|
|
|
+ v-for="item in dict.type.coding_list_format"
|
|
|
:key="item.raw.dictCode"
|
|
|
:label="item.label"
|
|
|
:value="item.value"
|
|
|
@@ -649,23 +648,32 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item prop="printFormat" label="格式">
|
|
|
+ <el-form-item prop="grossWeight" label="毛重">
|
|
|
+ <el-input
|
|
|
+ v-model="form.grossWeight"
|
|
|
+ @input="changeGrossWeightForm"
|
|
|
+ size="mini"
|
|
|
+ clearable
|
|
|
+ ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <!-- <el-form-item prop="comPort" label="端口">
|
|
|
<el-select
|
|
|
- v-model="form.printFormat"
|
|
|
+ v-model="form.comPort"
|
|
|
clearable
|
|
|
filterable
|
|
|
size="mini"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="item in dict.type.coding_list_format"
|
|
|
+ v-for="item in dict.type.port"
|
|
|
:key="item.raw.dictCode"
|
|
|
:label="item.label"
|
|
|
:value="item.value"
|
|
|
>
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item> -->
|
|
|
</el-col>
|
|
|
+
|
|
|
<el-col :span="24">
|
|
|
<el-form-item prop="remark" label="备注">
|
|
|
<el-input
|
|
|
@@ -697,7 +705,7 @@
|
|
|
size="mini"
|
|
|
:disabled="!currentRow.lotNum || isDisabled || printAuto"
|
|
|
@click="addProductHandler"
|
|
|
- >添加
|
|
|
+ >添加
|
|
|
</el-button>
|
|
|
</div>
|
|
|
<div class="table-wrap">
|
|
|
@@ -748,12 +756,18 @@ import {
|
|
|
AutoPrinting,
|
|
|
} 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",
|
|
|
- dicts: ["packaging_type", "port", "coding_list_format", "direction_of_twist", "automatic_printing"],
|
|
|
+ dicts: [
|
|
|
+ "packaging_type",
|
|
|
+ "port",
|
|
|
+ "coding_list_format",
|
|
|
+ "direction_of_twist",
|
|
|
+ "automatic_printing",
|
|
|
+ ],
|
|
|
data() {
|
|
|
return {
|
|
|
isStartReadNum: false, //是否开始读取重量
|
|
|
@@ -808,37 +822,41 @@ export default {
|
|
|
tubeColor: "", //管色
|
|
|
comPort: "", //端口
|
|
|
printFormat: "", //格式
|
|
|
+ grossWeight: 0, //毛重
|
|
|
remark: "", //备注
|
|
|
},
|
|
|
rules: {
|
|
|
+ grossWeight: [
|
|
|
+ { 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: {},
|
|
|
@@ -936,7 +954,6 @@ export default {
|
|
|
},
|
|
|
mounted() {
|
|
|
// console.log(this.dict.type.packaging_type);
|
|
|
-
|
|
|
},
|
|
|
beforeDestroy() {
|
|
|
this.closeWebSocket();
|
|
|
@@ -960,8 +977,10 @@ export default {
|
|
|
},
|
|
|
initWebSocket() {
|
|
|
// console.log("开始连接ws", process.env.VUE_APP_BASE_WS_API);
|
|
|
- let automatis_printing = this.dict.type.automatic_printing
|
|
|
- let frequency = automatis_printing.find(item => item.label == "frequency")?.value
|
|
|
+ let automatis_printing = this.dict.type.automatic_printing;
|
|
|
+ let frequency = automatis_printing.find(
|
|
|
+ (item) => item.label == "frequency"
|
|
|
+ )?.value;
|
|
|
if (frequency == undefined) {
|
|
|
frequency = 30;
|
|
|
}
|
|
|
@@ -980,7 +999,8 @@ export default {
|
|
|
if (!this.printAuto) return;
|
|
|
const weightData = JSON.parse(event.data);
|
|
|
const weight = weightData.weight;
|
|
|
- this.nowWeight = weight
|
|
|
+ this.nowWeight = weight;
|
|
|
+ this.form.grossWeight = weight;
|
|
|
if (weight === 0.0 || weight === 0) {
|
|
|
this.resetWeightStatus();
|
|
|
shouldPrint = false; // 重量为0时，重置打印标志
|
|
|
@@ -1000,7 +1020,8 @@ export default {
|
|
|
shouldPrint = true;
|
|
|
} else {
|
|
|
this.waiting++;
|
|
|
- if (this.waiting == frequency && shouldPrint) { // 只有在应该打印且等待计数达标时才打印
|
|
|
+ if (this.waiting == frequency && shouldPrint) {
|
|
|
+ // 只有在应该打印且等待计数达标时才打印
|
|
|
this.waiting = 0;
|
|
|
shouldPrint = false; // 打印后禁止下一次打印，直到重量再次变化
|
|
|
const isValidate = await this.validateAndPrint(weight);
|
|
|
@@ -1009,7 +1030,6 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
|
|
|
-
|
|
|
this.websocket.addEventListener("on", (e) => {
|
|
|
console.log(e, "连接已建立");
|
|
|
});
|
|
|
@@ -1035,6 +1055,11 @@ export default {
|
|
|
}
|
|
|
return isValidate;
|
|
|
},
|
|
|
+ // 表单重量改变回调
|
|
|
+ changeGrossWeightForm(val) {
|
|
|
+ // console.log(val);
|
|
|
+ this.nowWeight = val;
|
|
|
+ },
|
|
|
// 开始设置新的重量
|
|
|
async setWeight(weight) {
|
|
|
console.log("设置新的重量", weight);
|
|
|
@@ -1084,7 +1109,7 @@ export default {
|
|
|
canisterNum,
|
|
|
workShifts,
|
|
|
tubeColor,
|
|
|
- grossWeight: this.nowWeight, //毛重
|
|
|
+ grossWeight: this.printAuto ? this.nowWeight : grossWeight, //毛重
|
|
|
// suttle: this.getSuttle(), //净重
|
|
|
suttle: 0, //净重
|
|
|
boxNum: this.tableData.length + 1, //序号
|
|
|
@@ -1165,7 +1190,7 @@ export default {
|
|
|
console.log(res);
|
|
|
if (res.code == 200 && res.status == "success") {
|
|
|
this.$message.success(res.msg);
|
|
|
- if (this.excuteType == 1) {
|
|
|
+ if (this.excuteType == 1 && this.printAuto) {
|
|
|
this.tableData.push(printRow);
|
|
|
}
|
|
|
} else {
|
|
|
@@ -1188,7 +1213,7 @@ export default {
|
|
|
// 毛重改变回调
|
|
|
changeGrossWeight(row) {
|
|
|
console.log(row);
|
|
|
- let {boxWeight, grossWeight, canisterWeight, canisterNum} = row;
|
|
|
+ let { boxWeight, grossWeight, canisterWeight, canisterNum } = row;
|
|
|
if (!Number(grossWeight)) return;
|
|
|
row.suttle = (
|
|
|
Number(grossWeight) -
|
|
|
@@ -1239,7 +1264,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))
|
|
|
@@ -1295,7 +1320,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];
|
|
|
@@ -1416,7 +1441,7 @@ export default {
|
|
|
canisterNum,
|
|
|
workShifts,
|
|
|
tubeColor,
|
|
|
- grossWeight: 0, //毛重
|
|
|
+ grossWeight: this.printAuto ? this.nowWeight : grossWeight, //毛重
|
|
|
// suttle: this.getSuttle(), //净重
|
|
|
suttle: 0, //净重
|
|
|
boxNum: this.tableData.length + 1, //序号
|
|
|
@@ -1439,7 +1464,7 @@ export default {
|
|
|
},
|
|
|
// 计算净重
|
|
|
getSuttle() {
|
|
|
- let {boxWeight, canisterWeight, canisterNum} = this.form;
|
|
|
+ let { boxWeight, canisterWeight, canisterNum } = this.form;
|
|
|
return (Number(boxWeight) - canisterWeight * canisterNum).toFixed(2);
|
|
|
},
|
|
|
// 表格点击回调
|
|
|
@@ -1459,7 +1484,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];
|
|
|
@@ -1538,8 +1563,7 @@ export default {
|
|
|
if (res.code == 200) {
|
|
|
this.dropDownData = res.data;
|
|
|
}
|
|
|
- } catch (error) {
|
|
|
- }
|
|
|
+ } catch (error) {}
|
|
|
},
|
|
|
/** 查询产品码单列表 */
|
|
|
getList() {
|
|
|
@@ -1735,8 +1759,7 @@ export default {
|
|
|
this.getList();
|
|
|
this.$modal.msgSuccess("删除成功");
|
|
|
})
|
|
|
- .catch(() => {
|
|
|
- });
|
|
|
+ .catch(() => {});
|
|
|
},
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|
lph