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

chenhaozhe

昨天 f5287b188f882f8d4bc2c6d0e3ca2638c50159c8

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

 pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue

@@ -80,13 +80,6 @@
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">问题来源:</view>
                    <view class="right">
                        <uni-combox :candidates="arrayHForm" placeholder="请选择问题来源" v-model="hform.HForm"
                            @input="HFormChange"></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">生产资源:</view>
                    <view class="right">
                        <uni-combox :candidates="arrayHSourceName" placeholder="请选择" v-model="hform.HSourceName"
@@ -150,6 +143,13 @@
        <template v-if="tabs == 1">
            <view class="form">
                <view class="form-item">
                    <view class="title">问题来源:</view>
                    <view class="right">
                        <uni-combox :candidates="arrayHForm" placeholder="请选择问题来源" v-model="hform.HForm"
                            @input="HFormChange"></uni-combox>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">接收部门:</view>
                    <view class="right">
                        <uni-combox :candidates="arrayHDeptName" placeholder="请选择部门" v-model="hform.HRecDeptName"

 pages/ZLGL/checkFlowList/QC_CheckBillflowList.vue

@@ -72,6 +72,7 @@
                    <button class="op3" size="mini" plain @tap.stop="fileUpload(item)">文件上传</button>
                    <button class="op3" size="mini" plain @tap.stop="getImage(item)">预览图片</button>
                    <button class="op3" size="mini" plain @tap.stop="Reject(item)">驳回</button>
                    <button class="op3" size="mini" plain @tap.stop="selected(item)">查看明细</button>
                    <button class="op5" size="mini" plain @tap.stop="operations = -1">取消操作</button>
                </view>
            </uni-card>
@@ -119,10 +120,12 @@
                listData: [],
                showList: [],
                page: 1,
                HSourceBillTypeList: {首件检验单:'8505',末件检验单:'8507'},
                HSourceBillTypeList: {首件检验单:'8505',末件检验单:'8507',采购订单:'1102',销售订单:'1401'},
                arrayHSourceBillTypeName: [
                    "首件检验单",
                    "末件检验单",
                    "采购订单",
                    "销售订单"
                ],
            }
        },
@@ -250,6 +253,22 @@
                        CurUserName: getUserInfo()["Czymc"],
                        CurUserID:getUserInfo()["Czybm"],
                    }
                }else if(this.hform.HSourceBillType=='1102'){
                    url = 'Cg_POOrderBill/AuditCg_POOrderBill_Flow',
                    ajaxData= {
                        HInterID: item["hmainid"],
                        IsAudit: mode,
                        CurUserName: getUserInfo()["Czymc"],
                        CurUserID:getUserInfo()["Czybm"],
                    }
                }else if(this.hform.HSourceBillType=='1401'){
                    url = 'Xs_SeOrderBill/AuditXs_SeOrderBill_Flow',
                    ajaxData= {
                        HInterID: item["hmainid"],
                        IsAudit: mode,
                        CurUserName: getUserInfo()["Czymc"],
                        CurUserID:getUserInfo()["Czybm"],
                    }
                }
                try{
                    let res = await CommonUtils.doRequest2Sync({
@@ -303,6 +322,18 @@
                    }
                }else if(this.hform.HSourceBillType=='8507'){
                    url = 'QC_ProcessCheckBill/RejectCheckFlow',
                    ajaxData= {
                        HInterID: item["hmainid"],
                        CurUserID:getUserInfo()["Czybm"],
                    }
                }else if(this.hform.HSourceBillType=='1401'){
                    url = 'Xs_SeOrderBill/RejectCheckFlow_POOrderBill',
                    ajaxData= {
                        HInterID: item["hmainid"],
                        CurUserID:getUserInfo()["Czybm"],
                    }
                }else if(this.hform.HSourceBillType=='1102'){
                    url = 'Cg_POOrderBill/RejectCheckFlow_POOrderBill',
                    ajaxData= {
                        HInterID: item["hmainid"],
                        CurUserID:getUserInfo()["Czybm"],
@@ -403,6 +434,23 @@
                }
              })
            },
            async selected(item)
            {
                if(this.hform.HSourceBillType=='1401')  //销售
                {
                    console.log(item)
                    uni.navigateTo({
                        url: '/pages/xiaoshoudingdan/xiaoshoudingdanListEdit?linterid=' + item.hmainid + '&HBillNo=' + item.单据号
                    })
                }else if(this.hform.HSourceBillType=='1102') //采购
                {
                    console.log(item)
                    uni.navigateTo({
                        url: '/pages/caigoudingdan/caigoudingdanListEdit?linterid=' + item.hmainid + '&HBillNo=' + item.单据号
                    })
                }
				
            },
            // 上传文件
            fileUpload(item) {
                this.uploadOptions.formData.HBillNo = item.单据号
@@ -476,6 +524,7 @@
                }
            }
        },
		
        onShow() {
            this.$nextTick(() => {
                this.cmdSearch()