Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

src/mycomponents/qty/countQtyEdit.vue

@@ -68,10 +68,10 @@
 							</view>
 
 
-							<view v-if="isShowStatus">
+							<view v-if="isShowDesc">
 								<view class='split_line'></view>
 								<view class="uni-flex uni-row space-between padding title u-col-center"
-									style="align-items: center; padding-left: 30rpx;">
+									style="align-items: center;">
 									<text>描述 : </text>
 									<view class="uni-flex uni-row uni-center" style="align-items: center;">
 										<input class="desc_input" v-model="description" :focus="true" 
@@ -158,6 +158,10 @@
 				type: Boolean,
 				default: false
 			},
+			isShowDesc: {
+				type: Boolean,
+				default: false
+			},
 		},
 		methods: {
 			checkNum(e) {

src/pages/count/job/fuzzyCountDetail.vue

@@ -56,7 +56,6 @@
 					</view>
 				</view>
 				<view class=" uni-flex uni-row space-between">
-
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
 				</view>
 			</view>
@@ -65,7 +64,7 @@
 		<win-scan-button v-if="fromLocationCode!=''" @goScan='openScanPopup'></win-scan-button>
 		<win-scan-pack ref="scanPopup" @getResult='getScanResult'></win-scan-pack>
 		<win-scan-location ref="scanLocationCode" title="盘点库位" @getLocation='getLocation'></win-scan-location>
-		<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true"
+		<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true" :isShowDesc="false"
 			:allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount=='TRUE'">
 		</count-qty-edit>
 		<comMessage ref="comMessage"></comMessage>
@@ -324,10 +323,6 @@
 			getScanResult(result) {
 				let that = this;
 				let packInfo = result.package;
-				let detail = this.createDetailInfo(packInfo);
-				this.detailSource.unshift(detail);
-				this.scanPopupGetFocus();
-				return;
 				if (this.itemRangeValue != '') {
 					let index = this.itemRangeValue.indexOf(packInfo.itemCode)
 					if (index < 0) {
@@ -395,7 +390,7 @@
 					createTime: new Date().getTime(),
 					countTime: new Date().getTime(),
 					countUser: this.$store.state.user.id,
-					countDescription: 'a',
+					countDescription: '',
 					countQty: packInfo.qty
 				}
 				return detail;