From 8c59c429d87663c01ff4558385de429d08e3b52c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 12 四月 2024 10:58:08 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before into master
---
src/views/equipment/equipment/index.vue | 2
src/views/plan/manufacturingorder/index.vue | 46 ----------------------
src/views/basic/workstation/workstation-form.vue | 4 +-
src/views/technology/routing/routing-form.vue | 4 +-
src/views/quality/teststandard/index.vue | 2 +
src/views/equipment/metering/index.vue | 2
src/views/equipment/mould/index.vue | 2
src/views/quality/Packaging_ledger/index.vue | 2
8 files changed, 11 insertions(+), 53 deletions(-)
diff --git a/src/views/basic/workstation/workstation-form.vue b/src/views/basic/workstation/workstation-form.vue
index 4d3d990..16509cd 100644
--- a/src/views/basic/workstation/workstation-form.vue
+++ b/src/views/basic/workstation/workstation-form.vue
@@ -182,7 +182,7 @@
>
</el-transfer>
</el-tab-pane>
- <el-tab-pane label="浜哄伐妯℃澘" name="handyman">
+ <!-- <el-tab-pane label="浜哄伐妯℃澘" name="handyman">
<el-transfer
filterable
v-model="handymanTypeIds"
@@ -193,7 +193,7 @@
@change="handleChangeHandyman"
>
</el-transfer>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
</el-row>
<span slot="footer" class="dialog-footer">
diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue
index f21c29b..30d6457 100644
--- a/src/views/equipment/equipment/index.vue
+++ b/src/views/equipment/equipment/index.vue
@@ -22,7 +22,7 @@
<el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px" top="5vh">
<div style="width:100%;height:400px;overflow-y: auto;">
<div class="dia_body" id="printRaw">
- <el-card class="box-card" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 10px; font-size: 16px !important;">
+ <el-card class="box-card" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 10px; font-size: 16px !important;page-break-before:always;page-break-after: always;">
<el-row>
<el-col :span="8" :offset="1">搴忓彿锛�</el-col>
<el-col :span="7" style="font-weight: bold;">{{ tem.id }}</el-col>
diff --git a/src/views/equipment/metering/index.vue b/src/views/equipment/metering/index.vue
index 8928d33..ae5a837 100644
--- a/src/views/equipment/metering/index.vue
+++ b/src/views/equipment/metering/index.vue
@@ -22,7 +22,7 @@
<el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px" top="5vh">
<div style="width:100%;height:400px;overflow-y: auto;">
<div class="dia_body" id="printMetering">
- <el-card class="box-card" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 10px; font-size: 16px !important;">
+ <el-card class="box-card" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 10px; font-size: 16px !important;page-break-before:always;page-break-after: always;">
<el-row>
<el-col :span="10" :offset="3">搴忓彿锛�</el-col>
<el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col>
diff --git a/src/views/equipment/mould/index.vue b/src/views/equipment/mould/index.vue
index a2ba424..2b486b8 100644
--- a/src/views/equipment/mould/index.vue
+++ b/src/views/equipment/mould/index.vue
@@ -147,7 +147,7 @@
<el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px" top="5vh">
<div style="width:100%;height:400px;overflow-y: auto;">
<div class="dia_body" id="printRaw">
- <el-card class="box-card" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 10px; font-size: 16px !important;">
+ <el-card class="box-card" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 10px; font-size: 16px !important;page-break-before:always;page-break-after: always;">
<!-- <el-row>
<el-col :span="8" :offset="1">搴忓彿锛�</el-col>
<el-col :span="7" style="font-weight: bold;">{{ tem.id }}</el-col>
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index a417123..fd28335 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -212,28 +212,6 @@
<el-checkbox-group @change="changePrintCode()" v-model="checkIndexList">
<el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 15px; font-size: 16px !important;">
<el-checkbox :label="i" :key="i" style="position: relative;top:-20px;left:5px"><br></el-checkbox>
- <!-- <el-row>
- <el-col :span="10" :offset="3">鎵规鍙�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.code.moNo2 }}</el-col>
- </el-row>
- <el-row>
- <el-col :span="10" :offset="3">璁㈠崟鍙凤細</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.orderNo }}</el-col>
- </el-row>
- <el-row>
- <el-col :span="10" :offset="3">瀹㈡埛鍚嶇О锛�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.cName }}</el-col>
- </el-row>
- <el-row>
- <el-col :span="10" :offset="3">闆朵欢鍚嶇О锛�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.pName }}</el-col>
- </el-row>
- <el-row>
- <el-col :span="10" :offset="3">杞﹂棿璁㈠崟浜岀淮鐮侊細</el-col>
- <el-col :span="10">
- <vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
- </el-col>
- </el-row> -->
<div>
<el-row style="font-size: 14px;padding-left: 20px;">
<el-col style="font-weight: bold;">{{ item.pName }}</el-col>
@@ -268,29 +246,7 @@
</el-dialog>
<div class="el-dialog__body" style="width:448.8px;overflow-y: auto;position: absolute;top:9999px;margin-top: 0;">
<div id="printMOrder">
- <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="margin-top-top:0px;margin-bottom:10px;font-size: 16px !important;">
- <!-- <el-row style="font-size:12px;">
- <el-col :span="10" :offset="3">鎵规鍙�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.code.moNo2 }}</el-col>
- </el-row>
- <el-row style="font-size:12px;">
- <el-col :span="10" :offset="3">璁㈠崟鍙凤細</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.orderNo }}</el-col>
- </el-row>
- <el-row style="font-size:12px;">
- <el-col :span="10" :offset="3">瀹㈡埛鍚嶇О锛�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.cName }}</el-col>
- </el-row>
- <el-row style="font-size:12px;">
- <el-col :span="10" :offset="3">闆朵欢鍚嶇О锛�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ item.pName }}</el-col>
- </el-row>
- <el-row style="font-size:12px;">
- <el-col :span="10" :offset="3">璁㈠崟浜岀淮鐮侊細</el-col>
- <el-col :span="10">
- <vueQr :text="JSON.stringify(item.code)" :size="80" :margin="2"></vueQr>
- </el-col>
- </el-row> -->
+ <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="margin-top-top:0px;margin-bottom:10px;font-size: 10px !important;page-break-before:always;page-break-after: always;">
<el-row style="font-size: 14px;padding-left: 20px;">
<el-col style="font-weight: bold;">{{ item.pName }}</el-col>
</el-row>
diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue
index d254576..ba7bbbb 100644
--- a/src/views/quality/Packaging_ledger/index.vue
+++ b/src/views/quality/Packaging_ledger/index.vue
@@ -147,7 +147,7 @@
</packfromadd>
</basic-container>
<el-dialog title="鏍囩鍒楄〃" top="5vh" :visible.sync="diaPrintTab" width="500px">
- <div style="width:100%;height: 400px;overflow-y: auto;">
+ <div style="width:100%;height: 400px;overflow-y: auto;page-break-before:always;page-break-after: always;">
<div class="dia_body" id="qrCard">
<el-card v-for="(item, i) in qrData" :key="i" >
<div>
diff --git a/src/views/quality/teststandard/index.vue b/src/views/quality/teststandard/index.vue
index 392c8ed..241ac69 100644
--- a/src/views/quality/teststandard/index.vue
+++ b/src/views/quality/teststandard/index.vue
@@ -870,6 +870,8 @@
if(m.referenceValue !== undefined) {
m.referenceValue = m.referenceValue.replace(',','锛�').replace('(','锛�').replace(')','锛�')
return m
+ } else{
+ this.$message.warning('瑕佹眰鑼冨洿娌℃湁濉啓!')
}
})
addTestStandardParam(this.testStandardParams)
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index b337123..b725d9d 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -891,11 +891,11 @@
operationsFlag = false
}
})
- if (!operationsFlag) {
+ /* if (!operationsFlag) {
this.$message.error('姣忎釜宸ュ簭閮介渶娣诲姞瀵瑰簲闆朵欢')
this.isSubmit = false
return
- }
+ } */
if (this.dataForm.id) {
putObj(this.dataForm)
.then((response) => {
--
Gitblit v1.9.3