productDev/funingyunwei.git

			@@ -32,7 +32,7 @@
			<view class="line">规格型号：{{ item.materialAttr }}</view>
			<view class="line" v-if="item.status == 0">
			<view class="">账面数量：{{ item.stock }}{{ item.materialUnitName }}</view>
			<view @click.stop="openEheck(item)" class="btn">执行盘点</view>
			<view v-if="info.status == 1" @click.stop="openEheck(item)" class="btn">执行盘点</view>
			</view>
			<view class="static" v-if="item.status == 1">
			<view class="ite">
			@@ -86,8 +86,10 @@
			<image v-if="!modalForm.actStock" src="@/static/side/btn_jian_grey@2x.png" mode=""></image>
			<image v-else @click="changeAct(-1)" src="@/static/side/btn_jian@3x.png" mode=""></image>
			</template>
			<input :disabled="Boolean(modalForm.handleType && modalForm.handleType == 'detail')" type="digit" v-model="modalForm.actStock"></input>
			<image v-if="!modalForm.handleType" @click="changeAct(1)" src="@/static/side/btn_jia@3x.png" mode=""></image>
			<input :disabled="Boolean(modalForm.handleType && modalForm.handleType == 'detail')" type="digit"
			v-model="modalForm.actStock"></input>
			<image v-if="!modalForm.handleType" @click="changeAct(1)" src="@/static/side/btn_jia@3x.png" mode="">
			</image>
			</view>
			<view class="unit">{{ modalForm.materialUnitName }}</view>
			</view>
			@@ -95,8 +97,9 @@
			</view>
			<view class="remark">
			<view class="la">备注：</view>
			<textarea v-model="modalForm.remark" :disabled="Boolean(modalForm.handleType && modalForm.handleType == 'detail')" placeholder="请填写备注" :maxlength="-1" placeholder-class="placeholder9"
			cols="30" rows="10"></textarea>
			<textarea v-model="modalForm.remark"
			:disabled="Boolean(modalForm.handleType && modalForm.handleType == 'detail')" placeholder="请填写备注"
			:maxlength="-1" placeholder-class="placeholder9" cols="30" rows="10"></textarea>
			</view>
			<view v-if="!modalForm.handleType" class="btns">
			<view class="btn" @click="showModal = false">取消</view>
			@@ -185,12 +188,12 @@

			})
			},
			handleQuery(str) {
			handleQuery() {
			this.list = []
			this.page = 1
			this.getList(str)
			this.getList()
			},
			getList(str) {
			getList() {
			const {
			page,
			activeTab,
			@@ -201,17 +204,29 @@
			capacity: 20,
			page,
			model: {
			status: str \|\| activeTab,
			status: activeTab,
			stocktakingId: id,
			...param
			}
			}).then(res => {
			this.list = [...this.list, ...res.data.records]
			this.list = [...this.list, ...res.data.records \|\| []]
			this.total = res.data.total
			if (this.param.materialQrcode && this.list.length == 1) {
			if (this.param.materialQrcode && this.total == 1) {
			this.openEheck(this.list[0])
			this.$set(this.param, 'materialQrcode', null)
			this.param = {}
			} else if (this.param.materialQrcode && this.total == 0) {
			this.param = {}
			uni.showModal({
			content: '未匹配到物料，请重新扫码',
			showCancel: false,
			success: (res) => {
			if (res.confirm) {
			this.getList()
			}
			}
			});
			}

			})
			},
			scrolltolower() {
			@@ -259,7 +274,9 @@
			this.getList()
			},
			tipSub() {
			const { info } = this
			const {
			info
			} = this
			ywStocktaFinishById(info.id).then(res => {
			this.showTip = false
			uni.navigateBack()
			@@ -282,7 +299,7 @@
			if (decodeText) { //这里decodeText就是通过扫描二维码得到的内容
			this.stopScan()
			this.$set(this.param, 'materialQrcode', decodeText)
			this.handleQuery('null')
			this.handleQuery()
			}
			},
			(err) => {
			@@ -397,17 +414,20 @@
			margin-bottom: 10rpx;
			flex: 1;
			}

			.head{
			display: flex;
			// align-items: center;
			justify-content: space-between;
			color: #666666;

			.status{
			width: 76rpx;
			text-align: right;
			padding-top: 3rpx;
			}
			}

			.line {
			height: 60rpx;
			display: flex;