From be8ee7b14b501747325337b641416ad8bea042e3 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 29 Oct 2024 10:12:22 +0800
Subject: [PATCH 01/15] =?UTF-8?q?fix:=E6=9B=B4=E6=94=B9=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/fmlog_detail.vue | 2 +-
 src/views/wpm_gx/mlog_detail.vue  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/wpm_gx/fmlog_detail.vue b/src/views/wpm_gx/fmlog_detail.vue
index 4469d483..4d972469 100644
--- a/src/views/wpm_gx/fmlog_detail.vue
+++ b/src/views/wpm_gx/fmlog_detail.vue
@@ -178,7 +178,7 @@
 			>
 			</check-dialog>
 			<el-dialog v-model="printVisible" width="1200px">
-				<print :baseData="fmlogItem" :tableData="tableData" type="mlogs12"  @closePrint="printVisible=false"/>
+				<print :baseData="fmlogItem" :tableData="tableData" type="1001"  @closePrint="printVisible=false"/>
 			</el-dialog>
 		</div>
 	</el-drawer>
diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue
index 8ede54f4..4d6bccfe 100644
--- a/src/views/wpm_gx/mlog_detail.vue
+++ b/src/views/wpm_gx/mlog_detail.vue
@@ -411,7 +411,7 @@
 				</template>
 			</el-dialog>
 			<el-dialog v-model="printVisible" width="1200px">
-				<print :baseData="mlogItem" :tableData="tableData" :tableData2="tableData2" type="mlogs23"  @closePrint="printVisible=false"/>
+				<print :baseData="mlogItem" :tableData="tableData" :tableData2="tableData2" type="102"  @closePrint="printVisible=false"/>
 			</el-dialog>
 		</div>
 	</el-drawer>
@@ -510,6 +510,7 @@ export default {
 		};
 	},
 	mounted() {
+		console.log('this.mlogId',this.mlogId);
 		let that = this;
 		this.paramsIn.mlog = this.mlogId;
 		this.paramsOut.mlog = this.mlogId;

From c5e83d9581443041c31534e588642786fccee3c2 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 29 Oct 2024 10:14:17 +0800
Subject: [PATCH 02/15] =?UTF-8?q?fix:=E6=9B=B4=E6=AD=A3=E9=94=99=E5=88=AB?=
 =?UTF-8?q?=E5=AD=97=EF=BC=8C=E8=A1=A8=E5=A4=B4=E6=B7=B1=E8=89=B2=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=94=99=E8=AF=AF=E6=95=B0=E6=8D=AE=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/setting/print/A4.vue | 416 +++++++++++++++------------------
 1 file changed, 187 insertions(+), 229 deletions(-)

diff --git a/src/views/setting/print/A4.vue b/src/views/setting/print/A4.vue
index 9094c2dc..7b32e4a8 100644
--- a/src/views/setting/print/A4.vue
+++ b/src/views/setting/print/A4.vue
@@ -4,8 +4,6 @@
         <el-main v-loading="mainLoading" style="margin-top: -10px;">
             <div id="exportDiv"  v-if="codeVisible" class="exportDiv">
                 <scQrCode :text="value"></scQrCode>
-                <!-- <div ref="qrCodeUrl" id="qrcode" v-if="codeVisible"></div> -->
-                <!-- <canvas id="barcode"></canvas> -->
                <!-- 入库信息 -->
                 <div class="containersDom" v-if="type=='do_in'||type=='pur_in'">
                     <ul class="export_ul">
@@ -57,13 +55,13 @@
                         <li class="export_ulli export_ulli_title">生产领料信息单</li>
                     </ul>
                     <ul class="export_ul">
-                        <li class="export_ulli">信息单编号</li>
-                        <li class="export_ulli">出库日期</li>
-                        <li class="export_ulli">执行部门-工段</li>
-                        <li class="export_ulli">交送人</li>
-                        <li class="export_ulli">仓库执行人</li>
-                        <li class="export_ulli">接收人</li>
-                        <li class="export_ulli">仓库</li>
+                        <li class="export_ulli export_ulli_h">信息单编号</li>
+                        <li class="export_ulli export_ulli_h">出库日期</li>
+                        <li class="export_ulli export_ulli_h">执行部门-工段</li>
+                        <li class="export_ulli export_ulli_h">交送人</li>
+                        <li class="export_ulli export_ulli_h">仓库执行人</li>
+                        <li class="export_ulli export_ulli_h">接收人</li>
+                        <li class="export_ulli export_ulli_h">仓库</li>
                     </ul>
                     <ul class="export_ul">
                         <li class="export_ulli">{{baseData.number}}</li>
@@ -79,9 +77,9 @@
                         <li class="export_ulli export_ulli_title">物料清单</li>
                     </ul>
                     <ul class="export_ul">
-                        <li class="export_ulli">物料名称</li>
-                        <li class="export_ulli">批次号</li>
-                        <li class="export_ulli">数量</li>
+                        <li class="export_ulli export_ulli_h">物料名称</li>
+                        <li class="export_ulli export_ulli_h">批次号</li>
+                        <li class="export_ulli export_ulli_h">数量</li>
                     </ul>
                     <ul class="export_ul" v-for="item in tableData" :key="item.id">
                         <li class="export_ulli">{{ item.material_name }}</li>
@@ -95,10 +93,10 @@
                         <li class="export_ulli export_ulli_title">销售发货信息单</li>
                     </ul>
                     <ul class="export_ul">
-                        <li class="export_ulli">发货单编号</li>
-                        <li class="export_ulli">发货日期</li>
-                        <li class="export_ulli">订单编号</li>
-                        <li class="export_ulli">客户</li>
+                        <li class="export_ulli export_ulli_h">发货单编号</li>
+                        <li class="export_ulli export_ulli_h">发货日期</li>
+                        <li class="export_ulli export_ulli_h">订单编号</li>
+                        <li class="export_ulli export_ulli_h">客户</li>
                     </ul>
                     <ul class="export_ul">
                         <li class="export_ulli">{{ baseData.number }}</li>
@@ -111,9 +109,9 @@
                         <li class="export_ulli export_ulli_title">物料清单</li>
                     </ul>
                     <ul class="export_ul">
-                        <li class="export_ulli">物料名称</li>
-                        <li class="export_ulli">批次号</li>
-                        <li class="export_ulli">数量</li>
+                        <li class="export_ulli export_ulli_h">物料名称</li>
+                        <li class="export_ulli export_ulli_h">批次号</li>
+                        <li class="export_ulli export_ulli_h">数量</li>
                     </ul>
                     <ul class="export_ul" v-for="item in tableData" :key="item.id">
                         <li class="export_ulli">{{ item.material_.name }}</li>
@@ -124,34 +122,45 @@
                 <!-- 过程检验/过程抽检-->
                 <div class="containersDom" v-else-if="type=='ptest_gx'||type=='ptest_cj'">
                     <ul class="export_ul">
-                        <li class="export_ulli export_ulli_title">XXX检验结果</li>
+                        <li class="export_ulli export_ulli_title" v-if="type=='ptest_gx'">过程检验</li>
+                        <li class="export_ulli export_ulli_title" v-else>过程抽检</li>
                     </ul>
                     <ul class="export_ul">
-                        <li class="export_ulli">物料名称</li>
-                        <li class="export_ulli">批次号总数</li>
-                        <li class="export_ulli">抽检数</li>
-                        <li class="export_ulli">检验人</li>
-                        <li class="export_ulli">检验设备</li>
-                        <li class="export_ulli">检验日期</li>
-                        <li class="export_ulli">备注</li>
+                        <li class="export_ulli export_ulli_h">物料名称</li>
+                        <li class="export_ulli export_ulli_h">批次号总数</li>
+                        <li class="export_ulli export_ulli_h">抽检数</li>
+                        <li class="export_ulli export_ulli_h">检验人</li>
+                        <li class="export_ulli export_ulli_h">检验设备</li>
+                        <li class="export_ulli export_ulli_h">检验日期</li>
+                        <li class="export_ulli export_ulli_h">备注</li>
                     </ul>
-                    <ul class="export_ul">
-                        <li class="export_ulli">{{ baseData.material_mame }}</li>
+                    <ul class="export_ul"  v-if="type=='ptest_gx'">
+                        <li class="export_ulli">{{ baseData.material_out_name }}</li>
                         <li class="export_ulli">{{ baseData.count_real }}</li>
                         <li class="export_ulli">{{ baseData.count_use }}</li>
                         <li class="export_ulli">{{ baseData.handle_user_name }}</li>
-                        <li class="export_ulli">{{ baseData.count_ok }}</li>
-                        <li class="export_ulli">{{ baseData.test_time }}</li>
+                        <li class="export_ulli"></li>
+                        <li class="export_ulli">{{ baseData.handle_date }}</li>
+                        <li class="export_ulli">{{ baseData.note }}</li>
+                    </ul>
+                    <ul class="export_ul"  v-else>
+                        <li class="export_ulli">{{ baseData.material_name }}</li>
+                        <li class="export_ulli">{{ baseData.count }}</li>
+                        <li class="export_ulli">{{ baseData.count_sampling }}</li>
+                        <li class="export_ulli">{{ baseData.test_user_name }}</li>
+                        <!-- {{ baseData.test_device_name }} -->
+                        <li class="export_ulli"></li>
+                        <li class="export_ulli">{{ baseData.test_date }}</li>
                         <li class="export_ulli">{{ baseData.note }}</li>
                     </ul>
                     <ul class="export_ul">
-                        <li class="export_ulli">合格数</li>
-                        <li class="export_ulli">不合格数合计</li>
-                        <li class="export_ulli">合格率</li>
-                        <li class="export_ulli"></li>
-                        <li class="export_ulli"></li>
-                        <li class="export_ulli"></li>
-                        <li class="export_ulli"></li>
+                        <li class="export_ulli export_ulli_h">合格数</li>
+                        <li class="export_ulli export_ulli_h">不合格数合计</li>
+                        <li class="export_ulli export_ulli_h">合格率</li>
+                        <li class="export_ulli export_ulli_h"></li>
+                        <li class="export_ulli export_ulli_h"></li>
+                        <li class="export_ulli export_ulli_h"></li>
+                        <li class="export_ulli export_ulli_h"></li>
                     </ul>
                     <ul class="export_ul">
                         <li class="export_ulli">{{ baseData.count_ok }}</li>
@@ -164,28 +173,40 @@
                     </ul>
                     <!-- 过程检验 -->
                     <ul class="export_ul">
-                        <li class="export_ulli">厚度</li>
-                        <li class="export_ulli">气泡</li>
-                        <li class="export_ulli">水纹</li>
-                        <li class="export_ulli">崩边</li>
-                        <li class="export_ulli">划伤</li>
-                        <li class="export_ulli">麻点</li>
-                        <li class="export_ulli">线痕</li>
-                        <li class="export_ulli">产品外径</li>
-                        <li class="export_ulli">产品圆度</li>
-                        <li class="export_ulli">产品同心度</li>
+                        <li class="export_ulli export_ulli_h">厚度</li>
+                        <li class="export_ulli export_ulli_h">气泡</li>
+                        <li class="export_ulli export_ulli_h">水纹</li>
+                        <li class="export_ulli export_ulli_h">崩边</li>
+                        <li class="export_ulli export_ulli_h">划伤</li>
+                        <li class="export_ulli export_ulli_h">麻点</li>
+                        <li class="export_ulli export_ulli_h">小崩边</li>
+                        <li class="export_ulli export_ulli_h">产品外径</li>
+                        <li class="export_ulli export_ulli_h">产品圆度</li>
+                        <li class="export_ulli export_ulli_h">产品同心度</li>
                     </ul>
-                    <ul class="export_ul">
+                    <ul class="export_ul" v-if="type=='ptest_gx'">
                         <li class="export_ulli">{{baseData.count_n_hd}}</li>
                         <li class="export_ulli">{{baseData.count_n_qp}}</li>
                         <li class="export_ulli">{{baseData.count_n_swen}}</li>
                         <li class="export_ulli">{{baseData.count_n_bb}}</li>
                         <li class="export_ulli">{{baseData.count_n_hs}}</li>
                         <li class="export_ulli">{{baseData.count_n_md}}</li>
-                        <li class="export_ulli">{{baseData.count_n_xh}}</li>
-                        <li class="export_ulli">{{baseData.count_n_cpwj}}</li>
-                        <li class="export_ulli">{{baseData.count_n_cpyd}}</li>
-                        <li class="export_ulli">{{baseData.count_n_cptxd}}</li>
+                        <li class="export_ulli">{{baseData.count_n_xbb}}</li>
+                        <li class="export_ulli">{{baseData.count_n_wj}}</li>
+                        <li class="export_ulli">{{baseData.count_n_yd}}</li>
+                        <li class="export_ulli">{{baseData.count_n_txd}}</li>
+                    </ul>
+                    <ul class="export_ul" v-else>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_hd}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_qp}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_swen}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_bb}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_hs}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_md}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_xbb}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_wj}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_yd}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_txd}}</li>
                     </ul>
                 </div>
                 <!-- 尺寸检验/外观检验 -->
@@ -195,28 +216,28 @@
                         <li class="export_ulli export_ulli_title" v-else>外观检验</li>
                     </ul>
                     <ul class="export_ul">
-                        <li class="export_ulli">批次号</li>
-                        <li class="export_ulli">总数</li>
-                        <li class="export_ulli">检验数</li>
-                        <li class="export_ulli">检验人</li>
-                        <li class="export_ulli">检验日期</li>
-                        <li class="export_ulli">班次</li>
+                        <li class="export_ulli export_ulli_h">批次号</li>
+                        <li class="export_ulli export_ulli_h">总数</li>
+                        <li class="export_ulli export_ulli_h">检验数</li>
+                        <li class="export_ulli export_ulli_h">检验人</li>
+                        <li class="export_ulli export_ulli_h">检验日期</li>
+                        <li class="export_ulli export_ulli_h">班次</li>
                     </ul>
                     <ul class="export_ul">
