积木打印相关

src/views/mes/queryManage/queryNew.vue

@@ -218,6 +218,7 @@ export default {
     return {
       title: "", // ContentWrap 的 title
       message: "", // ContentWrap 的 message
+      baseUrl: "",
       queryList: [],
       searchData: [],
       queryData: [],
@@ -250,6 +251,9 @@ export default {
   beforeDestroy() {
     this.saveColumnWidth();
   },
+  created() {
+    this.baseUrl = process.env.VUE_APP_REPORT_API;
+  },
   methods: {
     /* 生命周期 */
     async init() {
@@ -414,7 +418,6 @@ export default {
         return this.$message.error("接口地址未配置或格式错误！");
       }
 
-      const baseUrl = process.env.VITE_BASE_URL;
       const token = getAccessToken();
       const tenantId = getTenantId();
       const { paramList = [], reportId } = params;
@@ -424,7 +427,7 @@ export default {
         tenantId,
         ...fieldValues,
       });
-      const src = `${baseUrl}${interfaceUrl}${reportId}?${printParams.toString()}`;
+      const src = `${this.baseUrl}${interfaceUrl}${reportId}?${printParams.toString()}`;
       this.$refs.reportPrint.open(
         src,
         this.$route.query?.name ||

src/views/system/menu/index.vue

@@ -90,12 +90,7 @@
         width="250"
       />
       <el-table-column prop="componentName" label="Vue组件Name" width="150" />
-      <el-table-column
-        prop="activeMenu"
-        label="高亮菜单"
-        :show-overflow-tooltip="true"
-        width="150"
-      />
+      <el-table-column prop="path" label="路由地址" width="150" />
       <el-table-column prop="icon" label="图标" align="center" width="100">
         <template slot-scope="scope">
           <svg-icon :icon-class="scope.row.icon" />

src/views/wms/incoming/register/components/LabelRepair.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="label-repair">
     <!-- 操作工具栏 -->
-    <el-form ref="form" :model="form" size="small" label-width="98px">
+    <el-form ref="form" :model="form" size="small" label-width="98px" v-if="false">
       <el-row>
         <el-col :span="7">
           <el-form-item label="打印模板" prop="BtReportId">
@@ -116,7 +116,6 @@
       >
         <template slot-scope="scope">
           <el-button
-            v-hasPermi="['wms:incoming-receipt:labelPrintData']"
             size="mini"
             type="text"
             icon="el-icon-printer"
@@ -200,6 +199,8 @@ export default {
   },
   created() {
     this.getTemplateList();
+    // 打印单据reportId
+    this.reportId = this.$route.meta.reportId;
   },
   mounted() {
     this.tokens = localStorage.getItem(AccessTokenKey);
@@ -229,8 +230,6 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      // 打印单据reportId
-      this.reportId = this.$route.meta.reportId[0];
       // 执行查询
       getIncomingLabelPrintDetail(this.queryParams)
         .then((response) => {
@@ -279,8 +278,7 @@ export default {
     // 标签补打
     async handleRepairPrint(row) {
       if (
-        process.env.VUE_APP_TITLE === "麦禾田WMS管理系统" ||
-        process.env.VUE_APP_TITLE === "WMS开发环境"
+        process.env.VUE_APP_TITLE === "麦禾田WMS管理系统"
       ) {
         if (!this.form.BtReportUrl || !this.form.BtReportName) {
           return this.$modal.msgError("请选择需要打印的模板");
@@ -306,7 +304,7 @@ export default {
         }
       } else {
         const { qrCode } = row;
-        const src = `${this.baseUrl}/jmreport/view/${this.reportId}?token=${this.tokens}&qrCode=${qrCode}`;
+        const src = `${this.baseUrl}/jmreport/view/${this.reportId}?token=${this.tokens}&materialLots=${qrCode}`;
         this.$refs.issuePrint.dialogVisible = true;
         this.$refs.issuePrint.title = "单据打印";
         this.$refs.issuePrint.src = src;

src/views/wms/incoming/register/materialRegistration.vue

@@ -214,26 +214,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="打印模板" prop="BtReportId">
-            <el-select
-              v-model="form.BtReportId"
-              placeholder="请选择模板"
-              @change="reportChange"
-            >
-              <el-option
-                v-for="item in btTemplateList"
-                :key="item.id"
-                :label="item.originName"
-                :value="item.id"
-              >
-                <el-row :gutter="10">
-                  <el-col :span="12">{{ item.originName }}</el-col>
-                  <el-col :span="12" class="text-right">{{
-                    item.version
-                  }}</el-col>
-                </el-row>
-              </el-option>
-            </el-select>
+          <el-form-item label="物料批次" prop="materialLots">
+            <el-input v-model="form.materialLots" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="8" class="text-right">
@@ -567,9 +549,7 @@ export default {
   },
   created() {
     this.tokens = localStorage.getItem(AccessTokenKey);
-    this.reportId = this.$route.meta.reportId
-      ? this.$route.meta.reportId[0]
-      : null;
+    this.reportId = this.$route.meta.reportId;
     this.baseUrl = process.env.VUE_APP_REPORT_API;
     this.getTemplateList();
 
@@ -815,6 +795,7 @@ export default {
               "/entry-exit/purchase-out-in/material-regist-enter?materialLots?materialLots=" +
               materialLots,
           });
+          console.log(this.reportId);
           const src = `${this.baseUrl}/jmreport/view/${this.reportId}?token=${this.tokens}&materialLots=${materialLots}`;
           this.$refs.issuePrint.dialogVisible = true;
           this.$refs.issuePrint.src = src;