lilei 1 year ago
parent
commit
3780cc1216

+ 1 - 0
config/api.js

@@ -71,6 +71,7 @@ export const salesDetailList = (params, config = {}) => http.post(`/salesDetail/
 // 销售捡货
 export const salesPick = (params, config = {}) => http.post('/salesDetail/pick', params, config)
 //  销售 拣货出库
+export const salesWriteNoStockOut = (data, config) => http.get(`/sales/stockOut/${data.salesBillSn}`, data, config)
 export const salesWriteStockOut = (data, config) => http.get(`/sales/stockOutPick/${data.salesBillSn}`, data, config)
 
 // 连锁调拨调出 列表  分页

+ 60 - 21
pages/codeBar/codeBar.vue

@@ -39,24 +39,27 @@
 			</view>
 		</view>
 		<view class="p-body">
-			<uni-table border emptyText="暂无数据" :loading="loading" >
-				<!-- 表头行 -->
-				<uni-tr>
-					<uni-td align="center">产品编码</uni-td>
-					<uni-td align="center">产品名称</uni-td>
-					<uni-td align="center">条形码</uni-td>
-				</uni-tr>
-				<!-- 表格数据行 -->
-				<uni-tr 
-				v-for="item in detailList" :key="item.id" 
-				:checkedRow="tempProduct&&tempProduct.id == item.id" 
-				@click="toEdit(item)">
-					<uni-td width="30%" align="center">{{item.code}}</uni-td>
-					<uni-td width="40%" align="center">{{item.name}}</uni-td>
-					<uni-td width="30%" align="center">{{item.qrCode}}</uni-td>
-				</uni-tr>
-			</uni-table>
-			<view v-if="noMore" style="padding: 30upx;text-align: center;color:#999;font-size: 24rpx;">{{noMore}}</view>
+			<view class="uni-table">
+				 <!-- 表头行 -->
+				 <uni-tr>
+				 	<uni-td align="center">产品编码</uni-td>
+				 	<uni-td align="center">产品名称</uni-td>
+				 	<uni-td align="center">条形码</uni-td>
+				 </uni-tr>
+			</view>
+			<scroll-view enable-flex scroll-y="true" class="table-scroll-body" @scrolltolower="scrolltolower">
+				<uni-table style="width: 100%;" border :loading="loading">
+					<!-- 表格数据行 -->
+					<uni-tr 
+					v-for="item in detailList" :key="item.id" 
+					:checkedRow="tempProduct&&tempProduct.id == item.id" 
+					@click="toEdit(item)">
+						<uni-td width="30%" align="center">{{item.code}}</uni-td>
+						<uni-td width="40%" align="center">{{item.name}}</uni-td>
+						<uni-td width="30%" align="center">{{item.qrCode}}</uni-td>
+					</uni-tr>
+				</uni-table>
+			</scroll-view>
 		</view>
 		 
 		<scanCode></scanCode>
@@ -118,7 +121,10 @@
 				detailList:[],
 				code:'',
 				tempProduct: null,
-				noMore: ''
+				noMore: '',
+				pageNo: 1,
+				pageSize: 10,
+				total: 0,
 			};
 		},
 		onLoad(opts) {
@@ -184,8 +190,8 @@
 				  }
 				}
 				const params = { 
-					pageNo:1, 
-					pageSize:10 ,
+					pageNo:this.pageNo, 
+					pageSize: this.pageSize ,
 					sysFlag: "0"
 				}
 				this.loading = true
@@ -202,6 +208,15 @@
 					this.loading = false
 				})
 			},
+			scrolltolower(e){
+				const pageNums = Math.ceil(this.total / this.pageSize)
+				if(this.pageNo < pageNums){
+					this.pageNo = this.pageNo + 1
+					this.queryProduct()
+				}else{
+					uni.$u.toast("没有更多数据了!")
+				}
+			},
 			// 编辑
 			toEdit(item) {
 				this.tempProduct = item
@@ -218,6 +233,30 @@
 		button{
 			line-height: 1.7;
 		}
+		.uni-table {
+			position: relative;
+			width: 100%;
+			border-radius: 5px;
+			background-color: #fff;
+			/* #ifndef APP-NVUE */
+			box-sizing: border-box;
+			display: table;
+			overflow-x: auto;
+			::v-deep .uni-table-tr:nth-child(n + 2) {
+				&:hover {
+					background-color: #f5f7fa;
+				}
+			}
+			::v-deep .uni-table-td{
+				border-right: 1px $border-color solid;
+			}
+			/* #endif */
+		}
+		.table-scroll-body{
+			height: calc(100% - 32px);
+			width: 100%;
+			overflow: auto;
+		}
 		.p-head{
 			font-size: 32upx;
 			color: $uni-text-color;

+ 0 - 1
pages/stockIn/index.vue

@@ -15,7 +15,6 @@
 					<text>产品条码:</text>
 					<view style="flex-grow: 1;display: flex;align-items: center;">
 						<input 
-						:focus="true"
 						style="width: 150px;text-align: left;font-size: 32rpx;padding: 6rpx 0 6rpx 7rpx;" 
 						class="uni-input" 
 						placeholder="扫描或输入条码" 

+ 28 - 8
pages/stockOut/salesOut/index.vue

@@ -9,7 +9,6 @@
 				<text>条码:</text>
 				<view>
 					<input
-					:focus="true"
 					@blur="queryProduct"
 					style="width: 100%;text-align: left;" 
 					class="uni-input" 
@@ -24,15 +23,15 @@
 				<!-- 表头行 -->
 				<uni-tr>
 					<uni-td align="center">产品编码</uni-td>
-					<uni-td align="center">产品名称</uni-td>
+					<uni-td align="center">产品分类</uni-td>
 					<uni-td align="center">数量</uni-td>
 					<uni-td align="center">扫码检货</uni-td>
 				</uni-tr>
 				<!-- 表格数据行 -->
 				<uni-tr v-for="item in detailList" :key="item.id" :checkedRow="curProduct&&curProduct.qrCode == item.qrCode">
 					<uni-td width="30%" align="center">{{item.dealerProductEntity.code}}</uni-td>
-					<uni-td width="30%" align="center">{{item.dealerProductEntity.name}}</uni-td>
-					<uni-td width="20%" align="center">{{item.qty}}</uni-td>
+					<uni-td width="30%" align="center">{{item.dealerProductEntity.productTypeName2}}</uni-td>
+					<uni-td width="20%" align="center">{{item.qty}}/{{item.qty}}</uni-td>
 					<uni-td width="20%" align="center">
 						<text :style="{color:item.pickFlag==1?'green':'red'}">{{item.pickFlag==1?'已检货':'未检货'}}</text>
 					</uni-td>
@@ -40,7 +39,8 @@
 			</uni-table>
 		</view>
 		<view class="p-footer">
-			<button :disabled="loading" size="mini" type="primary" @click="toOut"> 出库 <text class="iconfont icon-icon-test43"></text></button>
+			<button :disabled="loading" size="mini" type="default" @click="toNoOut"> 未检货出库 <text class="iconfont icon-icon-test43"></text></button>
+			<button :disabled="loading" size="mini" type="primary" @click="toOut"> 检货出库 <text class="iconfont icon-icon-test43"></text></button>
 		</view>
 		<scanCode></scanCode>
 	</view>
@@ -48,7 +48,7 @@
 
 <script>
 	import scanCode from '@/libs/scan-code.vue';
-	import { salesDetail, salesDetailList, salesPick, salesWriteStockOut } from '@/config/api.js'
+	import { salesDetail, salesDetailList, salesPick, salesWriteStockOut, salesWriteNoStockOut } from '@/config/api.js'
 	import { playAudio } from '@/libs/tools.js'
 	export default {
 		components: { scanCode },
@@ -122,6 +122,26 @@
 					}
 				})
 			},
+			// 未捡货出库
+			toNoOut(){
+				const _this = this
+				uni.showModal({
+					title: '提示',
+					content: '确定未检货出库?',
+					success: function (res) {
+						if (res.confirm) {
+							 _this.salesWriteNoStockOut()
+						}
+					}
+				});
+			},
+			async salesWriteNoStockOut(){
+				const ret = await salesWriteNoStockOut({salesBillSn: this.salesBillSn})
+				if(ret.status == 200){
+					this.$store.state.vuex_isRefash = true
+					uni.navigateBack()
+				}
+			},
 			// 出库
 			async toOut(){
 				const ret = await salesWriteStockOut({salesBillSn: this.salesBillSn})
@@ -163,10 +183,10 @@
 			height: 50%;
 		}
 		.p-footer{
-			padding:20upx 30upx;
+			padding:30upx;
 			display: flex;
 			> button{
-				width: 30%;
+				width: 40%;
 			}
 		}
 	}

+ 22 - 10
pages/stockPan/index.vue

@@ -15,7 +15,6 @@
 					<text>产品条码:</text>
 					<view style="flex-grow: 1;display: flex;align-items: center;">
 						<input 
-						:focus="true"
 						style="width: 150px;text-align: left;font-size: 32rpx;padding: 6rpx 0 6rpx 7rpx;" 
 						class="uni-input" 
 						placeholder="扫描或输入条码" 
@@ -26,6 +25,21 @@
 				</view>
 				<view></view>
 			</view>
+			<view>
+				<view>
+					<text>产品编码:</text>
+					<view style="flex-grow: 1;display: flex;align-items: center;">
+						<input 
+						style="width: 150px;text-align: left;font-size: 32rpx;padding: 6rpx 0 6rpx 7rpx;" 
+						class="uni-input" 
+						placeholder="请输入产品编码" 
+						border="surround" 
+						v-model="productCode">
+						<button size="mini" @click="queryProduct" :style="{padding:'2px 10px',color:'#00aaff'}">查询</button>
+					</view>
+				</view>
+				<view></view>
+			</view>
 			<view v-if="curProduct">
 				<view>
 					<text style="width:180rpx">产品名称:</text>
@@ -91,6 +105,7 @@
 				detailList:[],
 				countData: null,
 				code:'',
+				productCode: '',
 				baseData: null,
 				curProduct: null,
 			};
@@ -143,7 +158,7 @@
 			// 加减数量
 			addQty(type){
 				playAudio('info')
-				const hasProduct = this.detailList.find(item => item.qrCode == this.code)
+				const hasProduct = this.detailList.find(item => item.qrCode == this.code || item.productCode == this.productCode)
 				if(hasProduct){
 				  hasProduct.checkQty = hasProduct.checkQty + (type ? 1 : -1)
 				  if(hasProduct.checkQty>0){
@@ -165,25 +180,22 @@
 			},
 			// 查询产品
 			queryProduct(){
-				if(!this.code){
-					uni.$u.toast("请扫码或输入条形码!")
+				if(!this.code&&!this.productCode){
+					uni.$u.toast("未识别到条形码!")
+					playAudio('error')
 					return
 				}
 				// 如果已添加产品,则累加数量
-				const hasProduct = this.detailList.find(item => item.qrCode == this.code)
+				const hasProduct = this.detailList.find(item => item.qrCode == this.code || item.productCode == this.productCode)
 				console.log(hasProduct)
 				if(!!hasProduct){
 				  this.addQty(true)
 				  return
 				}
-				if(this.code==''){
-				  uni.$u.toast("未识别到条形码!")
-				  playAudio('error')
-				  return
-				}
 				const params = { 
 					checkWarehouseId: this.checkWarehouseId, 
 					qrCode: this.code, 
+					productCode: this.productCode,
 					pageNo:1, 
 					pageSize:1 ,
 				}

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


+ 219 - 130
unpackage/dist/dev/app-plus/app-view.js

@@ -5349,7 +5349,6 @@ var render = function () {
                         staticClass: _vm._$g(8, "sc"),
                         staticStyle: { width: "100%", "text-align": "left" },
                         attrs: {
-                          focus: true,
                           placeholder: "扫描或输入条码",
                           border: "surround",
                           _i: 8,
@@ -5390,7 +5389,7 @@ var render = function () {
                 { attrs: { _i: 11 } },
                 [
                   _c("uni-td", { attrs: { _i: 12 } }, [_vm._v("产品编码")]),
-                  _c("uni-td", { attrs: { _i: 13 } }, [_vm._v("产品名称")]),
+                  _c("uni-td", { attrs: { _i: 13 } }, [_vm._v("产品分类")]),
                   _c("uni-td", { attrs: { _i: 14 } }, [_vm._v("数量")]),
                   _c("uni-td", { attrs: { _i: 15 } }, [_vm._v("扫码检货")]),
                 ],
@@ -5408,7 +5407,11 @@ var render = function () {
                       _vm._v(_vm._$g("18-" + $30, "t0-0")),
                     ]),
                     _c("uni-td", { attrs: { _i: "19-" + $30 } }, [
-                      _vm._v(_vm._$g("19-" + $30, "t0-0")),
+                      _vm._v(
+                        _vm._$g("19-" + $30, "t0-0") +
+                          "/" +
+                          _vm._$g("19-" + $30, "t0-1")
+                      ),
                     ]),
                     _c(
                       "uni-td",
@@ -5445,7 +5448,7 @@ var render = function () {
               attrs: {
                 disabled: _vm._$g(23, "a-disabled"),
                 size: "mini",
-                type: "primary",
+                type: "default",
                 _i: 23,
               },
               on: {
@@ -5455,7 +5458,7 @@ var render = function () {
               },
             },
             [
-              _vm._v("出库"),
+              _vm._v("未检货出库"),
               _c("v-uni-text", {
                 staticClass: _vm._$g(24, "sc"),
                 attrs: { _i: 24 },
@@ -5463,10 +5466,34 @@ var render = function () {
             ],
             1
           ),
+          _c(
+            "v-uni-button",
+            {
+              attrs: {
+                disabled: _vm._$g(25, "a-disabled"),
+                size: "mini",
+                type: "primary",
+                _i: 25,
+              },
+              on: {
+                click: function ($event) {
+                  return _vm.$handleViewEvent($event)
+                },
+              },
+            },
+            [
+              _vm._v("检货出库"),
+              _c("v-uni-text", {
+                staticClass: _vm._$g(26, "sc"),
+                attrs: { _i: 26 },
+              }),
+            ],
+            1
+          ),
         ],
         1
       ),
-      _c("scanCode", { attrs: { _i: 25 } }),
+      _c("scanCode", { attrs: { _i: 27 } }),
     ],
     1
   )
@@ -6591,7 +6618,7 @@ if(false) {}
 var ___CSS_LOADER_API_IMPORT___ = __webpack_require__(/*! ../../../../../HBuilderX.2.9.8.20201110.full/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/runtime/api.js */ 10);
 exports = ___CSS_LOADER_API_IMPORT___(false);
 // Module
-exports.push([module.i, "@charset \"UTF-8\";\r\n/**\r\n * 这里是uni-app内置的常用样式变量\r\n *\r\n * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量\r\n * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App\r\n *\r\n */\r\n/**\r\n * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能\r\n *\r\n * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件\r\n */\r\n/* 颜色变量 */\r\n/* 行为相关颜色 */\r\n/* 文字基本颜色 */\r\n/* 背景颜色 */\r\n/* 边框颜色 */\r\n/* 尺寸变量 */\r\n/* 文字尺寸 */\r\n/* 图片尺寸 */\r\n/* Border Radius */\r\n/* 水平间距 */\r\n/* 垂直间距 */\r\n/* 透明度 */\r\n/* 文章场景相关 */\n.p-content .p-head {\r\n  font-size: 32upx;\r\n  color: #333;\n}\n.p-content .p-head > uni-view {\r\n  display: flex;\r\n  align-items: center;\r\n  padding: 10upx 20upx;\r\n  border-bottom: 1px solid #eee;\n}\n.p-content .p-head > uni-view > uni-view {\r\n  display: flex;\r\n  padding: 0 10upx;\r\n  align-items: center;\n}\n.p-content .p-head .uni-input {\r\n  border: 1px solid #eee;\r\n  width: 150upx;\r\n  text-align: center;\r\n  padding: 8upx;\n}\n.p-content .p-body {\r\n  overflow: auto;\r\n  flex-grow: 1;\r\n  height: 50%;\n}\n.p-content .p-footer {\r\n  padding: 20upx 30upx;\r\n  display: flex;\n}\n.p-content .p-footer > uni-button {\r\n  width: 30%;\n}\r\n", ""]);
+exports.push([module.i, "@charset \"UTF-8\";\r\n/**\r\n * 这里是uni-app内置的常用样式变量\r\n *\r\n * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量\r\n * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App\r\n *\r\n */\r\n/**\r\n * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能\r\n *\r\n * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件\r\n */\r\n/* 颜色变量 */\r\n/* 行为相关颜色 */\r\n/* 文字基本颜色 */\r\n/* 背景颜色 */\r\n/* 边框颜色 */\r\n/* 尺寸变量 */\r\n/* 文字尺寸 */\r\n/* 图片尺寸 */\r\n/* Border Radius */\r\n/* 水平间距 */\r\n/* 垂直间距 */\r\n/* 透明度 */\r\n/* 文章场景相关 */\n.p-content .p-head {\r\n  font-size: 32upx;\r\n  color: #333;\n}\n.p-content .p-head > uni-view {\r\n  display: flex;\r\n  align-items: center;\r\n  padding: 10upx 20upx;\r\n  border-bottom: 1px solid #eee;\n}\n.p-content .p-head > uni-view > uni-view {\r\n  display: flex;\r\n  padding: 0 10upx;\r\n  align-items: center;\n}\n.p-content .p-head .uni-input {\r\n  border: 1px solid #eee;\r\n  width: 150upx;\r\n  text-align: center;\r\n  padding: 8upx;\n}\n.p-content .p-body {\r\n  overflow: auto;\r\n  flex-grow: 1;\r\n  height: 50%;\n}\n.p-content .p-footer {\r\n  padding: 30upx;\r\n  display: flex;\n}\n.p-content .p-footer > uni-button {\r\n  width: 40%;\n}\r\n", ""]);
 // Exports
 module.exports = exports;
 
@@ -10365,7 +10392,6 @@ var render = function () {
                           padding: "6rpx 0 6rpx 7rpx",
                         },
                         attrs: {
-                          focus: true,
                           placeholder: "扫描或输入条码",
                           border: "surround",
                           _i: 13,
@@ -10401,22 +10427,88 @@ var render = function () {
             ],
             1
           ),
-          _vm._$g(16, "i")
+          _c(
+            "uni-view",
+            { attrs: { _i: 16 } },
+            [
+              _c(
+                "uni-view",
+                { attrs: { _i: 17 } },
+                [
+                  _c("v-uni-text", { attrs: { _i: 18 } }, [
+                    _vm._v("产品编码:"),
+                  ]),
+                  _c(
+                    "uni-view",
+                    {
+                      staticStyle: {
+                        "flex-grow": "1",
+                        display: "flex",
+                        "align-items": "center",
+                      },
+                      attrs: { _i: 19 },
+                    },
+                    [
+                      _c("v-uni-input", {
+                        staticClass: _vm._$g(20, "sc"),
+                        staticStyle: {
+                          width: "150px",
+                          "text-align": "left",
+                          "font-size": "32rpx",
+                          padding: "6rpx 0 6rpx 7rpx",
+                        },
+                        attrs: {
+                          placeholder: "请输入产品编码",
+                          border: "surround",
+                          _i: 20,
+                        },
+                        model: {
+                          value: _vm._$g(20, "v-model"),
+                          callback: function ($$v) {
+                            _vm.$handleVModelEvent(20, $$v)
+                          },
+                          expression: "productCode",
+                        },
+                      }),
+                      _c(
+                        "v-uni-button",
+                        {
+                          style: _vm._$g(21, "s"),
+                          attrs: { size: "mini", _i: 21 },
+                          on: {
+                            click: function ($event) {
+                              return _vm.$handleViewEvent($event)
+                            },
+                          },
+                        },
+                        [_vm._v("查询")]
+                      ),
+                    ],
+                    1
+                  ),
+                ],
+                1
+              ),
+              _c("uni-view", { attrs: { _i: 22 } }),
+            ],
+            1
+          ),
+          _vm._$g(23, "i")
             ? _c(
                 "uni-view",
-                { attrs: { _i: 16 } },
+                { attrs: { _i: 23 } },
                 [
                   _c(
                     "uni-view",
-                    { attrs: { _i: 17 } },
+                    { attrs: { _i: 24 } },
                     [
                       _c(
                         "v-uni-text",
-                        { staticStyle: { width: "180rpx" }, attrs: { _i: 18 } },
+                        { staticStyle: { width: "180rpx" }, attrs: { _i: 25 } },
                         [_vm._v("产品名称:")]
                       ),
-                      _c("uni-view", { attrs: { _i: 19 } }, [
-                        _vm._v(_vm._$g(19, "t0-0")),
+                      _c("uni-view", { attrs: { _i: 26 } }, [
+                        _vm._v(_vm._$g(26, "t0-0")),
                       ]),
                     ],
                     1
@@ -10425,28 +10517,28 @@ var render = function () {
                 1
               )
             : _vm._e(),
-          _vm._$g(20, "i")
+          _vm._$g(27, "i")
             ? _c(
                 "uni-view",
-                { attrs: { _i: 20 } },
+                { attrs: { _i: 27 } },
                 [
                   _c(
                     "uni-view",
-                    { attrs: { _i: 21 } },
+                    { attrs: { _i: 28 } },
                     [
                       _vm._v("盘点数量:"),
                       _c("v-uni-input", {
-                        staticClass: _vm._$g(22, "sc"),
-                        attrs: { min: 0, type: "digit", _i: 22 },
+                        staticClass: _vm._$g(29, "sc"),
+                        attrs: { min: 0, type: "digit", _i: 29 },
                         on: {
                           blur: function ($event) {
                             return _vm.$handleViewEvent($event)
                           },
                         },
                         model: {
-                          value: _vm._$g(22, "v-model"),
+                          value: _vm._$g(29, "v-model"),
                           callback: function ($$v) {
-                            _vm.$handleVModelEvent(22, $$v)
+                            _vm.$handleVModelEvent(29, $$v)
                           },
                           expression: "curProduct.checkQty",
                         },
@@ -10454,14 +10546,14 @@ var render = function () {
                     ],
                     1
                   ),
-                  _c("uni-view", { attrs: { _i: 23 } }, [
-                    _vm._v("库存数量:" + _vm._$g(23, "t0-0")),
+                  _c("uni-view", { attrs: { _i: 30 } }, [
+                    _vm._v("库存数量:" + _vm._$g(30, "t0-0")),
                   ]),
                 ],
                 1
               )
             : _vm._e(),
-          _vm._$g(24, "i")
+          _vm._$g(31, "i")
             ? _c(
                 "uni-view",
                 {
@@ -10469,24 +10561,24 @@ var render = function () {
                     "justify-content": "flex-start",
                     "flex-wrap": "wrap",
                   },
-                  attrs: { _i: 24 },
+                  attrs: { _i: 31 },
                 },
                 [
-                  _c("uni-view", { attrs: { _i: 25 } }, [
-                    _vm._v("共" + _vm._$g(25, "t0-0") + "款"),
+                  _c("uni-view", { attrs: { _i: 32 } }, [
+                    _vm._v("共" + _vm._$g(32, "t0-0") + "款"),
                   ]),
-                  _c("uni-view", { attrs: { _i: 26 } }, [
-                    _vm._v("总数量:" + _vm._$g(26, "t0-0")),
+                  _c("uni-view", { attrs: { _i: 33 } }, [
+                    _vm._v("总数量:" + _vm._$g(33, "t0-0")),
                   ]),
                   _c(
                     "uni-view",
-                    { attrs: { _i: 27 } },
+                    { attrs: { _i: 34 } },
                     [
                       _vm._v("盈亏数量:"),
                       _c(
                         "span",
-                        { style: _vm._$g(28, "s"), attrs: { _i: 28 } },
-                        [_vm._v(_vm._$g(28, "t0-0"))]
+                        { style: _vm._$g(35, "s"), attrs: { _i: 35 } },
+                        [_vm._v(_vm._$g(35, "t0-0"))]
                       ),
                     ],
                     1
@@ -10500,28 +10592,28 @@ var render = function () {
       ),
       _c(
         "uni-view",
-        { staticClass: _vm._$g(29, "sc"), attrs: { _i: 29 } },
+        { staticClass: _vm._$g(36, "sc"), attrs: { _i: 36 } },
         [
           _c(
             "uni-table",
-            { staticStyle: { width: "100%" }, attrs: { _i: 30 } },
+            { staticStyle: { width: "100%" }, attrs: { _i: 37 } },
             [
               _c(
                 "uni-tr",
-                { attrs: { _i: 31 } },
+                { attrs: { _i: 38 } },
                 [
-                  _c("uni-td", { attrs: { _i: 32 } }, [_vm._v("产品编码")]),
-                  _c("uni-td", { attrs: { _i: 33 } }, [_vm._v("库存")]),
-                  _c("uni-td", { attrs: { _i: 34 } }, [_vm._v("盈亏数量")]),
+                  _c("uni-td", { attrs: { _i: 39 } }, [_vm._v("产品编码")]),
+                  _c("uni-td", { attrs: { _i: 40 } }, [_vm._v("库存")]),
+                  _c("uni-td", { attrs: { _i: 41 } }, [_vm._v("盈亏数量")]),
                 ],
                 1
               ),
-              _vm._l(_vm._$g(35, "f"), function (item, $10, $20, $30) {
+              _vm._l(_vm._$g(42, "f"), function (item, $10, $20, $30) {
                 return _c(
                   "uni-tr",
                   {
                     key: item,
-                    attrs: { _i: "35-" + $30 },
+                    attrs: { _i: "42-" + $30 },
                     on: {
                       click: function ($event) {
                         return _vm.$handleViewEvent($event)
@@ -10529,23 +10621,23 @@ var render = function () {
                     },
                   },
                   [
-                    _c("uni-td", { attrs: { _i: "36-" + $30 } }, [
-                      _vm._v(_vm._$g("36-" + $30, "t0-0")),
+                    _c("uni-td", { attrs: { _i: "43-" + $30 } }, [
+                      _vm._v(_vm._$g("43-" + $30, "t0-0")),
                     ]),
-                    _c("uni-td", { attrs: { _i: "37-" + $30 } }, [
-                      _vm._v(_vm._$g("37-" + $30, "t0-0")),
+                    _c("uni-td", { attrs: { _i: "44-" + $30 } }, [
+                      _vm._v(_vm._$g("44-" + $30, "t0-0")),
                     ]),
                     _c(
                       "uni-td",
-                      { attrs: { _i: "38-" + $30 } },
+                      { attrs: { _i: "45-" + $30 } },
                       [
                         _c(
                           "span",
                           {
-                            style: _vm._$g("39-" + $30, "s"),
-                            attrs: { _i: "39-" + $30 },
+                            style: _vm._$g("46-" + $30, "s"),
+                            attrs: { _i: "46-" + $30 },
                           },
-                          [_vm._v(_vm._$g("39-" + $30, "t0-0"))]
+                          [_vm._v(_vm._$g("46-" + $30, "t0-0"))]
                         ),
                       ],
                       1
@@ -10562,12 +10654,12 @@ var render = function () {
       ),
       _c(
         "uni-view",
-        { staticClass: _vm._$g(40, "sc"), attrs: { _i: 40 } },
+        { staticClass: _vm._$g(47, "sc"), attrs: { _i: 47 } },
         [
           _c(
             "v-uni-button",
             {
-              attrs: { size: "mini", type: "warn", _i: 41 },
+              attrs: { size: "mini", type: "warn", _i: 48 },
               on: {
                 click: function ($event) {
                   return _vm.$handleViewEvent($event)
@@ -10577,7 +10669,7 @@ var render = function () {
             [
               _c(
                 "v-uni-text",
-                { staticClass: _vm._$g(42, "sc"), attrs: { _i: 42 } },
+                { staticClass: _vm._$g(49, "sc"), attrs: { _i: 49 } },
                 [_vm._v("减")]
               ),
             ],
@@ -10586,7 +10678,7 @@ var render = function () {
           _c(
             "v-uni-button",
             {
-              attrs: { size: "mini", type: "primary", _i: 43 },
+              attrs: { size: "mini", type: "primary", _i: 50 },
               on: {
                 click: function ($event) {
                   return _vm.$handleViewEvent($event)
@@ -10596,7 +10688,7 @@ var render = function () {
             [
               _c(
                 "v-uni-text",
-                { staticClass: _vm._$g(44, "sc"), attrs: { _i: 44 } },
+                { staticClass: _vm._$g(51, "sc"), attrs: { _i: 51 } },
                 [_vm._v("加")]
               ),
             ],
@@ -10605,7 +10697,7 @@ var render = function () {
         ],
         1
       ),
-      _c("scanCode", { attrs: { _i: 45 } }),
+      _c("scanCode", { attrs: { _i: 52 } }),
     ],
     1
   )
@@ -15931,7 +16023,6 @@ var render = function () {
                           padding: "6rpx 0 6rpx 7rpx",
                         },
                         attrs: {
-                          focus: true,
                           placeholder: "扫描或输入条码",
                           border: "surround",
                           _i: 13,
@@ -20352,13 +20443,13 @@ __webpack_require__.r(__webpack_exports__);
 var components
 try {
   components = {
-    uniTable:
-      __webpack_require__(/*! @/uni_modules/uni-table/components/uni-table/uni-table.vue */ 145)
-        .default,
     uniTr: __webpack_require__(/*! @/uni_modules/uni-table/components/uni-tr/uni-tr.vue */ 153)
       .default,
     uniTd: __webpack_require__(/*! @/uni_modules/uni-table/components/uni-td/uni-td.vue */ 170)
       .default,
+    uniTable:
+      __webpack_require__(/*! @/uni_modules/uni-table/components/uni-table/uni-table.vue */ 145)
+        .default,
     uniPopup:
       __webpack_require__(/*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 431)
         .default,
@@ -20546,8 +20637,8 @@ var render = function () {
         { staticClass: _vm._$g(16, "sc"), attrs: { _i: 16 } },
         [
           _c(
-            "uni-table",
-            { attrs: { _i: 17 } },
+            "uni-view",
+            { staticClass: _vm._$g(17, "sc"), attrs: { _i: 17 } },
             [
               _c(
                 "uni-tr",
@@ -20559,57 +20650,62 @@ var render = function () {
                 ],
                 1
               ),
-              _vm._l(_vm._$g(22, "f"), function (item, $10, $20, $30) {
-                return _c(
-                  "uni-tr",
-                  {
-                    key: item,
-                    attrs: { _i: "22-" + $30 },
-                    on: {
-                      click: function ($event) {
-                        return _vm.$handleViewEvent($event)
+            ],
+            1
+          ),
+          _c(
+            "v-uni-scroll-view",
+            {
+              staticClass: _vm._$g(22, "sc"),
+              attrs: { "enable-flex": true, "scroll-y": "true", _i: 22 },
+              on: {
+                scrolltolower: function ($event) {
+                  return _vm.$handleViewEvent($event)
+                },
+              },
+            },
+            [
+              _c(
+                "uni-table",
+                { staticStyle: { width: "100%" }, attrs: { _i: 23 } },
+                _vm._l(_vm._$g(24, "f"), function (item, $10, $20, $30) {
+                  return _c(
+                    "uni-tr",
+                    {
+                      key: item,
+                      attrs: { _i: "24-" + $30 },
+                      on: {
+                        click: function ($event) {
+                          return _vm.$handleViewEvent($event)
+                        },
                       },
                     },
-                  },
-                  [
-                    _c("uni-td", { attrs: { _i: "23-" + $30 } }, [
-                      _vm._v(_vm._$g("23-" + $30, "t0-0")),
-                    ]),
-                    _c("uni-td", { attrs: { _i: "24-" + $30 } }, [
-                      _vm._v(_vm._$g("24-" + $30, "t0-0")),
-                    ]),
-                    _c("uni-td", { attrs: { _i: "25-" + $30 } }, [
-                      _vm._v(_vm._$g("25-" + $30, "t0-0")),
-                    ]),
-                  ],
-                  1
-                )
-              }),
+                    [
+                      _c("uni-td", { attrs: { _i: "25-" + $30 } }, [
+                        _vm._v(_vm._$g("25-" + $30, "t0-0")),
+                      ]),
+                      _c("uni-td", { attrs: { _i: "26-" + $30 } }, [
+                        _vm._v(_vm._$g("26-" + $30, "t0-0")),
+                      ]),
+                      _c("uni-td", { attrs: { _i: "27-" + $30 } }, [
+                        _vm._v(_vm._$g("27-" + $30, "t0-0")),
+                      ]),
+                    ],
+                    1
+                  )
+                }),
+                1
+              ),
             ],
-            2
+            1
           ),
-          _vm._$g(26, "i")
-            ? _c(
-                "uni-view",
-                {
-                  staticStyle: {
-                    padding: "30upx",
-                    "text-align": "center",
-                    color: "#999",
-                    "font-size": "24rpx",
-                  },
-                  attrs: { _i: 26 },
-                },
-                [_vm._v(_vm._$g(26, "t0-0"))]
-              )
-            : _vm._e(),
         ],
         1
       ),
-      _c("scanCode", { attrs: { _i: 27 } }),
+      _c("scanCode", { attrs: { _i: 28 } }),
       _c(
         "uni-popup",
-        { ref: "popup", attrs: { _i: 28 } },
+        { ref: "popup", attrs: { _i: 29 } },
         [
           _c(
             "uni-view",
@@ -20622,22 +20718,22 @@ var render = function () {
                 width: "80%",
                 margin: "0 auto",
               },
-              attrs: { _i: 29 },
+              attrs: { _i: 30 },
             },
             [
-              _vm._$g(30, "i")
+              _vm._$g(31, "i")
                 ? _c(
                     "uni-view",
                     {
                       staticStyle: { "line-height": "60rpx", width: "600rpx" },
-                      attrs: { _i: 30 },
+                      attrs: { _i: 31 },
                     },
                     [
-                      _c("uni-view", { attrs: { _i: 31 } }, [
-                        _vm._v("产品编码:" + _vm._$g(31, "t0-0")),
-                      ]),
                       _c("uni-view", { attrs: { _i: 32 } }, [
-                        _vm._v("产品名称:" + _vm._$g(32, "t0-0")),
+                        _vm._v("产品编码:" + _vm._$g(32, "t0-0")),
+                      ]),
+                      _c("uni-view", { attrs: { _i: 33 } }, [
+                        _vm._v("产品名称:" + _vm._$g(33, "t0-0")),
                       ]),
                       _c(
                         "uni-view",
@@ -20647,20 +20743,20 @@ var render = function () {
                             "align-items": "center",
                             "padding-top": "15rpx",
                           },
-                          attrs: { _i: 33 },
+                          attrs: { _i: 34 },
                         },
                         [
-                          _c("v-uni-text", { attrs: { _i: 34 } }, [
+                          _c("v-uni-text", { attrs: { _i: 35 } }, [
                             _vm._v("条形码:"),
                           ]),
                           _c("v-uni-input", {
-                            staticClass: _vm._$g(35, "sc"),
+                            staticClass: _vm._$g(36, "sc"),
                             staticStyle: { width: "350rpx" },
                             attrs: {
                               focus: true,
                               placeholder: "扫描或输入条码",
                               border: "surround",
-                              _i: 35,
+                              _i: 36,
                             },
                             on: {
                               confirm: function ($event) {
@@ -20668,9 +20764,9 @@ var render = function () {
                               },
                             },
                             model: {
-                              value: _vm._$g(35, "v-model"),
+                              value: _vm._$g(36, "v-model"),
                               callback: function ($$v) {
-                                _vm.$handleVModelEvent(35, $$v)
+                                _vm.$handleVModelEvent(36, $$v)
                               },
                               expression: "code",
                             },
@@ -20690,14 +20786,14 @@ var render = function () {
                     padding: "50rpx 15rpx 10rpx",
                     "justify-content": "center",
                   },
-                  attrs: { _i: 36 },
+                  attrs: { _i: 37 },
                 },
                 [
                   _c(
                     "v-uni-button",
                     {
-                      style: _vm._$g(37, "s"),
-                      attrs: { size: "mini", _i: 37 },
+                      style: _vm._$g(38, "s"),
+                      attrs: { size: "mini", _i: 38 },
                       on: {
                         click: function ($event) {
                           return _vm.$handleViewEvent($event)
@@ -20709,12 +20805,12 @@ var render = function () {
                   _c(
                     "v-uni-button",
                     {
-                      style: _vm._$g(38, "s"),
+                      style: _vm._$g(39, "s"),
                       attrs: {
                         size: "mini",
                         type: "primary",
-                        loading: _vm._$g(38, "a-loading"),
-                        _i: 38,
+                        loading: _vm._$g(39, "a-loading"),
+                        _i: 39,
                       },
                       on: {
                         click: function ($event) {
@@ -20829,16 +20925,9 @@ if(false) {}
   !*** ./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-2!./node_modules/postcss-loader/src??ref--8-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js??ref--8-oneOf-1-4!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--8-oneOf-1-5!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/view/style.js!D:/jianguan/apls-checkGoods-app/pages/codeBar/codeBar.vue?vue&type=style&index=0&lang=scss&mpType=page ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-// Imports
-var ___CSS_LOADER_API_IMPORT___ = __webpack_require__(/*! ../../../../HBuilderX.2.9.8.20201110.full/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/runtime/api.js */ 10);
-exports = ___CSS_LOADER_API_IMPORT___(false);
-// Module
-exports.push([module.i, "@charset \"UTF-8\";\r\n/**\r\n * 这里是uni-app内置的常用样式变量\r\n *\r\n * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量\r\n * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App\r\n *\r\n */\r\n/**\r\n * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能\r\n *\r\n * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件\r\n */\r\n/* 颜色变量 */\r\n/* 行为相关颜色 */\r\n/* 文字基本颜色 */\r\n/* 背景颜色 */\r\n/* 边框颜色 */\r\n/* 尺寸变量 */\r\n/* 文字尺寸 */\r\n/* 图片尺寸 */\r\n/* Border Radius */\r\n/* 水平间距 */\r\n/* 垂直间距 */\r\n/* 透明度 */\r\n/* 文章场景相关 */\n.p-content uni-button {\r\n  line-height: 1.7;\n}\n.p-content .p-head {\r\n  font-size: 32upx;\r\n  color: #333;\n}\n.p-content .p-head > uni-view {\r\n  display: flex;\r\n  align-items: center;\r\n  padding: 15upx 20upx;\r\n  justify-content: space-between;\n}\n.p-content .p-head > uni-view > uni-view {\r\n  display: flex;\r\n  padding: 0 10upx;\r\n  align-items: center;\n}\n.p-content .p-body {\r\n  overflow: auto;\r\n  flex-grow: 1;\r\n  height: 50%;\n}\n.p-content .uni-input {\r\n  border: 1px solid #eee;\r\n  width: 100%;\r\n  padding: 10upx;\r\n  font-size: 32rpx;\n}\n.p-content .p-footer {\r\n  padding: 20upx 30upx;\r\n  display: flex;\n}\n.p-content .p-footer > uni-button {\r\n  width: 30%;\n}\r\n", ""]);
-// Exports
-module.exports = exports;
+/***/ (function(module, exports) {
 
+throw new Error("Module build failed (from ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/sass-loader/dist/cjs.js):\nSassError: Undefined variable: \"$border-color\".\n        on line 302 of D:\\jianguan\\apls-checkGoods-app\\pages\\codeBar\\codeBar.vue\n>> \t\t\tborder-right: 1px $border-color solid;\n\n   ---------------------^\n");
 
 /***/ }),
 /* 526 */

Some files were not shown because too many files changed in this diff