-                        <li class="export_ulli">{{ baseData.material_mame }}</li>
-                        <li class="export_ulli">{{ baseData.count_real }}</li>
-                        <li class="export_ulli">{{ baseData.count_use }}</li>
-                        <li class="export_ulli">{{ baseData.handle_user_name }}</li>
-                        <li class="export_ulli">{{ baseData.count_ok }}</li>
+                        <li class="export_ulli">{{ baseData.batch }}</li>
+                        <li class="export_ulli">{{ baseData.count }}</li>
+                        <li class="export_ulli">{{ baseData.count_sampling }}</li>
+                        <li class="export_ulli">{{ baseData.test_user_name }}</li>
                         <li class="export_ulli">{{ baseData.test_time }}</li>
+                        <li class="export_ulli">{{ baseData.shift }}</li>
                     </ul>
                     <ul class="export_ul">
-                        <li class="export_ulli">合格数</li>
-                        <li class="export_ulli">不合格数</li>
-                        <li class="export_ulli"></li>
-                        <li class="export_ulli"></li>
-                        <li class="export_ulli"></li>
-                        <li class="export_ulli"></li>
+                        <li class="export_ulli export_ulli_h">合格数</li>
+                        <li class="export_ulli export_ulli_h">不合格数</li>
+                        <li class="export_ulli export_ulli_h"></li>
+                        <li class="export_ulli export_ulli_h"></li>
+                        <li class="export_ulli export_ulli_h"></li>
+                        <li class="export_ulli export_ulli_h"></li>
                     </ul>
                     <ul class="export_ul">
                         <li class="export_ulli">{{ baseData.count_ok }}</li>
@@ -228,57 +249,57 @@
                     </ul>
                     <!-- 尺寸检验 -->
                     <ul class="export_ul" v-if="type=='productstest_cc'">
-                        <li class="export_ulli">黑圈内径</li>
-                        <li class="export_ulli">黑圈内径圆度</li>
-                        <li class="export_ulli">黑圈外径</li>
-                        <li class="export_ulli">黑圈外径圆度</li>
-                        <li class="export_ulli">产品外径</li>
-                        <li class="export_ulli">产品圆度</li>
-                        <li class="export_ulli">产品同心度</li>
-                        <li class="export_ulli">厚度</li>
-                        <li class="export_ulli">准合格</li>
-                        <li class="export_ulli">圆准</li>
+                        <li class="export_ulli export_ulli_h">黑圈内径</li>
+                        <li class="export_ulli export_ulli_h">黑圈内径圆度</li>
+                        <li class="export_ulli export_ulli_h">黑圈外径</li>
+                        <li class="export_ulli export_ulli_h">黑圈外径圆度</li>
+                        <li class="export_ulli export_ulli_h">产品外径</li>
+                        <li class="export_ulli export_ulli_h">产品圆度</li>
+                        <li class="export_ulli export_ulli_h">产品同心度</li>
+                        <li class="export_ulli export_ulli_h">厚度</li>
+                        <li class="export_ulli export_ulli_h">准合格</li>
+                        <li class="export_ulli export_ulli_h">圆准</li>
                     </ul>
                     <!-- 外观检验 -->
                     <ul class="export_ul" v-else>
-                        <li class="export_ulli">脏</li>
-                        <li class="export_ulli">气泡</li>
-                        <li class="export_ulli">水纹</li>
-                        <li class="export_ulli">崩边</li>
-                        <li class="export_ulli">棕边</li>
-                        <li class="export_ulli">棕圈</li>
-                        <li class="export_ulli">划伤</li>
-                        <li class="export_ulli">麻点</li>
-                        <li class="export_ulli">黑圈变形</li>
-                        <li class="export_ulli">倒角</li>
-                        <li class="export_ulli">破损</li>
-                        <li class="export_ulli">蓝圈</li>
+                        <li class="export_ulli export_ulli_h">脏</li>
+                        <li class="export_ulli export_ulli_h">气泡</li>
+                        <li class="export_ulli export_ulli_h">水纹</li>
+                        <li class="export_ulli export_ulli_h">崩边</li>
+                        <li class="export_ulli export_ulli_h">棕边</li>
+                        <li class="export_ulli export_ulli_h">棕圈</li>
+                        <li class="export_ulli export_ulli_h">划伤</li>
+                        <li class="export_ulli export_ulli_h">麻点</li>
+                        <li class="export_ulli export_ulli_h">黑圈变形</li>
+                        <li class="export_ulli export_ulli_h">倒角</li>
+                        <li class="export_ulli export_ulli_h">破损</li>
+                        <li class="export_ulli export_ulli_h">蓝圈</li>
                     </ul>
                     <ul class="export_ul" v-if="type=='productstest_cc'">
-                        <li class="export_ulli">{{baseData.count_n_hd}}</li>
-                        <li class="export_ulli">{{baseData.count_n_qp}}</li>
-                        <li class="export_ulli">{{baseData.count_n_swen}}</li>
-                        <li class="export_ulli">{{baseData.count_n_bb}}</li>
-                        <li class="export_ulli">{{baseData.count_n_hs}}</li>
-                        <li class="export_ulli">{{baseData.count_n_md}}</li>
-                        <li class="export_ulli">{{baseData.count_n_xh}}</li>
-                        <li class="export_ulli">{{baseData.count_n_cpwj}}</li>
-                        <li class="export_ulli">{{baseData.count_n_cpyd}}</li>
-                        <li class="export_ulli">{{baseData.count_n_cptxd}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_hqnj}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_hqnjyd}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_hqwj}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_hqwjyd}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_wj}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_yd}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_txd}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_hd}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_zhg}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_yz}}</li>
                     </ul>
                     <ul class="export_ul" v-else>
-                        <li class="export_ulli">{{baseData.count_n_hd}}</li>
-                        <li class="export_ulli">{{baseData.count_n_qp}}</li>
-                        <li class="export_ulli">{{baseData.count_n_swen}}</li>
-                        <li class="export_ulli">{{baseData.count_n_bb}}</li>
-                        <li class="export_ulli">{{baseData.count_n_hs}}</li>
-                        <li class="export_ulli">{{baseData.count_n_md}}</li>
-                        <li class="export_ulli">{{baseData.count_n_xh}}</li>
-                        <li class="export_ulli">{{baseData.count_n_cpwj}}</li>
-                        <li class="export_ulli">{{baseData.count_n_cpyd}}</li>
-                        <li class="export_ulli">{{baseData.count_n_cptxd}}</li>
-                        <li class="export_ulli">{{baseData.count_n_cptxd}}</li>
-                        <li class="export_ulli">{{baseData.count_n_cptxd}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_z}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_qp}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_swen}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_bb}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_zb}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_zq}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_hs}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_md}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_hqbx}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_dj}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_ps}}</li>
+                        <li class="export_ulli">{{baseData.count_notok_json.count_n_lq}}</li>
                     </ul>
                 </div>
                  <!-- 任务分解单 -->
@@ -287,10 +308,10 @@
                         <li class="export_ulli export_ulli_title">任务分解单</li>
                     </ul>
                     <ul class="export_ul">
-                        <li class="export_ulli">任务编号</li>
-                        <li class="export_ulli">所在工段</li>
-                        <li class="export_ulli">产品名称</li>
-                        <li class="export_ulli">任务总数量</li>
+                        <li class="export_ulli export_ulli_h">任务编号</li>
+                        <li class="export_ulli export_ulli_h">所在工段</li>
+                        <li class="export_ulli export_ulli_h">产品名称</li>
+                        <li class="export_ulli export_ulli_h">任务总数量</li>
                     </ul>
                     <ul class="export_ul">
                         <li class="export_ulli">{{ baseData.number }}</li>
@@ -303,8 +324,8 @@
                         <li class="export_ulli export_ulli_title">任务分解表</li>
                     </ul>
                     <ul class="export_ul">
-                        <li class="export_ulli">人员</li>
-                        <li class="export_ulli">数量</li>
+                        <li class="export_ulli export_ulli_h">人员</li>
+                        <li class="export_ulli export_ulli_h">数量</li>
                     </ul>
                     <ul class="export_ul" v-for="item in baseData.mtaskb" :key="item.id">
                         <li class="export_ulli">{{ item.handle_user_name }}</li>
@@ -312,14 +333,14 @@
                     </ul>
                 </div>
                 <!-- 日志记录 -->
-                <div class="containersDom" v-else-if="type=='mlogs12'">
+                <div class="containersDom" v-else-if="type=='101'">
                     <ul class="export_ul">
                         <li class="export_ulli export_ulli_title">日志记录</li>
                     </ul>
                     <ul class="export_ul">
-                        <li class="export_ulli">任务编号</li>
-                        <li class="export_ulli">工艺路线</li>
-                        <li class="export_ulli">备注</li>
+                        <li class="export_ulli export_ulli_h">任务编号</li>
+                        <li class="export_ulli export_ulli_h">工艺路线</li>
+                        <li class="export_ulli export_ulli_h">备注</li>
                         <!-- <li class="export_ulli">任务总数</li> -->
                     </ul>
                     <ul class="export_ul">
@@ -336,10 +357,10 @@
                         <div style="width: 40px; border-top: 1px solid #aaaaaa;border-left: 1px solid #aaaaaa;">{{ index+1 }}</div>
                         <div style="flex: 1;">
                             <ul class="export_ul">
-                                <li class="export_ulli">设备编号</li>
-                                <li class="export_ulli">操作人</li>
-                                <li class="export_ulli">班次</li>
-                                <li class="export_ulli">开始时间</li>
+                                <li class="export_ulli export_ulli_h">设备编号</li>
+                                <li class="export_ulli export_ulli_h">操作人</li>
+                                <li class="export_ulli export_ulli_h">班次</li>
+                                <li class="export_ulli export_ulli_h">开始时间</li>
                             </ul>
                             <ul class="export_ul">
                                 <li class="export_ulli">{{ item.equipment_name }}</li>
@@ -348,13 +369,13 @@
                                 <li class="export_ulli">{{ item.work_start_time }}</li>
                             </ul>
                             <ul class="export_ul">
-                                <li class="export_ulli flex2">输入物料批次号</li>
-                                <li class="export_ulli">领料数量</li>
-                                <li class="export_ulli">加工数量</li>
-                                <li class="export_ulli">加工前不良数量</li>
-                                <li class="export_ulli flex2">输出物料批次号</li>
-                                <li class="export_ulli">合格数量</li>
-                                <li class="export_ulli">不合格数量</li>
+                                <li class="export_ulli export_ulli_h flex2">输入物料批次号</li>
+                                <li class="export_ulli export_ulli_h">领料数量</li>
+                                <li class="export_ulli export_ulli_h">加工数量</li>
+                                <li class="export_ulli export_ulli_h">加工前不良数量</li>
+                                <li class="export_ulli export_ulli_h flex2">输出物料批次号</li>
+                                <li class="export_ulli export_ulli_h">合格数量</li>
+                                <li class="export_ulli export_ulli_h">不合格数量</li>
                                 <!-- <li class="export_ulli">不合格原因</li> -->
                                 <!-- <li class="export_ulli">工段</li> -->
                             </ul>
@@ -372,18 +393,18 @@
                     </div>
                 </div>
                 <!-- 日志记录 -->
-                <div class="containersDom" v-else-if="type=='mlogs23'">
+                <div class="containersDom" v-else-if="type=='102'">
                     <ul class="export_ul">
                         <li class="export_ulli export_ulli_title">日志记录</li>
                     </ul>
                     <ul class="export_ul">
-                        <li class="export_ulli">工艺路线</li>
-                        <li class="export_ulli">工段</li>
-                        <li class="export_ulli flex2">输入物料</li>
-                        <li class="export_ulli flex2">输出物料</li>
-                        <li class="export_ulli">生产设备</li>
-                        <li class="export_ulli">处理人</li>
-                        <li class="export_ulli">开始时间</li>
+                        <li class="export_ulli export_ulli_h">工艺路线</li>
+                        <li class="export_ulli export_ulli_h">工段</li>
+                        <li class="export_ulli export_ulli_h flex2">输入物料</li>
+                        <li class="export_ulli export_ulli_h flex2">输出物料</li>
+                        <li class="export_ulli export_ulli_h">生产设备</li>
+                        <li class="export_ulli export_ulli_h">处理人</li>
+                        <li class="export_ulli export_ulli_h">开始时间</li>
                         
                     </ul>
                     <ul class="export_ul">
@@ -397,11 +418,11 @@
                         
                     </ul>
                     <ul class="export_ul">
-                        <li class="export_ulli" v-if="mgroupName=='黑化'">温度</li>
-                        <li class="export_ulli" v-if="mgroupName=='黑化'||mgroupName=='退火'">保温时间</li>
-                        <li class="export_ulli" v-if="mgroupName=='黑化'||mgroupName=='退火'">冷却时间</li>
-                        <li class="export_ulli" v-if="mgroupName=='黑化'||mgroupName=='退火'">预估结束时间</li>
-                        <li class="export_ulli" v-if="mgroupName=='黑化'||mgroupName=='退火'">备注层数</li>
+                        <li class="export_ulli export_ulli_h" v-if="mgroupName=='黑化'">温度</li>
+                        <li class="export_ulli export_ulli_h" v-if="mgroupName=='黑化'||mgroupName=='退火'">保温时间</li>
+                        <li class="export_ulli export_ulli_h" v-if="mgroupName=='黑化'||mgroupName=='退火'">冷却时间</li>
+                        <li class="export_ulli export_ulli_h" v-if="mgroupName=='黑化'||mgroupName=='退火'">预估结束时间</li>
+                        <li class="export_ulli export_ulli_h" v-if="mgroupName=='黑化'||mgroupName=='退火'">备注层数</li>
                     </ul>
                     <ul class="export_ul">
                         <li class="export_ulli" v-if="mgroupName=='黑化'">温度</li>
