panxuejun преди 8 месеца
родител
ревизия
98323063bf
променени са 1 файла, в които са добавени 5 реда и са изтрити 76 реда
  1. 5 76
      src/renderer/components/views/receiverWasteDeliveryNote.vue

+ 5 - 76
src/renderer/components/views/receiverWasteDeliveryNote.vue

@@ -279,7 +279,11 @@ export default {
       }
       setTimeout(function () {
         let formData = new FormData();
-        formData.append('list',JSON.stringify(self.selectedRows));
+        const ids = []
+        self.selectedRows.forEach(_ => {
+          ids.push(_.orderCenterOrderId)
+        })
+        formData.append('ids', JSON.stringify(ids));
         formData.append('loginName',self.default_login_name);
         for (let i = 0; i < self.deviceIds.length; i++) {
           if (i == 0) {
@@ -454,81 +458,6 @@ export default {
             });
         }
       }
-      setTimeout(function () {
-        let formData = new FormData();
-        formData.append('list',JSON.stringify(self.selectedRows));
-        formData.append('loginName',self.default_login_name);
-        for (let i = 0; i < self.deviceIds.length; i++) {
-          if (i == 0) {
-            var context = canvas.getContext('2d');
-            context.drawImage(video, 0, 0, 1920, 1080);
-            var picBase64 = canvas.toDataURL()
-            formData.append('file1',self.base64toBlob(picBase64));
-          } else if (i == 1) {
-            var context = canvas2.getContext('2d');
-            context.drawImage(video2, 0, 0, 1920, 1080);
-            var picBase642 = canvas2.toDataURL()
-            formData.append('file2',self.base64toBlob(picBase642));
-          } else if (i == 2) {
-            var context = canvas3.getContext('2d');
-            context.drawImage(video3, 0, 0, 1920, 1080);
-            var picBase643 = canvas3.toDataURL()
-            formData.append('file3',self.base64toBlob(picBase643));
-          }
-        }
-        let config = {
-          headers:{'Content-Type':'multipart/form-data'}
-        };
-
-        // const formData = new URLSearchParams();
-        // formData.append('list',JSON.stringify(self.selectedRows));
-        // formData.append('loginName', self.default_login_name);
-
-        // self.axios({
-        //   method: "post",//指定请求方式
-        //   url: "/Print/printReceiveDeliveryNote.action",
-        //   headers: {
-        //     'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8'
-        //   },
-        //   data: formData
-        // })
-        self.axios.post('/Print/printReceiveDeliveryNote.action',formData,config)
-          .then(function (res) {
-            self.loading = false
-            if (res.data.code === "success") {
-              const msg = res.data.data
-              var printData = msg.printData;
-              for (const obj of printData) {
-                const printMsg = {
-                  requestData: {
-                    TempleteType: '通用模板',
-                    Acccoutid: msg.accountId,
-                    TempleteVersion: 1,
-                    ShowPreview: 1,
-                    AutoMatch: 1,
-                    TempleteName: '',
-                    ShowPrinterSelect: 1,
-                    Warehouseid: '',
-                    PrintDatas: [obj]
-                  }
-                }
-                sendPrintSock("DoPrint", printMsg, top.getPrintCallback);
-                self.$message.info('打印成功!', 2);
-                self.$router.push('/');
-                // if (self.intervalID) {
-                //   clearInterval(self.intervalID); // 停止定时器
-                // }
-                // self.intervalID = setInterval(function() {
-                //   self.$router.push('/')
-                //   clearInterval(self.intervalID); // 停止定时器
-                // }, 5000); // 1000 毫秒 = 1 秒
-              }
-            } else {
-              self.$message.info('无单据打印!', 2);
-              return;
-            }
-          })
-      }, 2000);
     },
     getPrintCallback(error) {
       const self = this;