报工部分代码修改

src/views/modules/scheduleReport/com_fqc_report.vue

@@ -86,7 +86,7 @@
                     <a class="customer-a" v-if="scope.row.statusCode === 1"
                                            @click="confirmCancelCheckFinalRoll(scope.row)"
                                         >取消检验</a>
-                    <a class="customer-a" v-if="scope.row.statusCode === 1"
+                    <a class="customer-a" v-if="scope.row.statusCode === 1 || scope.row.statusCode === 2"
                        @click="reprintFinalRoll(scope.row)"
                     >补打标签</a>
                   </template>

src/views/modules/scheduleReport/com_reprint_label.vue

@@ -0,0 +1,193 @@
+<script src="print_roll_label.js"></script>
+<template>
+  <div class="customer-css">
+    <el-dialog
+      v-drag
+      width="500px"
+      class="customer-dialog"
+      :visible.sync="visible"
+      :title="titleCon"
+      v-bind="$attrs"
+      v-on="$listeners"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false">
+
+      <el-form :inline="false" label-position="top" label-width="80px" style="padding: 20px;">
+        <el-form-item label="标签条码" class="customer-item">
+          <el-input
+            v-model="searchData.tagNo"
+            ref="tagNo"
+            type="textarea"
+            :rows="2"
+            placeholder="请扫描或输入标签条码"
+            @keyup.enter.native="handleScan"
+            clearable>
+          </el-input>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getReprintFqcFinalRollPrintData,
+} from "@/api/scheduleReport/com_reprint_label.js";
+
+/*打印标签专用的js*/
+import { printFqcLabel } from "@/views/modules/label/print_fqc_label.js"
+
+var functionId = 'C10000005';
+export default {
+  data() {
+    return {
+      titleCon: '扫码补打标签',
+      visible: false,
+      searchData: {
+        site: this.$store.state.user.site,
+        username: this.$store.state.user.name,
+        tagNo: '',
+        statusCode: 1,
+      },
+      printRow: {},
+      dataListLoading: false,
+    }
+  },
+  methods: {
+
+    init() {
+      //判断是否关闭所有的页面按钮
+      this.searchData.tagNo = '';
+      //打开显示
+      this.visible = true;
+      //自动获取焦点
+      this.$nextTick(() => {
+        if (this.$refs.tagNo) {
+          this.$refs.tagNo.focus();
+        }
+      });
+    },
+
+    // 处理扫描
+    handleScan() {
+      if (!this.searchData.tagNo || this.searchData.tagNo.trim() === '') {
+        this.$message.warning('请输入标签条码');
+        return;
+      }
+      //调用方法
+      getReprintFqcFinalRollPrintData(this.searchData).then(({data}) => {
+        debugger;
+        if(data.code === 200){
+          printFqcLabel(data.printRow);
+        }else {
+          this.$message.error(data.msg);
+        }
+
+      });
+    },
+
+  },
+
+  created() {
+    // this.factoryList()
+    // this.getLanguageList()
+  }
+}
+
+</script>
+
+<style scoped lang="scss">
+/deep/ .customer-tab .el-tabs__content {
+  padding: 0px !important;
+}
+
+/*当前按钮的通用样式*/
+.customer-css .customer-bun-mid {
+  width: 60px;
+  text-align: center;
+}
+
+.customer-css .customer-bun-min {
+  width: 50px;
+  text-align: center;
+}
+
+.customer-css .customer-bun-max {
+  width: 80px;
+  text-align: center;
+}
+
+/*当前按钮的通用样式*/
+.customer-css .el-button--medium {
+  padding: 5px 5px;
+}
+
+.customer-css .customer-roll-css span {
+  margin-left: 15px;
+  font-size: 16px;
+  color: #387877;
+}
+
+/*定制组件的样式*/
+.customer-css /deep/ .el-dialog {
+  top: 6vh !important;
+  margin-top: 0px !important;
+  margin-bottom: 10px;
+}
+
+/*自定义当前el-input的样式 */
+.customer-item .el-input {
+  margin-top: -3vh;
+  margin-right: 25px;
+}
+
+/* 确保对话框有足够的高度 */
+.customer-dialog /deep/ .el-dialog {
+  min-height: 200px;
+}
+
+/* 调整对话框底部间距 */
+.customer-dialog /deep/ .el-dialog__footer {
+  padding: 15px 20px;
+  text-align: center;
+  border-top: 1px solid #e4e7ed;
+  margin-top: 10px;
+}
+
+/* 文本域样式优化 */
+.customer-item /deep/ .el-textarea__inner {
+  font-size: 14px;
+  line-height: 1.5;
+  padding: 12px;
+  border-radius: 4px;
+  resize: vertical;
+  min-height: 80px;
+}
+
+.customer-item /deep/ .el-textarea__inner:focus {
+  border-color: #409eff;
+  box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.2);
+}
+
+/* 按钮图标样式 */
+.customer-bun-mid i {
+  margin-right: 4px;
+}
+
+/* 对话框样式 */
+.customer-dialog /deep/ .el-dialog__body {
+  padding: 0;
+}
+
+.customer-dialog /deep/ .el-dialog__footer {
+  padding: 10px 20px;
+  text-align: right;
+  border-top: 1px solid #e4e7ed;
+}
+
+.dialog-footer {
+  display: flex;
+  justify-content: center;
+  gap: 10px;
+}
+</style>