@@ -418,13 +439,13 @@
                         <div style="width: 40px; border-top: 1px solid #aaaaaa;border-left: 1px solid #aaaaaa;">{{ index+1 }}</div>
                         <div style="flex: 1;">
                             <ul class="export_ul">
-                                <li class="export_ulli flex2">输入物料批次号</li>
-                                <li class="export_ulli">领料数量</li>
-                                <li class="export_ulli">加工数量</li>
-                                <li class="export_ulli">加工前不良数</li>
-                                <li class="export_ulli flex2">输出物料批次号</li>
-                                <li class="export_ulli">合格数量</li>
-                                <li class="export_ulli">不合格数量</li>
+                                <li class="export_ulli export_ulli_h flex2">输入物料批次号</li>
+                                <li class="export_ulli export_ulli_h">领料数量</li>
+                                <li class="export_ulli export_ulli_h">加工数量</li>
+                                <li class="export_ulli export_ulli_h">加工前不良数</li>
+                                <li class="export_ulli export_ulli_h flex2">输出物料批次号</li>
+                                <li class="export_ulli export_ulli_h">合格数量</li>
+                                <li class="export_ulli export_ulli_h">不合格数量</li>
                             </ul>
                             <ul class="export_ul">
                                 <li class="export_ulli flex2">{{item.batch}}</li>
@@ -444,13 +465,13 @@
                         <li class="export_ulli export_ulli_title">交接记录</li>
                     </ul>
                     <ul class="export_ul">
-                        <li class="export_ulli">交送工序</li>
-                        <li class="export_ulli">交送人</li>
-                        <li class="export_ulli">接受工序</li>
-                        <li class="export_ulli">接收人</li>
-                        <li class="export_ulli">交送日期</li>
-                        <li class="export_ulli">接收日期</li>
-                        <li class="export_ulli">备注</li>
+                        <li class="export_ulli export_ulli_h">交送工序</li>
+                        <li class="export_ulli export_ulli_h">交送人</li>
+                        <li class="export_ulli export_ulli_h">接收工序</li>
+                        <li class="export_ulli export_ulli_h">接收人</li>
+                        <li class="export_ulli export_ulli_h">交送日期</li>
+                        <li class="export_ulli export_ulli_h">接收日期</li>
+                        <li class="export_ulli export_ulli_h">备注</li>
                     </ul>
                     <ul class="export_ul">
                         <li class="export_ulli">{{ baseData.send_mgroup_name }}</li>
@@ -467,8 +488,8 @@
                     </ul>
                     <ul class="export_ul">
                         <!-- <li class="export_ulli">物料名称</li> -->
-                        <li class="export_ulli">批次号</li>
-                        <li class="export_ulli">数量</li>
+                        <li class="export_ulli export_ulli_h">批次号</li>
+                        <li class="export_ulli export_ulli_h">数量</li>
                     </ul>
                     <ul class="export_ul" v-for="item in tableData" :key="item.id">
                         <!-- <li class="export_ulli">{{ item.material_name }}</li> -->
@@ -476,70 +497,6 @@
                         <li class="export_ulli">{{ item.count }}</li>
                     </ul>
                 </div>
-                <!-- 成品尺寸检测记录单 -->
-                <div class="containersDom"  v-else-if="type=='chicun'">
-                    <ul class="export_ul">
-                        <li class="export_ulli export_ulli_title">成品尺寸检测记录单</li>
-                    </ul>
-                    <ul class="export_ul">
-                        <li class="export_ulli">日期</li>
-                        <li class="export_ulli">批次号</li>
-                        <li class="export_ulli">输入</li>
-                        <li class="export_ulli">合格输出</li>
-                        <li class="export_ulli">内径不良</li>
-                        <li class="export_ulli">外径不良</li>
-                        <li class="export_ulli">产品外径不良</li>
-                        <li class="export_ulli">同心度不良</li>
-                        <li class="export_ulli">圆度不良</li>
-                        <li class="export_ulli">准合格</li>
-                        <li class="export_ulli">不合格总数</li>
-                    </ul>
-                    <ul class="export_ul">
-                        <li class="export_ulli">1</li>
-                        <li class="export_ulli">2</li>
-                        <li class="export_ulli">3</li>
-                        <li class="export_ulli">4</li>
-                        <li class="export_ulli">5</li>
-                        <li class="export_ulli">6</li>
-                        <li class="export_ulli">7</li>
-                        <li class="export_ulli">8</li>
-                        <li class="export_ulli">9</li>
-                        <li class="export_ulli">10</li>
-                        <li class="export_ulli">11</li>
-                    </ul>
-                </div>
-                <!-- 成品外观检测记录单 -->
-                <div class="containersDom" v-else-if="type=='waiguan'">
-                    <ul class="export_ul">
-                        <li class="export_ulli export_ulli_title">成品外观检测记录单</li>
-                    </ul>
-                    <ul class="export_ul">
-                        <li class="export_ulli">日期</li>
-                        <li class="export_ulli">批次号</li>
-                        <li class="export_ulli">输入</li>
-                        <li class="export_ulli">合格输出</li>
-                        <li class="export_ulli">内径不良</li>
-                        <li class="export_ulli">外径不良</li>
-                        <li class="export_ulli">产品外径不良</li>
-                        <li class="export_ulli">同心度不良</li>
-                        <li class="export_ulli">圆度不良</li>
-                        <li class="export_ulli">准合格</li>
-                        <li class="export_ulli">不合格总数</li>
-                    </ul>
-                    <ul class="export_ul">
-                        <li class="export_ulli">1</li>
-                        <li class="export_ulli">2</li>
-                        <li class="export_ulli">3</li>
-                        <li class="export_ulli">4</li>
-                        <li class="export_ulli">5</li>
-                        <li class="export_ulli">6</li>
-                        <li class="export_ulli">7</li>
-                        <li class="export_ulli">8</li>
-                        <li class="export_ulli">9</li>
-                        <li class="export_ulli">10</li>
-                        <li class="export_ulli">11</li>
-                    </ul>
-                </div>
             </div>
             <el-button type="primary" @click="handleExport">导出</el-button>
             <el-button type="primary" @click="handlePrint">打印</el-button>
