Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue

@@ -30,8 +30,8 @@
             <el-table-column prop="uploadMoney" label="上传金额" align="center" />
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
             <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+              <template>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -52,8 +52,8 @@
             <el-table-column prop="uploadMoney" label="上传金额" align="center" />
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
             <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+              <template>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -225,9 +225,9 @@ export default {
         }
       })
     },
-    handleLook(row) {
+    handleLook() {
       this.viewState = 3
-      this.$refs['divAdd'].showInfo(row, this.formobj.scmCollectionrebateCheckapplydetailVos)
+      this.$refs['divAdd'].showInfo(this.formobj.sid, this.formobj.scmCollectionrebateCheckapplydetailVos)
     },
     backAdd(val) {
       this.viewState = 1

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedInfo.vue

@@ -23,8 +23,8 @@
             <el-table-column prop="uploadMoney" label="上传金额" align="center" />
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
             <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+              <template>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -43,8 +43,8 @@
             <el-table-column prop="uploadMoney" label="上传金额" align="center" />
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
             <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+              <template>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -93,9 +93,9 @@ export default {
         this.formobj = row
       })
     },
-    handleLook(row) {
+    handleLook() {
       this.viewState = 2
-      this.$refs['divInfo'].showInfo(row)
+      this.$refs['divInfo'].showInfo(this.formobj.sid)
     },
     resetState() {
       this.viewState = 1

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/heduishenpiAdd.vue

@@ -73,20 +73,23 @@ export default {
       this.sids = aa
       console.log('sids', this.sids)
     },
-    showInfo(row, value) {
+    showInfo(sid, value) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
       this.viewTitle = '回款返利核对审核申请明细'
-      console.log('编辑回显', row)
-      req.collectionRebateCheckDetails(row.collectionRebateSids).then((resp) => {
-        if (resp.success) {
-          this.list = resp.data
-          this.scmCollectionrebateCheckapplydetailVos = value
-        }
-      }).catch((e) => {
-        this.list = []
-      })
+      this.scmCollectionrebateCheckapplydetailVos = value
+      if (sid !== '' && sid !== null) {
+        req.collectionRebateCheckDetails(sid).then((resp) => {
+          if (resp.success) {
+            this.list = resp.data
+          }
+        }).catch((e) => {
+          this.list = []
+        })
+      } else {
+        this.list = this.scmCollectionrebateCheckapplydetailVos
+      }
     },
     handleDelete() {
       if (this.sids.length === 0) {

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/heduishenpiInfo.vue

@@ -61,13 +61,12 @@ export default {
     }
   },
   methods: {
-    showInfo(row) {
+    showInfo(sid) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
       this.viewTitle = '回款返利核对审核申请明细'
-      console.log('编辑回显', row)
-      req.collectionRebateCheckDetails(row.collectionRebateSids).then((resp) => {
+      req.collectionRebateCheckDetails(sid).then((resp) => {
         if (resp.success) {
           this.list = resp.data
         }

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedAdd.vue

@@ -81,20 +81,23 @@ export default {
       this.sids = aa
       console.log('sids', this.sids)
     },
-    showInfo(row, value) {
+    showInfo(sid, value) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
       this.viewTitle = '专项返利核对审核申请明细'
-      console.log('编辑回显', row)
-      req.specialRebateCheckDetails(row.specialRebateSids).then((resp) => {
-        if (resp.success) {
-          this.list = resp.data
-          this.scmSpecialrebateCheckapplydetailDetails = value
-        }
-      }).catch((e) => {
-        this.list = []
-      })
+      this.scmSpecialrebateCheckapplydetailDetails = value
+      if (sid !== '' && sid !== null) {
+        req.specialRebateCheckDetails(sid).then((resp) => {
+          if (resp.success) {
+            this.list = resp.data
+          }
+        }).catch((e) => {
+          this.list = []
+        })
+      } else {
+        this.list = this.scmSpecialrebateCheckapplydetailDetails
+      }
     },
     handleDelete() {
       if (this.sids.length === 0) {

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedInfo.vue

@@ -70,13 +70,12 @@ export default {
     }
   },
   methods: {
-    showInfo(row) {
+    showInfo(sid) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
       this.viewTitle = '专项返利核对审核申请明细'
-      console.log('编辑回显', row)
-      req.specialRebateCheckDetails(row.specialRebateSids).then((resp) => {
+      req.specialRebateCheckDetails(sid).then((resp) => {
         if (resp.success) {
           this.list = resp.data
         }

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue

@@ -35,7 +35,7 @@
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
             <el-table-column label="明细" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -49,10 +49,10 @@
             <el-table-column prop="uploadMoney" label="上传金额" align="center" />
             <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
             <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
             <el-table-column label="明细" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -250,9 +250,9 @@ export default {
     dataDelete(index) {
       this.formobj.baseVehinstallModpricedetails.splice(index, 1)
     },
-    handleLook(row) {
+    handleLook() {
       this.viewState = 3
-      this.$refs['divAdd'].showInfo(row, this.formobj.scmSpecialrebateCheckapplydetailDetails)
+      this.$refs['divAdd'].showInfo(this.formobj.sid, this.formobj.scmSpecialrebateCheckapplydetailDetails)
     },
     backAdd(val) {
       this.viewState = 1

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckInfo.vue

@@ -28,7 +28,7 @@
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
             <el-table-column label="明细" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -42,10 +42,10 @@
             <el-table-column prop="uploadMoney" label="上传金额" align="center" />
             <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
             <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
             <el-table-column label="明细" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -100,9 +100,9 @@ export default {
         this.formobj = row
       })
     },
-    handleLook(row) {
+    handleLook() {
       this.viewState = 2
-      this.$refs['divInfo'].showInfo(row)
+      this.$refs['divInfo'].showInfo(this.formobj.sid)
     },
     resetState() {
       this.viewState = 1

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue

@@ -293,8 +293,8 @@ export default {
     },
     changeIsAdjustment(val) {
       if (val === '是' || val === '无需调整') {
-        // 计算调整金额 = 上传金额(一次上传金额 + 二次上传金额) - 待确定金额 - 费用(一次支出费用 + 一次待支付费用 + 一次抵顶费用 + 二次支出费用 + 二次待支付费用 + 二次抵顶费用) - 预提返利
-        this.formobj.adjustmentMoney = Math.round((parseFloat(this.formobj.uploadMoney !== '' ? this.formobj.uploadMoney : 0) + parseFloat(this.formobj.secondaryUploadMoney !== '' ? this.formobj.secondaryUploadMoney : 0) - parseFloat(this.formobj.stayDetermineMoney !== '' ? this.formobj.stayDetermineMoney : 0) - (parseFloat(this.formobj.onceItureCost !== '' ? this.formobj.onceItureCost : 0) + parseFloat(this.formobj.onceTreatCost !== '' ? this.formobj.onceTreatCost : 0) + parseFloat(this.formobj.onceSuppCost !== '' ? this.formobj.onceSuppCost : 0) + parseFloat(this.formobj.secondItureCost !== '' ? this.formobj.secondItureCost : 0) + parseFloat(this.formobj.secondTreatCost !== '' ? this.formobj.secondTreatCost : 0) + parseFloat(this.formobj.secondSuppCost !== '' ? this.formobj.secondSuppCost : 0)) - parseFloat(this.formobj.estimateRebate !== '' ? this.formobj.estimateRebate : 0)) * 100) / 100
+        // 计算调整金额 = 上传金额(一次上传金额 + 二次上传金额) - 待确定金额 - 费用(一次支出费用 + 一次待支付费用 + 一次抵顶费用 + 二次支出费用 + 二次待支付费用 + 二次抵顶费用) - (预提返利 - 其中预提费用)
+        this.formobj.adjustmentMoney = Math.round((parseFloat(this.formobj.uploadMoney !== '' ? this.formobj.uploadMoney : 0) + parseFloat(this.formobj.secondaryUploadMoney !== '' ? this.formobj.secondaryUploadMoney : 0) - parseFloat(this.formobj.stayDetermineMoney !== '' ? this.formobj.stayDetermineMoney : 0) - (parseFloat(this.formobj.onceItureCost !== '' ? this.formobj.onceItureCost : 0) + parseFloat(this.formobj.onceTreatCost !== '' ? this.formobj.onceTreatCost : 0) + parseFloat(this.formobj.onceSuppCost !== '' ? this.formobj.onceSuppCost : 0) + parseFloat(this.formobj.secondItureCost !== '' ? this.formobj.secondItureCost : 0) + parseFloat(this.formobj.secondTreatCost !== '' ? this.formobj.secondTreatCost : 0) + parseFloat(this.formobj.secondSuppCost !== '' ? this.formobj.secondSuppCost : 0)) - (parseFloat(this.formobj.estimateRebate !== '' ? this.formobj.estimateRebate : 0) - parseFloat(this.formobj.expectItureCost !== '' ? this.formobj.expectItureCost : 0) - parseFloat(this.formobj.expectTreatCost !== '' ? this.formobj.expectTreatCost : 0) - parseFloat(this.formobj.expectSuppCost !== '' ? this.formobj.expectSuppCost : 0))) * 100) / 100
       } else {
         this.formobj.adjustmentMoney = '0'
         this.formobj.adjustmentRemarks = ''

anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue

@@ -25,8 +25,8 @@
             <el-table-column prop="uploadMoney" label="上传金额" align="center" />
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
             <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+              <template>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -45,14 +45,16 @@
             <el-table-column prop="uploadMoney" label="上传金额" align="center" />
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
             <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+              <template>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
         </el-form>
       </div>
     </div>
+    <!--End 添加修改部分-->
+    <heduishenpiInfo v-show="viewState == 2" ref="divInfo" @doback="resetState" />
     <!-- 选择待办人 的弹出框-->
     <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
       <el-form class="formaddcopy02" >
@@ -164,9 +166,9 @@ export default {
         this.formobj = {}
       })
     },
-    handleLook(row) {
+    handleLook() {
       this.viewState = 2
-      this.$refs['divInfo'].showInfo(row)
+      this.$refs['divInfo'].showInfo(this.formobj.sid)
     },
     resetState() {
       this.viewState = 1

anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiEdit.vue

@@ -31,8 +31,8 @@
             <el-table-column prop="uploadMoney" label="上传金额" align="center" />
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
             <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+              <template>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -53,8 +53,8 @@
             <el-table-column prop="uploadMoney" label="上传金额" align="center" />
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
             <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+              <template>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -221,9 +221,9 @@ export default {
         }
       })
     },
-    handleLook(row) {
+    handleLook() {
       this.viewState = 3
-      this.$refs['divAdd'].showInfo(row, this.formobj.scmCollectionrebateCheckapplydetailVos)
+      this.$refs['divAdd'].showInfo(this.formobj.sid, this.formobj.scmCollectionrebateCheckapplydetailVos)
     },
     backAdd(value) {
       this.viewState = 1

anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiYiBanInfo.vue

@@ -23,8 +23,8 @@
             <el-table-column prop="uploadMoney" label="上传金额" align="center" />
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
             <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+              <template>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -43,8 +43,8 @@
             <el-table-column prop="uploadMoney" label="上传金额" align="center" />
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
             <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+              <template>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -129,9 +129,9 @@ export default {
         this.formobj = {}
       })
     },
-    handleLook(row) {
+    handleLook() {
       this.viewState = 2
-      this.$refs['divInfo'].showInfo(row)
+      this.$refs['divInfo'].showInfo(this.formobj.sid)
     },
     resetState() {
       this.viewState = 1

anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/heduishenpiAdd.vue

@@ -73,20 +73,23 @@ export default {
       this.sids = aa
       console.log('sids', this.sids)
     },
-    showInfo(row, value) {
+    showInfo(sid, value) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
       this.viewTitle = '回款返利核对审核申请明细'
-      console.log('编辑回显', row)
-      req.collectionRebateCheckDetails(row.collectionRebateSids).then((resp) => {
-        if (resp.success) {
-          this.list = resp.data
-          this.scmCollectionrebateCheckapplydetailVos = value
-        }
-      }).catch((e) => {
-        this.list = []
-      })
+      this.scmCollectionrebateCheckapplydetailVos = value
+      if (sid !== '' && sid !== null) {
+        req.collectionRebateCheckDetails(sid).then((resp) => {
+          if (resp.success) {
+            this.list = resp.data
+          }
+        }).catch((e) => {
+          this.list = []
+        })
+      } else {
+        this.list = this.scmCollectionrebateCheckapplydetailVos
+      }
     },
     handleDelete() {
       if (this.sids.length === 0) {

anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/heduishenpiInfo.vue

@@ -61,13 +61,12 @@ export default {
     }
   },
   methods: {
-    showInfo(row) {
+    showInfo(sid) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
       this.viewTitle = '回款返利核对审核申请明细'
-      console.log('编辑回显', row)
-      req.collectionRebateCheckDetails(row.collectionRebateSids).then((resp) => {
+      req.collectionRebateCheckDetails(sid).then((resp) => {
         if (resp.success) {
           this.list = resp.data
         }

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedAdd.vue

@@ -81,20 +81,23 @@ export default {
       this.sids = aa
       console.log('sids', this.sids)
     },
-    showInfo(row, value) {
+    showInfo(sid, value) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
       this.viewTitle = '专项返利核对审核申请明细'
-      console.log('编辑回显', row)
-      req.specialRebateCheckDetails(row.specialRebateSids).then((resp) => {
-        if (resp.success) {
-          this.list = resp.data
-          this.scmSpecialrebateCheckapplydetailDetails = value
-        }
-      }).catch((e) => {
-        this.list = []
-      })
+      this.scmSpecialrebateCheckapplydetailDetails = value
+      if (sid !== '' && sid !== null) {
+        req.specialRebateCheckDetails(sid).then((resp) => {
+          if (resp.success) {
+            this.list = resp.data
+          }
+        }).catch((e) => {
+          this.list = []
+        })
+      } else {
+        this.list = this.scmSpecialrebateCheckapplydetailDetails
+      }
     },
     handleDelete() {
       if (this.sids.length === 0) {

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedInfo.vue

@@ -70,13 +70,12 @@ export default {
     }
   },
   methods: {
-    showInfo(row) {
+    showInfo(sid) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
       this.viewTitle = '专项返利核对审核申请明细'
-      console.log('编辑回显', row)
-      req.specialRebateCheckDetails(row.specialRebateSids).then((resp) => {
+      req.specialRebateCheckDetails(sid).then((resp) => {
         if (resp.success) {
           this.list = resp.data
         }

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue

@@ -27,10 +27,10 @@
             <el-table-column prop="uploadMoney" label="上传金额" align="center" />
             <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
             <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
             <el-table-column label="明细" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -47,7 +47,7 @@
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
             <el-table-column label="明细" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -173,9 +173,9 @@ export default {
         this.formobj = {}
       })
     },
-    handleLook(row) {
+    handleLook() {
       this.viewState = 2
-      this.$refs['divInfo'].showInfo(row)
+      this.$refs['divInfo'].showInfo(this.formobj.sid)
     },
     resetState() {
       this.viewState = 1

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue

@@ -31,10 +31,10 @@
             <el-table-column prop="uploadMoney" label="上传金额" align="center" />
             <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
             <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
             <el-table-column label="明细" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -51,7 +51,7 @@
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
             <el-table-column label="明细" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -235,9 +235,9 @@ export default {
     dataDelete(index) {
       this.formobj.baseVehinstallModpricedetails.splice(index, 1)
     },
-    handleLook(row) {
+    handleLook() {
       this.viewState = 3
-      this.$refs['divAdd'].showInfo(row, this.formobj.scmSpecialrebateCheckapplydetailDetails)
+      this.$refs['divAdd'].showInfo(this.formobj.sid, this.formobj.scmSpecialrebateCheckapplydetailDetails)
     },
     backAdd(val) {
       this.viewState = 1

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue

@@ -25,10 +25,10 @@
             <el-table-column prop="uploadMoney" label="上传金额" align="center" />
             <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
             <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
             <el-table-column label="明细" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -45,7 +45,7 @@
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
             <el-table-column label="明细" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -136,9 +136,9 @@ export default {
         this.formobj = {}
       })
     },
-    handleLook(row) {
+    handleLook() {
       this.viewState = 2
-      this.$refs['divInfo'].showInfo(row)
+      this.$refs['divInfo'].showInfo(this.formobj.sid)
     },
     resetState() {
       this.viewState = 1