| pages/JIAOYAN/chuchangjiaoyandan/QC_OutCompCheckBill.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/JIAOYAN/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/ZLGL/mojianjianyan/lastPieceCheckBill.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/ZLGL/shoujianjianyan/firstCheckBill.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
pages/JIAOYAN/chuchangjiaoyandan/QC_OutCompCheckBill.vue
@@ -640,11 +640,11 @@ } if(item.HInspectValQ >= item.HDownLimit && item.HInspectValQ <= item.HUpLimit){ this.checkItems[item.num].HResult = true this.checkItems[item.num].HResult = 1 return } this.checkItems[item.num].HResult = false this.checkItems[item.num].HResult = 2 }, // 源单类型选择 HSourceBillTypeNameChange(e) { @@ -1601,7 +1601,7 @@ } try { let res = await CommonUtils.doRequest2Async({ url: "/Web/GetCheckItemByCheckProjectID", url: "/Web/GetCheckItemByCheckProjectID_Sec", data: { CheckProjectID: this.hform.HQCSchemeID || 0, HBatchQty: this.hform.HProcExchQty || 0, pages/JIAOYAN/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
@@ -640,11 +640,11 @@ } if(item.HInspectValQ >= item.HDownLimit && item.HInspectValQ <= item.HUpLimit){ this.checkItems[item.num].HResult = true this.checkItems[item.num].HResult = 1 return } this.checkItems[item.num].HResult = false this.checkItems[item.num].HResult = 2 }, // 源单类型选择 HSourceBillTypeNameChange(e) { @@ -1565,7 +1565,7 @@ } try { let res = await CommonUtils.doRequest2Async({ url: "/Web/GetCheckItemByCheckProjectID", url: "/Web/GetCheckItemByCheckProjectID_Sec", data: { CheckProjectID: this.hform.HQCSchemeID || 0, HBatchQty: this.hform.HProcExchQty || 0, pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill.vue
@@ -826,16 +826,16 @@ calcHResult(item) { // 非抽检条件下判断结论 console.log('item: ', item); if (item.HSampleSchemeID) { if (!item.HSampleSchemeID) { return } if (item.HInspectValQ >= item.HDownLimit && item.HInspectValQ <= item.HUpLimit) { this.checkItems[item.num].HResult = true this.checkItems[item.num].HResult = 1 return } this.checkItems[item.num].HResult = false this.checkItems[item.num].HResult = 2 }, // 源单类型选择 HSourceBillTypeNameChange(e) { @@ -1819,7 +1819,7 @@ } try { let res = await CommonUtils.doRequest2Async({ url: "/Web/GetCheckItemByCheckProjectID", url: "/Web/GetCheckItemByCheckProjectID_Sec", data: { CheckProjectID: this.hform.HQCSchemeID || 0, HBatchQty: this.hform.HProcExchQty || 0, pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
@@ -96,7 +96,7 @@ <view class="left">检验员</view> <view class="right"> <uni-combox :candidates="GyFirstCheckEmpNameList" placeholder="请选择检验员" :v-model="hform.HFirstCheckEmpName" v-model="hform.HFirstCheckEmpName" @update:modelValue="HFirstCheckEmpChange"></uni-combox> </view> </view> @@ -679,8 +679,8 @@ HMaterNumber: "", HMaterID: "0", HMaterName: "", HFirstCheckEmpName: "", HFirstCheckEmp: 0, HFirstCheckEmpName: getUserInfo().HEmpName, HFirstCheckEmp: getUserInfo().HEmpID, HQCSchemeName: "", HQCSchemeID: "0", HBatchNo: "", @@ -822,16 +822,16 @@ calcHResult(item) { // 非抽检条件下判断结论 console.log('item: ', item); if (item.HSampleSchemeID) { if (!item.HSampleSchemeID) { return } if (item.HInspectValQ >= item.HDownLimit && item.HInspectValQ <= item.HUpLimit) { this.checkItems[item.num].HResult = true this.checkItems[item.num].HResult = 1 return } this.checkItems[item.num].HResult = false this.checkItems[item.num].HResult = 2 }, // 源单类型选择 HSourceBillTypeNameChange(e) { @@ -1804,7 +1804,7 @@ } try { let res = await CommonUtils.doRequest2Async({ url: "/Web/GetCheckItemByCheckProjectID", url: "/Web/GetCheckItemByCheckProjectID_Sec", data: { CheckProjectID: this.hform.HQCSchemeID || 0, HBatchQty: this.hform.HProcExchQty || 0, @@ -2254,7 +2254,7 @@ async onLoad(e) { this.operationType = e.operationType || 1; this.hform.HInterID = e.linterid || 0; console.log(this.hform.HFirstCheckEmp) if (this.operationType == 1) { await this.getMaxBillNo(); } else if (this.operationType == 2) {} else if (this.operationType == 3) { pages/ZLGL/mojianjianyan/lastPieceCheckBill.vue
@@ -35,12 +35,14 @@ v-model="hform.HSourceBillNo" @confirm="getSourceBillInfo(hform.HSourceBillNo)" /> </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> <uni-icons class="right-icon" type="scan" :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'" :disabled="hasSourceBill" size="20" @click="toScanCode"></uni-icons> </view> <view class="icon-wrapper-big"> <uni-icons class="right-icon" type="search" :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'" :disabled="hasSourceBill" size="20" @click="toBillSelector"></uni-icons> </view> </view> @@ -49,7 +51,8 @@ <view class="right disabled"> <input type="text" :value="hform.HICMOBillNo" disabled /> </view> <view class="icon-wrapper-big"><uni-icons type="search" size="20" <view class="icon-wrapper-big"><uni-icons type="search" size="20":class="!hasSourceBill?'enable-icon-button':'disable-icon-button'" :disabled="hasSourceBill" @click="showSelectorModule(hform, 5)"></uni-icons></view> </view> @@ -58,7 +61,8 @@ <view class="right disabled"> <input type="text" :value="hform.HProcExchBillNo" disabled /> </view> <view class="icon-wrapper-big"><uni-icons type="search" size="20" <view class="icon-wrapper-big"><uni-icons type="search" size="20":class="!hasSourceBill?'enable-icon-button':'disable-icon-button'" :disabled="hasSourceBill" @click="showSelectorModule(hform, 6)"></uni-icons></view> </view> @@ -68,7 +72,8 @@ <input type="text" disabled :value="hform.HMaterNumber" /> </view> <view class="icon-wrapper-big"> <uni-icons type="search" size="20" @click="showSelectorModule(hform, 4)"></uni-icons> <uni-icons type="search" size="20" :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'" :disabled="hasSourceBill" @click="showSelectorModule(hform, 4)"></uni-icons> </view> </view> <view class="form-item"> @@ -78,10 +83,16 @@ </view> </view> <view class="form-item"> <view class="left">检验数量</view> <view class="right"> <input type="number" v-model="hform.HCheckQty" /> </view> </view> <view class="form-item"> <view class="left">检验员</view> <view class="right"> <uni-combox :candidates="GyFirstCheckEmpNameList" placeholder="请选择检验员" :v-model="hform.HFirstCheckEmpName" v-model="hform.HFirstCheckEmpName" @update:modelValue="HFirstCheckEmpChange"></uni-combox> </view> </view> @@ -99,12 +110,12 @@ <view class="right none-border"> <radio-group @changer="checkResultChange"> <label> <radio value="0" :checked="hform.HLastResult" /><text></text> <radio value="0" :checked="hform.HCheckerResult" /><text></text> 合格 </label> <view style="width: 20rpx; display: inline-block"></view> <label> <radio value="1" :checked="!hform.HLastResult" /><text></text> <radio value="1" :checked="!hform.HCheckerResult" /><text></text> 不合格 </label> </radio-group> @@ -115,7 +126,8 @@ <view class="right disabled"> <input type="text" disabled :value="hform.HProcName" /> </view> <view class="icon-wrapper-big"><uni-icons type="search" size="20" <view class="icon-wrapper-big"><uni-icons type="search" size="20" :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'" :disabled="hasSourceBill" @click="showSelectorModule(hform, 8)"></uni-icons></view> </view> @@ -308,8 +320,11 @@ <view class="detail" v-if="checkItem.HUnit"> <text>单位：</text>{{ checkItem.HUnit }} </view> <view class="detail" v-if="checkItem.HQCStd"> <text>检验值：</text>{{ checkItem.HQCStd }} <!-- 只有定量分析才启用检验值 --> <view class="detail editable" v-show="checkItem.HAnalysisMethod == 2"> <text>检验值：</text> <input type="text" class="editable-input" @blur="calcHResult(checkItem)" v-model="checkItem.HInspectValQ" /> </view> <view class="detail" v-if="checkItem.HQCNote"> <text>检验记录：</text>{{ checkItem.HQCNote }} @@ -448,6 +463,8 @@ :bindKey="0"></ProcessPopupVue> <CheckProjectPopupVue v-if="enablePopupModule == PopupModuleNameList[7]" ref="listPopup" @update="HQCSchemeComplete" :bindKey="0"></CheckProjectPopupVue> <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HSourceBillType" :HStockOrgID="hform.HStockOrgID" @BillSelectComplete="HandleBillSelectComplete"></BillListPopupVue> </view> </template> @@ -465,6 +482,7 @@ import ProcExchBillPopupVue from "../../../components/ZLGL/ProcExchBillPopup.vue"; import ProcessPopupVue from "../../../components/ZLGL/ProcessPopup.vue"; import CheckProjectPopupVue from "../../../components/ZLGL/CheckProjectPopup.vue"; import BillListPopupVue from "../../../components/BillListPopup/BillListPopup.vue"; import { getUserInfo } from "../../../utils/auth"; @@ -482,6 +500,7 @@ ProcExchBillPopupVue, ProcessPopupVue, CheckProjectPopupVue, BillListPopupVue, }, computed: { judgeConclusion: { @@ -565,7 +584,9 @@ // 主表属性 hform: { HSourceBillType: "3791", HBillType: '7507', HSourceBillNo: "", HSourceBillQty: 0, HBillNo: "", HInterID: "0", HDate: dayjs(new Date()).format("YYYY-MM-DD"), @@ -584,12 +605,12 @@ HMaterNumber: "", HMaterID: "0", HMaterName: "", HFirstCheckEmpName: "", HFirstCheckEmp: 0, HFirstCheckEmpName: getUserInfo().HEmpName, HFirstCheckEmp: getUserInfo().HEmpID, HQCSchemeName: "", HQCSchemeID: "0", HBatchNo: "", HLastResult: true, // 默认合格 HCheckerResult: true, // 默认合格 HProcName: "", HProcID: "0", HTakeSampleCheckBillNo: "", // 取样单 @@ -608,7 +629,9 @@ HDeleteDate: "", HResult: 1, HAnalysisMethod: "", HCheckQty: 0, HResDec: "", HStatus: 1, @@ -616,6 +639,7 @@ HMainSourceInterID: "0", HMainSourceEntryID: "1", HMainSourceBillNo: "", HStockOrgID: uni.getStorageSync('OrganizationID'), }, // 检验项目和抽样检验 值 checkItems: {}, @@ -630,6 +654,30 @@ HSourceBillTypeNameChange(e) { this.HSourceBillType = this.HSourceBillTypeNameList[e.detail.value]; this.hform.HSourceBillType = this.HSourceBillTypeValueList[e.detail.value]; const pages = getCurrentPages() // 获取页面栈中的最后一个元素，也就是当前显示的页面 const currentPage = pages[pages.length - 1] // 选择源单类型后 缓存当前页面选择 uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, { HSourceBillTypeName: this.HSourceBillType, HSourceBillType: this.hform.HSourceBillType }) }, // 读取缓存 loadCache() { const pages = getCurrentPages() // 获取页面栈中的最后一个元素，也就是当前显示的页面 const currentPage = pages[pages.length - 1] let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`) if (HBillTypeCache) { this.HSourceBillType = HBillTypeCache.HSourceBillTypeName this.hform.HSourceBillType = HBillTypeCache.HSourceBillType this.hform.HMainSourceBillType = HBillTypeCache.HSourceBillType } }, // 根据源单类型选择单据 toBillSelector() { this.$refs['billList'].showPopup() }, toScanCode() { MpaasScan.scanCode((res) => { @@ -640,58 +688,55 @@ }, async getSourceBillInfo(HBarCode) { console.log('HBarCode: ', HBarCode); // 根据单据类型，调用不同的下推函数 if (this.hform.HSourceBillType == 3791) { // 工序进站接收单列表首检 await this.LoadingInformation_StationInBill(HBarCode); 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(); // 客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案 let res = await CommonUtils.doRequest2Async({ url: "/WEBSController/get_CheckBillBarCode_Json_CheckItem", data: { HBillType: this.hform.HBillType, HSourceBillType: this.hform.HSourceBillType, HBarCode: HBarCode, HInterID: 0, HEntryID: 0, Mode: 1 //扫码模式 } return; } // if (this.hform.HSourceBillType == 3793) { // // 工序委外接收单列表首检 // await this.LoadingInformation_StationEntrustOutBill(HBarCode); // 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(); // 客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案 // } // return; // } if (this.hform.HSourceBillType == 3710) { // 生产订单列表首检 await this.LoadingInformation_ICMO(HBarCode); 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(); // 客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案 } return; } if (this.hform.HSourceBillType == 3772) { // 工序流转卡列表首检 await this.LoadingInformation_ProcExchange(HBarCode); 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(); // 客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案 } return; }) console.log(res) let { data, Message, count } = res.data if (count == 1) { this.hform.HMaterID = data[0]['HMaterID'] this.hform.HMaterName = data[0]['产品名称'] this.hform.HMaterNumber = data[0]['HMaterNumber'] this.hform.HMainSourceBillNo = data[0]['HBillNo'] this.hform.HSourceBillNo = 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.hform.HSourceBillQty = data[0].HSourceBillQty this.hasSourceBill = true this.hform.HICMOBillNo= data[0].任务单号 this.hform.HICMOInterID= data[0].HICMOInterID this.hform.HICMOEntryID= data[0].HICMOEntryID this.hform.HICMOQty= data[0].生产数量 this.hform.HProcExchBillNo= data[0].单据号 this.hform.HProcExchInterID= data[0].HInterID this.hform.HProcExchEntryID= data[0].HEntryID this.hform.HProcExchQty= data[0].流转卡数量 this.hform.HSourceName= data[0].生产资源 this.hform.HSourceID= data[0].HSourceID this.hform.HProcID= data[0].HProcID this.hform.HProcName= data[0].当前工序 this.get_CheckItem(); } else { CommonUtils.showTips({ title: '温馨提示', message: Message }) } }, async GetCheckItemID() { @@ -1258,10 +1303,25 @@ } if (unPassNum > 0) { this.hform.HLastResult = false; this.hform.HCheckerResult = false; return; } this.hform.HLastResult = true; this.hform.HCheckerResult = true; }, // 检验值 计算是否合格 calcHResult(item) { // 非抽检条件下判断结论 console.log('item: ', item); if (!item.HSampleSchemeID) { return } if (item.HInspectValQ >= item.HDownLimit && item.HInspectValQ <= item.HUpLimit) { this.checkItems[item.num].HResult = 1 return } this.checkItems[item.num].HResult = 2 }, // 检验方案修改 HAnalysisMethodChange(id, e) { @@ -1565,10 +1625,12 @@ } try { let res = await CommonUtils.doRequest2Async({ url: "/Web/GetCheckItemByCheckProjectID", url: "/Web/GetCheckItemByCheckProjectID_Sec", data: { CheckProjectID: this.hform.HQCSchemeID || 0, HBatchQty: this.hform.HProcExchQty || 0, HMaterID: this.hform.HMaterID, HBillType: '生产入库检方案' }, }); @@ -1918,7 +1980,7 @@ HShiftsName: data[0].班次名称, HErrTreatment: data[0].异常临时处理方案, HBatchNo: data[0].批号, HLastResult: data[0].判定结论 == "合格" ? true : false, HCheckerResult: data[0].判定结论 == "合格" ? true : false, HTakeSampleCheckBillID: data[0].HTakeSampleCheckBillID, HTakeSampleCheckBillNo: data[0].HTakeSampleCheckBillNo, HAnalysisMethod: function() { @@ -2011,6 +2073,7 @@ await this.InitHSource(); await this.InitHWorkShift(); await this.InitHEmp(); await this.loadCache(); }, }; </script> @@ -2232,6 +2295,11 @@ border-radius: 10%; padding: 0 12rpx; } .editable-input { border: 1px solid #acacac; border-radius: 5rpx; padding: 0 12rpx; } } } } @@ -2289,4 +2357,19 @@ background-color: #f0d6e3; border: none; } .enable-icon-button { background-color: #3a78ff; padding: 6rpx; color: #fff; border-radius: 100%; } .disable-icon-button { background-color: lightgray; padding: 6rpx; color: #fff; border-radius: 100%; pointer-events: none; } </style> pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
@@ -110,7 +110,7 @@ <view class="left">检验员</view> <view class="right"> <uni-combox :candidates="GyFirstCheckEmpNameList" placeholder="请选择检验员" :v-model="hform.HFirstCheckEmpName" v-model="hform.HFirstCheckEmpName" @update:modelValue="HFirstCheckEmpChange"></uni-combox> </view> </view> @@ -675,8 +675,8 @@ HMaterNumber: "", HMaterID: "0", HMaterName: "", HFirstCheckEmpName: "", HFirstCheckEmp: 0, HFirstCheckEmpName: getUserInfo().HEmpName, HFirstCheckEmp: getUserInfo().HEmpID, HQCSchemeName: "", HQCSchemeID: "0", HBatchNo: "", @@ -835,16 +835,16 @@ calcHResult(item) { // 非抽检条件下判断结论 console.log('item: ', item); if (item.HSampleSchemeID) { if (!item.HSampleSchemeID) { return } if (item.HInspectValQ >= item.HDownLimit && item.HInspectValQ <= item.HUpLimit) { this.checkItems[item.num].HResult = true this.checkItems[item.num].HResult = 1 return } this.checkItems[item.num].HResult = false this.checkItems[item.num].HResult = 2 }, // 源单类型选择 HSourceBillTypeNameChange(e) { @@ -1801,7 +1801,7 @@ } try { let res = await CommonUtils.doRequest2Async({ url: "/Web/GetCheckItemByCheckProjectID", url: "/Web/GetCheckItemByCheckProjectID_Sec", data: { CheckProjectID: this.hform.HQCSchemeID || 0, HBatchQty: this.hform.HProcExchQty || 0, pages/ZLGL/shoujianjianyan/firstCheckBill.vue
@@ -34,13 +34,15 @@ v-model="hform.HSourceBillNo" @confirm="getSourceBillInfo(hform.HSourceBillNo)" /> </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> <uni-icons class="right-icon" type="scan" :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'" :disabled="hasSourceBill" size="20" @click="toScanCode"></uni-icons> </view> <view class="icon-wrapper-big"> <uni-icons class="right-icon" type="search" :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'" :disabled="hasSourceBill" size="20" @click="toBillSelector"></uni-icons> </view> </view> <view class="form-item"> @@ -49,6 +51,8 @@ <input type="text" :value="hform.HICMOBillNo" disabled /> </view> <view class="icon-wrapper-big"><uni-icons type="search" size="20" :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'" :disabled="hasSourceBill" @click="showSelectorModule(hform, 5)"></uni-icons></view> </view> <view class="form-item"> @@ -57,7 +61,8 @@ <input type="text" :value="hform.HProcExchBillNo" disabled /> </view> <view class="icon-wrapper-big"><uni-icons type="search" size="20" @click="showSelectorModule(hform, 6)"></uni-icons></view> :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'" :disabled="hasSourceBill"@click="showSelectorModule(hform, 6)"></uni-icons></view> </view> <view class="form-item"> <view class="left">产品代码</view> @@ -65,7 +70,8 @@ <input type="text" disabled :value="hform.HMaterNumber" /> </view> <view class="icon-wrapper-big"> <uni-icons type="search" size="20" @click="showSelectorModule(hform, 4)"></uni-icons> <uni-icons type="search" size="20":class="!hasSourceBill?'enable-icon-button':'disable-icon-button'" :disabled="hasSourceBill" @click="showSelectorModule(hform, 4)"></uni-icons> </view> </view> <view class="form-item"> @@ -74,11 +80,17 @@ <input type="text" disabled :value="hform.HMaterName" /> </view> </view> <view class="form-item"> <view class="left">检验数量</view> <view class="right"> <input type="number" v-model="hform.HCheckQty" /> </view> </view> <view class="form-item"> <view class="left">检验员</view> <view class="right"> <uni-combox :candidates="GyFirstCheckEmpNameList" placeholder="请选择检验员" :v-model="hform.HFirstCheckEmpName" v-model="hform.HFirstCheckEmpName" @update:modelValue="HFirstCheckEmpChange"></uni-combox> </view> </view> @@ -113,7 +125,8 @@ <input type="text" disabled :value="hform.HProcName" /> </view> <view class="icon-wrapper-big"><uni-icons type="search" size="20" @click="showSelectorModule(hform, 8)"></uni-icons></view> :class="!hasSourceBill?'enable-icon-button':'disable-icon-button'" :disabled="hasSourceBill"@click="showSelectorModule(hform, 8)"></uni-icons></view> </view> </view> @@ -456,6 +469,8 @@ :bindKey="0"></ProcessPopupVue> <CheckProjectPopupVue v-if="enablePopupModule == PopupModuleNameList[7]" ref="listPopup" @update="HQCSchemeComplete" :bindKey="0"></CheckProjectPopupVue> <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HSourceBillType" :HStockOrgID="hform.HStockOrgID" @BillSelectComplete="HandleBillSelectComplete"></BillListPopupVue> </view> </template> @@ -473,6 +488,7 @@ import ProcExchBillPopupVue from "../../../components/ZLGL/ProcExchBillPopup.vue"; import ProcessPopupVue from "../../../components/ZLGL/ProcessPopup.vue"; import CheckProjectPopupVue from "../../../components/ZLGL/CheckProjectPopup.vue"; import BillListPopupVue from "../../../components/BillListPopup/BillListPopup.vue"; import { getUserInfo } from "../../../utils/auth"; @@ -490,6 +506,7 @@ ProcExchBillPopupVue, ProcessPopupVue, CheckProjectPopupVue, BillListPopupVue, }, computed: { judgeConclusion: { @@ -573,8 +590,10 @@ ], // 主表属性 hform: { HBillType: '7505', HSourceBillType: "3790", HSourceBillNo: "", HSourceBillQty: 0, HBillNo: "", HInterID: "0", HDate: dayjs(new Date()).format("YYYY-MM-DD"), @@ -593,8 +612,8 @@ HMaterNumber: "", HMaterID: "0", HMaterName: "", HFirstCheckEmpName: "", HFirstCheckEmp: 0, HFirstCheckEmpName: getUserInfo().HEmpName, HFirstCheckEmp: getUserInfo().HEmpID, HQCSchemeName: "", HQCSchemeID: "0", HBatchNo: "", @@ -617,7 +636,9 @@ HDeleteDate: "", HResult: 1, HAnalysisMethod: "", HCheckQty: 0, HResDec: "", HStatus: 1, @@ -625,6 +646,8 @@ HMainSourceInterID: "0", HMainSourceEntryID: "1", HMainSourceBillNo: "", HStockOrgID: uni.getStorageSync('OrganizationID'), }, // 检验项目和抽样检验 值 checkItems: {}, @@ -639,22 +662,46 @@ calcHResult(item){ // 非抽检条件下判断结论 console.log('item: ',item); if(item.HSampleSchemeID) { if(!item.HSampleSchemeID) { return } if(item.HInspectValQ >= item.HDownLimit && item.HInspectValQ <= item.HUpLimit){ this.checkItems[item.num].HResult = true this.checkItems[item.num].HResult = 1 return } this.checkItems[item.num].HResult = false this.checkItems[item.num].HResult = 2 }, // 读取缓存 loadCache() { const pages = getCurrentPages() // 获取页面栈中的最后一个元素，也就是当前显示的页面 const currentPage = pages[pages.length - 1] let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`) if (HBillTypeCache) { this.HSourceBillType = HBillTypeCache.HSourceBillTypeName this.hform.HSourceBillType = HBillTypeCache.HSourceBillType this.hform.HMainSourceBillType = HBillTypeCache.HSourceBillType } }, // 源单类型选择 HSourceBillTypeNameChange(e) { this.HSourceBillType = this.HSourceBillTypeNameList[e.detail.value]; this.hform.HSourceBillType = this.HSourceBillTypeValueList[e.detail.value]; const pages = getCurrentPages() // 获取页面栈中的最后一个元素，也就是当前显示的页面 const currentPage = pages[pages.length - 1] // 选择源单类型后 缓存当前页面选择 uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, { HSourceBillTypeName: this.HSourceBillType, HSourceBillType: this.hform.HSourceBillType }) }, // 根据源单类型选择单据 toBillSelector() { this.$refs['billList'].showPopup() }, toScanCode() { MpaasScan.scanCode((res) => { if (res) { @@ -664,59 +711,66 @@ }, async getSourceBillInfo(HBarCode) { console.log('HBarCode: ', HBarCode); // 根据单据类型，调用不同的下推函数 if (this.hform.HSourceBillType == 3790) { // 工序进站接收单列表首检 await this.LoadingInformation_StationInBill(HBarCode); 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(); // 客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案 let res = await CommonUtils.doRequest2Async({ url: "/WEBSController/get_CheckBillBarCode_Json_CheckItem", data: { HBillType: this.hform.HBillType, HSourceBillType: this.hform.HSourceBillType, HBarCode: HBarCode, HInterID: 0, HEntryID: 0, Mode: 1 //扫码模式 } return; }) console.log(res) let { data, Message, count } = res.data if (count == 1) { this.hform.HMaterID = data[0]['HMaterID'] this.hform.HMaterName = data[0]['产品名称'] this.hform.HMaterNumber = data[0]['HMaterNumber'] this.hform.HMainSourceBillNo = data[0]['HBillNo'] this.hform.HSourceBillNo = 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.hform.HSourceBillQty = data[0].HSourceBillQty this.hasSourceBill = true this.hform.HICMOBillNo= data[0].任务单号 this.hform.HICMOInterID= data[0].HICMOInterID this.hform.HICMOEntryID= data[0].HICMOEntryID this.hform.HICMOQty= data[0].生产数量 this.hform.HProcExchBillNo= data[0].单据号 this.hform.HProcExchInterID= data[0].HInterID this.hform.HProcExchEntryID= data[0].HEntryID this.hform.HProcExchQty= data[0].流转卡数量 this.hform.HSourceName= data[0].生产资源 this.hform.HSourceID= data[0].HSourceID this.hform.HProcID= data[0].HProcID this.hform.HProcName= data[0].当前工序 this.get_CheckItem(); } else { CommonUtils.showTips({ title: '温馨提示', message: Message }) } if (this.hform.HSourceBillType == 3793) { // 工序委外接收单列表首检 await this.LoadingInformation_StationEntrustOutBill(HBarCode); 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(); // 客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案 } return; } if (this.hform.HSourceBillType == 3710) { // 生产订单列表首检 await this.LoadingInformation_ICMO(HBarCode); 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(); // 客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案 } return; } if (this.hform.HSourceBillType == 3772) { // 工序流转卡列表首检 await this.LoadingInformation_ProcExchange(HBarCode); 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(); // 客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案 } return; } // 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(); // 客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案 // } }, async GetCheckItemID() { if (!this.hform.HMaterName && !this.hform.HProcName) { @@ -1542,10 +1596,12 @@ } try { let res = await CommonUtils.doRequest2Async({ url: "/Web/GetCheckItemByCheckProjectID", url: "/Web/GetCheckItemByCheckProjectID_Sec", data: { CheckProjectID: this.hform.HQCSchemeID || 0, HBatchQty: this.hform.HProcExchQty || 0, HMaterID: this.hform.HMaterID, HBillType: '生产入库检方案' }, }); @@ -1981,6 +2037,7 @@ await this.InitHSource(); await this.InitHWorkShift(); await this.InitHEmp(); await this.loadCache(); }, }; </script> @@ -2259,4 +2316,18 @@ background-color: #f0d6e3; border: none; } .enable-icon-button { background-color: #3a78ff; padding: 6rpx; color: #fff; border-radius: 100%; } .disable-icon-button { background-color: lightgray; padding: 6rpx; color: #fff; border-radius: 100%; pointer-events: none; } </style> pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
@@ -1524,7 +1524,7 @@ } try { let res = await CommonUtils.doRequest2Async({ url: "/Web/GetCheckItemByCheckProjectID", url: "/Web/GetCheckItemByCheckProjectID_Sec", data: { CheckProjectID: this.hform.HQCSchemeID || 0, HBatchQty: this.hform.HProcExchQty || 0,
