asd26269546 il y a 2 ans
Parent
commit
04629c6ad2

+ 1 - 1
manifest.json

@@ -2,7 +2,7 @@
     "name" : "智能仓储2",
     "appid" : "__UNI__4E49201",
     "description" : "",
-    "versionName" : "1.0.4.0",
+    "versionName" : "1.0.4.2",
     "versionCode" : 200,
     "transformPx" : false,
     /* 5+App特有相关 */

+ 3 - 5
pages/store-out-manage/store-out/store-out.vue

@@ -16,7 +16,7 @@
 					<span style="color: red;">*</span>
 					出库信息
 				</span>
-			</view>
+			</view> 
 			<view class="text">
 				<view class="label">领料人:</view>
 				<select-lay :value="operateUser" placeholder="默认当前用户" :options="userList" @selectitem="selectitem" :zindex="2000"></select-lay>
@@ -127,9 +127,8 @@
 				}
 				console.log(this.roleKey)
 				console.log(this.stockChangeType)
-				if((this.roleKey == 'sewing' || this.roleKey == 'crop')){
-					if(this.stockChangeType == 20) obj.stockChangeType = 30
-					
+				if((this.roleKey == 'sewing' || this.roleKey == 'crop' ||  this.roleKey == '001')){
+					if(this.stockChangeType == 20) obj.stockChangeType = 30	
 				}
 				console.log(obj)
 				
@@ -143,7 +142,6 @@
 						}, 2000)
 					}
 				})
-				
 			},
 			materialReceiveSubmit(obj){
 				console.log(obj)

+ 1 - 1
pages/warehouse/review.vue

@@ -24,7 +24,7 @@
 					面料米数:{{i.operationMeters}}
 				</view>
 				<view class="btn-warp">
-					<button style="background-color: red;" @click="open(i.stockBackId)">取消</button>
+					<button style="background-color: red;" @click="open(i.stockBackId)">删除</button>
 					<button style="" @click="toDtl(i.stockBackId)">去复核</button>
 				</view>
 			</li>

+ 5 - 0
pages/warehouse/tag-scan.vue

@@ -18,6 +18,9 @@
 				<view class="title" v-if="isReading">扫描中...</view>
 				<view class="title" v-if="!isReading">扫描结果</view>
 			</view>
+			<view style="text-align: center;margin-bottom: 50rpx;">
+				{{rfidCode}}
+			</view>
 			<view class="btn" v-if="!isReading">
 				<view class="row">
 					<u-button throttleTime="300" type="primary" style="width: 100%;" @click="bind">绑定并继续</u-button>
@@ -44,6 +47,7 @@
 		methods: {
 			bind() {
 				const v = this
+				console.log(this.option)
 				this.$http.CreateRfidStockTag({
 					rfidCode: this.rfidCode,
 					bindingRfidWay: 0,
@@ -96,6 +100,7 @@
 		},
 		onLoad(option) {
 			this.option = this.$utils.code2Object(option.data)
+			console.log(this.option)
 			this.scanRfid()
 		},
 		onUnload() {

+ 3 - 2
pages/warehouse/tag.vue

@@ -19,7 +19,7 @@
 					</view>
 					<view class="row flex-start">
 						<view class="label">物料编号:</view>
-						<view class="value">{{ query.materialId }}</view>
+						<view class="value">{{ query.materialCode }}</view>
 					</view>
 					<view class="row flex-start">
 						<view class="label">物料名称:</view>
@@ -86,6 +86,7 @@
 			uni.getStorage({
 				key: 'reviewDtl',
 				success: function (res) {
+					console.log(res)
 					v.query = res.data.checkDetailsInfoList[res.data.index]
 					v.quantity = res.data.checkDetailsInfoList[res.data.index].stockBackDetailsList[res.data.jindex].materialMeters
 					v.query.code = res.data.checkDetailsInfoList[res.data.index].materialId
@@ -132,7 +133,7 @@
 					return this.$msg.showToast('请输入物料长度!')
 				}
 				let data = {
-					materialCode: this.query.code,
+					materialCode: this.query.materialCode,
 					quantity: this.quantity,
 					purchaseBillNo: this.purchaseBillNo,
 					batchNo: this.batchNo

+ 1 - 1
unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/4335cae0-38aa-11ed-9638-efc34b13f091
+https://ide.dcloud.net.cn/build/download/07897f80-3a26-11ed-90ad-6b46fe4b207a

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/cache/apk/cmManifestCache.json


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/cache/wgt/__UNI__4E49201/app-service.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/cache/wgt/__UNI__4E49201/app-view.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/cache/wgt/__UNI__4E49201/manifest.json


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


+ 15 - 7
unpackage/dist/dev/app-plus/app-view.js

@@ -44125,7 +44125,7 @@ var render = function() {
                         }
                       }
                     },
-                    [_vm._v("取消")]
+                    [_vm._v("删除")]
                   ),
                   _c(
                     "v-uni-button",
@@ -46466,20 +46466,28 @@ var render = function() {
             ],
             1
           ),
-          _vm._$g(13, "i")
+          _c(
+            "uni-view",
+            {
+              staticStyle: { "text-align": "center", "margin-bottom": "50rpx" },
+              attrs: { _i: 13 }
+            },
+            [_vm._v(_vm._$g(13, "t0-0"))]
+          ),
+          _vm._$g(14, "i")
             ? _c(
                 "uni-view",
-                { staticClass: _vm._$g(13, "sc"), attrs: { _i: 13 } },
+                { staticClass: _vm._$g(14, "sc"), attrs: { _i: 14 } },
                 [
                   _c(
                     "uni-view",
-                    { staticClass: _vm._$g(14, "sc"), attrs: { _i: 14 } },
+                    { staticClass: _vm._$g(15, "sc"), attrs: { _i: 15 } },
                     [
                       _c(
                         "u-button",
                         {
                           staticStyle: { width: "100%" },
-                          attrs: { _i: 15 },
+                          attrs: { _i: 16 },
                           on: {
                             click: function($event) {
                               return _vm.$handleViewEvent($event)
@@ -46493,13 +46501,13 @@ var render = function() {
                   ),
                   _c(
                     "uni-view",
-                    { staticClass: _vm._$g(16, "sc"), attrs: { _i: 16 } },
+                    { staticClass: _vm._$g(17, "sc"), attrs: { _i: 17 } },
                     [
                       _c(
                         "u-button",
                         {
                           staticStyle: { width: "100%" },
-                          attrs: { _i: 17 },
+                          attrs: { _i: 18 },
                           on: {
                             click: function($event) {
                               return _vm.$handleViewEvent($event)

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
unpackage/dist/dev/app-plus/manifest.json


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff