内部码打印功能代码提交

src/api/inout/innerOrderQRCode.js

@@ -17,11 +17,19 @@ export function stockQRCodeText(query) {
 export function filterPrint(query) {
     return axios(
         {
-            url: "/spms/stockPrint/filter",
+            url: "/udiwms/innerOrderPrint/filter",
             method: "get",
             params: query
         }
     )
 }
+export function generateInnerQRCodeText(query) {
+  return axios({
+    url: "/udiwms/innerOrderPrint/addOrderPrint",
+    method: "post",
+    data: query
+  });
+}
+
 
 

src/api/inout/stockOrder.js

@@ -246,13 +246,6 @@ export function generateStockOrderQRCodeText(query) {
     });
 }
 
-export function generateInnerQRCodeText(query) {
-    return axios({
-        url: "/udiwms/inner/order/generate/text",
-        method: "post",
-        data: query
-    });
-}
 
 
 

src/views/inventory/inner/innerCodeDetail.vue

@@ -50,13 +50,14 @@
 
             <el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
                       highlight-current-row
+                      border
                       ref="multipleTable">
                 <el-table-column label="序号" type="index" width="50"></el-table-column>
                 <el-table-column label="码" prop="udiCode"></el-table-column>
 
                 <el-table-column label="状态" width="120">
                     <template slot-scope="scope">
