From 284c2a25ea17b53317a6cd830503564ba382f676 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Fri, 29 Apr 2022 11:28:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=89=A9=E6=96=99=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yieldReport/com_transform_part.vue        |  1 +
 .../yieldReport/order_transform_part.vue      | 40 +---------
 .../modules/yieldReport/print_roll_label.js   | 73 +------------------
 3 files changed, 5 insertions(+), 109 deletions(-)

diff --git a/src/views/modules/yieldReport/com_transform_part.vue b/src/views/modules/yieldReport/com_transform_part.vue
index 9eab6d6..4478e57 100644
--- a/src/views/modules/yieldReport/com_transform_part.vue
+++ b/src/views/modules/yieldReport/com_transform_part.vue
@@ -288,6 +288,7 @@ export default {
         if(data.code == 500){
           this.$message.error(data.msg);
         }else{
+          this.$message.success(data.msg);
           //二次扫描使用
           this.pageData.rollNo = '';
           //刷新页面的数据
diff --git a/src/views/modules/yieldReport/order_transform_part.vue b/src/views/modules/yieldReport/order_transform_part.vue
index 3235892..fe7326e 100644
--- a/src/views/modules/yieldReport/order_transform_part.vue
+++ b/src/views/modules/yieldReport/order_transform_part.vue
@@ -57,7 +57,7 @@
         label="操作">
         <template slot-scope="scope">
           <a type="text" size="small" @click="transformPartModal(scope.row)">转换</a>
-          <a type="text" size="small" @click="showTransformedRollModal(scope.row)">已入库列表</a>
+          <a type="text" size="small" @click="showTransformedRollModal(scope.row)">已转卷列表</a>
         </template>
       </el-table-column>
       <el-table-column
@@ -125,7 +125,7 @@ export default {
         orderNo: '',
         date1: '',
         date2: '',
-        slittedFlag: 'ALL',
+        slittedFlag: 'N',
       },
       transformOrderList: [],
       transformOrderColumns: [
@@ -183,24 +183,6 @@ export default {
           fixed: false,
           columnWidth: 120
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6033,
-          serialNumber: '6033TableSupplierID',
-          tableId: "6033Table",
-          tableName: "查询SAP分卷订单表",
-          columnProp: "supplierID",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "供应商编码",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 80
-        },
         {
           userId: this.$store.state.user.name,
           functionId: 6033,
@@ -219,24 +201,6 @@ export default {
           fixed: false,
           columnWidth: 70
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 6033,
-          serialNumber: '6033TableSupplierName',
-          tableId: "6033Table",
-          tableName: "查询SAP分卷订单表",
-          columnProp: "supplierName",
-          headerAlign: "center",
-          align: "left",
-          columnLabel: "供应商名称",
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false,
-          columnWidth: 300
-        },
         {
           userId: this.$store.state.user.name,
           functionId: 6033,
diff --git a/src/views/modules/yieldReport/print_roll_label.js b/src/views/modules/yieldReport/print_roll_label.js
index 7818a13..8a6e0fa 100644
--- a/src/views/modules/yieldReport/print_roll_label.js
+++ b/src/views/modules/yieldReport/print_roll_label.js
@@ -4,7 +4,8 @@ import getLodop from '@/utils/LodopFuncs.js'
 export function printMaterialLabel(printList) {
   const LODOP = getLodop()
   if (LODOP) {
-    LODOP.SET_LICENSES("", "13F0BE83846277CB60918577C6281375", "", "");
+    //LODOP.SET_LICENSES("", "13F0BE83846277CB60918577C6281375", "", "");
+    LODOP.SET_LICENSES("", "7B5624CC84E599D6B17F27DF40F4310C", "", "");
     //循环调用打印机
     for(let i = 0; i < printList.length; i++){
       let printData = printList[i];
@@ -64,73 +65,3 @@ export function printMaterialLabel(printList) {
   }
 }
 
-/**
- * 是否有权限
- * @param {*} key
- */
-export function isAuth (key) {
-  return JSON.parse(sessionStorage.getItem('permissions') || '[]').indexOf(key) !== -1 || false
-}
-
-/**
- * 树形数据转换
- * @param {*} data
- * @param {*} id
- * @param {*} pid
- */
-export function treeDataTranslate (data, id = 'id', pid = 'parentId') {
-  var res = []
-  var temp = {}
-  for (var i = 0; i < data.length; i++) {
-    temp[data[i][id]] = data[i]
-  }
-  for (var k = 0; k < data.length; k++) {
-    if (temp[data[k][pid]] && data[k][id] !== data[k][pid]) {
-      if (!temp[data[k][pid]]['children']) {
-        temp[data[k][pid]]['children'] = []
-      }
-      if (!temp[data[k][pid]]['_level']) {
-        temp[data[k][pid]]['_level'] = 1
-      }
-      data[k]['_level'] = temp[data[k][pid]]._level + 1
-      temp[data[k][pid]]['children'].push(data[k])
-    } else {
-      res.push(data[k])
-    }
-  }
-  return res
-}
-
-/**
- * 清除登录信息
- */
-export function clearLoginInfo () {
-  Vue.cookie.delete('token')
-  store.commit('resetStore')
-  router.options.isAddDynamicMenuRoutes = false
-}
-
-
-export function handleExport(data) {
-  // 动态创建iframe下载文件
-  let fileName = this.selectedTabelRow[0].dirName;
-  if (!data) {
-    return;
-  }
-  let blob = new Blob([data], { type: "application/octet-stream" });
-  if ("download" in document.createElement("a")) {
-    // 不是IE浏览器
-    let url = window.URL.createObjectURL(blob);
-    let link = document.createElement("a");
-    link.style.display = "none";
-    link.href = url;
-    link.setAttribute("download", fileName);
-    document.body.appendChild(link);
-    link.click();
-    document.body.removeChild(link); // 下载完成移除元素
-    window.URL.revokeObjectURL(url); // 释放掉blob对象
-  } else {
-    // IE 10+
-    window.navigator.msSaveBlob(blob, fileName);
-  }
-}