Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

qq_41295110

2026-03-17 d6e2661e7411d2c49b68efa46ad0ddc7520df653

 pages/ZLGL/QualityReportStep/QualityReportStepBill.vue

@@ -7,6 +7,7 @@
            <view :class="mainTabSelected == 1 ? 'selected' : ''" @tap="mainTabSelected = 1">基本信息</view>
            <view :class="mainTabSelected == 2 ? 'selected' : ''" @tap="mainTabSelected = 2">扫描信息</view>
            <view :class="mainTabSelected == 3 ? 'selected' : ''" @tap="mainTabSelected = 3">制单信息</view>
            <view :class="mainTabSelected == 4 ? 'selected' : ''" @tap="mainTabSelected = 4">其他信息</view>
         </view>
         <!-- 主表内容 -->
         <view class="bill-main-contents">
@@ -92,19 +93,7 @@
                     <input type="number" v-model="hform.HCheckQty" :disabled="hasCheckQty" />
                  </view>
               </view>
               <view class="form-item">
                  <view class="left">生产班组</view>
                  <view class="right-select">
                     <zxz-uni-data-select
                        v-model="hform.HGroupID"
                        dataKey="班组名称"
                        dataValue="HItemID"
                        :filterable="true"
                        :localdata="HGroupList"
                        :clear="false"
                     ></zxz-uni-data-select>
                  </view>
               </view>
					
               <view class="form-item">
                  <view class="left">检验员</view>
                  <view class="right-select">
@@ -127,19 +116,7 @@
                  
               </view>
               
               <view class="form-item">
                  <view class="left">生产资源</view>
                  <view class="right-select">
                     <zxz-uni-data-select
                        v-model="hform.HSourceID"
                        dataKey="生产资源名称"
                        dataValue="HItemID"
                        :filterable="true"
                        :localdata="HSourceList"
                        :clear="false"
                     ></zxz-uni-data-select>
                  </view>
               </view>
					
               
               <view class="form-item">
                  <view class="left">备注</view>
@@ -228,6 +205,35 @@
                  </view>
               </view>
            </view>
            <!-- 其他信息 -->
            <view class="bill-main-content" v-if="mainTabSelected == 4">
               <view class="form-item">
                  <view class="left">生产班组</view>
                  <view class="right-select">
                     <zxz-uni-data-select
                        v-model="hform.HGroupID"
                        dataKey="班组名称"
                        dataValue="HItemID"
                        :filterable="true"
                        :localdata="HGroupList"
                        :clear="false"
                     ></zxz-uni-data-select>
                  </view>
               </view>
               <view class="form-item">
                  <view class="left">生产资源</view>
                  <view class="right-select">
                     <zxz-uni-data-select
                        v-model="hform.HSourceID"
                        dataKey="生产资源名称"
                        dataValue="HItemID"
                        :filterable="true"
                        :localdata="HSourceList"
                        :clear="false"
                     ></zxz-uni-data-select>
                  </view>
               </view>
            </view>
         </view>
      </view>
      <!-- 子表区域 -->
@@ -250,7 +256,7 @@
               <view >
                  <view>{{ item.不良原因代码 }}</view>
                  <view>{{ item.不良原因名称 }}</view>
                  <view>汇报总数:{{ item.num }}</view>
                  <view style="color:brown;">汇报总数:{{ item.num }}</view>
               </view>
            </view>
         </view>
@@ -349,6 +355,7 @@
               HCheckQty: 0,
               //源单信息
               HSourceBillQty: 0,
               HSourceBillNo:'',
               HSourceBillType: "3772",
               //流转卡信息
               HICMOBillNo: "",