@@ -596,7 +553,8 @@
 		mounted() {
             let that = this;
             that.printId = that.baseData.id;
-            that.value = that.type + ":" + that.printId+",url:'/wpm_gx/qiepian'";
+            that.value = that.type+":"+that.printId;
+            console.log('that.value',that.value)
             that.codeVisible = true;
             // var canvas = document.getElementById("barcode");
 		    // var context = canvas.getContext("2d");

From 8e5f258d1adbe18bfdd3d4bcd7fa3f1ed8a9db70 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 29 Oct 2024 10:14:58 +0800
Subject: [PATCH 03/15] =?UTF-8?q?fix:=E5=8C=BA=E5=88=AB=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=92=8C=E6=89=AB=E7=A0=81=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/template/scan.vue | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/views/template/scan.vue b/src/views/template/scan.vue
index 46e4d518..11df1868 100644
--- a/src/views/template/scan.vue
+++ b/src/views/template/scan.vue
@@ -1,6 +1,7 @@
 <template>
     <div>
-        <el-button type="primary" @click="open" style="margin-left: 10px;">扫码添加</el-button>
+        <el-icon v-if="type=='info'" size="18"  @click="open"><el-icon-files /></el-icon>
+        <el-button v-else type="primary" @click="open" style="margin-left: 10px;">扫码添加</el-button>
         <el-dialog
             title="扫描二维码"
             v-model="visible"
@@ -10,13 +11,19 @@
                 ref="codeInput"
                 v-model="codeText"
                 clearable
-                @change="$emit('closed',codeText)"
+                @change="codeTextChange"
             ></el-input>
         </el-dialog>
     </div>
 </template>
 <script>
 export default {
+    props:{
+        type:{
+            type:String,
+            default:''
+        }
+    },
 	data(){
         return{
             visible:false,
@@ -32,6 +39,11 @@ export default {
             }, 200);
             return this;
         },
+        codeTextChange(){
+            console.log('this.codeText',this.codeText);
+            this.$emit('closed',this.codeText);
+            this.closed();
+        },
         closed(){
             this.visible = false;
         }

From af24f1f4cf32a3affb9685790fc7c8cb61a36375 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 29 Oct 2024 10:15:46 +0800
Subject: [PATCH 04/15] =?UTF-8?q?feat=EF=BC=9A=E5=AF=BC=E8=88=AA=E6=A0=8F?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=AB=E6=8F=8F=E6=8C=89=E9=92=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/scan_detail.vue | 868 ++++++++++++++++++++++++++
 src/layout/components/userbar.vue     |  37 +-
 2 files changed, 902 insertions(+), 3 deletions(-)
 create mode 100644 src/layout/components/scan_detail.vue

diff --git a/src/layout/components/scan_detail.vue b/src/layout/components/scan_detail.vue
new file mode 100644
index 00000000..0af2705f
--- /dev/null
+++ b/src/layout/components/scan_detail.vue
@@ -0,0 +1,868 @@
+<template>
+	<el-drawer
+		title="详情"
+		:size="'90%'"
+		destroy-on-close
+		v-model="visible"
+		@closed="$emit('closed')"
+	>
+		<!-- <div> -->
+		<div v-if="mType=='101'">
+			<el-card style="width: 100%" header="基本信息" shadow="never">
+				<el-descriptions>
+					<el-descriptions-item label="工艺路线">{{
+						itemObj.routepack_name
+					}}</el-descriptions-item>
+					<el-descriptions-item label="任务编号">{{
+						itemObj.material_in_name
+					}}</el-descriptions-item>
+					<el-descriptions-item label="部门/车间">{{
+						itemObj.material_out_name
+					}}</el-descriptions-item>
+				</el-descriptions>
+			</el-card>
+			<el-card
+				style="width: 100%; margin: 1vh 0"
+				header="日志列表"
+				shadow="never"
+			>
+				<scTable
+					ref="tableIn"
+					:apiObj="apiObj"
+					row-key="id"
+					stripe
+					:params="params12"
+					hidePagination
+				>
+				<el-table-column  type="index" width="50"></el-table-column>
+					<el-table-column type="expand">
+						<template #default="props">
+							<div style="padding-left: 50px">
+								<el-descriptions :column="2">
+									<template v-for="item in props.row.mlogb_full" :key="item.id">
+										<el-descriptions-item :label="item.material_out!==null?'输出物料':'输入物料'">
+											<span v-if="item.material_out!==null">{{item.batch}}</span>
+											<span v-else>{{item.batch}}</span>
+										</el-descriptions-item>
+									</template>
+								</el-descriptions>
+								<el-divider></el-divider>
+								<el-descriptions :column="4">
+									<el-descriptions-item label="划伤" v-if="props.row.count_n_hs>0">
+										{{props.row.count_n_hs}}
+									</el-descriptions-item>
+									<el-descriptions-item label="气泡" v-if="props.row.count_n_qp>0">
+										{{props.row.count_n_qp}}
+									</el-descriptions-item>
+									<el-descriptions-item label="水纹" v-if="props.row.count_n_swen>0">
+										{{props.row.count_n_swen}}
+									</el-descriptions-item>
+									<el-descriptions-item label="崩边" v-if="props.row.count_n_bb>0">
+										{{props.row.count_n_bb}}
+									</el-descriptions-item>
+									<el-descriptions-item label="小崩边" v-if="props.row.count_n_xbb>0">
+										{{props.row.count_n_xbb}}
+									</el-descriptions-item>
+									<el-descriptions-item label="雾面" v-if="props.row.count_n_wm>0">
+										{{props.row.count_n_wm}}
+									</el-descriptions-item>
+									<el-descriptions-item label="麻点" v-if="props.row.count_n_md>0">
+										{{props.row.count_n_md}}
+									</el-descriptions-item>
+									<el-descriptions-item label="线痕" v-if="props.row.count_n_xh>0">
+										{{props.row.count_n_xh}}
+									</el-descriptions-item>
+									<el-descriptions-item label="破损" v-if="props.row.count_n_ps>0">
+										{{props.row.count_n_ps}}
+									</el-descriptions-item>
+									<el-descriptions-item label="产品外径" v-if="props.row.count_n_wj>0">
+										{{props.row.count_n_wj}}
+									</el-descriptions-item>
+									<el-descriptions-item label="产品圆度" v-if="props.row.count_n_xh>0">
+										{{props.row.count_n_xh}}
+									</el-descriptions-item>
+									<el-descriptions-item label="产品同心度" v-if="props.row.count_n_yd>0">
+										{{props.row.count_n_yd}}
+									</el-descriptions-item>
+									<el-descriptions-item label="其它" v-if="props.row.count_n_qt>0">
+										{{props.row.count_n_ps}}
+									</el-descriptions-item>
+								</el-descriptions>
+							</div>
+						</template>
+					</el-table-column>
+					<el-table-column label="操作员" prop="handle_user_name" min-width="80"></el-table-column>
+					<el-table-column label="设备" prop="equipment_name" min-width="150"></el-table-column>
+					<el-table-column label="领料数" prop="count_use"></el-table-column>
+					<el-table-column label="加工数" prop="count_real"></el-table-column>
+					<el-table-column label="加工前不良" prop="count_pn_jgqbl"></el-table-column>
+					<el-table-column label="合格数" prop="count_ok"></el-table-column>
+					<el-table-column label="不合格数" prop="count_notok"></el-table-column>
+					<el-table-column label="开始时间" prop="work_start_time"></el-table-column>
+					<el-table-column label="结束时间" prop="work_end_time"></el-table-column>
+					<el-table-column label="班次" prop="shift_name"></el-table-column>
+				</scTable>
+			</el-card>
+			<!-- 输出物料 -->
+			<el-card style="width: 100%" header="输出物料" shadow="never">
+				<scTable
+					ref="tableOut"
+					:apiObj="apiObj"
+					row-key="id"
+					stripe
+					:params="paramsOut"
+					hidePagination
+				>
+					<el-table-column type="index" width="50" />
+					<el-table-column type="expand">
+						<template #default="props">
+							<div style="padding-left: 50px" v-if="props.row.count_notok_json.length>0">
+								<el-descriptions :column="4" v-for="item in props.row.count_notok_json" :key="item">
+									<el-descriptions-item label="层数">
+										{{item.floor}}
+									</el-descriptions-item>
+									<el-descriptions-item label="抽检数">
+										{{item.count_sampling}}
+									</el-descriptions-item>
+									<el-descriptions-item label="总数">
+										{{item.count}}
+									</el-descriptions-item>
+								</el-descriptions>
+							</div>
+							<div style="padding-left: 50px" v-else>
+								<el-descriptions :column="4">
+									<el-descriptions-item label="划伤">{{
+										props.row.count_n_hs
+									}}</el-descriptions-item>
+									<el-descriptions-item label="气泡">{{
+										props.row.count_n_qp
+									}}</el-descriptions-item>
+									<el-descriptions-item label="水纹">{{
+										props.row.count_n_swen
+									}}</el-descriptions-item>
+									<el-descriptions-item label="崩边">{{
+										props.row.count_n_bb
+									}}</el-descriptions-item>
+									<el-descriptions-item label="小崩边">{{
+										props.row.count_n_xbb
+									}}</el-descriptions-item>
+									<el-descriptions-item label="雾面">{{
+										props.row.count_n_wm
+									}}</el-descriptions-item>
+									<el-descriptions-item label="麻点">{{
+										props.row.count_n_md
+									}}</el-descriptions-item>
+									<el-descriptions-item label="线痕">{{
+										props.row.count_n_xh
+									}}</el-descriptions-item>
+								</el-descriptions>
+							</div>
+						</template>
+					</el-table-column>
+					<el-table-column
+						label="产出物料"
+						prop="material_out_name"
+						show-overflow-tooltip
+					></el-table-column>
+					<el-table-column label="批次号" prop="batch">
+					</el-table-column>
+					<el-table-column label="数量" prop="count_real">
+					</el-table-column>
+					<el-table-column label="合格数" prop="count_ok">
+					</el-table-column>
+					<el-table-column label="不合格数量" prop="count_notok">
+					</el-table-column>
+					<el-table-column
+						label="创建时间"
+						prop="create_time"
+						show-overflow-tooltip
+					>
+					</el-table-column>
+				</scTable>
+			</el-card>
+		</div>
+		<div v-if="mType=='102'">
+			<el-card style="width: 100%" header="基本信息" shadow="never">
+				<el-descriptions>
+					<el-descriptions-item label="工艺路线">{{
+						itemObj.routepack_name
+					}}</el-descriptions-item>
+					<el-descriptions-item label="输入物料">{{
+						itemObj.material_in_name
+					}}</el-descriptions-item>
+					<el-descriptions-item label="输出物料">{{
+						itemObj.material_out_name
+					}}</el-descriptions-item>
+					<el-descriptions-item label="工段名称">{{
+						itemObj.mgroup_name
+					}}</el-descriptions-item>
+					<el-descriptions-item label="生产设备">{{
+						itemObj.equipment_name
+					}}</el-descriptions-item>
+					<el-descriptions-item label="预计工时">{{
+						itemObj.hour_work
+					}}</el-descriptions-item>
+					<el-descriptions-item label="部门/车间">{{
+						itemObj.belong_dept_name
+					}}</el-descriptions-item>
+					<el-descriptions-item label="处理人">{{
+						itemObj.handle_user_name
+					}}</el-descriptions-item>
+					<el-descriptions-item label="开始时间">{{
+						itemObj.work_start_time
+					}}</el-descriptions-item>
+					<el-descriptions-item label="创建时间">{{
+						itemObj.create_time
+					}}</el-descriptions-item>
+					<el-descriptions-item label="工单状态" v-if="itemObj.mgroup_name=='退火'">
+						<el-tag v-if="itemObj.ticket_">{{act_states[itemObj.ticket_.act_state]}}</el-tag>
+					</el-descriptions-item>
+					<el-descriptions-item label="检验表单" v-if="itemObj.mgroup_name=='退火'||itemObj.mgroup_name=='黑化'">
+						<el-link :href="itemObj.test_file" target="_blank" type="primary" :underline="false">{{itemObj.test_file}}</el-link>
+					</el-descriptions-item>
+				</el-descriptions>
+			</el-card>
+			<!-- 输入物料 -->
+			<el-card
+				style="width: 100%; margin: 1vh 0"
+				header="输入物料"
+				shadow="never"
+			>
+				<scTable
+					ref="tableIn"
+					:apiObj="apiObj"
+					row-key="id"
+					stripe
+					:params="paramsIn"
+					hidePagination
+				>
+					<el-table-column type="index" width="50" />
+					<el-table-column
+						label="物料"
+						prop="material_in_name"
+						show-overflow-tooltip
+					></el-table-column>
+					<el-table-column label="批次号" prop="batch">
+					</el-table-column>
+					<el-table-column label="领用数量" prop="count_use">
+					</el-table-column>
+					<el-table-column label="加工前不良" prop="count_pn_jgqbl">
+					</el-table-column>
+					<el-table-column
+						label="创建时间"
+						prop="create_time"
+						show-overflow-tooltip
+					>
+					</el-table-column>
+				</scTable>
+			</el-card>
+			<!-- 输出物料 -->
+			<el-card style="width: 100%" header="输出物料" shadow="never">
+				<scTable
+					ref="tableOut"
+					:apiObj="apiObj"
+					row-key="id"
+					stripe
+					:params="paramsOut"
+					hidePagination
+				>
+					<el-table-column type="index" width="50" />
+					<el-table-column type="expand">
+						<template #default="props">
+							<div style="padding-left: 50px" v-if="props.row.count_notok_json.length>0">
+								<el-descriptions :column="4" v-for="item in props.row.count_notok_json" :key="item">
+									<el-descriptions-item label="层数">
+										{{item.floor}}
+									</el-descriptions-item>
+									<el-descriptions-item label="抽检数">
+										{{item.count_sampling}}
+									</el-descriptions-item>
+									<el-descriptions-item label="总数">
+										{{item.count}}
+									</el-descriptions-item>
+								</el-descriptions>
+							</div>
+							<div style="padding-left: 50px" v-else>
+								<el-descriptions :column="4">
+									<el-descriptions-item label="划伤">{{
+										props.row.count_n_hs
+									}}</el-descriptions-item>
+									<el-descriptions-item label="气泡">{{
+										props.row.count_n_qp
+									}}</el-descriptions-item>
+									<el-descriptions-item label="水纹">{{
+										props.row.count_n_swen
+									}}</el-descriptions-item>
+									<el-descriptions-item label="崩边">{{
+										props.row.count_n_bb
+									}}</el-descriptions-item>
+									<el-descriptions-item label="小崩边">{{
+										props.row.count_n_xbb
+									}}</el-descriptions-item>
+									<el-descriptions-item label="雾面">{{
+										props.row.count_n_wm
+									}}</el-descriptions-item>
+									<el-descriptions-item label="麻点">{{
+										props.row.count_n_md
+									}}</el-descriptions-item>
+									<el-descriptions-item label="线痕">{{
+										props.row.count_n_xh
+									}}</el-descriptions-item>
+								</el-descriptions>
+							</div>
+						</template>
+					</el-table-column>
+					<el-table-column
+						label="产出物料"
+						prop="material_out_name"
+						show-overflow-tooltip
+					></el-table-column>
+					<el-table-column label="批次号" prop="batch">
+					</el-table-column>
+					<el-table-column label="数量" prop="count_real">
+					</el-table-column>
+					<el-table-column label="合格数" prop="count_ok">
+					</el-table-column>
+					<el-table-column label="不合格数量" prop="count_notok">
+					</el-table-column>
+					<el-table-column
+						label="创建时间"
+						prop="create_time"
+						show-overflow-tooltip
+					>
+					</el-table-column>
+				</scTable>
+			</el-card>
+		</div>
+		<div v-if="mType=='handover'">
+			<el-card style="width: 100%" header="基本信息" shadow="never">
+				<el-descriptions>
+					<el-descriptions-item label="交送工序">{{
+						itemObj.send_mgroup_name
+					}}</el-descriptions-item>
+					<el-descriptions-item label="交送人">{{
+						itemObj.send_user_name
+					}}</el-descriptions-item>
+					<el-descriptions-item label="接收工序">{{
+						itemObj.recive_mgroup_name
+					}}</el-descriptions-item>
+					<el-descriptions-item label="接收人">{{
+						itemObj.recive_user_name
+					}}</el-descriptions-item>
+					<el-descriptions-item label="交送日期">{{
+						itemObj.send_date
+					}}</el-descriptions-item>
+					<el-descriptions-item label="接收日期">{{
+						itemObj.recive_date
+					}}</el-descriptions-item>
+					<el-descriptions-item label="备注">{{
+						itemObj.note
+					}}</el-descriptions-item>
+				</el-descriptions>
+			</el-card>
+			<el-card style="width: 100%" header="交送物料" shadow="never">
+				<scTable
+					:data="itemObj.handoverb"
+					ref="tableOut"
+					row-key="id"
+					stripe
+					hideDo
+					hidePagination
+				>
+					<el-table-column type="index" width="50" />
+					<el-table-column label="批次号" prop="batch">
+					</el-table-column>
+					<el-table-column label="数量" prop="count">
+					</el-table-column>
+					<el-table-column label="不合格标记" prop="notok_sign">
+					</el-table-column>
+				</scTable>
+			</el-card>
+		</div>
+		<div v-if="mType=='do_in'||mType=='do_out'||mType=='pur_in'||mType=='sale_out'">
+			<el-card style="width: 100%" header="基本信息" shadow="never" v-if="mType=='sale_out'">
+				<el-descriptions>
+					<el-descriptions-item label="编号">{{
+						itemObj.number
+					}}</el-descriptions-item>
+					<el-descriptions-item label="出入库类型">{{
+						typeDict[itemObj.type]
+					}}</el-descriptions-item>
+					<el-descriptions-item label="状态">{{
+						stateDict[itemObj.state]
+					}}</el-descriptions-item>
+					<el-descriptions-item label="部门/车间">
+						{{itemObj.belong_dept_name}}-{{ itemObj.mgroup_name }}
+					</el-descriptions-item>
+					<el-descriptions-item label="执行人">{{
+						itemObj.do_user_name
+					}}</el-descriptions-item>
+					<el-descriptions-item label="创建时间">{{
+						itemObj.create_time
+					}}</el-descriptions-item>
+					<el-descriptions-item label="销售订单">
+						{{ itemObj.order_number }}
+					</el-descriptions-item>
+					<el-descriptions-item label="客户">
+						{{ itemObj.customer_name }}
+					</el-descriptions-item>
+				</el-descriptions>
+			</el-card>
+			<el-card style="width: 100%" header="基本信息" shadow="never" v-else>
+				<el-descriptions>
+					<el-descriptions-item label="编号">{{
+						itemObj.number
+					}}</el-descriptions-item>
+					<el-descriptions-item label="出入库类型">{{
+						typeDict[itemObj.type]
+					}}</el-descriptions-item>
+					<el-descriptions-item label="状态">{{
+						stateDict[itemObj.state]
+					}}</el-descriptions-item>
+					<el-descriptions-item label="部门/车间">
+						{{itemObj.belong_dept_name}}-{{ itemObj.mgroup_name }}
+					</el-descriptions-item>
+					<el-descriptions-item label="执行人">{{
+						itemObj.do_user_name
+					}}</el-descriptions-item>
+					<el-descriptions-item label="创建日期">{{
+						itemObj.create_time
+					}}</el-descriptions-item>
+				</el-descriptions>
+			</el-card>
+			
+			<el-card style="width: 100%" shadow="never">
+				<scTable
+					:apiObj="apiObj"
+					row-key="id"
+					stripe
+					:params="params"
+					hideDo
+					hidePagination
+				>
+					<el-table-column type="index" width="50" />
+					<el-table-column label="批次号" prop="batch">
+					</el-table-column>
+					<el-table-column label="数量" prop="count">
+					</el-table-column>
+					<el-table-column label="不合格标记" prop="notok_sign">
+					</el-table-column>
+				</scTable>
+			</el-card>
+		</div>
+		<div v-if="mType=='ptest_gx'||mType=='ptest_cj'">
+			<el-card style="width: 100%" header="基本信息" shadow="never">
+				<el-descriptions v-if="mType=='ptest_gx'">
+					<el-descriptions-item label="物料">
+						{{itemObj.material_out_name}}
+					</el-descriptions-item>
+					<el-descriptions-item label="工序">
+						{{itemObj.mgroup_name}}
+					</el-descriptions-item>
+					<el-descriptions-item label="生产数">
+						{{itemObj.count_real}}
+					</el-descriptions-item>
+					<el-descriptions-item label="合格数">
+						{{itemObj.count_ok}}
+					</el-descriptions-item>
+					<el-descriptions-item label="不合格数">
+						{{itemObj.count_notok}}
+					</el-descriptions-item>
+					<el-descriptions-item label="班组">
+						{{ itemObj.shift_name }}
+					</el-descriptions-item>
+					<el-descriptions-item label="所属车间">
+						{{itemObj.belong_dept_name}}
+					</el-descriptions-item>
+					<el-descriptions-item label="处理人">
+						{{ itemObj.handle_user_name }}
+					</el-descriptions-item>
+					<el-descriptions-item label="操作时间">
+						{{ itemObj.handle_date }}
+					</el-descriptions-item>
+				</el-descriptions>
+				<el-descriptions v-if="mType=='ptest_cj'">
+					<el-descriptions-item label="物料">
+						{{itemObj.material_name}}
+					</el-descriptions-item>
+					<el-descriptions-item label="检验数">
+						{{itemObj.count}}
+					</el-descriptions-item>
+					<el-descriptions-item label="抽检数">
+						{{itemObj.count_sampling}}
+					</el-descriptions-item>
+					<el-descriptions-item label="合格数">
+						{{itemObj.count_ok}}
+					</el-descriptions-item>
+					<el-descriptions-item label="不合格数">
+						{{itemObj.count_notok}}
+					</el-descriptions-item>
+					<el-descriptions-item label="抽检时间">
+						{{ itemObj.test_date }}
+					</el-descriptions-item>
+				</el-descriptions>
+				<el-descriptions v-if="mType=='ptest_gx'">
+					<el-descriptions-item label="厚度">
+						{{itemObj.count_n_hd}}
+					</el-descriptions-item>
+					<el-descriptions-item label="气泡">
+						{{itemObj.count_n_qp}}
+					</el-descriptions-item>
+					<el-descriptions-item label="水纹">
+						{{itemObj.count_n_swen}}
+					</el-descriptions-item>
+					<el-descriptions-item label="崩边">
+						{{itemObj.count_n_bb}}
+					</el-descriptions-item>
+					<el-descriptions-item label="划伤">
+						{{itemObj.count_n_hs}}
+					</el-descriptions-item>
+					<el-descriptions-item label="麻点">
+						{{itemObj.count_n_md}}
+					</el-descriptions-item>
+					<el-descriptions-item label="小崩边">
+						{{itemObj.count_n_xbb}}
+					</el-descriptions-item>
+					<el-descriptions-item label="产品外径">
+						{{itemObj.count_n_wj}}
+					</el-descriptions-item>
+					<el-descriptions-item label="产品圆度">
+						{{itemObj.count_n_yd}}
+					</el-descriptions-item>
+					<el-descriptions-item label="产品同心度">
+						{{itemObj.count_n_txd}}
+					</el-descriptions-item>
+				</el-descriptions>
+				<el-descriptions v-else>
+					<el-descriptions-item label="厚度">
+						{{itemObj.count_notok_json.count_n_hd}}
+					</el-descriptions-item>
+					<el-descriptions-item label="气泡">
+						{{itemObj.count_notok_json.count_n_qp}}
+					</el-descriptions-item>
+					<el-descriptions-item label="水纹">
+						{{itemObj.count_notok_json.count_n_swen}}
+					</el-descriptions-item>
+					<el-descriptions-item label="崩边">
+						{{itemObj.count_notok_json.count_n_bb}}
+					</el-descriptions-item>
+					<el-descriptions-item label="划伤">
+						{{itemObj.count_notok_json.count_n_hs}}
+					</el-descriptions-item>
+					<el-descriptions-item label="麻点">
+						{{itemObj.count_notok_json.count_n_md}}
+					</el-descriptions-item>
+					<el-descriptions-item label="小崩边">
+						{{itemObj.count_notok_json.count_n_xbb}}
+					</el-descriptions-item>
+					<el-descriptions-item label="产品外径">
+						{{itemObj.count_notok_json.count_n_cpwj}}
+					</el-descriptions-item>
+					<el-descriptions-item label="产品圆度">
+						{{itemObj.count_notok_json.count_n_cpyd}}
+					</el-descriptions-item>
+					<el-descriptions-item label="产品同心度">
+						{{itemObj.count_notok_json.count_n_cptxd}}
+					</el-descriptions-item>
+				</el-descriptions>
+			</el-card>
+		</div>
+		<div v-if="mType=='productstest_cc'||mType=='productstest_wg'">
+			<el-card style="width: 100%" header="基本信息" shadow="never">
+				<el-descriptions>
+					<el-descriptions-item label="物料名">
+						{{itemObj.material_name}}
+					</el-descriptions-item>
+					<el-descriptions-item label="批次号">
+						{{itemObj.batch}}
+					</el-descriptions-item>
+					<el-descriptions-item label="总数">
+						{{itemObj.count}}
+					</el-descriptions-item>
+					<el-descriptions-item label="检验数">
+						{{itemObj.count_sampling}}
+					</el-descriptions-item>
+					<el-descriptions-item label="检验人">
+						{{ itemObj.test_user_name }}
+					</el-descriptions-item>
+					<el-descriptions-item label="检验日期">
+						{{ itemObj.test_date }}
+					</el-descriptions-item>
+					<el-descriptions-item label="班次">
+						{{ itemObj.shift }}
+					</el-descriptions-item>
+					<el-descriptions-item label="合格数">
+						{{itemObj.count_ok}}
+					</el-descriptions-item>
+					<el-descriptions-item label="不合格数">{{
+						itemObj.count_notok
+					}}</el-descriptions-item>
+					
+				</el-descriptions>
+				<el-descriptions v-if="mType=='productstest_cc'">
+					<el-descriptions-item label="黑圈内径" v-if="itemObj.count_notok_json">
+						{{itemObj.count_notok_json.count_n_hqnj}}
+					</el-descriptions-item>
+					<el-descriptions-item label="黑圈内径圆度" v-if="itemObj.count_notok_json">
+						{{itemObj.count_notok_json.count_n_hqnjyd}}
+					</el-descriptions-item>
+					<el-descriptions-item label="黑圈外径" v-if="itemObj.count_notok_json">
+						{{itemObj.count_notok_json.count_n_hqwj}}
+					</el-descriptions-item>
+					<el-descriptions-item label="黑圈外径圆度" v-if="itemObj.count_notok_json">
+						{{itemObj.count_notok_json.count_n_hqwjyd}}
+					</el-descriptions-item>
+					<el-descriptions-item label="产品外径" v-if="itemObj.count_notok_json">
+						{{itemObj.count_notok_json.count_n_wj}}
+					</el-descriptions-item>
+					<el-descriptions-item label="产品圆度" v-if="itemObj.count_notok_json">
+						{{itemObj.count_notok_json.count_n_yd}}
+					</el-descriptions-item>
+					<el-descriptions-item label="产品同心度" v-if="itemObj.count_notok_json">
+						{{itemObj.count_notok_json.count_n_txd}}
+					</el-descriptions-item>
+					<el-descriptions-item label="厚度" v-if="itemObj.count_notok_json">
+						{{itemObj.count_notok_json.count_n_hd}}
+					</el-descriptions-item>
+					<el-descriptions-item label="准合格" v-if="itemObj.count_notok_json">
+						{{itemObj.count_notok_json.count_n_zhg}}
+					</el-descriptions-item>
+					<el-descriptions-item label="圆准" v-if="itemObj.count_notok_json">
+						{{itemObj.count_notok_json.count_n_yz}}
+					</el-descriptions-item>
+				</el-descriptions>
+				<el-descriptions v-if="mType=='productstest_wg'">
+					<el-descriptions-item label="脏" v-if="itemObj.count_notok_json">
+						{{itemObj.count_notok_json.count_n_z}}
+					</el-descriptions-item>
+					<el-descriptions-item label="气泡" v-if="itemObj.count_notok_json">
+						{{itemObj.count_notok_json.count_n_qp}}
+					</el-descriptions-item>
+					<el-descriptions-item label="水纹" v-if="itemObj.count_notok_json">
+						{{itemObj.count_notok_json.count_n_swen}}
+					</el-descriptions-item>
+					<el-descriptions-item label="崩边" v-if="itemObj.count_notok_json">
+						{{itemObj.count_notok_json.count_n_bb}}
+					</el-descriptions-item>
+					<el-descriptions-item label="棕边" v-if="itemObj.count_notok_json">
+						{{itemObj.count_notok_json.count_n_zb}}
+					</el-descriptions-item>
+					<el-descriptions-item label="棕圈" v-if="itemObj.count_notok_json">
+						{{itemObj.count_notok_json.count_n_zq}}
+					</el-descriptions-item>
+					<el-descriptions-item label="划伤" v-if="itemObj.count_notok_json">
+						{{itemObj.count_notok_json.count_n_hs}}
+					</el-descriptions-item>
+					<el-descriptions-item label="麻点" v-if="itemObj.count_notok_json">
+						{{itemObj.count_notok_json.count_n_md}}
+					</el-descriptions-item>
+					<el-descriptions-item label="黑圈变形" v-if="itemObj.count_notok_json">
+						{{itemObj.count_notok_json.count_n_hqbx}}
+					</el-descriptions-item>
+					<el-descriptions-item label="倒角" v-if="itemObj.count_notok_json">
+						{{itemObj.count_notok_json.count_n_dj}}
+					</el-descriptions-item>
+					<el-descriptions-item label="破损" v-if="itemObj.count_notok_json">
+						{{itemObj.count_notok_json.count_n_ps}}
+					</el-descriptions-item>
+					<el-descriptions-item label="蓝圈" v-if="itemObj.count_notok_json">
+						{{itemObj.count_notok_json.count_n_lq}}
+					</el-descriptions-item>
+				</el-descriptions>
+			</el-card>
+		</div>
+		<div v-if="mType=='mtask'">
+			<el-card style="width: 100%" header="基本信息" shadow="never">
+				<el-descriptions>
+					<el-descriptions-item label="任务编号">{{
+						itemObj.number
+					}}</el-descriptions-item>
+					<el-descriptions-item label="所在工段">{{
+						itemObj.mgroup_name
+					}}</el-descriptions-item>
+					<el-descriptions-item label="产品名称">{{
+						itemObj.material_out_name
+					}}</el-descriptions-item>
+					<el-descriptions-item label="任务总数量">{{
+						itemObj.count
+					}}</el-descriptions-item>
+				</el-descriptions>
+			</el-card>
+			<el-card style="width: 100%" header="任务分解表" shadow="never">
+				<scTable
+					:data="itemObj.mtaskb"
+					ref="tableOut"
+					row-key="id"
+					stripe
+					hideDo
+					hidePagination
+				>
+					<el-table-column type="index" width="50" />
+					<el-table-column label="人员" prop="handle_user_name">
+					</el-table-column>
+					<el-table-column label="数量" prop="count">
+					</el-table-column>
+				</scTable>
+			</el-card>
+		</div>
+	</el-drawer>
+</template>
+<script>
+export default {
+	props: {
+		mlogId: {
+			type: String,
+			default: "",
+		},
+		// mType: {
+		// 	type: String,
+		// 	default: "",
+		// },
+	},
+	emits: ["success", "closed"],
+	data() {
+		return {
+			loading: false,
+			apiObj: null,
+			paramsIn: {
+				page: 0,
+				mlog: "",
+				material_in__isnull: 0,
+			},
+			paramsOut: {
+				page: 0,
+				mlog: "",
+				material_out__isnull: 0,
+			},
+			params:{
+				page: 0,
+				mio:''
+			},
+			params12:{
+				fmlog:'',
+				page:0
+			},
+			mgroup: "",
+			itemObj: {},
+			oinfo_json:{
+				退火炉号:'',
+				退火时间:'',
+				退火温度:'',
+				抽检结果:'',
+				抽检数:'',
+				强度落球:'',
+			},
+			act_states: {
+				0: "草稿中",
+				1: "进行中",
+				2: "被退回",
+				3: "被撤回",
+				4: "已完成",
+				5: "已关闭",
+			},
+			stateDict: {10: "创建中",20: "已提交",},
+			typeDict:{
+				'do_in':'生产入库',
+				'do_out':'生产领料',
+				'sale_out': "销售发货",
+				'pur_in': "采购入库",
+			},
+			fileList:[],
+			test_file:'',
+			deptId: "",
+			visible: false,
+		};
+	},
+	mounted() {
+		// let that = this;
+		// this.paramsIn.mlog = this.mlogId;
+		// this.paramsOut.mlog = this.mlogId;
+		// this.apiObj = this.$API.wpm.mlogb.list;
+		// that.getMlogItem();
+	},
+	methods: {
+		open(type) {
+			console.log('type',type);
+			let that = this;
+			that.mType = type;
+			that.visible = true;
+			if(type=='101'){
+				that.params12.fmlog = that.mlogId;
+				that.apiObj = that.$API.wpm.mlog.list;
+				that.getfmlogItem();
+			}else if(type=='102'){
+				that.paramsIn.mlog = that.mlogId;
+				that.paramsOut.mlog = that.mlogId;
+				that.apiObj = that.$API.wpm.mlogb.list;
+				that.getMlogItem();
+			}else if(type=='handover'){
+				that.getHandoverItem();
+			}else if(type=='do_in'||type=='pur_in'||type=='do_out'||type=='sale_out'){
+				that.params.mio = that.mlogId;
+				that.apiObj = that.$API.inm.mioitem.list;
+				that.getInItem();
+			}else if(type=='sale_out'){
+				that.params.mio = that.mlogId;
+				that.apiObj = that.$API.inm.mioitem.list;
+				that.getInItem();
+			}else if(type=='ptest_gx'){
+			    that.getMlogItem();
+			}else if(type=='ptest_cj'||type=='productstest_cc'||type=='productstest_wg'){
+			    that.getftestworkItem();
+			}else if(type=='mtask'){
+			    that.getMtaskItem();
+			}
+		},
+		getfmlogItem() {
+			let that = this;
+			that.$API.wpm.fmlog.item.req(that.mlogId).then((res) => {
+				that.itemObj = res;
+			});
+		},
+		getMlogItem() {
+			let that = this;
+			that.$API.wpm.mlog.item.req(that.mlogId).then((res) => {
+				that.itemObj = res;
+				// if(res.test_file!==null){
+				// 	that.fileList = [{name:res.test_file,url:res.test_file}];
+				// 	that.form.test_file = res.test_file;
+				// }
+			});
+		},
+		getHandoverItem(){
+			let that = this;
+			console.log('getHandoverItem')
+			that.$API.wpm.handover.list.req({id:that.mlogId,page:0}).then((res) => {
+			    that.itemObj = res[0];
+			})
+		},
+		getInItem(){
+			let that = this;
+			that.$API.inm.mio.list.req({id:that.mlogId,page:0}).then((res) => {
+			    that.itemObj = res[0];
+			})
+		},
+		getsaleOutItem(){
+			let that = this;
+			that.$API.inm.mio.list.req({id:that.mlogId,page:0}).then((res) => {
+			    that.itemObj = res[0];
+			})
+		},
+		getftestworkItem(){
+			let that = this;
+			that.$API.qm.ftestwork.item.req(that.mlogId).then((res) => {
+			    that.itemObj = res;
+			})
+		},
+		getMtaskItem(){
+			let that = this;
+			that.$API.pm.mtask.list.req({id:that.mlogId,page:0}).then((res) => {
+			    that.itemObj = res[0];
+			})
+		},
+
+	},
+};
+</script>
+
+<style></style>
diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue
index f89a901a..3f3a218f 100644
--- a/src/layout/components/userbar.vue
+++ b/src/layout/components/userbar.vue
@@ -1,5 +1,6 @@
 <template>
 	<div class="user-bar">
+		<scan-dialog ref="scanDialog" :type="'info'" @closed="scanClose"> </scan-dialog>
 		<div class="screen panel-item hidden-sm-and-down" @click="screen">
 			<el-icon>
 				<el-icon-full-screen />
@@ -94,19 +95,22 @@
 	>
 		<search @success="searchVisible = false"></search>
 	</el-dialog>
+	<scan-detail ref="scanDetails" v-if="scanVisible" :mlogId="scanId"></scan-detail>
 </template>
 
 <script>
 import search from "./search.vue";
-
-export default {
+import scanDetail from "./scan_detail.vue";
+import scanDialog from "./../../views/template/scan.vue";
+export default {	
 	components: {
-		search,
+		search,scanDialog,scanDetail
 	},
 	data() {
 		return {
 			userName: "",
 			userNameF: "",
+			visible:false,
 			searchVisible: false,
 			msg: false,
 			msgList: {},
@@ -114,6 +118,11 @@ export default {
 				lang: this.$TOOL.data.get("APP_LANG") || this.$CONFIG.LANG,
 				dark: this.$TOOL.data.get("APP_DARK") || false,
 			},
+			apiObj:null,
+			params:{},
+			scanId:'',
+			scanType:'',
+			scanVisible:false,
 		};
 	},
 	watch: {
@@ -233,6 +242,28 @@ export default {
 		search() {
 			this.searchVisible = true;
 		},
+		scanClose(data){
+			
+			let that = this;
+			let arr = [];
+			if(data.indexOf(':')>-1){
+				arr = data.split(":");
+			}else{
+				arr = data.split("：");
+			}
+			that.scanId = arr[1];
+			let scanType = that.scanType = arr[0];
+			console.log(data);
+			console.log('arr',arr);
+			console.log('scanType',scanType);
+			console.log('this.scanId',that.scanId);
+			that.scanVisible = true;
+			that.$nextTick(() => {
+				// that.$refs.saveDialog.open("add");
+				that.$refs.scanDetails.open(scanType);
+			});
+			//根据扫描内容，获取详情  data里又标记和id根据标记判断请求接口，根据id获取详情
+		},
 	},
 };
 </script>

From d91db25ed67488cd1f12084c5c4319946daeb855 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 29 Oct 2024 13:54:28 +0800
Subject: [PATCH 05/15] =?UTF-8?q?fix:fmlogs=E6=89=93=E5=8D=B0=E4=BC=A0?=
 =?UTF-8?q?=E5=8F=82=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/fmlog_detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wpm_gx/fmlog_detail.vue b/src/views/wpm_gx/fmlog_detail.vue
index 4d972469..bbc2c2eb 100644
--- a/src/views/wpm_gx/fmlog_detail.vue
+++ b/src/views/wpm_gx/fmlog_detail.vue
@@ -178,7 +178,7 @@
 			>
 			</check-dialog>
 			<el-dialog v-model="printVisible" width="1200px">
-				<print :baseData="fmlogItem" :tableData="tableData" type="1001"  @closePrint="printVisible=false"/>
+				<print :baseData="fmlogItem" :tableData="tableData" type="101"  @closePrint="printVisible=false"/>
 			</el-dialog>
 		</div>
 	</el-drawer>

From 7ed39bb24afae4b8d73b2d3b13fe6eaf266dd33e Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 29 Oct 2024 14:24:57 +0800
Subject: [PATCH 06/15] =?UTF-8?q?fix:=E6=A0=87=E7=AD=BE=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/template/printmaterial.vue | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/views/template/printmaterial.vue b/src/views/template/printmaterial.vue
index 24426209..24c60183 100644
--- a/src/views/template/printmaterial.vue
+++ b/src/views/template/printmaterial.vue
@@ -105,13 +105,16 @@ export default {
 				let obj = {};
 				obj.printer_commands = str;
 				obj.printer_name = that.printer_name;
-                if(that.$INTERVAL == null){
-                    that.$INTERVAL = setInterval(() => {
+                let printerInterval = that.$TOOL.data.get('printerInterval');
+                if(printerInterval==null){
+                    let intervalID  = setInterval(() => {
                         that.printLabel(obj)
                     }, 2000);
                     that.visible = false;
+                    that.$TOOL.data.set('printerInterval',intervalID );
+
                 }else{
-                    that.$message.warning("请等待当前打印任务完成")
+                    that.$message.warning("请等待当前打印任务完成");
                 }
 			})
         },
@@ -123,8 +126,9 @@ export default {
             that.$API.wpm.prints.req(obj).then((response) => {
                 that.count_printed ++
                 if (that.count_printed >= that.print_count){
-                    clearInterval(that.$INTERVAL);
-                    that.$INTERVAL = null;
+                    let printerInterval = that.$TOOL.data.get('printerInterval');
+                    clearInterval(printerInterval);
+                    that.$TOOL.data.set('printerInterval',null);
                 }
             });
         }

From 6f476c2740023016721daad40ac16a4ed64be840 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 29 Oct 2024 15:29:03 +0800
Subject: [PATCH 07/15] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97=E4=B8=AD=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=A0=87=E7=AD=BE=E7=9A=84=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/handover_form.vue | 14 +++-------
 src/views/wpm_gx/inm.vue           |  1 -
 src/views/wpm_gx/inm_record.vue    | 40 ++++++++++++++--------------
 src/views/wpm_gx/mlog_detail.vue   | 42 ++++++++++++++----------------
 4 files changed, 43 insertions(+), 54 deletions(-)

diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue
index 9a904e4d..a40c8648 100644
--- a/src/views/wpm_gx/handover_form.vue
+++ b/src/views/wpm_gx/handover_form.vue
@@ -182,12 +182,6 @@
 			<el-button @click="visible = false">取消</el-button>
 		</el-footer>
 	</el-dialog>
-	<!-- <scan-dialog
-		v-if="scanVisible"
-		ref="scanDialog"
-		@closed="scanClose"
-	>
-	</scan-dialog> -->
 </template>
 <script>
 import scanDialog from "./../template/scan.vue";
@@ -547,20 +541,20 @@ export default {
 				return;
 			}
 			let that = this;
-			let id =data.split(':')[1];
+			let id = data.split('#')[1];
 			console.log('id',id);
 			this.$API.cm.labelmat.item.req(id).then((res) => {
-			    console.log('res',res);
+			    // console.log('res',res);
 				let arr = that.form.handoverb.filter((item) => {
 					return item.batch == res.batch;
 				})
-				console.log('arr',arr);
+				// console.log('arr',arr);
 				if(arr.length>0){
 					that.$message.error("该批次已存在")
 				}else{
 					that.materialOptions.forEach((item) => {
 						if(item.batch == res.batch){
-							let arr = that.form.handoverb
+							// let arr = that.form.handoverb
 							let obj = {};
 							obj.wm = item.id;
 							obj.batch = item.batch;
diff --git a/src/views/wpm_gx/inm.vue b/src/views/wpm_gx/inm.vue
index 0e93bdd4..70a944cb 100644
--- a/src/views/wpm_gx/inm.vue
+++ b/src/views/wpm_gx/inm.vue
@@ -223,7 +223,6 @@ export default {
 			visibleDrawer: false,
 			apiObjPrint:this.$API.cm.labelmat.fromWm,
 			wmId:'',
-			printer_name:localStorage.getItem("printer_name")
 		};
 	},
 	mounted() {
diff --git a/src/views/wpm_gx/inm_record.vue b/src/views/wpm_gx/inm_record.vue
index 43164ae6..508be431 100644
--- a/src/views/wpm_gx/inm_record.vue
+++ b/src/views/wpm_gx/inm_record.vue
@@ -284,14 +284,22 @@
 		<el-dialog v-model="printVisible" width="1200px">
 			<print :baseData="form" :tableData="tableData" :type="form.type" mtype="20"  @closePrint="printVisible=false"/>
 		</el-dialog>
+		<print-dialog
+			v-if="dialog.print_m"
+			ref="printmaterial"
+			:mId="wmId"
+			:mtype="wmtype"
+			:apiObj="apiObjPrint"
+		></print-dialog>
 	</el-drawer>
 </template>
 <script>
 import saveDialog from "./inm_record_form.vue";
 import print from "./../setting/print/A4.vue";
+import printDialog from "./../template/printmaterial.vue";
 export default {
 	name: "inm_record",
-	components: { saveDialog,print },
+	components: { saveDialog,print,printDialog },
 	props: {
 		cate: { type: String, default: "" },
 		deptId: { type: String, default: "" },
@@ -314,6 +322,7 @@ export default {
 			printVisible:false,
 			dialog: {
 				save: false,
+				print_m:false,
 			},
 			form: {
 				number: "",
@@ -341,7 +350,10 @@ export default {
 			userOptions: [],//部门执行人
 			deptOptions: [],
 			mgroupOptions: [],
-			printer_name:localStorage.getItem("printer_name")
+			wmId:'',
+			wmtype:'',
+			batchContains:'',
+			apiObjPrint:this.$API.cm.labelmat.fromWm,
 		};
 	},
 	mounted() {
@@ -478,25 +490,11 @@ export default {
 		//打印物料标签
 		printMaterial(row){
 			let that = this;
-			that.$API.cm.labelmat.fromMioitem.req({tid:row.id}).then((res) => {
-			    let code = res.code_label;
-				let str = [
-					"SIZE 40 mm,70 mm",
-					"GAP 7 mm,7 mm",
-					"CLS",
-					"REFERENCE 0,0",
-					'QRCODE 30,400,H,5,A,0,"' +code +'"',
-					"WINTEXT 200,550,28,90,0,0,Simhei," + res.material_name,
-					"WINTEXT 240,550,28,90,0,0,Simhei," + res.batch,
-					]; 
-				if(res.notok_sign!==null){
-					str.push("WINTEXT 280,550,28,90,0,0,Simhei," +res.notok_sign_name,)
-				}
-				str.push("PRINT 1",)
-				let obj = {};
-				obj.printer_commands = str;
-				obj.printer_name = that.printer_name;
-				this.$API.wpm.prints.req(obj).then((response) => {});
+			that.wmId = row.id;
+			that.wmtype = row.material_.type;
+			that.dialog.print_m = true;
+			that.$nextTick(() => {
+			    that.$refs.printmaterial.open();
 			})
 		},
 		//本地更新数据
diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue
index 4d6bccfe..4be32377 100644
--- a/src/views/wpm_gx/mlog_detail.vue
+++ b/src/views/wpm_gx/mlog_detail.vue
@@ -413,6 +413,13 @@
 			<el-dialog v-model="printVisible" width="1200px">
 				<print :baseData="mlogItem" :tableData="tableData" :tableData2="tableData2" type="102"  @closePrint="printVisible=false"/>
 			</el-dialog>
+			<print-dialog
+				v-if="dialog.print_m"
+				ref="printmaterial"
+				:mId="wmId"
+				:mtype="wmtype"
+				:apiObj="apiObjPrint"
+			></print-dialog>
 		</div>
 	</el-drawer>
 </template>
@@ -421,6 +428,7 @@ import editDialog from "./mlog_form.vue";
 import saveDialog from "./mlogb_form.vue";
 import checkDialog from "./mlogb_check.vue";
 import print from "./../setting/print/A4.vue";
+import printDialog from "./../template/printmaterial.vue";
 export default {
 	props: {
 		mlogId: {
@@ -432,7 +440,8 @@ export default {
 		editDialog,
 		saveDialog,
 		checkDialog,
-		print
+		print,
+		printDialog
 	},
 	emits: ["success", "closed"],
 	data() {
@@ -444,6 +453,7 @@ export default {
 				save: false,
 				edit: false,
 				check: false,
+				print_m:false,
 			},
 			apiObj: null,
 			apiObjWm:null,
@@ -506,7 +516,10 @@ export default {
 					},
 				],
 			},
-			batchContains:''
+			wmId:'',
+			wmtype:'',
+			batchContains:'',
+			apiObjPrint:this.$API.cm.labelmat.fromWm,
 		};
 	},
 	mounted() {
@@ -703,27 +716,12 @@ export default {
 		//打印物料标签
 		printMaterial(row){
 			let that = this;
-			that.$API.cm.labelmat.fromWm.req({tid:row.id}).then((res) => {
-				let code = res.code_label;
-				let str = [
-					"SIZE 40 mm,70 mm",
-					"GAP 7 mm,7 mm",
-					"CLS",
-					"REFERENCE 0,0",
-					'QRCODE 30,400,H,5,A,0,"' +code +'"',
-					"WINTEXT 200,550,28,90,0,0,Simhei," + res.material_name,
-					"WINTEXT 240,550,28,90,0,0,Simhei," + res.batch,
-					]; 
-				if(res.notok_sign!==null){
-					str.push("WINTEXT 280,550,28,90,0,0,Simhei," +res.notok_sign_name,)
-				}
-				str.push("PRINT 1",)
-				let obj = {};
-				obj.printer_commands = str;
-				obj.printer_name = that.printer_name;
-				this.$API.wpm.prints.req(obj).then((response) => {});
+			that.wmId = row.id;
+			that.wmtype = row.material_.type;
+			that.dialog.print_m = true;
+			this.$nextTick(() => {
+			    this.$refs.printmaterial.open();
 			})
-			
 		},
 	},
 };

From 2ed4e5dc7a5340fef6cb6d6ce319fdbaa39b2e18 Mon Sep 17 00:00:00 2001
From: zty <zty18395607196@163.com>
Date: Tue, 29 Oct 2024 16:28:25 +0800
Subject: [PATCH 08/15] =?UTF-8?q?feat:fac=5Fcal=20=E5=A2=9E=E5=8A=A0=20?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E4=B8=AD=E5=BF=83=E6=8A=98=E7=BA=BF=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/index_enm.vue |  1 -
 src/views/fac_cal/mpointstat.vue  | 79 ++++++++++++++++++++++++++++---
 2 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/src/views/bigScreen/index_enm.vue b/src/views/bigScreen/index_enm.vue
index 089d8e2f..fda451ec 100644
--- a/src/views/bigScreen/index_enm.vue
+++ b/src/views/bigScreen/index_enm.vue
@@ -501,7 +501,6 @@ export default {
 					axisLabel: {
 						color: "#ffffff",
 					},
-
 					splitLine: {
 						show: true,
 						lineStyle: {
diff --git a/src/views/fac_cal/mpointstat.vue b/src/views/fac_cal/mpointstat.vue
index f06c0529..d2c499dd 100644
--- a/src/views/fac_cal/mpointstat.vue
+++ b/src/views/fac_cal/mpointstat.vue
@@ -30,9 +30,10 @@
 						:value="item.value"
 					></el-option>
 				</el-select>
-                <el-date-picker v-model="timeRange" type="datetimerange" range-separator="至"
-                                    start-placeholder="开始时间" end-placeholder="结束时间" @change="handleQuery"
-                                    style="width: 100%" />
+                <el-date-picker v-model="timeRange" type="datetimerange" 
+					value-format="YYYY-MM-DD HH:mm:ss" range-separator="至"
+					start-placeholder="开始时间" end-placeholder="结束时间" @change="handleQuery"
+					style="width: 100%" />
 				<el-button
 					type="primary"
 					icon="el-icon-search"
@@ -41,7 +42,8 @@
 				></el-button>
 			</div>
 		</el-header>
-		<el-main class="nopadding">
+		<el-container>
+			<el-main class="nopadding">
 			<scTable
 				ref="table"
 				:apiObj="apiObj"
@@ -51,6 +53,7 @@
                 :query="query"
 				highlightCurrentRow
 				@row-click="rowClick"
+				@dataChange="dataChange"
 			>
 				<el-table-column type="index" width="50" />
 				<el-table-column label="测点" prop="mpoint_name">
@@ -93,6 +96,12 @@
 				</el-table-column>
 			</scTable>
 		</el-main>
+		<el-aside style="width: 50%; float: right;">
+        <!-- 折线图组件 -->
+        <scEcharts :option="chartOption" height="400px" />
+      </el-aside>
+		</el-container>
+	</el-container>
 		<el-dialog title="校正" v-model="visible">
 			<el-main style="padding: 0 20px 20px 20px">
 				<el-form
@@ -142,9 +151,9 @@
 				<el-button @click="visible = false">取消</el-button>
 			</el-footer>
 		</el-dialog>
-	</el-container>
-</template>
+	</template>
 <script>
+
 export default {
 	name: "sflog",
 	data() {
@@ -157,6 +166,42 @@ export default {
                 start_time: null,
                 end_time: null
             },
+			chartOption: {
+				color: ["#80FFA5", "#00DDFF", "#37A2FF", "#FF0087", "#FFBF00"],
+				tooltip: {
+					trigger: "axis",
+					axisPointer: {
+						type: "cross",
+						label: {
+							backgroundColor: "#6a7985",
+						},
+					},
+				},
+				legend: {
+					icon: "stack",
+					top: 5,
+					right: 5,
+					data: [],
+				},
+				grid: {
+					left: "2%",
+					right: "4%",
+					bottom: "5%",
+					containLabel: true,
+				},
+				xAxis: {
+					name: "",
+					type: "category",
+					data: [],
+					
+				},
+				yAxis: {
+					name: "当前值",
+					type: "value",
+					
+				},
+				series: [],
+			},
 			options: [
                 { label: "小时", value: "hour"},
                 { label: "天", value: "day" },
@@ -177,6 +222,28 @@ export default {
 		this.getMpoints();
 	},
 	methods: {
+	dataChange(req, tableData) {
+		let that = this;
+		let option = { ...that.chartOption };
+		// 获取 x 轴的数据
+		option.xAxis.data = tableData.map((item, index) => (index+1).toString());
+
+		// 获取 y 轴的数据
+
+		option.series = [
+			{
+				name: '总生产',
+				type: 'line', // 折线图类型
+				data: tableData.map((item) => parseFloat(item.val)), // 将字符串转为数字
+				smooth: true, // 平滑曲线
+			}
+		];
+		option.legend.data = ['总生产'];
+
+		// 更新图表选项
+		that.chartOption = option;
+	},
+
 		getMpoints() {
 			let that = this;
 			this.$API.enm.mpoint.list

From 371316faea2182d1980fcb4379d43f850c0cd54b Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 30 Oct 2024 09:04:00 +0800
Subject: [PATCH 09/15] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E5=B9=B6=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/Scan.vue   |  8 ++++++++
 src/assets/icons/index.js   |  3 ++-
 src/views/template/scan.vue | 16 ++++++++++++++--
 3 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 src/assets/icons/Scan.vue

diff --git a/src/assets/icons/Scan.vue b/src/assets/icons/Scan.vue
new file mode 100644
index 00000000..73e49f66
--- /dev/null
+++ b/src/assets/icons/Scan.vue
@@ -0,0 +1,8 @@
+<template>
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24">
+		<g fill="none">
+			<path d="m12.593 23.258l-.011.002l-.071.035l-.02.004l-.014-.004l-.071-.035q-.016-.005-.024.005l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.017-.018m.265-.113l-.013.002l-.185.093l-.01.01l-.003.011l.018.43l.005.012l.008.007l.201.093q.019.005.029-.008l.004-.014l-.034-.614q-.005-.018-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.004-.011l.017-.43l-.003-.012l-.01-.01z" />
+			<path fill="currentColor" d="M4 14.5A1.5 1.5 0 0 1 5.5 16v2.5H9a1.5 1.5 0 0 1 0 3H5A2.5 2.5 0 0 1 2.5 19v-3A1.5 1.5 0 0 1 4 14.5m16 0a1.5 1.5 0 0 1 1.493 1.356L21.5 16v3a2.5 2.5 0 0 1-2.336 2.495L19 21.5h-4a1.5 1.5 0 0 1-.144-2.993L15 18.5h3.5V16a1.5 1.5 0 0 1 1.5-1.5m0-4a1.5 1.5 0 0 1 .144 2.993L20 13.5H4a1.5 1.5 0 0 1-.144-2.993L4 10.5zm-11-8a1.5 1.5 0 0 1 .144 2.993L9 5.5H5.5V8a1.5 1.5 0 0 1-2.993.144L2.5 8V5a2.5 2.5 0 0 1 2.336-2.495L5 2.5zm10 0a2.5 2.5 0 0 1 2.495 2.336L21.5 5v3a1.5 1.5 0 0 1-2.993.144L18.5 8V5.5H15a1.5 1.5 0 0 1-.144-2.993L15 2.5z" />
+		</g>
+	</svg>
+</template>
diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js
index f51c6b06..10417c56 100644
--- a/src/assets/icons/index.js
+++ b/src/assets/icons/index.js
@@ -24,4 +24,5 @@ export { default as Zhixing } from './Zhixing.vue'
 export { default as Zhizao } from './Zhizao.vue'
 export { default as Env } from './Env.vue'
 export { default as Elec } from './Elec.vue'
-export { default as Jcpz } from './Jcpz.vue'
\ No newline at end of file
+export { default as Jcpz } from './Jcpz.vue'
+export { default as Scan } from './Scan.vue'
\ No newline at end of file
diff --git a/src/views/template/scan.vue b/src/views/template/scan.vue
index 11df1868..7f396806 100644
--- a/src/views/template/scan.vue
+++ b/src/views/template/scan.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-icon v-if="type=='info'" size="18"  @click="open"><el-icon-files /></el-icon>
+        <el-icon class="printIcon" v-if="type=='info'" size="18" @click="open"><component :is="'sc-icon-scan'" /></el-icon>
         <el-button v-else type="primary" @click="open" style="margin-left: 10px;">扫码添加</el-button>
         <el-dialog
             title="扫描二维码"
@@ -49,4 +49,16 @@ export default {
         }
     }
 }
-</script>
\ No newline at end of file
+</script>
+<style scoped>
+.printIcon{
+    width: 38px;
+    height: 58px;
+    padding: 0 10px;
+    font-size: 19px;
+    color: rgb(145,149,162);
+    &:hover{
+        background-color: rgba(255, 255, 255, 0.1) !important;
+    }
+}
+</style>
\ No newline at end of file

From f4fcc315bb525eb134ff36b15a893d4d227f51aa Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 30 Oct 2024 09:05:57 +0800
Subject: [PATCH 10/15] =?UTF-8?q?fix:=E5=B0=8F=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=EF=BC=88=E8=BF=87=E7=A8=8B=E6=8A=BD=E6=A3=80=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qm/process2.vue      |  2 +-
 src/views/setting/print/A4.vue | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/views/qm/process2.vue b/src/views/qm/process2.vue
index 407e80f9..38426b8d 100644
--- a/src/views/qm/process2.vue
+++ b/src/views/qm/process2.vue
@@ -122,7 +122,7 @@
 			></materials>
 		</el-dialog>
 		<el-dialog v-model="printVisible" width="1200px">
-			<print :baseData="rowItem" type="ptest_gx" @closePrint="printVisible=false"/>
+			<print :baseData="rowItem" type="ptest_cj" @closePrint="printVisible=false"/>
 		</el-dialog>
 	</el-container>
 </template>
diff --git a/src/views/setting/print/A4.vue b/src/views/setting/print/A4.vue
index 7b32e4a8..5c80749b 100644
--- a/src/views/setting/print/A4.vue
+++ b/src/views/setting/print/A4.vue
@@ -163,7 +163,8 @@
                         <li class="export_ulli export_ulli_h"></li>
                     </ul>
                     <ul class="export_ul">
-                        <li class="export_ulli">{{ baseData.count_ok }}</li>
+                        <li class="export_ulli" v-if="type=='ptest_gx'">{{ baseData.count_ok }}</li>
+                        <li class="export_ulli" v-else>{{ baseData.count_sampling_ok }}</li>
                         <li class="export_ulli">{{baseData.count_notok}}</li>
                         <li class="export_ulli">{{ baseData.rate }}</li>
                         <li class="export_ulli"></li>
@@ -197,16 +198,16 @@
                         <li class="export_ulli">{{baseData.count_n_txd}}</li>
                     </ul>
                     <ul class="export_ul" v-else>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_hd}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_qp}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_swen}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_bb}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_hs}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_md}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_xbb}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_wj}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_yd}}</li>
-                        <li class="export_ulli">{{baseData.count_notok_json.count_n_txd}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_hd}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_qp}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_swen}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_bb}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_hs}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_md}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_xbb}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_wj}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_yd}}</li>
+                        <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_txd}}</li>
                     </ul>
                 </div>
                 <!-- 尺寸检验/外观检验 -->
@@ -551,6 +552,7 @@
 			};
 		},
 		mounted() {
+            console.log('this.baseData',this.baseData)
             let that = this;
             that.printId = that.baseData.id;
             that.value = that.type+":"+that.printId;

From 9734d461cfdd59d16880f5c0ec7af3cea353a54e Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 30 Oct 2024 10:03:34 +0800
Subject: [PATCH 11/15] =?UTF-8?q?fix:=E4=BA=A4=E6=8E=A5=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/handover.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index cc59cead..0f2b01ec 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -153,7 +153,7 @@
 						<el-button
 							link
 							size="small"
-							v-if="scope.row.send_mgroup == mgroupId"
+							v-if="scope.row.send_mgroup == mgroupId||deptId==scope.row.send_dept"
 							@click="table_print(scope.row)"
 							type="success"
 							>打印</el-button
@@ -178,7 +178,7 @@
 							v-auth="'handover.update'"
 							type="primary"
 							v-if="
-								scope.row.send_mgroup == mgroupId &&
+								(scope.row.send_mgroup == mgroupId||deptId==scope.row.send_dept)&&
 								scope.row.submit_time == null
 							"
 							>编辑</el-button
@@ -186,7 +186,7 @@
 						<el-popconfirm
 							title="确定删除吗？"
 							v-if="
-								scope.row.send_mgroup == mgroupId &&
+							(scope.row.send_mgroup == mgroupId||deptId==scope.row.send_dept)&&
 								scope.row.submit_time == null
 							"
 							@confirm="table_del(scope.row, scope.$index)"

From 0dd7648593cd62c88d173aa0a4555b750c8ae89a Mon Sep 17 00:00:00 2001
From: zty <zty18395607196@163.com>
Date: Thu, 31 Oct 2024 11:28:23 +0800
Subject: [PATCH 12/15] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/fac_cal/mpointstat.vue | 124 +++++++++++++++----------------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/src/views/fac_cal/mpointstat.vue b/src/views/fac_cal/mpointstat.vue
index d2c499dd..eaef4894 100644
--- a/src/views/fac_cal/mpointstat.vue
+++ b/src/views/fac_cal/mpointstat.vue
@@ -42,65 +42,67 @@
 				></el-button>
 			</div>
 		</el-header>
-		<el-container>
-			<el-main class="nopadding">
-			<scTable
-				ref="table"
-				:apiObj="apiObj"
-				row-key="id"
-				stripe
-				:params="params"
-                :query="query"
-				highlightCurrentRow
-				@row-click="rowClick"
-				@dataChange="dataChange"
-			>
-				<el-table-column type="index" width="50" />
-				<el-table-column label="测点" prop="mpoint_name">
-				</el-table-column>
-                <el-table-column label="所属集合" prop="mgroup_name">
-				</el-table-column>
-				<el-table-column label="类型" prop="type" width="80"> </el-table-column>
-				<el-table-column label="年" prop="year" width="80"> </el-table-column>
-                <el-table-column label="班年" prop="year_s" width="80"> </el-table-column>
-				<el-table-column label="月" prop="month" width="50"> </el-table-column>
-                <el-table-column label="班月" prop="month_s" width="50"> </el-table-column>
-				<el-table-column label="日" prop="day" width="50"> </el-table-column>
-                <el-table-column label="班日" prop="day_s" width="50"> </el-table-column>
-                <el-table-column label="时" prop="hour" width="50"> </el-table-column>
-				<el-table-column label="当前值" prop="val"></el-table-column>
-				<el-table-column
-					label="校正值"
-					prop="val_correct"
-				></el-table-column>
-				<el-table-column
-					label="原始计算值"
-					prop="val_origin"
-				></el-table-column>
-				<el-table-column
-					label="操作"
-					fixed="right"
-					align="center"
-					width="140"
+		<el-main class="nopadding">
+			<el-container>
+				<el-aside style="width: 50%; float: right;">
+        		<!-- 折线图组件 -->
+					<scTable
+					ref="table"
+					:apiObj="apiObj"
+					row-key="id"
+					stripe
+					:params="params"
+					:query="query"
+					highlightCurrentRow
+					@row-click="rowClick"
+					@dataChange="dataChange"
 				>
-					<template #default="scope">
-						<el-button
-							link
-							size="small"
-							v-if="scope.row.type == 'year_s' || scope.row.type == 'month_s' || scope.row.type == 'day_s'"
-							@click="handle_edit(scope.row)"
-							type="primary"
-							>校正</el-button
-						>
-					</template>
-				</el-table-column>
-			</scTable>
+					<el-table-column type="index" width="50" />
+					<el-table-column label="测点" prop="mpoint_name">
+					</el-table-column>
+					<el-table-column label="所属集合" prop="mgroup_name">
+					</el-table-column>
+					<el-table-column label="类型" prop="type" width="80"> </el-table-column>
+					<el-table-column label="年" prop="year" width="80"> </el-table-column>
+					<el-table-column label="班年" prop="year_s" width="80"> </el-table-column>
+					<el-table-column label="月" prop="month" width="50"> </el-table-column>
+					<el-table-column label="班月" prop="month_s" width="50"> </el-table-column>
+					<el-table-column label="日" prop="day" width="50"> </el-table-column>
+					<el-table-column label="班日" prop="day_s" width="50"> </el-table-column>
+					<el-table-column label="时" prop="hour" width="50"> </el-table-column>
+					<el-table-column label="当前值" prop="val"></el-table-column>
+					<el-table-column
+						label="校正值"
+						prop="val_correct"
+					></el-table-column>
+					<el-table-column
+						label="原始计算值"
+						prop="val_origin"
+					></el-table-column>
+					<el-table-column
+						label="操作"
+						fixed="right"
+						align="center"
+						width="140"
+					>
+						<template #default="scope">
+							<el-button
+								link
+								size="small"
+								v-if="scope.row.type == 'year_s' || scope.row.type == 'month_s' || scope.row.type == 'day_s'"
+								@click="handle_edit(scope.row)"
+								type="primary"
+								>校正</el-button
+							>
+						</template>
+					</el-table-column>
+					</scTable>
+      			</el-aside>
+				<el-main>
+					<scEcharts :option="chartOption" height="400px" />
+				</el-main>
+			</el-container>		
 		</el-main>
-		<el-aside style="width: 50%; float: right;">
-        <!-- 折线图组件 -->
-        <scEcharts :option="chartOption" height="400px" />
-      </el-aside>
-		</el-container>
 	</el-container>
 		<el-dialog title="校正" v-model="visible">
 			<el-main style="padding: 0 20px 20px 20px">
@@ -167,7 +169,7 @@ export default {
                 end_time: null
             },
 			chartOption: {
-				color: ["#80FFA5", "#00DDFF", "#37A2FF", "#FF0087", "#FFBF00"],
+				color: ["#191970"],
 				tooltip: {
 					trigger: "axis",
 					axisPointer: {
@@ -232,14 +234,13 @@ export default {
 
 		option.series = [
 			{
-				name: '总生产',
+				name: tableData[0].mpoint_name,
 				type: 'line', // 折线图类型
 				data: tableData.map((item) => parseFloat(item.val)), // 将字符串转为数字
 				smooth: true, // 平滑曲线
 			}
 		];
-		option.legend.data = ['总生产'];
-
+		option.legend.data = [tableData[0].mpoint_name];
 		// 更新图表选项
 		that.chartOption = option;
 	},
@@ -254,7 +255,6 @@ export default {
 		},
 		handle_add() {},
 		handleQuery() {
-            console.log(this.query)
             if (this.timeRange) {
                 this.query.start_time = this.timeRange[0]
                 this.query.end_time = this.timeRange[1]

From 6f717b03ec5bbfe847c4166f33fecab87a7d22b7 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 1 Nov 2024 09:11:17 +0800
Subject: [PATCH 13/15] =?UTF-8?q?fix:fmlog=E6=97=A5=E5=BF=97=E4=B8=AD?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91mlog=E6=97=B6=E5=8F=96=E6=B6=88=E9=A2=86?=
 =?UTF-8?q?=E6=96=99=E6=95=B0=E9=87=8F=E4=B8=8D=E8=83=BD=E5=A4=A7=E4=BA=8E?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E5=B7=A5=E6=AE=B5=E5=BA=93=E5=AD=98=E6=95=B0?=
 =?UTF-8?q?=E7=9A=84=E9=99=90=E5=88=B6=EF=BC=8C=E4=B8=94=E5=90=88=E6=A0=BC?=
 =?UTF-8?q?=E4=B8=8D=E5=90=88=E6=A0=BC=E7=A6=81=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/f_mlogs_form.vue | 34 ++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/views/wpm_gx/f_mlogs_form.vue b/src/views/wpm_gx/f_mlogs_form.vue
index 75319b36..fd21c3e8 100644
--- a/src/views/wpm_gx/f_mlogs_form.vue
+++ b/src/views/wpm_gx/f_mlogs_form.vue
@@ -131,8 +131,7 @@
 							<el-form-item label="领用数量">
 								<el-input-number
 									v-model="form.count_use"
-									:min="1"
-									:max="materialCount"
+									:min="0"
 									controls-position="right"
 									class="width100"
 									@change = "countUseChange"
@@ -159,14 +158,13 @@
 									controls-position="right"
 									disabled
 								/>
-								<!-- countChanges -->
 							</el-form-item>
 						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="合格数量">
 								<el-input-number
 									v-model="form.count_ok"
-									:min="0"
+									disabled
 									class="width100"
 									controls-position="right"
 								/>
@@ -176,9 +174,8 @@
 							<el-form-item label="不合格数量">
 								<el-input-number
 									v-model="form.count_notok"
-									:min="0"
+									disabled
 									class="width100"
-									@change="countChanges"
 									controls-position="right"
 								/>
 							</el-form-item>
@@ -397,7 +394,7 @@ export default {
 				work_end_time:[{required: true,message: "请选择生产开始时间",trigger: "blur",},],
 				route: [{required: true,message: "请选择工艺路线",trigger: "blur",},]
 			},
-			materialCount:1,
+			materialCount:1,//领料批次现有库存数
 			material_in:'',
 			material_out:'',
 			shiftOtions:[],
@@ -475,8 +472,21 @@ export default {
 			let that = this;
 			that.materialOptions.forEach(item=>{
 				if(item.id == val){
-					that.materialCount = item.count;
-					that.form.count_use = item.count;
+					that.form.count_n_hs =
+					that.form.count_n_qp =
+					that.form.count_n_swen =
+					that.form.count_n_bb =
+					that.form.count_n_xbb =
+					that.form.count_n_md =
+					that.form.count_n_xh =
+					that.form.count_n_ps =
+					that.form.count_n_zq =
+					that.form.count_n_qt =
+					that.form.count_n_wm=0;
+					that.materialCount = 
+					that.form.count_use = 
+					that.form.count_real = 
+					that.form.count_ok = item.count;
 					that.form.count_real = item.count-that.form.count_pn_jgqbl;
 				}
 			})
@@ -512,9 +522,9 @@ export default {
 			this.form.count_n_wm;
 			this.form.count_ok = this.form.count_real - this.form.count_notok;
 		},
-		countChanges(){
-			this.form.count_ok = this.form.count_real - this.form.count_notok;
-		},
+		// countChanges(){
+		// 	this.form.count_ok = this.form.count_real - this.form.count_notok;
+		// },
 		//表单提交方法
 		submit() {
 			let that = this;

From 7cb112bde80e2be0e5532f51515f3e6233a7a8c1 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 1 Nov 2024 09:24:04 +0800
Subject: [PATCH 14/15] =?UTF-8?q?fix:=E5=87=BA=E5=85=A5=E5=BA=93=E5=90=8E?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=BA=93=E5=AD=98=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/inm.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/wpm_gx/inm.vue b/src/views/wpm_gx/inm.vue
index 70a944cb..74838781 100644
--- a/src/views/wpm_gx/inm.vue
+++ b/src/views/wpm_gx/inm.vue
@@ -317,7 +317,10 @@ export default {
 			this.dialog.scrap = false;
 			this.$refs.table.refresh();
 		},
-		handleinmSuccess(){},
+		//出入库后刷新页面
+		handleinmSuccess(){
+			this.$refs.table.refresh();
+		},
 		//搜索
 		handleQuery() {
 			this.$refs.table.queryData(this.query);

From d7965ef1705009b6f0d61350d66d5bf1ee710296 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 1 Nov 2024 09:26:17 +0800
Subject: [PATCH 15/15] fix:coding507

---
 src/views/mtm/process.vue     | 24 +++++++++++++++---------
 src/views/wpm_gx/handover.vue |  1 +
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/views/mtm/process.vue b/src/views/mtm/process.vue
index b81cdd54..d3fa094d 100644
--- a/src/views/mtm/process.vue
+++ b/src/views/mtm/process.vue
@@ -49,26 +49,32 @@
 				></el-table-column>
 				<el-table-column label="批号追加设备" min-width="60">
 					<template #default="scope">
-						<el-icon
-							v-if="scope.row.batch_append_equip"
-							color="green"
-						>
+						<el-tag type="success" v-if="scope.row.batch_append_equip">
+							是
+						</el-tag>
+						<!-- <el-icon v-if="scope.row.batch_append_equip" color="green">
 							<CircleCheckFilled />
-						</el-icon>
+						</el-icon> -->
 					</template>
 				</el-table-column>
 				<el-table-column label="交接到工段" min-width="60">
 					<template #default="scope">
-						<el-icon v-if="scope.row.into_wm_mgroup" color="green">
+						<el-tag type="success" v-if="scope.row.into_wm_mgroup">
+							是
+						</el-tag>
+						<!-- <el-icon v-if="scope.row.into_wm_mgroup" color="green">
 							<CircleCheckFilled />
-						</el-icon>
+						</el-icon> -->
 					</template>
 				</el-table-column>
 				<el-table-column label="不合格品是否入库" min-width="60">
 					<template #default="scope">
-						<el-icon v-if="scope.row.store_notok" color="green">
+						<el-tag type="success" v-if="scope.row.store_notok">
+							是
+						</el-tag>
+						<!-- <el-icon v-if="scope.row.store_notok" color="green">
 							<CircleCheckFilled />
-						</el-icon>
+						</el-icon> -->
 					</template>
 				</el-table-column>
 				<el-table-column label="排序" prop="sort" min-width="60">
diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index 0f2b01ec..2d26c035 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -14,6 +14,7 @@
 					icon="el-icon-plus"
 					@click="table_add(20)"
 					v-auth="'handover.create'"
+					v-if="mgroupName!=='切片'"
 					>返工</el-button
 				>
 				<el-button