fix:修改
This commit is contained in:
17630416519
parent
3e8e7a697e
commit
bbae43c37f
@ -54,3 +54,14 @@ export function FreeNumBoxLabel(params) {
|
||||
params
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* 6.打印工单外箱标签
|
||||
*/
|
||||
export function PrintPackageLabel(data) {
|
||||
return request({
|
||||
url: 'http://localhost:9696/print_api/bartender/print',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
@ -43,40 +43,23 @@
|
||||
<div class="descriptions-title-workorder">
|
||||
<h2 style="margin-right: 20px">{{ `工单:${workOrderInfo.workorder}` }}</h2>
|
||||
<el-tag v-if="workOrderInfo.status === 1" type="info" size="large" effect="dark" round> 未开始 </el-tag>
|
||||
<el-tag v-if="workOrderInfo.status === 2" type="primary" size="large" effect="dark" round>
|
||||
进行中
|
||||
</el-tag>
|
||||
<el-tag v-if="workOrderInfo.status === 3" type="success" size="large" effect="dark" round>
|
||||
已完成
|
||||
</el-tag>
|
||||
<el-tag v-if="workOrderInfo.status === 2" type="primary" size="large" effect="dark" round> 进行中 </el-tag>
|
||||
<el-tag v-if="workOrderInfo.status === 3" type="success" size="large" effect="dark" round> 已完成 </el-tag>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<el-descriptions-item
|
||||
:span="4"
|
||||
label="产品名称"
|
||||
className="workOrderInfoItemClass"
|
||||
labelClassName="workOrderInfoLabelClass"
|
||||
>{{ workOrderInfo.productionName }}</el-descriptions-item
|
||||
>
|
||||
<el-descriptions-item
|
||||
label="存货编码"
|
||||
className="workOrderInfoItemClass"
|
||||
labelClassName="workOrderInfoLabelClass"
|
||||
>{{ workOrderInfo.productionCode }}</el-descriptions-item
|
||||
>
|
||||
<el-descriptions-item
|
||||
label="规格型号"
|
||||
className="workOrderInfoItemClass"
|
||||
labelClassName="workOrderInfoLabelClass"
|
||||
>{{ workOrderInfo.specification }}</el-descriptions-item
|
||||
>
|
||||
<el-descriptions-item
|
||||
label="工单日期"
|
||||
className="workOrderInfoItemClass"
|
||||
labelClassName="workOrderInfoLabelClass"
|
||||
>{{ $dayjs(workOrderInfo.workorderDate).format('YYYY-MM-DD') }}</el-descriptions-item
|
||||
>
|
||||
<el-descriptions-item :span="4" label="产品名称" className="workOrderInfoItemClass" labelClassName="workOrderInfoLabelClass">{{
|
||||
workOrderInfo.productionName
|
||||
}}</el-descriptions-item>
|
||||
<el-descriptions-item label="存货编码" className="workOrderInfoItemClass" labelClassName="workOrderInfoLabelClass">{{
|
||||
workOrderInfo.productionCode
|
||||
}}</el-descriptions-item>
|
||||
<el-descriptions-item label="规格型号" className="workOrderInfoItemClass" labelClassName="workOrderInfoLabelClass">{{
|
||||
workOrderInfo.specification
|
||||
}}</el-descriptions-item>
|
||||
<el-descriptions-item label="工单日期" className="workOrderInfoItemClass" labelClassName="workOrderInfoLabelClass">{{
|
||||
$dayjs(workOrderInfo.workorderDate).format('YYYY-MM-DD')
|
||||
}}</el-descriptions-item>
|
||||
<el-descriptions-item label="单位" className="workOrderInfoItemClass" labelClassName="workOrderInfoLabelClass">{{
|
||||
workOrderInfo.unit
|
||||
}}</el-descriptions-item>
|
||||
@ -86,12 +69,9 @@
|
||||
<el-descriptions-item label="线别" className="workOrderInfoItemClass" labelClassName="workOrderInfoLabelClass">{{
|
||||
workOrderInfo.lineCode
|
||||
}}</el-descriptions-item>
|
||||
<el-descriptions-item
|
||||
label="是否纸箱"
|
||||
className="workOrderInfoItemClass"
|
||||
labelClassName="workOrderInfoLabelClass"
|
||||
>{{ workOrderInfo.isCarton === 1 ? '是' : '否' }}</el-descriptions-item
|
||||
>
|
||||
<el-descriptions-item label="是否纸箱" className="workOrderInfoItemClass" labelClassName="workOrderInfoLabelClass">{{
|
||||
workOrderInfo.isCarton === 1 ? '是' : '否'
|
||||
}}</el-descriptions-item>
|
||||
<el-descriptions-item label="箱数" className="workOrderInfoItemClass" labelClassName="workOrderInfoLabelClass">{{
|
||||
workOrderInfo.packageCapacity
|
||||
}}</el-descriptions-item>
|
||||
@ -100,27 +80,15 @@
|
||||
<el-tag v-if="workOrderInfo.priority === 2" type="warning" size="large" effect="dark" round> 插单 </el-tag>
|
||||
<el-tag v-if="workOrderInfo.priority === 3" type="danger" size="large" effect="dark" round> 紧急 </el-tag>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item
|
||||
:span="2"
|
||||
label="交货数"
|
||||
className="workOrderInfoItemClass"
|
||||
labelClassName="workOrderInfoLabelClass"
|
||||
<el-descriptions-item :span="2" label="交货数" className="workOrderInfoItemClass" labelClassName="workOrderInfoLabelClass"
|
||||
><h3>{{ workOrderInfo.deliveryNum }}</h3></el-descriptions-item
|
||||
>
|
||||
<el-descriptions-item
|
||||
:span="2"
|
||||
label="报工数"
|
||||
className="workOrderInfoItemClass"
|
||||
labelClassName="workOrderInfoLabelClass"
|
||||
<el-descriptions-item :span="2" label="报工数" className="workOrderInfoItemClass" labelClassName="workOrderInfoLabelClass"
|
||||
><h3>{{ reportNum }}</h3></el-descriptions-item
|
||||
>
|
||||
<el-descriptions-item
|
||||
:span="4"
|
||||
label="备注"
|
||||
className="workOrderInfoItemClass"
|
||||
labelClassName="workOrderInfoLabelClass"
|
||||
>{{ workOrderInfo.productionName }}</el-descriptions-item
|
||||
>
|
||||
<el-descriptions-item :span="4" label="备注" className="workOrderInfoItemClass" labelClassName="workOrderInfoLabelClass">{{
|
||||
workOrderInfo.productionName
|
||||
}}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</div>
|
||||
<!-- 总进度条 -->
|
||||
@ -142,6 +110,7 @@
|
||||
<el-col :span="8" class="progress-item">
|
||||
<div>实际耗时(小时): {{ workOrderNowHour }}</div>
|
||||
<div>计划耗时(小时): {{ workOrderPlanHour }}</div>
|
||||
<!-- <div>扫码计数: {{ packageScanNum }}</div> -->
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
@ -167,20 +136,10 @@
|
||||
<el-button :disabled="!workOrderInfo.workorder" class="action-button" type="primary" size="large" @click="handlerStartOrder"
|
||||
>开始工单</el-button
|
||||
>
|
||||
<el-button
|
||||
:disabled="!workOrderInfo.workorder"
|
||||
class="action-button"
|
||||
type="warning"
|
||||
size="large"
|
||||
@click="handlerShowReportCode"
|
||||
<el-button :disabled="!workOrderInfo.workorder" class="action-button" type="warning" size="large" @click="handlerShowReportCode"
|
||||
>报工数{{ reportNum }}</el-button
|
||||
>
|
||||
<el-button
|
||||
:disabled="!workOrderInfo.workorder"
|
||||
class="action-button"
|
||||
type="success"
|
||||
size="large"
|
||||
@click="handlerReportWorkOrder"
|
||||
<el-button :disabled="!workOrderInfo.workorder" class="action-button" type="success" size="large" @click="handlerReportWorkOrder"
|
||||
>完成工单</el-button
|
||||
>
|
||||
</div>
|
||||
@ -245,15 +204,7 @@
|
||||
<span style="font-size: 18px; font-weight: 600; margin-right: 20px">报工数:{{ store.workOrderTotalTaskNum.value }}</span>
|
||||
<span style="font-size: 18px; font-weight: 600">需求数:{{ store.workOrderRemainTaskNum.value }}</span>
|
||||
</div>
|
||||
<el-table
|
||||
size="large"
|
||||
header-cell-class-name="table-header"
|
||||
stripe
|
||||
border
|
||||
:data="reportCodeDialogList"
|
||||
height="600"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-table size="large" header-cell-class-name="table-header" stripe border :data="reportCodeDialogList" height="600" style="width: 100%">
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column align="center" prop="workorder" label="工单号" />
|
||||
<el-table-column align="center" prop="labelCode" label="标签" />
|
||||
@ -277,6 +228,7 @@
|
||||
|
||||
<script setup name="productwork">
|
||||
import * as WorkOrderApi from '@/api/workorder'
|
||||
import * as PrintApi from '@/api/print'
|
||||
import { getCurrentInstance } from 'vue'
|
||||
import { onMounted, onUnmounted, computed } from 'vue'
|
||||
import { ref } from 'vue'
|
||||
@ -337,9 +289,8 @@ const doGetAllWorkOrderList = async () => {
|
||||
proxy.$message.error('获取全部工单异常！')
|
||||
}
|
||||
} catch (e) {
|
||||
console.log(e);
|
||||
console.log(e)
|
||||
}
|
||||
|
||||
}
|
||||
const workOrderInfo = ref({
|
||||
productionName: '',
|
||||
@ -513,7 +464,7 @@ function reportInputChange(value) {
|
||||
reportStatus.value = true
|
||||
// workOrderReportList.value.push(_value)
|
||||
}
|
||||
getWorkOrderReportNumber()
|
||||
getWorkOrderReportNumberByPrint()
|
||||
})
|
||||
}
|
||||
// 检查重复（暂时弃用）
|
||||
@ -526,13 +477,55 @@ function getWorkOrderReportNumber() {
|
||||
const params = {
|
||||
workorder: workOrderInfo.value.workorder,
|
||||
}
|
||||
// 扫码校验
|
||||
WorkOrderApi.getWorkOrderProgress(params).then((res) => {
|
||||
if (res.code === 200) {
|
||||
reportNum.value = res.data.item2
|
||||
}
|
||||
})
|
||||
}
|
||||
// 分离打印的判定
|
||||
function getWorkOrderReportNumberByPrint() {
|
||||
const params = {
|
||||
workorder: workOrderInfo.value.workorder,
|
||||
}
|
||||
WorkOrderApi.getWorkOrderProgress(params).then((res) => {
|
||||
if (res.code === 200) {
|
||||
reportNum.value = res.data.item2
|
||||
checkIsNeedPrintLabel()
|
||||
}
|
||||
})
|
||||
}
|
||||
// 检查是否需要打印外箱标签
|
||||
function checkIsNeedPrintLabel() {
|
||||
try {
|
||||
if (store.lineCode.value != '4' || store.lineCode.value != 4) {
|
||||
return
|
||||
}
|
||||
//console.log(reportNum.value, reportNum.value % 4 === 0, reportNum.value > 0)
|
||||
if (reportNum.value % 4 === 0 && reportNum.value > 0) {
|
||||
// 打印定额外箱标签
|
||||
const data = {
|
||||
TemplatePath: 'D:\\RIZO\\label\\tiguanPackageLabel.btw',
|
||||
// TemplatePath:"G:\\项目--2024\\干巷车镜git仓库\\总装车间-产线标签打印\\Label\\tiguanPackageLabel.btw",
|
||||
PartNumber: workOrderInfo.value.productCode,
|
||||
Description: workOrderInfo.value.productionName,
|
||||
Specification: workOrderInfo.value.specification,
|
||||
WorkOrder: workOrderInfo.value.workorder,
|
||||
PackageNum: 4,
|
||||
LabelCode: `${workOrderInfo.value.specification}/${proxy.$dayjs(workOrderInfo.value.workorderDate).format('YYYYMMDD')}${
|
||||
workOrderInfo.value.groupCode
|
||||
}//`,
|
||||
}
|
||||
PrintApi.PrintPackageLabel(data).then((res) => {
|
||||
if (res.code === 200) {
|
||||
proxy.$notify({ title: '打印外箱标签', message: `打印成功!`, duration: 10000, type: 'success' })
|
||||
} else {
|
||||
//proxy.$notify({ title: '打印外箱标签', message: `打印失败!`, duration: 10000, type: 'error' })
|
||||
}
|
||||
})
|
||||
}
|
||||
} catch (e) {}
|
||||
}
|
||||
//
|
||||
// 计算百分比
|
||||
function getRate(num1, num2) {
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"outDir": "dist",
|
||||
"noImplicitAny": false,
|
||||
"allowJs": true,
|
||||
"skipLibCheck": true,
|
||||
@ -8,7 +9,6 @@
|
||||
"strict": true,
|
||||
"jsx": "preserve",
|
||||
"moduleResolution": "node",
|
||||
"skipLibCheck": true,
|
||||
"esModuleInterop": true,
|
||||
"allowSyntheticDefaultImports": true,
|
||||
"forceConsistentCasingInFileNames": true,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user