完善回款返利核对

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) => {
+      this.scmCollectionrebateCheckapplydetailVos = value
+      if (sid !== '' && sid !== null) {
+        req.collectionRebateCheckDetails(sid).then((resp) => {
           if (resp.success) {
             this.list = resp.data
-          this.scmCollectionrebateCheckapplydetailVos = value
           }
         }).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/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) => {
+      this.scmCollectionrebateCheckapplydetailVos = value
+      if (sid !== '' && sid !== null) {
+        req.collectionRebateCheckDetails(sid).then((resp) => {
           if (resp.success) {
             this.list = resp.data
-          this.scmCollectionrebateCheckapplydetailVos = value
           }
         }).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
         }