-                        <span>{{ statusMap[scope.row.printStatus] }}</span>
+                        <span>{{ statusMap[scope.row.status] }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -77,7 +78,7 @@
                         <!--                            <span>{{ scope.row.reCount }}</span>-->
                     </template>
                 </el-table-column>
-                <el-table-column label="操作" fixed="right" width="150">
+                <el-table-column label="操作"width="150">
                     <template slot-scope="scope">
                         <el-button
                             type="text"
@@ -92,14 +93,13 @@
 
 
             <div class="block">
-                <el-pagination
+              <pagination
-                    @current-change="handleCurrentChange"
+                v-show="total>0"
-                    layout="prev, pager, next"
+                :total="total"
-                    :page-size="query.limit"
+                :limit.sync="query.limit"
-                    :total="total"
+                :page.sync="query.page"
-                    :current-page="query.page"
+                @pagination="handleCurrentChange"
-                >
+              ></pagination>
-                </el-pagination>
             </div>
         </el-form>
         <el-dialog
@@ -120,7 +120,7 @@
                 </el-button
                 >
             </el-button-group>
-            <el-table :data="lableFileLsit" style="width: 100%">
+            <el-table :data="lableFileLsit" style="width: 100%" border>
                 <el-table-column label="序号" type="index"></el-table-column>
                 <el-table-column
                     label="文件名称"
@@ -142,41 +142,32 @@
 
                 </el-table-column>
 
-                <el-table-column label="操作" fixed="right">
+                <el-table-column label="操作">
                     <template slot-scope="scope">
-                        <el-button
+                        <el-button type="text" size="small" @click="printLabel(scope.row)">标签打印</el-button>
-                            type="text"
-                            size="small"
-                            @click="printLabel(scope.row)"
-                        >标签打印
-                        </el-button
-                        >
                     </template>
                 </el-table-column>
             </el-table>
 
-            <el-pagination
+          <pagination
-                :page-size="refreshQuery.limit"
+            v-show="labltotal>0"
-                @current-change="handleLableChange"
+            :total="labltotal"
-                layout="prev, pager, next"
+            :limit.sync="refreshQuery.limit"
-                :total="labltotal"
+            :page.sync="refreshQuery.page"
-                :current-page="refreshQuery.page"
+            @pagination="handleLableChange"
-            >
+          ></pagination>
-            </el-pagination>
         </el-dialog>
     </div>
 </template>
 
 <script>
-import {stockQRCodeText, filterPrint} from "@/api/inout/stockQRCode";
+import {stockQRCodeText, filterPrint,generateInnerQRCodeText} from "@/api/inout/innerOrderQRCode";
 import draggable from "vuedraggable";
-import {
+import {filterTemp, inspectionStockQRCodeTextPDFFromTemplateFile,
-    inspectionOrderDetailPDFFromTemplateFile, filterTemp,
+  stockQRCodeTextPDFFromTemplateFile, stockQRCodeTextPDFFromTemplateFileMax
-    inspectionStockQRCodeTextPDFFromTemplateFile,
-    orderDetailPDFFromTemplateFile, stockQRCodeTextPDFFromTemplateFile, stockQRCodeTextPDFFromTemplateFileMax
 } from "@/api/itextpdf/itextpdf";
-import {getLocalJoinBusType} from "@/api/basic/busLocalType";
+
-import {generateInnerQRCodeText} from "@/api/inout/stockOrder";
+
 
 export default {
     name: "innerCodeDetail",
@@ -201,7 +192,6 @@ export default {
                 limit: 10,
             },
             labelPrintVisible: false,
-            busTypes: [],
             formData: {},
             codeArray: [],
             total: 0,
@@ -237,13 +227,11 @@ export default {
     methods: {
 
         refeshLabel() {
-
             filterTemp(this.refreshQuery).then((response) => {
                 if (response.code == 20000) {
                     this.lableFileLsit = response.data.list;
                     this.labelPrintVisible = true;
                     this.labltotal = response.data.total || 0;
-                    // this.$message.warning("打印文件正在生成中，请点击刷新按钮查看进度，请勿关闭按钮重复打印！");
                 }
             }).catch(() => {
                 this.loading = false;
@@ -270,35 +258,19 @@ export default {
             this.$refs.multipleTable.clearSelection();
             this.$refs.multipleTable.toggleAllSelection();
         },
-        handleSizeChange(val) {
-            this.query.limit = val;
-            this.getStockQRCodeTextList();
-        },
         handleCurrentChange(val) {
-            this.query.page = val;
+            this.query.page = val.page;
-            this.getStockQRCodeTextList();
+            this.getOrderQRCodeTextList();
         },
 
 
         handleLableChange(val) {
-            this.refreshQuery.page = val;
+            this.refreshQuery.page = val.page;
             this.refeshLabel();
-            this.getStockQRCodeTextList();
+            this.getOrderQRCodeTextList();
         },
 
-
+      getOrderQRCodeTextList() {
-        getBusType() {
-            let query = {
-                enabled: true,
-            };
-            getLocalJoinBusType(query)
-                .then((response) => {
-                    this.busTypes = response.data.list || [];
-                })
-                .catch(() => {
-                });
-        },
-        getStockQRCodeTextList() {
             this.loading = true;
             filterPrint(this.query) //查找该单号下的所有条码
                 .then((response) => {
@@ -320,7 +292,7 @@ export default {
                 countList: [],
             };
             if (row == null) {
-                tQuery.orderId = this.query.sOrderId;
+                tQuery.orderId = this.formData.id;
             } else {
                 if (row.reCount <= 0) {
                     return this.$message.error('数量错误');
@@ -404,15 +376,13 @@ export default {
                 cancelButtonText: "取消",
                 type: "warning",
             }).then(() => {
-                let tQuery = {ids: []};
-                tQuery.ids.push(this.query.orderId)
                 this.loading = true;
-                generateInnerQRCodeText(tQuery)
+                generateInnerQRCodeText({orderIdFk:this.formData.id})
                     .then(response => {
                         this.loading = false;
                         if (response.code === 20000) {
                             this.$message.success(response.data);
-                            this.getStockQRCodeTextList();
+                            this.getOrderQRCodeTextList();
                             this.detailList = [];
                         } else {
                             this.$message.error(response.message);
@@ -450,16 +420,14 @@ export default {
     mounted() {
     },
     created() {
-        this.getBusType();
         this.formData = {};
         this.codeArray = [];
         this.pdffileUrl = this.BASE_URL + "/spms/donwload/pdf?fileName=";
         if (this.$isNotBlank(this.inQuery.id)) {
-
             this.formData = this.inQuery.formData;
             this.query.orderId = this.inQuery.id;
             this.query.sOrderId = this.inQuery.id;
-            this.getStockQRCodeTextList();
+            this.getOrderQRCodeTextList();
         }
     },
 };

src/views/inventory/inner/innerOrder.vue

@@ -49,8 +49,8 @@
                 <el-table-column label="备注说明" prop="remark"></el-table-column>
                 <el-table-column label="打印状态" prop="printStatus">
                     <template slot-scope="scope">
-                        <el-tag :type="(scope.row.printStatus) | statusFilterType">
+                        <el-tag :type="(scope.row.status) | statusFilterType">
-                            {{ statusPrintMap[scope.row.printStatus] }}
+                            {{ statusPrintMap[scope.row.status] }}
                         </el-tag>
                     </template>
                 </el-table-column>