~jhz/STUWMS.git

			@@ -36,12 +36,18 @@
			</view>
			<view class="icon-wrapper-big">
			<uni-icons class="right-icon" type="scan" style="
			background-color: #3a78ff;
			padding: 6rpx;
			color: #fff;
			border-radius: 100%;
			" size="20" @click="toScanCode"></uni-icons>
			background-color: #3a78ff;
			padding: 6rpx;
			color: #fff;
			border-radius: 100%;" size="20" @click="toScanCode"></uni-icons>
			</view>
			<view class="icon-wrapper-big">
			<uni-icons class="right-icon" type="search" style="
			background-color: #3a78ff;
			padding: 6rpx;
			color: #fff;
			border-radius: 100%;" size="20" @click="toBillSelector"></uni-icons>
			</view>
			</view>
			<view class="form-item" v-if="false">
			<view class="left">生产资源</view>
			@@ -455,7 +461,9 @@
			:bindKey="0"></ProcessPopupVue>
			<CheckProjectPopupVue v-if="enablePopupModule == PopupModuleNameList[7]" ref="listPopup"
			@update="HQCSchemeComplete" :bindKey="0"></CheckProjectPopupVue>
			</view>
			<BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HSourceBillType"
			:HStockOrgID="hform.HStockOrgID" @BillSelectComplete="HandleBillSelectComplete"></BillListPopupVue>
			</view>
			</template>

			<script>
			@@ -478,6 +486,7 @@
			import {
			MpaasScan
			} from "../../../utils/mpaasScan";
			import BillListPopupVue from "../../../components/BillListPopup/BillListPopup.vue";
			export default {
			components: {
			InspectValueTemplateVue,
			@@ -489,6 +498,7 @@
			ProcExchBillPopupVue,
			ProcessPopupVue,
			CheckProjectPopupVue,
			BillListPopupVue
			},
			computed: {
			judgeConclusion: {
			@@ -569,6 +579,7 @@
			],
			// 主表属性
			hform: {
			HBillType: "7504",
			HSourceBillType: "1401",
			HSourceBillNo: "",
			HBillNo: "",
			@@ -621,6 +632,8 @@
			HMainSourceInterID: "0",
			HMainSourceEntryID: "1",
			HMainSourceBillNo: "",

			HStockOrgID: uni.getStorageSync('OrganizationID')
			},
			// 检验项目和抽样检验值
			checkItems: {},
			@@ -631,6 +644,60 @@
			};
			},
			methods: {
			toBillSelector() {
			this.$refs['billList'].showPopup()
			},
			async HandleBillSelectComplete(e) {
			try{
			let res = await CommonUtils.doRequest2Async({
			url: "/WEBSController/get_CheckBillBarCode_Json_CheckItem",
			data: {
			HBillType: this.hform.HBillType,
			HSourceBillType: this.hform.HSourceBillType,
			HBarCode: "",
			HInterID: e?.HInterID,
			HEntryID: e?.HEntryID,
			Mode: 2 //选单模式
			}
			})

			console.log(res)
			let {data, Message, count} = res.data
			if(count == 1) {
			this.hform.HMaterID = data[0]['HMaterID']
			this.hform.HMaterName = data[0]['HMaterName']
			this.hform.HMaterNumber = data[0]['HMaterNumber']
			this.hform.HMainSourceBillNo = data[0]['HBillNo']
			this.hform.HMainSourceInterID = data[0].HInterID
			this.hform.HMainSourceEntryID = data[0].HEntryID
			this.hform.HQCSchemeName = data[0].检验方案名称
			this.hform.HQCSchemeID = data[0].检验方案ID

			this.get_CheckItem();
			this.$refs['billList'].exit()
			}else {
			CommonUtils.showTips({
			title: '温馨提示',
			message: Message
			})
			}

			if (
			(uni.getStorageSync("OrganizationID") == "7667152" &&
			uni.getStorageSync("Organization") == "CMR Technology Mexico S.A. de C.V.") \|\|
			(uni.getStorageSync("OrganizationID") == "100199" &&
			uni.getStorageSync("Organization") == "杭州斯莫尔磁性材料有限公司")
			) {
			await this.GetCheckItemID(); // 客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案
			}
			}catch(err) {
			CommonUtils.showTips({
			title: '温馨提示',
			message: "源单下推错误: " + err
			})
			}

			},
			// 检验值计算是否合格
			calcHResult(item){
			// 非抽检条件下判断结论
			@@ -1605,6 +1672,8 @@
			data: {
			CheckProjectID: this.hform.HQCSchemeID \|\| 0,
			HBatchQty: this.hform.HProcExchQty \|\| 0,
			HMaterID: this.hform.HMaterID,
			HBillType: '出厂检方案'
			},
			});

			@@ -1843,7 +1912,7 @@
			if (res.confirm) {
			console.log("用户点击确定");
			uni.redirectTo({
			url: "/pages/JIAOYAN/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2?operationType=1",
			url: "/pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill?operationType=1",
			});
			} else if (res.cancel) {
			console.log("用户点击取消");
			@@ -1868,7 +1937,7 @@
			},
			addNew() {
			uni.redirectTo({
			url: "/pages/ZLGL/shoujianjianyan/firstCheckBillList?operationType=1",
			url: "/pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill?operationType=1",
			});
			},
			goBack() {