Merge branch 'master' of http://116.204.71.86:3000/UDI/udiwms-vue-frame

src/views/basic/business/stockOrderDistribution.vue

@@ -296,7 +296,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;

src/views/basic/business/stockOrderQRCodeDetail.vue

@@ -436,7 +436,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;

src/views/basic/business/stockQRCodeExport.vue

@@ -467,7 +467,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;

src/views/basic/corpMaintain/corpExport.vue

@@ -239,7 +239,7 @@
         },
     };
 </script>
-<style>
+<style scoped>
     .itemTag {
         float: left;
         text-align: left;

src/views/basic/corpMaintain/corpExportSmp.vue

@@ -241,7 +241,7 @@
         },
     };
 </script>
-<style>
+<style scoped>
     .itemTag {
         float: left;
         text-align: left;

src/views/basic/corpMaintain/corpImport.vue

@@ -254,7 +254,7 @@ export default {
     },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
     float: left;
     text-align: left;

src/views/basic/corpMaintain/corpImportDetail.vue

@@ -147,7 +147,7 @@
         },
     };
 </script>
-<style>
+<style scoped>
     .itemTag {
         float: left;
         text-align: left;

src/views/basic/product/udiInfoImport.vue

@@ -265,7 +265,7 @@
         },
     };
 </script>
-<style>
+<style scoped>
     .itemTag {
         float: left;
         text-align: left;

src/views/basic/product/udiInfoImportDetail.vue

@@ -151,7 +151,7 @@ export default {
     filters: {},
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
     float: left;
     text-align: left;

src/views/basic/product/udiinfoExport.vue

@@ -246,7 +246,7 @@ export default {
     },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
     float: left;
     text-align: left;

src/views/basic/product/udiinfoExportSmp.vue

@@ -242,7 +242,7 @@
         },
     };
 </script>
-<style>
+<style scoped>
     .itemTag {
         float: left;
         text-align: left;

src/views/inout/DialogCheck.vue

@@ -402,7 +402,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;

src/views/inout/DialogCreateOrder.vue

@@ -1070,7 +1070,7 @@ export default {
 </script>
 
 
-<style>
+<style scoped>
 #inputer {
   width: 100%;
   min-height: 30px;

src/views/inout/DialogInvoice.vue

@@ -345,7 +345,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;

src/views/inout/PanelCreateOrderBizDetail.vue

@@ -72,7 +72,7 @@
 
       <el-table-column width="100"
                        label="扫码数量"
-                       prop="scanCount"
+                       prop="reCount"
                        v-if="viewType!=2"
                        show-overflow-tooltip
       ></el-table-column>

src/views/inout/receive/DialogNewReceive.vue

@@ -532,7 +532,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;

src/views/inout/receive/receiveAuditDetail.vue

@@ -155,7 +155,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;

src/views/inventory/inner/innerCodeDetail.vue

@@ -435,7 +435,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;

src/views/inventory/inner/innerOrderEditDialog.vue

@@ -444,7 +444,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;

src/views/inventory/trace/invUdiTraceOrder.vue

@@ -752,7 +752,7 @@ export default {
 </script>
 
 
-<style>
+<style scoped>
 .el-table .warning-row {
   background: #ffb5b5;
 }

src/views/purchase/cert/supCertAddDialog.vue

@@ -379,7 +379,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;

src/views/purchase/company/supCompanyAduditDialog.vue

@@ -813,7 +813,7 @@ export default {
   },
 }
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;

src/views/purchase/company/supCompanyEditDialog.vue

@@ -667,7 +667,7 @@ export default {
 }
 ;
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;

src/views/purchase/manufacturer/supManufacturerAuditDialog.vue

@@ -887,7 +887,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;

src/views/purchase/manufacturer/supManufacturerEditDialog.vue

@@ -735,7 +735,7 @@ export default {
   }
 }
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;

src/views/purchase/product/supProductAuditDialog.vue

@@ -861,7 +861,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;

src/views/purchase/product/supProductEditDialog.vue

@@ -798,7 +798,7 @@ export default {
 
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;

src/views/purchase/purApply/purApplyEditDiaolog.vue

@@ -527,7 +527,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;

src/views/purchase/purApply/pureApplyDetailDialog.vue

@@ -419,7 +419,7 @@ export default {
     },
 };
 </script>
-<style>
+<style scoped>
 
 
 

src/views/purchase/purOrder/purOrderDetailDialog.vue

@@ -491,7 +491,7 @@ export default {
     },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
     width: 100%;

src/views/purchase/purOrder/purOrderEditDialog.vue

@@ -521,7 +521,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;

src/views/purchase/purPlan/purPlanDetailDialog.vue

@@ -479,7 +479,7 @@ export default {
     },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
     width: 100%;

src/views/purchase/purPlan/purPlanEditDialog.vue

@@ -517,7 +517,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;

src/views/sync/SysUdimsData.vue

@@ -365,7 +365,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;

src/views/sync/SysUdimsDownloadData.vue

@@ -355,7 +355,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;

src/views/system/param/addhelpSettings.vue

@@ -302,7 +302,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 
 .ao-text {
   width: 100%;

src/views/thirdSys/corps/thrCorpsExport.vue

@@ -234,7 +234,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;

src/views/thirdSys/corps/thrCorpsExportSmp.vue

@@ -239,7 +239,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;

src/views/thirdSys/corps/thrCorpsImportDetail.vue

@@ -143,7 +143,7 @@ export default {
   filters: {},
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;

src/views/thirdSys/invProducts/thrInvProductsExport.vue

@@ -275,7 +275,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;

src/views/thirdSys/invProducts/thrInvProductsImport.vue

@@ -428,7 +428,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;

src/views/thirdSys/invProducts/thrInvProductsImportDetail.vue

@@ -152,7 +152,7 @@ export default {
   filters: {},
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;

src/views/thirdSys/order/thrOrderExport.vue

@@ -238,7 +238,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;

src/views/thirdSys/order/thrOrderExportSmp.vue

@@ -240,7 +240,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;

src/views/thirdSys/order/thrOrderImport.vue

@@ -404,7 +404,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;

src/views/thirdSys/order/thrOrderImportDetail.vue

@@ -145,7 +145,7 @@ export default {
   filters: {},
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;

src/views/thirdSys/product/thrProductsExport.vue

@@ -238,7 +238,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;

src/views/thirdSys/product/thrProductsImport.vue

@@ -384,7 +384,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 .itemTag {
   float: left;
   text-align: left;