~jhz/STUWMS.git

parent: 4794dcd8 | 补丁 | 提交 | ignore whitespace

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

chenhaozhe

5 天以前 55f71c430596acfc33ae8498031f34fbfa105212

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

3个文件已修改

	pages/ZLGL/QualityReportStep/QualityReportStepBill.vue	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/ZLGL/mojianjianyan/ProcessCheckBill.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 pages/ZLGL/QualityReportStep/QualityReportStepBill.vue

@@ -355,6 +355,7 @@
                    HCheckQty: 0,
                    //源单信息
                    HSourceBillQty: 0,
                    HSourceBillNo:'',
                    HSourceBillType: "3772",
                    //流转卡信息
                    HICMOBillNo: "",
@@ -616,7 +617,7 @@
                        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].流转卡数量

 pages/ZLGL/mojianjianyan/ProcessCheckBill.vue

@@ -719,7 +719,7 @@
                    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.HQCSchemeName = data[0].检验方案名称
@@ -780,7 +780,7 @@
                        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.HQCSchemeName = data[0].检验方案名称

 pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue

@@ -805,7 +805,7 @@
                        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.HQCSchemeName = data[0].检验方案名称
@@ -906,7 +906,7 @@
                    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.HQCSchemeName = data[0].检验方案名称

			@@ -355,6 +355,7 @@
			HCheckQty: 0,
			//源单信息
			HSourceBillQty: 0,
			HSourceBillNo:'',
			HSourceBillType: "3772",
			//流转卡信息
			HICMOBillNo: "",
			@@ -616,7 +617,7 @@
			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].流转卡数量

			@@ -719,7 +719,7 @@
			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.HQCSchemeName = data[0].检验方案名称
			@@ -780,7 +780,7 @@
			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.HQCSchemeName = data[0].检验方案名称

			@@ -805,7 +805,7 @@
			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.HQCSchemeName = data[0].检验方案名称
			@@ -906,7 +906,7 @@
			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.HQCSchemeName = data[0].检验方案名称