@@ -461,12 +468,18 @@
         toScanCode() {
            MpaasScan.scanCode((res) => {
               if (res) {
                  this.getSourceBillInfo(HBarCode);
                  this.getSourceBillInfo(res);
               }
            });
         },
         async getGy_BadReasonList() {
            let sWhere = ` and HUSEORGID = '${uni.getStorageSync('OrganizationID')}' and ISNULL(审核人,'')  != '' order by 不良原因代码`
            let sWhere = ` and HUSEORGID = '${uni.getStorageSync('OrganizationID')}' and ISNULL(审核人,'')  != '' `
            if (this.serverUrl == 'http://122.228.39.234:7177/API/') {
                //海诚根据物料分组设置不良原因
               sWhere += " and 不良类型 like '%成品%' order by 不良原因代码"
            }else{
               sWhere += " order by 不良原因代码"
            }
            let res = await CommonUtils.doRequest2Async({
               url: "/Gy_BadReason/list",
               data: {
@@ -523,12 +536,19 @@
               count
            } = res.data
            if (count == 1) {
               if(data[0]['HBack']==1){
                  CommonUtils.showTips({
                     title: '温馨提示',
                     message: data[0]['HBackRemark']
                  })
                  return;
               }
               this.hform.HMaterID = data[0]['HMaterID']
               this.hform.HMaterName = data[0]['产品名称']
               this.hform.HMaterNumber = data[0]['产品代码']
               //源单信息
               this.hform.HMainSourceBillNo = data[0]['HBillNo']
               this.hform.HSourceBillNo = data[0]['HBillNo']
               this.hform.HMainSourceBillNo = data[0]['单据号']
               this.hform.HSourceBillNo = data[0]['单据号']
               this.hform.HMainSourceInterID = data[0].HInterID
               this.hform.HMainSourceEntryID = data[0].HEntryID
               this.hform.HSourceBillQty = data[0].流转卡数量
@@ -583,13 +603,21 @@
                     count
                 } = res.data
                 if (count == 1) {
                  //如果源单数量超出提示
                  if(data[0]['HBack']==1){
                     CommonUtils.showTips({
                        title: '温馨提示',
                        message: data[0]['HBackRemark']
                     })
                     return;
                  }
                     console.log('获取源单：', data)
                     this.hform.HMaterID = data[0]['HMaterID']
                     this.hform.HMaterName = data[0]['产品名称']
                     this.hform.HMaterNumber = data[0]['产品代码']
                     //源单信息
                     this.hform.HMainSourceBillNo = data[0]['HBillNo']
                     this.hform.HSourceBillNo = data[0]['HBillNo']
                     this.hform.HSourceBillNo = data[0]['单据号']
                     this.hform.HMainSourceInterID = data[0].HInterID
                     this.hform.HMainSourceEntryID = data[0].HEntryID
                     this.hform.HSourceBillQty = data[0].流转卡数量
@@ -709,7 +737,7 @@
               let res = await CommonUtils.doRequest2Async({
                  url: "/Gy_Employee/list",
                  data: {
                     sWhere: ` and 组织名称 = '${uni.getStorageSync("Organization")}' and 禁用标记 = ''and 审核人 !='' order by 部门代码`,
                     sWhere: ` and 禁用标记 = ''  and HDeptID = ${uni.getStorageSync("HDeptID")}`,
                     user: getUserInfo()["Czymc"],
                     Organization: uni.getStorageSync("Organization"),
                  },
@@ -744,7 +772,7 @@
               let res = await CommonUtils.doRequest2Async({
                  url: "/Gy_Source/list",
                  data: {
                     sWhere: `and 禁用标记 != 'Y' and ISNULL(审核人,'')  != '' and 组织 = '${uni.getStorageSync("Organization")}'`,
                     sWhere: `and 禁用标记 != 'Y' and 组织 = '${uni.getStorageSync("Organization")}'`,
                     user: getUserInfo()["Czymc"],
                  },
               });
@@ -776,7 +804,7 @@
               let res = await CommonUtils.doRequest2Async({
                  url: "/Gy_Group/list",
                  data: {
                     sWhere: `and 禁用标记 != 'Y' and ISNULL(审核人,'')  != '' and 组织 = '${uni.getStorageSync("Organization")}'`,
                     sWhere: `and 禁用标记 != 'Y' and 组织 = '${uni.getStorageSync("Organization")}'`,
                     user: getUserInfo()["Czymc"],
                  },
               });
@@ -862,6 +890,9 @@
                  ,HMakeDate:this.hform.HMakeDate
                  ,HReportType:1
                  ,HSourceBillType:this.hform.HSourceBillType
                  ,HSourceBillNo:this.hform.HSourceBillNo
                  ,HSourceInterID:this.hform.HMainSourceInterID
                  ,HSourceEntryID:this.hform.HMainSourceEntryID
                  ,HBadReasonHQty:1
                  ,HQty:this.hform.HCheckQty
               }
@@ -945,6 +976,13 @@
            // if (!this.checkSubmitValidate()) {
            //    return;
            // }
            if(this.HisReportList.length<=0){
               CommonUtils.showTips({
                  title: "温馨提示",
                  message: `请输入检验信息`,
               });
               return
            }
            try {
               console.log('this.$refs: ', this.$refs);

@@ -1007,188 +1045,47 @@
         goBack() {
            uni.navigateBack();
         },
         async RoadBillMain() {
            try {
               let res = await CommonUtils.doRequest2Async({
                  url: "/QC_ProcessCheckBill/QC_ProcessCheckBill_Edit",
                  data: {
                     sWhere: ` and hmainid=${this.hform.HInterID}`,
                     user: getUserInfo()["Czymc"],
                  },
               });

               let {
                  data,
                  count,
                  Message
               } = res.data;

               if (count == 1) {
                  console.log("RoadBillMain: : ", data);
                  Object.assign(this.hform, {
                     HInterID: data[0].hmainid,
                     HBillNo: data[0].单据号,
                     HDate: dayjs(data[0].日期).format("YYYY-MM-DD"),
                     HSourceID: data[0].HSourceID,
                     HSourceName: data[0].生产资源名称,
                     HICMOBillNo: data[0].任务单号,
                     HICMOQty: data[0].任务单数量,
                     HICMOInterID: data[0].HICMOInterID,
                     HICMOEntryID: data[0].HICMOEntryID || 1,
                     HMaterID: data[0].HMaterID,
                     HMaterName: data[0].物料名称,
                     HMaterNumber: data[0].物料代码,
                     HProcID: data[0].HProcID,
                     HProcName: data[0].HProcName,
                     HProcExchQty: data[0].HProcExchQty || 0,
                     HProcExchBillNo: data[0].HProcExchBillNo,
                     HProcExchInterID: data[0].HProcExchInterID,
                     HProcExchEntryID: data[0].HProcExchEntryID || 0,
                     HFirstCheckEmp: data[0].HFirstCheckEmp,
                     HFirstCheckEmpName: data[0].质检员名称,
                     HQCSchemeID: data[0].检验方案ID,
                     HQCSchemeName: data[0].检验方案名称,
                     HRemark: data[0].表头备注,
                     HMaker: data[0].制单人,
                     HMakeDate: data[0].制单日期,
                     HChecker: data[0].审核人,
                     HCheckDate: data[0].审核日期,
                     HCloseMan: data[0].关闭人,
                     HCloseDate: data[0].关闭日期,
                     HUpDateDate: data[0].修改日期,
                     HDeleteDate: data[0].作废日期,
                     HSampleSchemeID: data[0].HSampleSchemeID,
                     HSampleSchemeName: data[0].抽样方案名称,
                     HSampleQty: data[0].样本量,
                     HSampleQty2: data[0].样本量,
                     HSampleDamageQty: data[0].样本破坏数,
                     HSamplingType: data[0].抽样类型,
                     HAcceptQty: data[0].允许数,
                     HInspectionLevel: data[0].检验水平,
                     HRejectQty: data[0].拒绝数,
                     HStrictness: data[0].严格度,
                     HSampleUnRightQty: data[0].样本不合格数 || 0,
                     HSampleUnRightQty2: data[0].样本不合格数,
                     HAQL: data[0].AQL,
                     HUnitID: data[0].HUnitID,
                     HUnit: data[0].单位,
                     HInspectValB: data[0].检测值基础资料,
                     HInspectVal: data[0].检测值,
                     HTargetValB: data[0].目标值基础资料,
                     HTargetVal: data[0].目标值,
                     HUpLimit: data[0].上限值,
                     HDownLimit: data[0].下限值,
                     HUpOffSet: data[0].上偏差,
                     HDownOffSet: data[0].下偏差,
                     HEntryID: data[0].hsubid,
                     HQCCheckItemName: data[0].检验项目名称,
                     HQCCheckItemID: data[0].HQCCheckItemID,
                     HShiftsID: data[0].HShiftsID,
                     HShiftsName: data[0].班次名称,
                     HErrTreatment: data[0].异常临时处理方案,
                     HBatchNo: data[0].批号,
                     HCheckerResult: data[0].判定结论 == "合格" ? true : false,
                     HTakeSampleCheckBillID: data[0].HTakeSampleCheckBillID,
                     HTakeSampleCheckBillNo: data[0].HTakeSampleCheckBillNo,
                     HAnalysisMethod: function() {
                        if (data[0].HAnalysisMethod == 1) {
                           return '定性检验'
                        } else if (data[0].HAnalysisMethod == 2) {
                           return '定量检验'
                        } else {
                           return '其他检验'
                        }
                     }(),



                  });

                  for (let i = 0; i < data.length; i++) {
                     this.addCheckItem({
                        HQCCheckItemID: data[i].HQCCheckItemID,
                        HQCCheckItemNumber: data[i].检验项目代码,
                        HQCCheckItemName: data[i].检验项目名称,
                        HInspectInstruMentID: data[i].HInspectInstruMentID,
                        HInspectInstruMentNumber: data[i].检验仪器代码,
                        HInspectInstruMentName: data[i].检验仪器名称,
                        HQCStd: data[i].检验标准,
                        HUnit: data[i].单位名称,
                        HQCNote: data[i].检验记录,
                        HResult: data[i].结论 == "合格" ? 1 : 0,
                        HMax: data[i].最大值,
                        HMin: data[i].最小值,
                        HAvg: data[i].平均值,
                        HRemark: data[i].表体备注,
                        HAnalysisMethod: data[i].分析方法 == "定性分析" ?
                           1 : data[i].分析方法 == "定量分析" ?
                           2 : 3,
                        HKeyInspect: data[i].重点检查 == "否" ? false : true,
                        HSampleSchemeID: data[i].HSampleSchemeID,
                        HUnitID: data[i].HUnitID,
                        HInspectVal: data[i].检测值,
                        HTargetVal: data[i].目标值,
                        HUpLimit: data[i].上限值,
                        HDownLimit: data[i].下限值,
                        HUpOffSet: data[i].上偏差,
                        HDownOffSet: data[i].下偏差,
                        HSampleDamageQty: data[i].样本破坏数,
                        HSampleSchemeName: data[i].抽样方案名称,
                        HSampleQty: data[i].样本量,
                        HSampleDamageQty: data[i].样本破坏数,
                        HAcceptQty: data[i].允许数,
                        HInspectionLevel: 0,
                        HRejectQty: data[i].拒绝数,
                        HStrictness: 0,
                        HSampleUnRightQty: data[i].样本不合格数,
                        HAQL: data[i].AQL,
                        HSamplingType: 0,
                        HSamplingType: data[i].抽样类型,
                        HStrictness: data[i].严格度,
                        HInspectResultToSee: data[i].检验结果
                     });

                  }


                  this.hasSourceBill = true
               } else {
                  CommonUtils.showTips({
                     title: "温馨提示",
                     message: `加载单据失败: ${Message}`,
                  });
               }
            } catch (err) {
               CommonUtils.showTips({
                  title: "温馨提示",
                  message: `加载单据失败: ${err}`,
               });
         // 设置为自动
         setAuto() {
            if (uni.getSystemInfoSync().platform === 'android' || 
                 uni.getSystemInfoSync().platform === 'ios') {
               plus.screen.unlockOrientation();
            }
         },
         // 设置为竖屏
         setPortrait() {
           if (uni.getSystemInfoSync().platform === 'android' || 
              uni.getSystemInfoSync().platform === 'ios') {
            plus.screen.lockOrientation('portrait');
           }
         },
			
      },
      async onLoad(e) {
         this.setAuto(); 
         this.operationType = e.operationType || 1;
         this.hform.HInterID = e.linterid || 0;
         if (this.operationType == 1) {
            await this.getMaxBillNo();
         } else if (this.operationType == 2) {

         } else if (this.operationType == 3) {
            await this.RoadBillMain();
         }
         } 
         this.getGy_BadReasonList();
         await this.InitHSource();
         await this.InitHEmp();
         await this.InitHGroup();
         await this.loadCache();
      },
      onUnload(){
         this.setPortrait();
      }
   };
</script>

<style lang="scss" scoped>
   input {
      width: inherit;
      font-size: 26rpx;
      font-size: 30rpx;
   }

   .uni-input {
@@ -1211,7 +1108,7 @@

      view {
         width: auto;
         font-size: 26rpx;
         font-size: 30rpx;
         color: #555;
         text-align: center;
         padding: 16rpx 0;
@@ -1234,10 +1131,10 @@
      /* 可选：设置换行后的对齐方式 */
      align-content: flex-start; /* 多行对齐方式 */
      .form-item {
         width: 600rpx;
         width: 650rpx;
         display: flex;
         align-items: center;
         font-size: 26rpx;
         font-size: 30rpx;
         padding: 6rpx 0;
          margin-right: 20rpx;
         .left {
@@ -1252,7 +1149,7 @@
         .right {
            // width: 450rpx;
            padding: 8rpx 20rpx;
            font-size: 26rpx;
            font-size: 30rpx;
            flex: 1;
            border-radius: 22rpx;
            border: 1px solid #acacac;
@@ -1263,18 +1160,18 @@

               .uni-input-placeholder,
               .uni-input-input {
                  font-size: 26rpx;
                  font-size: 30rpx;
               }
            }

            .uni-combox::v-deep input {
               height: inherit;
               font-size: 26rpx;
               font-size: 30rpx;
            }
         }
         .right-select {
            //padding: 8rpx 20rpx;
            font-size: 26rpx;
            font-size: 30rpx;
            flex: 1;
            
         }
@@ -1346,7 +1243,7 @@
         width: 180rpx;
         height: 66rpx;
         line-height: 66rpx;
         font-size: 26rpx;
         font-size: 30rpx;
      }

      .btn-a {
@@ -1378,19 +1275,19 @@
         gap: 10rpx 0;

         input {
            font-size: 26rpx;
            font-size: 30rpx;
         }

         .detail {
            // width: 50%;
            box-sizing: border-box;
            font-size: 26rpx;
            font-size: 30rpx;
            color: #555;
            padding-right: 20rpx;

				
            text {
               color: #999;
               font-size: 26rpx;
               font-size: 30rpx;
            }
         }

@@ -1498,18 +1395,20 @@
   
   .reason-item-flex {
     /* 方块基础样式 */
     background-color: #f5f5f5;
     background-color: #55ffff;
     border-radius: 8px;
     padding: 12px 16px;
     box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
     transition: all 0.3s ease;
	  
      border-width: 2px;      /* 边框宽度 */
          border-style: solid;     /* 边框样式 */
          border-color: #333;      /* 边框颜色 */
     /* 文字样式 */
     font-size: 14px;
     font-size: 30rpx;
     color: #333;
     text-align: center;
     
     width: 300rpx;
     width: 350rpx;
     
     /* 确保内容不换行时居中 */
     display: flex;
@@ -1521,6 +1420,7 @@
     0% {
       transform: scale(1);
       box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
      border-color: #0000ff;      /* 边框颜色 */
     }
     50% {
       transform: scale(0.95);