From 1e7cd1f93e9a69eca057385a51ea66ffbf4654bf Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 17 Aug 2022 17:25:30 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/warehouse/IOCheckErrOrder.vue     | 54 +--------------
 src/views/warehouse/IONewOrder.vue          | 10 ++-
 src/views/warehouse/IOSearchOrder.vue       | 68 +------------------
 src/views/warehouse/IOWaitOrder.vue         | 75 ++-------------------
 src/views/warehouse/stockOrder.vue          | 23 +------
 src/views/warehouse/stockOrderDelSearch.vue |  3 +
 src/views/warehouse/stockOrderDelete.vue    |  4 ++
 src/views/warehouse/stockOrderEditor.vue    | 14 +---
 src/views/warehouse/stockOrderNew.vue       |  3 +
 src/views/warehouse/stockOrderSearch.vue    |  2 +
 src/views/warehouse/stockOrderWaitCheck.vue |  8 +--
 11 files changed, 37 insertions(+), 227 deletions(-)

diff --git a/src/views/warehouse/IOCheckErrOrder.vue b/src/views/warehouse/IOCheckErrOrder.vue
index 1b199f8..6065ea1 100644
--- a/src/views/warehouse/IOCheckErrOrder.vue
+++ b/src/views/warehouse/IOCheckErrOrder.vue
@@ -93,7 +93,6 @@
                 highlight-current-row
                 @selection-change="handleSelectionChange"
             >
-                <!--                <el-table-column type="selection" width="55"></el-table-column>-->
                 <el-table-column label="序号" type="index"></el-table-column>
                 <el-table-column label="扫码单据类型" prop="billTypeName" width="120">
                 </el-table-column>
@@ -102,11 +101,6 @@
                     prop="id"
                     show-overflow-tooltip="true"
                 ></el-table-column>
-                <!-- <el-table-column
-                  label="来源订单号"
-                  prop="corpOrderId"
-                  :show-overflow-tooltip="true"
-                ></el-table-column> -->
                 <el-table-column label="来源" prop="fromType">
                     <template slot-scope="scope">
                         <span>{{ fromTypeMap[scope.row.fromType] }}</span>
@@ -119,6 +113,8 @@
                 </el-table-column>
                 <el-table-column label="当前分库" prop="subInvName" width="120">
                 </el-table-column>
+                <el-table-column label="所属部门" prop="deptName" width="120">
+                </el-table-column>
                 <el-table-column
                     label="创建时间"
                     prop="actDate"
@@ -130,14 +126,6 @@
                         <span>{{ scope.row.actDate }}</span>
                     </template>
                 </el-table-column>
-                <!--<el-table-column label="校验状态" prop="status" width="100">-->
-                <!--<template slot-scope="scope">-->
-                <!--<el-tag :type="(scope.row.status === 3) | statusFilterType">{{-->
-                <!--checkStatus[scope.row.contrastStatus]-->
-                <!--}}-->
-                <!--</el-tag>-->
-                <!--</template>-->
-                <!--</el-table-column>-->
                 <el-table-column label="校验状态" prop="contrastStatus" width="120">
                     <template slot-scope="scope">
                         <el-tag :type="(scope.row.contrastStatus === 1) | statusFilterType">
@@ -145,27 +133,6 @@
                         </el-tag>
                     </template>
                 </el-table-column>
-                <!--<el-table-column label="操作" width="150">-->
-                <!--<template slot-scope="scope">-->
-                <!--<el-button-->
-                <!--type="text"-->
-                <!--size="small"-->
-                <!--:disabled="scope.row.contrastStatus === null"-->
-                <!--@click.native.stop="repeatCheckClick(scope.row)"-->
-                <!--&gt;重新校验-->
-                <!--</el-button-->
-                <!--&gt;-->
-                <!--<el-button-->
-                <!--type="text"-->
-                <!--size="small"-->
-                <!--:disabled="scope.row.contrastStatus !== 0"-->
-                <!--@click.native.stop="handleErrorDetail(scope.$index)"-->
-                <!--&gt;校验信息-->
-                <!--</el-button-->
-                <!--&gt;-->
-                <!--</template>-->
-                <!--</el-table-column>-->
-                <!-- <el-table-column label="上传状态" prop="exportStatus"></el-table-column> -->
                 <el-table-column label="操作" width="250">
                     <template slot-scope="scope">
                         <el-button
@@ -203,23 +170,6 @@
                         >详情
                         </el-button
                         >
