From 525407edc194622be92cb4bb0d6575d77abaf422 Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Mon, 22 Apr 2024 09:20:12 +0800
Subject: [PATCH] =?UTF-8?q?24-04-10=20=E5=87=BA=E5=BA=93=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.js                 |  4 ----
 src/views/modules/production/scanForm.vue | 24 +++++++++++++++++++++--
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index e679c6d..7a69f3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -6,10 +6,6 @@ export default {
     site: 0,
     languageDefault: '',
     userDisplay: '',
-    //客户环境
-    // padSopUrl:'http://192.168.2.172/upload/',
-    // tvSopUrl:'http://192.168.2.172/sopFile/',
-    //自己环境
     padSopUrl:process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? 'http://192.168.1.83:81/upload/' :'http://192.168.2.172/upload/',
     tvSopUrl:process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? 'http://192.168.1.83:81/sopFile/' :'http://192.168.2.172/sopFile/',
   },
diff --git a/src/views/modules/production/scanForm.vue b/src/views/modules/production/scanForm.vue
index 066f600..2e7d462 100644
--- a/src/views/modules/production/scanForm.vue
+++ b/src/views/modules/production/scanForm.vue
@@ -69,6 +69,15 @@ export default {
       fileName:'',
       photoUrl:'',
       num:1,
+      exportDataStandard: {
+        "通知单号": "delNotifyNo",
+        "通知单序号号": "delNotifyItemNo",
+        "产品编码": "partNo",
+        "数量": "scanQty",
+        "类型": "scanType",
+        "操作时间": "createData",
+      },
+      exportName: "发货扫描"+dayjs().format("YYYYMMDDHHmmss"),
     }
   },
   methods:{
@@ -254,7 +263,7 @@ export default {
   <el-dialog
     title="出货扫描" v-drag
     :visible.sync="flag"
-    width="75%"
+    width="80%"
     @open="scanLabel"
     @close="closeScanDialog" @opened="openScanDialog">
     <el-form :model="model" :inline="true" label-position="top">
@@ -273,6 +282,17 @@ export default {
       <el-form-item label="袋数">
         <el-input-number disabled :controls="false" style="margin-top: -5px;text-align: right" v-model="totalNum"></el-input-number>
       </el-form-item>
+      <el-form-item label=" " v-if="isReport">
+        <download-excel
+          :fields="exportDataStandard"
+          :data="scanLabelDetailList.map(item=>{item.partNo=detail.partNo;return item;})"
+          type="xlsx"
+          :name="exportName"
+          worksheet="导出信息"
+          class="el-button el-button--primary el-button--medium">
+          导出
+        </download-excel>
+      </el-form-item>
     </el-form>
     <div style="display:flex;justify-content:space-between;align-items:center;">
       <el-table :data="scanLabelDetailList" style="width: 60%" stripe border height="400" highlight-current-row>
@@ -293,7 +313,7 @@ export default {
         <el-table-column label="操作员" header-align="center" align="left" show-overflow-tooltip prop="createBy"/>
         <el-table-column label="扫描时间" header-align="center" align="center" show-overflow-tooltip prop="createData"/>
       </el-table>
-      <div style="width: 700px;display: flex;flex-wrap: wrap;align-items: center;">
+      <div style="width: 650px;display: flex;flex-wrap: wrap;align-items: center;">
         <div class="pad" style="width: 50%;">
           <h5 style="margin-left: 30px;font-size: 20px">产品图片</h5>
           <el-form :inline="true" style="margin-left: 30px" label-position="top">