完善款项确认--收款款项确认、出纳款项确认--采购系统

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

@@ -128,10 +128,11 @@
 </template>
 
 <script>
-import { listPage, dataDictionary } from '@/api/anruifinmanagement/paymentConfirmation.js'
+import { listPage } from '@/api/anruifinmanagement/paymentConfirmation.js'
 import Pagination from '@/components/pagination'
 import ButtonBar from '@/components/ButtonBar'
 import pageye from '@/components/pagination/pageye'
+import { typeValues } from '@/api/jichuxinxi/dictcommons'
 import acknowledgementReceiptAdd from './acknowledgementReceiptAdd.vue'
 import acknowledgementReceiptInfo from './acknowledgementReceiptInfo.vue'
 
@@ -183,7 +184,8 @@ export default {
           subscriptionState: '',
           useOrgSid: '',
           createBySid: '',
-          state: ''
+          state: '',
+          orgPath: ''
         },
         total: 0
       }
@@ -198,13 +200,13 @@ export default {
   },
   methods: {
     DataDictionary() {
-      dataDictionary({ type: 'receiptBank' }).then((res) => {
+      typeValues({ type: 'receiptBank' }).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.receiptBank_list = res.data
         }
       })
-      dataDictionary({ type: 'customerPayType' }).then((res) => {
+      typeValues({ type: 'customerPayType' }).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.collectionType_list = res.data
         }
       })
@@ -242,6 +244,7 @@ export default {
     getList() {
       this.listLoading = true
       this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       this.listQuery.params.state = 0
       listPage(this.listQuery).then((response) => {
         this.listLoading = false
@@ -268,7 +271,8 @@ export default {
           subscriptionState: '',
           useOrgSid: '',
           createBySid: '',
-          state: ''
+          state: '',
+          orgPath: ''
         },
         total: 0
       }
@@ -292,7 +296,7 @@ export default {
     doClose() {
       this.$store.dispatch('tagsView/delView', this.$route)
       this.$router.go(-1)
-    },
+    }
   }
 }
 </script>

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

@@ -134,7 +134,7 @@
           <el-col :span="4">
             <el-form-item prop="purchaseSystemName">
               <el-select v-model="formobj.purchaseSystemName" placeholder="请选择" :disabled="forbidden" @change="changePurchase" filterable clearable>
-                <el-option v-for="item in purchase_list_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"/>
+                <el-option v-for="item in purchase_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -352,6 +352,7 @@ export default {
         accountSid: '',
         purchaseSystemName: '',
         purchaseSystemSid: '',
+        orgPath: '',
         finSelectedReceivablesDetaileds: [],
         paymentVoucherAppendixs: [],
         remittanceConfirmationAppendixs: []
@@ -363,7 +364,8 @@ export default {
         sids: [],
         createBySid: '',
         vinNo: '',
-        orgPath: ''
+        orgPath: '',
+        purchaseSystemSid: '',
       },
       rules: {
         collectionMoney: [{ required: true, message: '收款金额不能为空', trigger: 'blur' }],
@@ -446,6 +448,7 @@ export default {
     changePurchase(value) {
       const choose = this.purchase_list.filter((item) => item.purchaseSystemName === value)
       this.formobj.purchaseSystemSid = choose[0].deptSid
+      this.getlist()
     },
     changeCollectionType(value) {
       let aa = null
@@ -519,6 +522,7 @@ export default {
     getlist() {
       this.listQuery.createBySid = window.sessionStorage.getItem('userSid')
       this.listQuery.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.purchaseSystemSid = this.formobj.purchaseSystemSid
       listAll(this.listQuery).then((res) => {
         if (res.code === '200') {
           this.overduereceivable_list = res.data
@@ -536,7 +540,8 @@ export default {
         sids: [],
         createBySid: '',
         vinNo: '',
-        orgPath: ''
+        orgPath: '',
+        purchaseSystemSid: ''
       }
       this.getlist()
     },
@@ -548,7 +553,7 @@ export default {
       this.formobj.staffSid = window.sessionStorage.getItem('staffSid')
       this.formobj.createDept = window.sessionStorage.getItem('departmentName')
       this.formobj.createDeptSid = window.sessionStorage.getItem('departmentSid')
-      this.getlist()
+      this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
@@ -754,6 +759,7 @@ export default {
         accountSid: '',
         purchaseSystemName: '',
         purchaseSystemSid: '',
+        orgPath: '',
         finSelectedReceivablesDetaileds: [],
         paymentVoucherAppendixs: [],
         remittanceConfirmationAppendixs: []

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

@@ -130,9 +130,10 @@
 </template>
 
 <script>
-import { listPage, dataDictionary } from '@/api/anruifinmanagement/paymentConfirmation.js'
+import { listPage } from '@/api/anruifinmanagement/paymentConfirmation.js'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
+import { typeValues } from '@/api/jichuxinxi/dictcommons'
 import cashierConfirmationInfo from './cashierConfirmationInfo.vue'
 
 export default {
@@ -178,7 +179,8 @@ export default {
           subscriptionState: '',
           useOrgSid: '',
           createBySid: '',
-          state: ''
+          state: '',
+          orgPath: ''
         },
         total: 0
       }
@@ -190,13 +192,13 @@ export default {
   },
   methods: {
     DataDictionary() {
-      dataDictionary({ type: 'receiptBank' }).then((res) => {
+      typeValues({ type: 'receiptBank' }).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.receiptBank_list = res.data
         }
       })
-      dataDictionary({ type: 'receiptType' }).then((res) => {
+      typeValues({ type: 'receiptType' }).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.collectionType_list = res.data
         }
       })
@@ -221,6 +223,7 @@ export default {
     getList() {
       this.listLoading = true
       this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       this.listQuery.params.state = 1
       listPage(this.listQuery).then((response) => {
         this.listLoading = false
@@ -246,7 +249,8 @@ export default {
           subscriptionState: '',
           useOrgSid: '',
           createBySid: '',
-          state: ''
+          state: '',
+          orgPath: ''
         },
         total: 0
       }