-
-                        <!--                        <el-button-->
-                        <!--                            type="text"-->
-                        <!--                            size="small"-->
-                        <!--                            @click.native.stop="successOrderExportPDFSetting(scope.row)"-->
-                        <!--                        >导出PDF-->
-                        <!--                        </el-button-->
-                        <!--                        >-->
-
-                        <!--<el-button-->
-                        <!--type="text"-->
-                        <!--size="small"-->
-                        <!--@click.native.stop="successOrderExportPDF(scope.row)"-->
-                        <!--&gt;打印-->
-                        <!--</el-button-->
-                        <!--&gt;-->
-
                         <el-button
                             type="text"
                             size="small"
diff --git a/src/views/warehouse/IONewOrder.vue b/src/views/warehouse/IONewOrder.vue
index bd89a7e..0efa7a5 100644
--- a/src/views/warehouse/IONewOrder.vue
+++ b/src/views/warehouse/IONewOrder.vue
@@ -106,6 +106,10 @@
                 <el-table-column label="当前分库" prop="subInvName" width="120">
                 </el-table-column>
 
+                <el-table-column label="所属部门" prop="deptName" width="120">
+                </el-table-column>
+
+
                 <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
                     <template slot-scope="scope">
                         <i class="el-icon-time"></i>
@@ -563,8 +567,7 @@ export default {
             let orderList = [];
 
 
-
-            for(let index in repeatData){
+            for (let index in repeatData) {
                 if (action !== repeatData[index].action) {
                     this.$message.warning("业务类型不一致！");
                     return;
@@ -658,7 +661,8 @@ export default {
                                 this.list.splice(i, 1);
                                 break;
                             }
-                        };
+                        }
+                        ;
                         this.$message.success("提交成功");
                     } else {
                         this.$message.error(response.message);
diff --git a/src/views/warehouse/IOSearchOrder.vue b/src/views/warehouse/IOSearchOrder.vue
index 4ae3085..b2a86ef 100644
--- a/src/views/warehouse/IOSearchOrder.vue
+++ b/src/views/warehouse/IOSearchOrder.vue
@@ -103,12 +103,9 @@
                     show-overflow-tooltip="true"
                 ></el-table-column>
                 <el-table-column label="来源" prop="fromType">
-
                     <template slot-scope="scope">
                         <span>{{ fromTypeMap[scope.row.fromType] }}</span>
                     </template>
-
-
                 </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="250">
                 </el-table-column>
@@ -116,6 +113,8 @@
                 </el-table-column>
                 <el-table-column label="当前分库" prop="subInvName" width="120">
                 </el-table-column>
+                <el-table-column label="所属部门" prop="deptName" width="120">
+                </el-table-column>
                 <el-table-column
                     label="创建时间"
                     prop="actDate"
@@ -127,14 +126,6 @@
                         <span>{{ scope.row.actDate }}</span>
                     </template>
                 </el-table-column>
-                <!--<el-table-column label="校验状态" prop="status" width="100">-->
-                <!--<template slot-scope="scope">-->
-                <!--<el-tag :type="(scope.row.status === 3) | statusFilterType">{{-->
-                <!--checkStatus[scope.row.contrastStatus]-->
-                <!--}}-->
-                <!--</el-tag>-->
-                <!--</template>-->
-                <!--</el-table-column>-->
                 <el-table-column label="校验状态" prop="contrastStatus" width="120">
                     <template slot-scope="scope">
                         <el-tag :type="(scope.row.contrastStatus === 1) | statusFilterType">
@@ -142,48 +133,6 @@
                         </el-tag>
                     </template>
                 </el-table-column>
-                <!--<el-table-column label="操作" width="150">-->
-                <!--<template slot-scope="scope">-->
-                <!--<el-button-->
-                <!--type="text"-->
-                <!--size="small"-->
-                <!--:disabled="scope.row.contrastStatus === null"-->
-                <!--@click.native.stop="repeatCheckClick(scope.row)"-->
-                <!--&gt;重新校验-->
-                <!--</el-button-->
-                <!--&gt;-->
-                <!--<el-button-->
-                <!--type="text"-->
-                <!--size="small"-->
-                <!--:disabled="scope.row.contrastStatus !== 0"-->
-                <!--@click.native.stop="handleErrorDetail(scope.$index)"-->
-                <!--&gt;校验信息-->
-                <!--</el-button-->
-                <!--&gt;-->
-                <!--</template>-->
-                <!--</el-table-column>-->
-                <!-- <el-table-column label="上传状态" prop="exportStatus"></el-table-column> -->
-                <!--<el-table-column label="操作" width="250">-->
-                <!--<template slot-scope="scope">-->
-                <!--<el-button-->
-                <!--type="text"-->
-                <!--size="small"-->
-                <!--:disabled="scope.row.status === 4"-->
-                <!--@click.native.stop="repeatCheckClick(scope.row)"-->
-                <!--&gt;重新校验-->
-                <!--</el-button-->
-                <!--&gt;-->
-                <!--<el-button-->
-                <!--type="text"-->
-                <!--size="small"-->
-                <!--:disabled="scope.row.status === 4"-->
-                <!--@click.native.stop="handleErrorDetail(scope.$index)"-->
-                <!--&gt;校验信息-->
-                <!--</el-button-->
-                <!--&gt;-->
-
-                <!--</template>-->
-                <!--</el-table-column>-->
                 <el-table-column label="操作" fixed="right" width="120">
                     <template slot-scope="scope">
                         <el-button
@@ -194,13 +143,6 @@
                         </el-button
                         >
 
-                        <!--                        <el-button-->
-                        <!--                            type="text"-->
-                        <!--                            size="small"-->
-                        <!--                            @click.native.stop="successOrderExportPDF(scope.row)"-->
-                        <!--                        >单据打印-->
-                        <!--                        </el-button-->
-                        <!--                        >-->
 
                         <el-button
                             type="text"
@@ -209,12 +151,6 @@
                         >删除
                         </el-button
                         >
-                        <!--<el-button-->
-                        <!--type="text"-->
-                        <!--size="small"-->
-                        <!--@click.native.stop="importOrder(scope.row)"-->
-                        <!--&gt;选择单据校验-->
-                        <!--</el-button>-->
                     </template>
                 </el-table-column>
             </el-table>
diff --git a/src/views/warehouse/IOWaitOrder.vue b/src/views/warehouse/IOWaitOrder.vue
index 162b6c6..b2126b8 100644
--- a/src/views/warehouse/IOWaitOrder.vue
+++ b/src/views/warehouse/IOWaitOrder.vue
@@ -117,6 +117,11 @@
                 </el-table-column>
                 <el-table-column label="当前分库" prop="subInvName" width="120">
                 </el-table-column>
+
+                <el-table-column label="所属部门" prop="deptName" width="120">
+                </el-table-column>
+
+
                 <el-table-column
                     label="创建时间"
                     prop="actDate"
@@ -128,14 +133,7 @@
                         <span>{{ scope.row.actDate }}</span>
                     </template>
                 </el-table-column>
-                <!--<el-table-column label="校验状态" prop="status" width="100">-->
-                <!--<template slot-scope="scope">-->
-                <!--<el-tag :type="(scope.row.status === 3) | statusFilterType">{{-->
-                <!--checkStatus[scope.row.contrastStatus]-->
-                <!--}}-->
-                <!--</el-tag>-->
-                <!--</template>-->
-                <!--</el-table-column>-->
+
                 <el-table-column label="校验状态" prop="contrastStatus" width="120">
                     <template slot-scope="scope">
                         <el-tag :type="(scope.row.contrastStatus === 1) | statusFilterType">
@@ -143,48 +141,6 @@
                         </el-tag>
                     </template>
                 </el-table-column>
-                <!--<el-table-column label="操作" width="150">-->
-                <!--<template slot-scope="scope">-->
-                <!--<el-button-->
-                <!--type="text"-->
-                <!--size="small"-->
-                <!--:disabled="scope.row.contrastStatus === null"-->
-                <!--@click.native.stop="repeatCheckClick(scope.row)"-->
-                <!--&gt;重新校验-->
-                <!--</el-button-->
-                <!--&gt;-->
-                <!--<el-button-->
-                <!--type="text"-->
-                <!--size="small"-->
-                <!--:disabled="scope.row.contrastStatus !== 0"-->
-                <!--@click.native.stop="handleErrorDetail(scope.$index)"-->
-                <!--&gt;校验信息-->
-                <!--</el-button-->
-                <!--&gt;-->
-                <!--</template>-->
-                <!--</el-table-column>-->
-                <!-- <el-table-column label="上传状态" prop="exportStatus"></el-table-column> -->
-                <!--<el-table-column label="操作" width="250">-->
-                <!--<template slot-scope="scope">-->
-                <!--<el-button-->
-                <!--type="text"-->
-                <!--size="small"-->
-                <!--:disabled="scope.row.status === 4"-->
-                <!--@click.native.stop="repeatCheckClick(scope.row)"-->
-                <!--&gt;重新校验-->
-                <!--</el-button-->
-                <!--&gt;-->
-                <!--<el-button-->
-                <!--type="text"-->
-                <!--size="small"-->
-                <!--:disabled="scope.row.status === 4"-->
-                <!--@click.native.stop="handleErrorDetail(scope.$index)"-->
-                <!--&gt;校验信息-->
-                <!--</el-button-->
-                <!--&gt;-->
-
-                <!--</template>-->
-                <!--</el-table-column>-->
                 <el-table-column label="操作" fixed="right" width="250">
                     <template slot-scope="scope">
                         <el-button
@@ -195,13 +151,6 @@
                         </el-button
                         >
 
-                        <!--                        <el-button-->
-                        <!--                            type="text"-->
-                        <!--                            size="small"-->
-                        <!--                            @click.native.stop="successOrderExportPDF(scope.row)"-->
-                        <!--                        >打印-->
-                        <!--                        </el-button-->
-                        <!--                        >-->
 
                         <el-button
                             type="text"
@@ -250,18 +199,6 @@
                 style="width: 100%"
             >
                 <el-table-column label="序号" type="index"></el-table-column>
-                <!--                <el-table-column-->
-                <!--                    label="ERP订单号"-->
-                <!--                    prop="erpOrderId"-->
-                <!--                    :show-overflow-tooltip="true"-->
-                <!--                ></el-table-column>-->
-
-                <!--                <el-table-column-->
-                <!--                    label="产品名称"-->
-                <!--                    prop="goodsname"-->
-                <!--                    :show-overflow-tooltip="true"-->
-                <!--                ></el-table-column>-->
-
                 <el-table-column
                     label="产品通用名"
                     prop="coName"
diff --git a/src/views/warehouse/stockOrder.vue b/src/views/warehouse/stockOrder.vue
index 6165fb4..61d47a9 100644
--- a/src/views/warehouse/stockOrder.vue
+++ b/src/views/warehouse/stockOrder.vue
@@ -68,15 +68,6 @@
                         >
                         </el-date-picker>
                     </el-form-item>
-
-                    <!--<el-form-item class="query-form-item">-->
-                    <!--<el-select v-model="query.status" placeholder="配货状态">-->
-                    <!--&lt;!&ndash;                            <el-option label="未配货" value="201"></el-option>&ndash;&gt;-->
-                    <!--<el-option label="已配货" value="202"></el-option>-->
-                    <!--<el-option label="新增提交" value="502"></el-option>-->
-                    <!--</el-select>-->
-                    <!--</el-form-item>-->
-
                     <el-form-item>
                         <el-button-group>
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
@@ -128,11 +119,8 @@
                 </el-table-column>
                 <el-table-column label="当前分库" prop="subInvName" width="120">
                 </el-table-column>
-                <!--                <el-table-column label="采购类型">-->
-                <!--                    <template slot-scope="scope">-->
-                <!--                        {{ scope.row.type | typeFilterName }}-->
-                <!--                    </template>-->
-                <!--                </el-table-column>-->
+                <el-table-column label="所属部门" prop="deptName" width="120">
+                </el-table-column>
                 <el-table-column label="操作" fixed="right" width="200">
                     <template slot-scope="scope">
                         <el-button
@@ -149,13 +137,6 @@
                         >标签打印
                         </el-button
                         >
-                        <!--                        <el-button-->
-                        <!--                            type="text"-->
-                        <!--                            size="small"-->
-                        <!--                            @click.native="deleteStockOrder(scope.row)"-->
-                        <!--                        >删除-->
-                        <!--                        </el-button-->
-                        <!--                        >-->
                     </template>
                 </el-table-column>
             </el-table>
diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue
index eb7c0d7..83660f1 100644
--- a/src/views/warehouse/stockOrderDelSearch.vue
+++ b/src/views/warehouse/stockOrderDelSearch.vue
@@ -100,6 +100,9 @@
                 </el-table-column>
                 <el-table-column label="当前分库" prop="subInvName" width="120">
                 </el-table-column>
+                <el-table-column label="所属部门" prop="deptName" width="120">
+                </el-table-column>
+
                 <el-table-column label="操作" fixed="right" width="200">
                     <template slot-scope="scope">
                         <el-button
diff --git a/src/views/warehouse/stockOrderDelete.vue b/src/views/warehouse/stockOrderDelete.vue
index 3f384b6..e9c4191 100644
--- a/src/views/warehouse/stockOrderDelete.vue
+++ b/src/views/warehouse/stockOrderDelete.vue
@@ -61,6 +61,10 @@
                         <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
                     </template>
                 </el-table-column>
+
+                <el-table-column label="所属部门" prop="deptName" width="120">
+                </el-table-column>
+
                 <el-table-column
                     label="创建时间"
                     prop="actDate"
diff --git a/src/views/warehouse/stockOrderEditor.vue b/src/views/warehouse/stockOrderEditor.vue
index ec8da7c..1f96942 100644
--- a/src/views/warehouse/stockOrderEditor.vue
+++ b/src/views/warehouse/stockOrderEditor.vue
@@ -102,6 +102,9 @@
                 </el-table-column>
                 <el-table-column label="当前分库" prop="subInvName" width="120">
                 </el-table-column>
+                <el-table-column label="所属部门" prop="deptName" width="120">
+                </el-table-column>
+
                 <el-table-column label="操作" fixed="right" width="250">
                     <template slot-scope="scope">
                         <el-button
@@ -418,17 +421,6 @@
                                       type="number"></el-input>
                         </el-form-item>
                     </el-col>
-                    <!--                    <el-col :span="3">-->
-                    <!--                        <div class="ao-text">-->
-                    <!--                            <span>扫码数量：</span>-->
-                    <!--                        </div>-->
-                    <!--                    </el-col>-->
-                    <!--                    <el-col :span="7">-->
-                    <!--                        <el-form-item prop="sweepCount">-->
-                    <!--                            <el-input v-model="detailFormData.sweepCount" auto-complete="off" :disabled="false"-->
-                    <!--                                      oninput="value=value.replace(/[^\d]/g,'')" ></el-input>-->
-                    <!--                        </el-form-item>-->
-                    <!--                    </el-col>-->
                 </el-row>
             </el-form>
             <div slot="footer" class="dialog-footer">
diff --git a/src/views/warehouse/stockOrderNew.vue b/src/views/warehouse/stockOrderNew.vue
index d632389..f28d055 100644
--- a/src/views/warehouse/stockOrderNew.vue
+++ b/src/views/warehouse/stockOrderNew.vue
@@ -109,6 +109,9 @@
                 </el-table-column>
                 <el-table-column label="当前分库" prop="subInvName" width="120">
                 </el-table-column>
+                <el-table-column label="所属部门" prop="deptName" width="120">
+                </el-table-column>
+
                 <el-table-column label="操作" fixed="right" width="150">
                     <template slot-scope="scope">
                         <el-button
diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue
index fa85a1c..e9b7bec 100644
--- a/src/views/warehouse/stockOrderSearch.vue
+++ b/src/views/warehouse/stockOrderSearch.vue
@@ -104,6 +104,8 @@
                 </el-table-column>
                 <el-table-column label="当前分库" prop="subInvName" width="120">
                 </el-table-column>
+                <el-table-column label="所属部门" prop="deptName" width="120">
+                </el-table-column>
                 <el-table-column label="操作" fixed="right" width="200">
                     <template slot-scope="scope">
                         <el-button
diff --git a/src/views/warehouse/stockOrderWaitCheck.vue b/src/views/warehouse/stockOrderWaitCheck.vue
index 1b7f863..3445dd8 100644
--- a/src/views/warehouse/stockOrderWaitCheck.vue
+++ b/src/views/warehouse/stockOrderWaitCheck.vue
@@ -101,11 +101,9 @@
                 </el-table-column>
                 <el-table-column label="当前分库" prop="subInvName" width="120">
                 </el-table-column>
-                <!--                <el-table-column label="采购类型">-->
-                <!--                    <template slot-scope="scope">-->
-                <!--                        {{ scope.row.type | typeFilterName }}-->
-                <!--                    </template>-->
-                <!--                </el-table-column>-->
+                <el-table-column label="所属部门" prop="deptName" width="120">
+                </el-table-column>
+
                 <el-table-column label="操作" fixed="right" width="200">
                     <template slot-scope="scope">
                         <el-button