Merge branch 'develop' into 'FOTON'
commit See merge request LAWS/laws-system-front-FOTON!297
This commit is contained in:
@@ -655,28 +655,28 @@
|
|||||||
getBDList () {
|
getBDList () {
|
||||||
this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
|
this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
|
||||||
standHisId: this.form.oldNumber,
|
standHisId: this.form.oldNumber,
|
||||||
leftOrRight: 'LEFT'
|
leftOrRight: 'RIGHT'
|
||||||
}, {
|
}, {
|
||||||
_this: this
|
_this: this
|
||||||
}, res => {
|
}, res => {
|
||||||
for (let a = 0; a < this.itemList.length; a++) {
|
for (let a = 0; a < this.itemList.length; a++) {
|
||||||
for (let b = 0; b < res.data.length; b++) {
|
for (let b = 0; b < res.data.length; b++) {
|
||||||
if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
|
if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
|
||||||
this.itemList[a].itemsId2 = res.data[b].itemsId
|
this.itemList[a].itemsId = res.data[b].itemsId
|
||||||
this.itemList[a].itemsDisplayNum = res.data[b].itemsDisplayNum
|
this.itemList[a].targetStand = res.data[b].targetStand
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
|
this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
|
||||||
standHisId: this.form.oldNumber,
|
standHisId: this.form.oldNumber,
|
||||||
leftOrRight: 'RIGHT'
|
leftOrRight: 'LEFT'
|
||||||
}, {
|
}, {
|
||||||
_this: this
|
_this: this
|
||||||
}, res => {
|
}, res => {
|
||||||
for (let a = 0; a < this.itemList.length; a++) {
|
for (let a = 0; a < this.itemList.length; a++) {
|
||||||
for (let b = 0; b < res.data.length; b++) {
|
for (let b = 0; b < res.data.length; b++) {
|
||||||
if (this.itemList[a].itemsDisplayNum === res.data[b].targetStand) {
|
if (this.itemList[a].targetStand === res.data[b].itemsDisplayNum) {
|
||||||
this.itemList[a].itemsId = res.data[b].itemsId
|
this.itemList[a].itemsId2 = res.data[b].itemsId
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -668,28 +668,28 @@ export default {
|
|||||||
getBDList () {
|
getBDList () {
|
||||||
this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
|
this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
|
||||||
standHisId: this.form.oldNumber,
|
standHisId: this.form.oldNumber,
|
||||||
leftOrRight: 'LEFT'
|
leftOrRight: 'RIGHT'
|
||||||
}, {
|
}, {
|
||||||
_this: this
|
_this: this
|
||||||
}, res => {
|
}, res => {
|
||||||
for (let a = 0; a < this.itemList.length; a++) {
|
for (let a = 0; a < this.itemList.length; a++) {
|
||||||
for (let b = 0; b < res.data.length; b++) {
|
for (let b = 0; b < res.data.length; b++) {
|
||||||
if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
|
if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
|
||||||
this.itemList[a].itemsId2 = res.data[b].itemsId
|
this.itemList[a].itemsId = res.data[b].itemsId
|
||||||
this.itemList[a].itemsDisplayNum = res.data[b].itemsDisplayNum
|
this.itemList[a].targetStand = res.data[b].targetStand
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
|
this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
|
||||||
standHisId: this.form.oldNumber,
|
standHisId: this.form.oldNumber,
|
||||||
leftOrRight: 'RIGHT'
|
leftOrRight: 'LEFT'
|
||||||
}, {
|
}, {
|
||||||
_this: this
|
_this: this
|
||||||
}, res => {
|
}, res => {
|
||||||
for (let a = 0; a < this.itemList.length; a++) {
|
for (let a = 0; a < this.itemList.length; a++) {
|
||||||
for (let b = 0; b < res.data.length; b++) {
|
for (let b = 0; b < res.data.length; b++) {
|
||||||
if (this.itemList[a].itemsDisplayNum === res.data[b].targetStand) {
|
if (this.itemList[a].targetStand === res.data[b].itemsDisplayNum) {
|
||||||
this.itemList[a].itemsId = res.data[b].itemsId
|
this.itemList[a].itemsId2 = res.data[b].itemsId
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -555,28 +555,28 @@
|
|||||||
getBDList () {
|
getBDList () {
|
||||||
this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
|
this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
|
||||||
standHisId: this.oldNumber,
|
standHisId: this.oldNumber,
|
||||||
leftOrRight: 'LEFT'
|
leftOrRight: 'RIGHT'
|
||||||
}, {
|
}, {
|
||||||
_this: this
|
_this: this
|
||||||
}, res => {
|
}, res => {
|
||||||
for (let a = 0; a < this.itemList.length; a++) {
|
for (let a = 0; a < this.itemList.length; a++) {
|
||||||
for (let b = 0; b < res.data.length; b++) {
|
for (let b = 0; b < res.data.length; b++) {
|
||||||
if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
|
if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
|
||||||
this.itemList[a].itemsId2 = res.data[b].itemsId
|
this.itemList[a].itemsId = res.data[b].itemsId
|
||||||
this.itemList[a].itemsDisplayNum = res.data[b].itemsDisplayNum
|
this.itemList[a].targetStand = res.data[b].targetStand
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
|
this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
|
||||||
standHisId: this.oldNumber,
|
standHisId: this.oldNumber,
|
||||||
leftOrRight: 'RIGHT'
|
leftOrRight: 'LEFT'
|
||||||
}, {
|
}, {
|
||||||
_this: this
|
_this: this
|
||||||
}, res => {
|
}, res => {
|
||||||
for (let a = 0; a < this.itemList.length; a++) {
|
for (let a = 0; a < this.itemList.length; a++) {
|
||||||
for (let b = 0; b < res.data.length; b++) {
|
for (let b = 0; b < res.data.length; b++) {
|
||||||
if (this.itemList[a].itemsDisplayNum === res.data[b].targetStand) {
|
if (this.itemList[a].targetStand === res.data[b].itemsDisplayNum) {
|
||||||
this.itemList[a].itemsId = res.data[b].itemsId
|
this.itemList[a].itemsId2 = res.data[b].itemsId
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user