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

zrg

5 小时以前 196e1b3cf2017cfa25038f9c8ef5071e046f0abf

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

 .hbuilderx/launch.json

@@ -21,11 +21,11 @@
            "type" : "uni-app:app-ios"
        },
        {
            "customPlaygroundType" : "local",
            "customPlaygroundType" : "device",
            "localRepoPath" : "D:/WorkBench/ZY_APP_Dev/STUWMS/unpackage/debug",
            "openVueDevtools" : true,
            "packageName" : "com.shebeiguanli.www",
            "playground" : "custom",
            "playground" : "standard",
            "type" : "uni-app:app-android"
        }
    ]

 manifest.json

@@ -16,6 +16,10 @@
            "autoclose" : true,
            "delay" : 0
        },
        "screenOrientation": [          //可选，字符串数组类型，应用支持的横竖屏
            "portrait-primary",                 //可选，字符串类型，支持竖屏
            "portrait-secondary"               //可选，字符串类型，支持反向竖屏
        ],
        /* 模块配置 */
        "modules" : {
            "Camera" : {},
@@ -151,18 +155,7 @@
        "enable" : false
    },
    "vueVersion" : "2",
    "orientation" : [
        //竖屏正方向
        "portrait-primary",
        //竖屏反方向
        "portrait-secondary",
        //横屏正方向
        "landscape-primary",
        //横屏反方向
        "landscape-secondary",
        //自然方向
        "default"
    ],
    
    "locale" : "zh-Hans",
    "fallbackLocale" : "zh-Hans"
}

 pages.json

@@ -341,7 +341,16 @@
            "style": {
                "navigationBarTitleText": "采购退料列表",
                "enablePullDownRefresh": true
            }
            }
        },
        {
            "path" : "pages/ZLGL/QualityReportStep/QualityReportStepBill",
            "style" : 
            {
                "navigationBarTitleText" : "全检检验单(不良汇报)",
                "pageOrientation": "auto"
				
            }
        },
        {
            "path": "pages/caigoutuiliao/POStockInBackBill",
@@ -1585,7 +1594,7 @@
                "pagePath": "pages/index/tab4",
                "iconPath": "static/tabBar/icon3.png",
                "selectedIconPath": "static/tabBar/icon3-default.png",
                "text": "质量管理"
                "text": "质量管理" 
            },
            {
                "pagePath": "pages/index/tab2",
@@ -1599,22 +1608,21 @@
                "selectedIconPath": "static/tabBar/user-default.png",
                "text": "我的"
            }
        ]
    },
    "globalStyle": {
        "navigationBarTextStyle": "white",
        "navigationBarTitleText": "设备管理",
        "navigationBarBackgroundColor": "#3A78FF",
        "backgroundColor": "#F8F8F8",
        "pageOrientation": "default"
    },
    "uniIdRouter": {},
    "condition": { //模式配置，仅开发期间生效
        "current": 0, //当前激活的模式(list 的索引项)
        "list": [{
            "name": "", //模式名称
            "path": "", //启动页面，必选
            "query": "" //启动参数，在页面的onLoad函数里面得到
        }]
    }
        ]
    },
    "globalStyle": {
        "navigationBarTextStyle": "white",
        "navigationBarTitleText": "设备管理",
        "navigationBarBackgroundColor": "#3A78FF",
        "backgroundColor": "#F8F8F8"
    },
    "uniIdRouter": {},
    "condition": { //模式配置，仅开发期间生效
        "current": 0, //当前激活的模式(list 的索引项)
        "list": [{
            "name": "", //模式名称
            "path": "", //启动页面，必选
            "query": "" //启动参数，在页面的onLoad函数里面得到
        }]
    }
}

 pages/ZLGL/QualityReportStep/QualityReportStepBill.vue

@@ -466,7 +466,13 @@
                });
            },
            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: {
@@ -709,7 +715,7 @@
                    let res = await CommonUtils.doRequest2Async({
                        url: "/Gy_Employee/list",
                        data: {
                            sWhere: ` and 组织名称 = '${uni.getStorageSync("Organization")}' and 禁用标记 = ''and 审核人 !='' order by 部门代码`,
                            sWhere: ` and 禁用标记 = '' order by 部门代码`,
                            user: getUserInfo()["Czymc"],
                            Organization: uni.getStorageSync("Organization"),
                        },
@@ -744,7 +750,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 +782,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"],
                        },
                    });
@@ -1014,164 +1020,7 @@
            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}`,
                    });
                }
            },
			
        },
        async onLoad(e) {
            this.operationType = e.operationType || 1;
@@ -1180,9 +1029,7 @@
                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();

 pages/ZLGL/checkFlowList/QC_CheckBillflowList.vue

@@ -68,7 +68,8 @@
                </view>
                <view class="op" v-if="operations == index">
                    <button class="op3" size="mini" plain @tap.stop="audit(item, 0)">审核</button>
                    <button class="op3" size="mini" plain @tap.stop="Reject(item)">驳回</button>
                    <button class="op3" size="mini" plain @tap.stop="audit(item, 1)">反审核</button>
                    <!-- <button class="op3" size="mini" plain @tap.stop="Reject(item)">驳回</button> -->
                    <button class="op5" size="mini" plain @tap.stop="operations = -1">取消操作</button>
                </view>
            </uni-card>

 pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue

@@ -470,15 +470,13 @@

            },
            HCheckResultChangeHandle(e) {

                this.detailManifestItem.HCheckResult =
                    this.HCheckResultList.find(elem => elem.text = e)?.value
                    this.HCheckResultList.find(elem => elem.text == e)?.value

            },
            HUseResultChangeHandle(e) {

                this.detailManifestItem.HUseResult =
                    this.HUseResultList.find(elem => elem.text = e)?.value
                    this.HUseResultList.find(elem => elem.text == e)?.value

            },
            async toDetail(item, index) {

 pages/jishikucunchaxun/table.vue

@@ -45,6 +45,9 @@
                        <view class="detail" v-if="item['仓位']">
                            <text>仓位：</text>{{item['仓位']}}
                        </view>
                        <view class="detail" v-if="item['供应商']">
                            <text>供应商：</text>{{item['供应商']}}
                        </view>
                        <view class="detail" v-if="item['物料名称']">
                            <text>物料名称：</text>{{item['物料名称']}}
                        </view>