Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundAdd.vue

@@ -621,7 +621,7 @@ export default {
         return
       }
       this.viewState = 2
-      this.$refs['divSelect'].showData(this.formobj.finSelectedReceivablesDetaileds, this.formobj.purchaseSystemSid)
+      this.$refs['divSelect'].showData(this.formobj.finSelectedReceivablesDetaileds, this.formobj.purchaseSystemSid, this.formobj.staffUserSid)
     },
     backData(val) {
       this.viewState = 1

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue

@@ -571,7 +571,7 @@ export default {
         return
       }
       this.viewState = 2
-      this.$refs['divSelect'].showData(this.formobj.finSelectedReceivablesDetaileds, this.formobj.purchaseSystemSid)
+      this.$refs['divSelect'].showData(this.formobj.finSelectedReceivablesDetaileds, this.formobj.purchaseSystemSid, '')
     },
     backData(val) {
       this.viewState = 1

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/relation/amountpledged.vue

@@ -148,7 +148,6 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
-      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
       this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       selectPageList(this.listQuery).then((response) => {
         this.listLoading = false
@@ -169,7 +168,6 @@ export default {
       this.listQuery.params.mobile = ''
       this.listQuery.params.vinNo = ''
       this.listQuery.params.orgPath = ''
-      this.listQuery.params.userSid = ''
       this.listQuery.current = 1
       this.listQuery.size = 5
       this.listQuery.total = 0
@@ -197,7 +195,7 @@ export default {
       })
       this.sids = aa
     },
-    showData(value, purchaseSystemSid) {
+    showData(value, purchaseSystemSid, userSid) {
       const aa = []
       if (value.length > 0) {
         for (var i = 0; i < value.length; i++) {
@@ -211,6 +209,11 @@ export default {
       this.listQuery.total = 0
       this.listQuery.size = 5
       this.listQuery.params.purchaseSystemSid = purchaseSystemSid
+      if (userSid !== '' && userSid !== null) {
+        this.listQuery.params.userSid = userSid
+      } else {
+        this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      }
       this.getList()
     },
     // 添加修改返回

anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforwardAdd.vue

@@ -542,7 +542,7 @@ export default {
         }
       }
       this.viewState = 2
-      this.$refs['divSelect'].showData(this.formobj.yxysFinFundsCarriedForwardYXYSKXVos, this.formobj.purchaseSystemSid)
+      this.$refs['divSelect'].showData(this.formobj.yxysFinFundsCarriedForwardYXYSKXVos, this.formobj.purchaseSystemSid, '')
     },
     // 跳转选择已认款项列表--选择数据后返回
     backData(val) {

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardEdit.vue

@@ -546,7 +546,7 @@ export default {
         }
       }
       this.viewState = 2
-      this.$refs['divSelect'].showData(this.formobj.yxysFinFundsCarriedForwardYXYSKXVos, this.formobj.purchaseSystemSid)
+      this.$refs['divSelect'].showData(this.formobj.yxysFinFundsCarriedForwardYXYSKXVos, this.formobj.purchaseSystemSid, '')
     },
     // 跳转选择已认款项列表--选择数据后返回
     backData(val) {

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/relation/amountpledged.vue

@@ -148,7 +148,6 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
-      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
       this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       selectPageList(this.listQuery).then((response) => {
         this.listLoading = false
@@ -169,7 +168,6 @@ export default {
       this.listQuery.params.mobile = ''
       this.listQuery.params.vinNo = ''
       this.listQuery.params.orgPath = ''
-      this.listQuery.params.userSid = ''
       this.listQuery.current = 1
       this.listQuery.size = 5
       this.listQuery.total = 0
@@ -197,7 +195,7 @@ export default {
       })
       this.sids = aa
     },
-    showData(value, purchaseSystemSid) {
+    showData(value, purchaseSystemSid, userSid) {
       const aa = []
       if (value.length > 0) {
         for (var i = 0; i < value.length; i++) {
@@ -211,6 +209,11 @@ export default {
       this.listQuery.total = 0
       this.listQuery.size = 5
       this.listQuery.params.purchaseSystemSid = purchaseSystemSid
+      if (userSid !== '' && userSid !== null) {
+        this.listQuery.params.userSid = userSid
+      } else {
+        this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      }
       this.getList()
     },
     // 添加修改返回