Merge remote-tracking branch 'origin/master'

.env.development

@@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
 ENV = 'development'
 
 # 开发环境
-VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://127.0.0.1:9991'
 
 VUE_APP_SYNC_API ="http://127.0.0.1:10001"
 

src/views/inout/InvoiceRegistration.vue

@@ -928,6 +928,9 @@ export default {
           } else if (response.code == 520) {
             this.$message.error("新增扫码单据列表已不存在该扫码单据！");
             this.getList();
+          }else {
+            this.$message.error(response.message);
+            this.getList();
           }
 
         })

src/views/inout/IoAuditedOrder.vue

@@ -163,6 +163,7 @@
             <!--            >报表打印-->
             <!--            </el-button-->
             <!--            >-->
+<!--            暂时隐藏-->
             <el-button
               type="text"
               size="small"
@@ -301,8 +302,7 @@
                 type="text"
                 size="small"
                 @click.native.stop="upload(scope.row)"
-                v-if="scope.row.checkFileName != null"
+              >编辑
-              >预览
               </el-button
               >
             </template>
@@ -400,7 +400,8 @@
 
     <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
 
-    <el-image-viewer v-if="imgViewerVisibleCold" style="z-index:9999" :on-close="closeImgViewerCold" :url-list="imgListCold"/>
+    <el-image-viewer v-if="imgViewerVisibleCold" style="z-index:9999" :on-close="closeImgViewerCold"
+                     :url-list="imgListCold"/>
 
 
     <el-dialog
@@ -419,7 +420,6 @@
     </el-dialog>
 
 
-
     <el-dialog
       title="根据当前单据生成新单据"
       :visible.sync="stockChangeVisible"
@@ -466,8 +466,6 @@ import {
 } from "@/api/itextpdf/itextpdf";
 
 
-
-
 const formJson = {
   site_id: "",
   site_name: "",
@@ -659,7 +657,9 @@ export default {
         console.log(this.imgList)
         this.imgViewerVisible = true;
       });
-      const m = (e) => { e.preventDefault() };
+      const m = (e) => {
+        e.preventDefault()
+      };
       document.body.style.overflow = 'hidden';
       document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
@@ -676,7 +676,9 @@ export default {
         console.log(this.imgListCold)
         this.imgViewerVisibleCold = true;
       });
-      const m = (e) => { e.preventDefault() };
+      const m = (e) => {
+        e.preventDefault()
+      };
       document.body.style.overflow = 'hidden';
       document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
@@ -684,14 +686,18 @@ export default {
 
     closeImgViewer() {
       this.imgViewerVisible = false;
-      const m = (e) => { e.preventDefault() };
+      const m = (e) => {
+        e.preventDefault()
+      };
       document.body.style.overflow = 'auto';
       document.removeEventListener("touchmove", m, true);
     },
 
     closeImgViewerCold() {
       this.imgViewerVisibleCold = false;
-      const m = (e) => { e.preventDefault() };
+      const m = (e) => {
+        e.preventDefault()
+      };
       document.body.style.overflow = 'auto';
       document.removeEventListener("touchmove", m, true);
     },

src/views/inout/IoCheckAuditOrder.vue

@@ -150,6 +150,8 @@
             </el-button
             >
 
+
+            <!--            暂时隐藏-->
             <el-button
               type="text"
               size="small"
@@ -301,7 +303,8 @@
         </el-table>
         <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
 
-        <el-image-viewer v-if="imgViewerVisibleCold" style="z-index:9999" :on-close="closeImgViewerCold" :url-list="imgListCold"/>
+        <el-image-viewer v-if="imgViewerVisibleCold" style="z-index:9999" :on-close="closeImgViewerCold"
+                         :url-list="imgListCold"/>
 
 
         <pagination
@@ -762,7 +765,9 @@ export default {
         console.log(this.imgListCold)
         this.imgViewerVisibleCold = true;
       });
-      const m = (e) => { e.preventDefault() };
+      const m = (e) => {
+        e.preventDefault()
+      };
       document.body.style.overflow = 'hidden';
       document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
@@ -778,7 +783,9 @@ export default {
 
     closeImgViewerCold() {
       this.imgViewerVisibleCold = false;
-      const m = (e) => { e.preventDefault() };
+      const m = (e) => {
+        e.preventDefault()
+      };
       document.body.style.overflow = 'auto';
       document.removeEventListener("touchmove", m, true);
     },
@@ -954,6 +961,9 @@ export default {
           } else if (response.code == 520) {
             this.$message.error("新增扫码单据列表已不存在该扫码单据！");
             this.getList();
+          } else {
+            this.$message.error(response.message);
+            this.getList();
           }
 
         })

src/views/inout/IoCheckErrorOrder.vue

@@ -732,6 +732,9 @@ export default {
           } else if (response.code == 520) {
             this.$message.error("新增扫码单据列表已不存在该扫码单据！");
             this.getList();
+          }else {
+            this.$message.error(response.message);
+            this.getList();
           }
 
         })

src/views/inout/IoCheckSuccessOrder.vue

@@ -266,7 +266,6 @@
           </el-table-column>
 
 
-
           <el-table-column label="操作" width="160" fixed="right">
             <template slot-scope="scope">
               <el-button
@@ -368,8 +367,8 @@
       </el-tab-pane>
     </el-tabs>
     <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
-    <el-image-viewer v-if="imgViewerVisibleCold" style="z-index:9999" :on-close="closeImgViewerCold" :url-list="imgListCold"/>
+    <el-image-viewer v-if="imgViewerVisibleCold" style="z-index:9999" :on-close="closeImgViewerCold"
-
+                     :url-list="imgListCold"/>
 
 
     <el-dialog