src/views/modules/scheduleReport/produce_order.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="customer-css">
     <!--  菜单按钮区域  -->
-    <fieldset class="customer-field" style="width: 675px; padding: 0.35em 0.75em 0.425em;">
+    <fieldset class="customer-field" style="width: 775px; padding: 0.35em 0.75em 0.425em;">
       <!--  查询产品  -->
       <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;">
         <el-form-item label="工站:">
@@ -31,6 +31,11 @@
                      style="margin-left: 10px;  margin-bottom: 5px;">{{ buttons.fqcReportButton }}
           </el-button>
         </el-form-item>
+        <el-form-item :label="' '" >
+          <el-button type="primary" @click="reprintLabelModal()" class="customer-bun-mid"
+                     style="margin-left: 10px;  margin-bottom: 5px;">{{ buttons.reprintLabel }}
+          </el-button>
+        </el-form-item>
       </el-form>
     </fieldset>
 
@@ -74,6 +79,10 @@
     <comFqcReport :close-on-click-modal="false" ref="comFqcReport">
     </comFqcReport>
 
+    <!-- 重打标签的组件 -->
+    <comReprintLabel :close-on-click-modal="false" ref="comReprintLabel">
+    </comReprintLabel>
+
 
   </div>
 </template>
@@ -108,6 +117,7 @@ import Chooselist from '@/views/modules/common/Chooselist'/* 列表组件 */
 import column from '@/views/modules/common/column'
 import comDieCuttingReport from './com_die_cutting_report' /* 模切报工的组件 */
 import comFqcReport from './com_fqc_report' /* 模切报工的组件 */
+import comReprintLabel from './com_reprint_label' /* 重打标签的组件 */
 var functionId = '600001';
 
 export default {
@@ -258,6 +268,7 @@ export default {
         searchButton: '查询',
         dieCuttingButton: '模切工站',
         fqcReportButton: 'FQC报工',
+        reprintLabel: '重打标签',
       },
       // 导出 start
       exportList: [],
@@ -273,6 +284,7 @@ export default {
     column,/* 动态列 */
     comDieCuttingReport, /* 模切工站页面的组件 */
     comFqcReport,/* fqc工站的组件*/
+    comReprintLabel,/* 重打标签的组件*/
   },
   mounted() {
     this.$nextTick(() => {
@@ -333,6 +345,14 @@ export default {
       })
     },
 
+    // 重打标签modal
+    reprintLabelModal() {
+      // 打开操作员切换功能
+      this.$nextTick(() => {
+        this.$refs.comReprintLabel.init();
+      })
+    },
+
     // 结束派工单后刷新页面
     processFinishScheduleOperation() {
       // 刷新当前页面的数据