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

zrg

2 天以前 5a50ffefc186e562c361c7fe672cb0d747dd3130

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

 manifest.json

@@ -2,6 +2,7 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",

    "versionName" : "2.0.63",
    "versionCode" : 263,
    "transformPx" : false,
@@ -162,7 +163,8 @@
            "LcPrinter" : {
                "__plugin_info__" : {
                    "name" : "LcPrinter",
                    "description" : "打印插件",
                    // "description" : "打印插件",
                    "description" : "新版打印插件",
                    "platforms" : "Android",
                    "url" : "",
                    "android_package_name" : "",

 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()

 pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue

@@ -652,6 +652,8 @@
                            message: `上传成功`
                        })
                        this.attachmentInfo = []
                        // 刷新单据号，防止单据号重复
                        this.GetMaxNumPDA()
                    } else {
                        CommonUtils.showTips({
                            title: '温馨提示',