Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

src/api/V2/financialManagement/index.js

@@ -0,0 +1,8 @@
+//收款管理
+export const API_GET_CAIWU_LIST= '/collectionManagement/selectCollectionInfo'
+//派发
+export const API_POST_PAIFA_LIST = '/collectionManagement/distribute'
+//查库管
+export const API_GET_KUGUAN_LIST = '/staff/query/staffsByRole'
+//派车查看
+export const API_GET_CHAKAN_LOOK = '/warehouseInOutInfo/selectDistributeCar'

src/model/financialManagement/index.js

@@ -0,0 +1,16 @@
+import { errorCatcher, errorHandle, filter } from 'base-core-lib'
+import { appRx } from '../defalutConfig/indexRx'
+import {
+    API_GET_CAIWU_LIST,
+    API_POST_PAIFA_LIST,
+    API_GET_KUGUAN_LIST,
+    API_GET_CHAKAN_LOOK,
+} from '@/api/V2/financialManagement'
+//采购详情列表
+export const caiwuList = appRx.get(API_GET_CAIWU_LIST, errorCatcher, errorHandle, filter)
+// 派发
+export const paifa = appRx.post(API_POST_PAIFA_LIST, errorCatcher , errorHandle, filter)
+//查库管
+export const kuguan = appRx.get(API_GET_KUGUAN_LIST, errorCatcher, errorHandle,filter)
+//派车查看
+export const paiLook = appRx.get(API_GET_CHAKAN_LOOK, errorCatcher, errorHandle,filter)

src/views/contractManagement/futuresPurchaseContractExamine.vue

@@ -287,6 +287,7 @@ export default {
       },
       mainReportAdd: {},
       list: {},
+      id : '',
       // contractNo:this.deptBudgetList.contractNo,
       // contractType : this.deptBudgetList.contractType
 
@@ -301,6 +302,7 @@ export default {
   methods: {
     loaddata() {
       // 数据
+      this.id = this.$route.query.id
       examineList({ id: this.$route.query.id })
         .toPromise()
         .then((response) => {
@@ -381,7 +383,7 @@ export default {
     },
     confirmationsheet() {
       this.$router.push({ path: 'priceConfirmationSheet',
-      query: { contractNo: this.deptBudgetList.contractNo , contractType: this.deptBudgetList.contractType } })
+      query: { contractNo: this.deptBudgetList.contractNo , contractType: this.deptBudgetList.contractType,id:this.id } })
     },
   },
 }

src/views/contractManagement/futuresSalesContractExamine.vue

@@ -287,6 +287,7 @@ export default {
       },
       mainReportAdd: {},
       list: {},
+      id : '',
     }
   },
 
@@ -298,6 +299,7 @@ export default {
   methods: {
     loaddata() {
       // 数据
+      this.id = this.$route.query.id
       examineList({ id: this.$route.query.id })
         .toPromise()
         .then((response) => {
@@ -378,7 +380,7 @@ export default {
     },
     confirmationsheet() {
       this.$router.push({ path: 'priceConfirmationSheet',
-      query: { contractNo: this.deptBudgetList.contractNo , contractType: this.deptBudgetList.contractType } })
+      query: { contractNo: this.deptBudgetList.contractNo , contractType: this.deptBudgetList.contractType , id : this.id} })
     },
   },
 }

src/views/contractManagement/priceConfirmationSheet.vue

@@ -236,12 +236,14 @@ export default {
     },
     returnsales() {
       if(this.$route.query.contractType == '1'){
-        this.$router.push({ path: 'futuresSalesContractExamine',
-        query: { contractNo: this.$route.query.contractNo , contractType: this.$route.query.contractType } })
+        this.$router.push({ path: 'futuresSalesContractExamine'
+        ,query: { contractNo: this.$route.query.contractNo , contractType: this.$route.query.contractType , id:this.$route.query.id } 
+        })
         // this.$router.go(-1)
       }else{
-        this.$router.push({ path: 'futuresPurchaseContractExamine',
-        query: { contractNo: this.$route.query.contractNo, contractType: this.$route.query.contractType } })
+        this.$router.push({ path: 'futuresPurchaseContractExamine'
+        ,query: { contractNo: this.$route.query.contractNo, contractType: this.$route.query.contractType , id: this.$route.query.id } 
+        })
         // this.$router.go(-1)
       }
       // 

src/views/contractManagement/priceConfirmationSheetAdd.vue

@@ -280,6 +280,8 @@ export default {
       this.selectedOptions1 = value
     },
     returnsales() {
+      this.priceConfirmationSheet = {}
+      this.deptBudgetList = {}
       this.$router.push({ path: 'priceConfirmationSheet',
       query: { contractNo: this.$route.query.contractNo , contractType: this.$route.query.contractType } })
     },
@@ -494,6 +496,7 @@ export default {
         .toPromise()
         .then((response) => {
           this.$message.success('添加成功')
+          this.deptBudgetList = {}
           this.priceConfirmationSheet = {}
           this.$router.push({ path: 'priceConfirmationSheet'
           ,query: { contractNo: this.$route.query.contractNo , contractType: this.$route.query.contractType } })

vue.config.js

@@ -141,7 +141,7 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.120:8090/',
+        target: 'http://192.168.1.116:8090/',
         // target: 'http://192.168.1.112:8090/',
         // target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',