@@ -644,13 +643,14 @@ export default {
         console.log(this.imgListCold)
         this.imgViewerVisibleCold = true;
       });
-      const m = (e) => { e.preventDefault() };
+      const m = (e) => {
+        e.preventDefault()
+      };
       document.body.style.overflow = 'hidden';
       document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
 
 
-
     closeImgViewer() {
       this.imgViewerVisible = false;
       const m = (e) => {
@@ -662,7 +662,9 @@ export default {
 
     closeImgViewerCold() {
       this.imgViewerVisibleCold = false;
-      const m = (e) => { e.preventDefault() };
+      const m = (e) => {
+        e.preventDefault()
+      };
       document.body.style.overflow = 'auto';
       document.removeEventListener("touchmove", m, true);
     },

src/views/inout/IoCreateBusOrder.vue

@@ -456,6 +456,9 @@ export default {
           } else if (response.code == 520) {
             this.$message.error("新增扫码单据列表已不存在该扫码单据！");
             this.getList();
+          } else {
+            this.$message.error(response.message);
+            this.getList();
           }
 
         })

src/views/inout/IoCreateErrorOrder.vue

@@ -406,6 +406,9 @@ export default {
           } else if (response.code == 520) {
             this.$message.error("新增扫码单据列表已不存在该扫码单据！");
             this.getList();
+          } else {
+            this.$message.error(response.message);
+            this.getList();
           }
 
         })

src/views/inout/IoCreateOrder.vue

@@ -488,6 +488,9 @@ export default {
           } else if (response.code == 520) {
             this.$message.error("新增扫码单据列表已不存在该扫码单据！");
             this.getList();
+          } else {
+            this.$message.error(response.message);
+            this.getList();
           }
 
         })

src/views/inout/IoCreateScanOrder.vue

@@ -409,6 +409,9 @@ export default {
           } else if (response.code == 520) {
             this.$message.error("新增扫码单据列表已不存在该扫码单据！");
             this.getList();
+          } else {
+            this.$message.error(response.message);
+            this.getList();
           }
 
         })

src/views/inout/IoDealOrder.vue

@@ -574,6 +574,9 @@ export default {
           } else if (response.code == 520) {
             this.$message.error("新增扫码单据列表已不存在该扫码单据！");
             this.getList();
+          } else {
+            this.$message.error(response.message);
+            this.getList();
           }
 
         })

src/views/inout/IoWaitAllocateOrder.vue

@@ -535,6 +535,9 @@ export default {
           } else if (response.code == 520) {
             this.$message.error("新增扫码单据列表已不存在该扫码单据！");
             this.getList();
+          } else {
+            this.$message.error(response.message);
+            this.getList();
           }
 
         })

src/views/inventory/InvPreProducts.vue

@@ -161,9 +161,6 @@
         <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
         <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
         <el-table-column label="结余数量" prop="reCount" width="120">
-          <template slot-scope="scope">
-            <span>{{ scope.row.inCount - scope.row.outCount }}</span>
-          </template>
         </el-table-column>
         <el-table-column label="部门" prop="deptName" v-if="showSup"
                          show-overflow-tooltip width="120"></el-table-column>

src/views/inventory/InvProducts.vue

@@ -161,11 +161,12 @@
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
         <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
-        <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
+        <el-table-column label="出库数量" prop="outCount" width="120">
+        </el-table-column>
         <el-table-column label="结余数量" prop="reCount" width="120">
-          <template slot-scope="scope">
+          <!--          <template slot-scope="scope">-->
-            <span>{{ scope.row.inCount - scope.row.outCount }}</span>
+          <!--            <span>{{ scope.row.inCount - scope.row.outCount }}</span>-->
-          </template>
+          <!--          </template>-->
         </el-table-column>
         <el-table-column label="部门" prop="deptName" v-if="showSup"
                          show-overflow-tooltip width="120"></el-table-column>

src/views/inventory/InvSupPreInProducts.vue

@@ -162,9 +162,6 @@
         <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
         <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
         <el-table-column label="结余数量" prop="reCount" width="120">
-          <template slot-scope="scope">
-            <span>{{ scope.row.inCount - scope.row.outCount }}</span>
-          </template>
         </el-table-column>
         <el-table-column label="部门" prop="deptName" v-if="showSup"
                          show-overflow-tooltip width="120"></el-table-column>

src/views/inventory/trace/invUdiTraceOrder.vue

@@ -474,22 +474,6 @@ export default {
       this.successOrderExportPDFSettingVisible = false;
       this.getList();
     },
-
-    deleteOrders(data) {
-      this.loading = true;
-      this.deleteData.id = data;
-      deleteByOrderId(this.deleteData)
-        .then((response) => {
-          this.getList();
-          this.refresgOrderDetail();
-          this.$message({
-            type: "success",
-            message: "删除成功！",
-          });
-        })
-        .catch(() => {
-        });
-    },
     tableRowClassName({row, rowIndex}) {
       if (row.reCount === row.count) {
         return "success-row";
@@ -497,7 +481,6 @@ export default {
         return "warning-row";
       }
     },
-
     exportDialog(value) {
       var mOrder = value;
       if (mOrder.exportStatus === "已上传") {
@@ -651,18 +634,6 @@ export default {
         });
     },
 
-    deleteDialog(rowId) {
-      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.deleteOrders(rowId);
-        })
-        .catch(() => {
-        });
-    },
     closeDetailDialog(val) {
       this.codeDetailVisible = false;
     },