Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue

@@ -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" v-show="formobj.sid !== ''" size="mini" @click="handleLook(scope.row)">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -62,7 +62,7 @@
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
             <el-table-column label="明细" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" v-show="formobj.sid !== ''" size="mini" @click="handleLook(scope.row)">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -279,9 +279,9 @@ export default {
     dataDelete(index) {
       this.formobj.baseVehinstallModpricedetails.splice(index, 1)
     },
-    handleLook(row) {
+    handleLook() {
       this.viewState = 3
-      this.$refs['divAdd'].showInfo(row, this.formobj.scmVehrebateCheckapplydetailList)
+      this.$refs['divAdd'].showInfo(this.formobj.sid, this.formobj.scmVehrebateCheckapplydetailList)
     },
     backAdd(val) {
       this.viewState = 1

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue

@@ -34,7 +34,7 @@
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
             <el-table-column label="明细" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" v-show="formobj.sid !== ''" 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" v-show="formobj.sid !== ''" size="mini" @click="handleLook(scope.row)">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -106,9 +106,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/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue

@@ -295,8 +295,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.onceTreatCost !== '' ? this.formobj.onceTreatCost : 0) + parseFloat(this.formobj.onceSuppCost !== '' ? this.formobj.onceSuppCost : 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.onceTreatCost !== '' ? this.formobj.onceTreatCost : 0) + parseFloat(this.formobj.onceSuppCost !== '' ? this.formobj.onceSuppCost : 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.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/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue

@@ -83,20 +83,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.scmVehrebateCheckapplydetailList = JSON.parse(JSON.stringify(value))
       this.viewTitle = '单车返利核对审核申请明细'
-      console.log('编辑回显', row)
-      req.vehRebateCheckDetails(row.vehRebateSids).then((resp) => {
-        if (resp.success) {
-          this.list = resp.data
-          this.scmVehrebateCheckapplydetailList = JSON.parse(JSON.stringify(value))
-        }
-      }).catch((e) => {
-        this.list = []
-      })
+      if (sid !== '' && sid !== null) {
+        req.vehRebateCheckDetails(sid).then((resp) => {
+          if (resp.success) {
+            this.list = resp.data
+          }
+        }).catch((e) => {
+          this.list = []
+        })
+      } else {
+        this.list = this.scmVehrebateCheckapplydetailList
+      }
     },
     handleDelete() {
       if (this.sids.length === 0) {

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedInfo.vue

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

anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue

@@ -36,7 +36,7 @@
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
             <el-table-column label="明细" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" v-show="formobj.sid !== ''" size="mini" @click="handleLook(scope.row)">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -53,7 +53,7 @@
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
             <el-table-column label="明细" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" v-show="formobj.sid !== ''" size="mini" @click="handleLook(scope.row)">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -179,9 +179,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/danchefanliheduiFlow/danchefanliheduiEdit.vue

@@ -44,7 +44,7 @@
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
             <el-table-column label="明细" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" v-show="formobj.sid !== ''" size="mini" @click="handleLook(scope.row)">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -61,7 +61,7 @@
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
             <el-table-column label="明细" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" v-show="formobj.sid !== ''" size="mini" @click="handleLook(scope.row)">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -274,9 +274,9 @@ export default {
     dataDelete(index) {
       this.formobj.baseVehinstallModpricedetails.splice(index, 1)
     },
-    handleLook(row) {
+    handleLook() {
       this.viewState = 3
-      this.$refs['divAdd'].showInfo(row, this.formobj.scmVehrebateCheckapplydetailList)
+      this.$refs['divAdd'].showInfo(this.formobj.sid, this.formobj.scmVehrebateCheckapplydetailList)
     },
     backAdd(val) {
       this.viewState = 1

anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue

@@ -34,7 +34,7 @@
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" />
             <el-table-column label="明细" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" v-show="formobj.sid !== ''" size="mini" @click="handleLook(scope.row)">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</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 v-show="formobj.sid !== ''"" size="mini" @click="handleLook(scope.row)">查看</el-button>
+                <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -142,9 +142,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/danchefanliheduiFlow/relation/bicyclerebatetobecheckedAdd.vue

@@ -83,20 +83,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.scmVehrebateCheckapplydetailList = JSON.parse(JSON.stringify(value))
       this.viewTitle = '单车返利核对审核申请明细'
-      console.log('编辑回显', row)
-      req.vehRebateCheckDetails(row.vehRebateSids).then((resp) => {
-        if (resp.success) {
-          this.list = resp.data
-          this.scmVehrebateCheckapplydetailList = JSON.parse(JSON.stringify(value))
-        }
-      }).catch((e) => {
-        this.list = []
-      })
+      if (sid !== '' && sid !== null) {
+        req.vehRebateCheckDetails(sid).then((resp) => {
+          if (resp.success) {
+            this.list = resp.data
+          }
+        }).catch((e) => {
+          this.list = []
+        })
+      } else {
+        this.list = this.scmVehrebateCheckapplydetailList
+      }
     },
     handleDelete() {
       if (this.sids.length === 0) {

anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedInfo.vue

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