修复bug--生产报工

components/AppScan/AppScan.vue

@@ -12,7 +12,8 @@ export default {
 		return {
 			barcode: null,
 			flash: false,
-			tip: '将二维码放入框中，即可自动扫描',
+			scanBarVew: null,
+			tip: '将二维码放入框中，即可自动扫描'
 		}
 	},
 	onShow() {
@@ -35,6 +36,9 @@ export default {
 		}
 	},
 	methods: {
+		start() {
+		  this.barcode.start()
+		},
 		/**
             * 创建二维码
             * @param {Object} currentWebview
@@ -65,6 +69,8 @@ export default {
 
 		closed() {
       this.barcode.close()
+			let currentWebview = this.$mp.page.$getAppWebview();
+			currentWebview.remove(this.scanBarVew)
 		},
 
 		/**
@@ -109,7 +115,7 @@ export default {
 				},
 				closeImg);
 			scanBarVew.interceptTouchEvent(true);
-
+			this.scanBarVew = scanBarVew
 			currentWebview.append(scanBarVew);
 
 			scanBarVew.addEventListener("click", (e) => { //点亮手电筒

pages/mes/prodReport/index.vue

@@ -573,19 +573,25 @@
       <view style="display: flex">
         <view style="width: 520px" v-if="recoilMaterialVisible">
           <!-- #ifdef APP-PLUS -->
-          <app-scan ref="appScan" @getCode="recoilMaterialScan"></app-scan>
-          <!-- #endif -->
+          <app-scan ref="appScan" @getCode="recoilMaterialScan" v-if="!recoilMaterialFlag"></app-scan>
+					<!-- #endif -->
+					<view class="scan-mask"  v-show="recoilMaterialFlag" :style="{top: '38px',
+						left: '0px',
+						height: '87%',
+						width: '500px',
+						position: 'absolute',
+						background: 'black'}"></view>
         </view>
         <view class="list-bar">
-          <scroll-view scroll-y="true" class="scroll-list" :style="{ height: this.screenHeight - 280 + 'px' }">
+          <scroll-view scroll-y="true" scroll-x="true" class="scroll-list" :style="{ height: this.screenHeight - 280 + 'px' }">
             <uni-table ref="qcTable" border stripe :loading="loading" emptyText="未查询到数据">
               <uni-tr>
                 <!-- <uni-th width="200px" align="center">操作</uni-th> -->
                 <uni-th width="110px" align="center">产品物料编码</uni-th>
-                <uni-th width="300px" align="center">产品物料名称</uni-th>
-                <uni-th width="110px" align="center">批次号</uni-th>
-                <uni-th width="110px" align="center">需求数量</uni-th>
-                <uni-th width="110px" align="center">数量</uni-th>
+                <uni-th width="200px" align="center">产品物料名称</uni-th>
+                <uni-th width="90px" align="center">批次号</uni-th>
+                <uni-th width="80px" align="center">需求数量</uni-th>
+                <uni-th width="65px" align="center">数量</uni-th>
 
               </uni-tr>
               <uni-tr v-for="(line, index) in recoilMaterialDetailList" :key="index">
@@ -790,8 +796,8 @@
         <zb-table :columns="tableDetailColumn" :stripe="true" :border="true" :data="tableDataDetail"></zb-table>
       </view>
     </u-modal>
-    <u-modal title="查看倒冲批次" :showRecoilMaterialButton="true"
-      :title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
+    <u-modal title="查看倒冲批次" :showRecoilMaterialButton="true" @confirm="$refs.appScan.start()"
+      :title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px',' z-index': 9999 }"
       v-model="recoilMaterialFlag" width="1300rpx">
       <view>
         <zb-table :columns="recoilMaterialColumn" :stripe="true" :border="true" :data="recoilMaterialList"></zb-table>
@@ -2570,6 +2576,7 @@ export default {
 
     batchShow(row) {
       this.recoilMaterialList = row.proRecoilMaterialList;
+			this.$refs.appScan.closed()
       this.recoilMaterialFlag = true;
     },
 

pages/mes/qc/components/addDialog.vue

@@ -22,6 +22,11 @@
 	          <u-input v-model="qcForm.ipqcName" placeholder="请输入检验单名称"></u-input>
 	        </u-form-item>
 	      </u-col>
+				<u-col span="4" v-if="btnType">
+				  <u-form-item label="检验单编号" label-width="90px">
+				    <u-input v-model="qcForm.ipqcCode" placeholder="请输入检验单编号"></u-input>
+				  </u-form-item>
+				</u-col>
 				<u-col span="4">
 				  <u-form-item label="检测结果" prop="checkResult">
 				    <u-radio-group v-model="qcForm.checkResult">
@@ -40,12 +45,12 @@
 	      </u-col>
 	      <u-col span="4">
 	        <u-form-item label="合格数量" prop="quantityQualified">
-	          <u-number-box v-model="qcForm.quantityQualified" @change="handleChangeQuantityCheck"></u-number-box>
+	          <u-number-box :min="0" v-model="qcForm.quantityQualified" @change="handleChangeQuantityCheck"></u-number-box>
 	        </u-form-item>
 	      </u-col>
 	      <u-col span="4">
 	        <u-form-item label="不合格数量" prop="quantityUnqualified">
-	          <u-number-box v-model="qcForm.quantityUnqualified" @change="handleChangeQuantityCheck"></u-number-box>
+	          <u-number-box :min="0" v-model="qcForm.quantityUnqualified" @change="handleChangeQuantityCheck"></u-number-box>
 	        </u-form-item>
 	      </u-col>
 	    </u-row>