zhangyuewww 3 年之前
父节点
当前提交
298f4a23c6

+ 3 - 4
src/views/contractManagement/futuresPurchaseContractEdit.vue

@@ -116,7 +116,6 @@
             v-model="deptBudgetList.packingMethod"
             placeholder=""
             class="typeselect"
-            :value="value1"
             @change="selectpackingMethod"
           >
             <ws-option
@@ -209,7 +208,6 @@
         <!--交易数量(吨)-->
         <ws-form-item label="交易数量(吨)" span="1" prop="weight">
           <ws-input
-            @input="weightchange"
             v-model="deptBudgetList.weight"
             placeholder="请输入重量(吨)"
             maxlength="100"
@@ -661,10 +659,10 @@ export default {
       selectedOptions: [],
       selectedOptions1: [],
       mainReportAdd: {},
+      options: [],
       list: {},
       transgeneList: [],
       unitList: [],
-      options_: regionData,
       options1_: provinceAndCityDataPlus,
       staffList: [],
       packtypeList: [],
@@ -878,7 +876,8 @@ export default {
       this.$router.push({ path: 'futuresPurchaseContract' })
     },
     confirmationsheet() {
-      this.$router.push({ path: 'priceConfirmationSheet' })
+      this.$router.push({ path: 'priceConfirmationSheet',
+      query: { contractNo: this.deptBudgetList.contractNo , contractType: this.deptBudgetList.contractType,id:this.deptBudgetList.id } })
     },
     selectChapterTwo(e) {
       for (var i = 0; i < this.ChapterTwoList.length; i++) {

+ 1 - 1
src/views/contractManagement/futuresPurchaseContractExamine.vue

@@ -383,7 +383,7 @@ export default {
     },
     confirmationsheet() {
       this.$router.push({ path: 'priceConfirmationSheet',
-      query: { contractNo: this.deptBudgetList.contractNo , contractType: this.deptBudgetList.contractType,id:this.id } })
+      query: { contractNo: this.deptBudgetList.contractNo , contractType: this.deptBudgetList.contractType,id:this.deptBudgetList.id } })
     },
   },
 }

+ 2 - 1
src/views/contractManagement/futuresSalesContractEdit.vue

@@ -872,7 +872,8 @@ export default {
       this.$router.push({ path: 'futuresSalesContract' })
     },
     confirmationsheet() {
-      this.$router.push({ path: 'salesPriceConfirmationSheet' })
+      this.$router.push({ path: 'priceConfirmationSheet',
+      query: { contractNo: this.deptBudgetList.contractNo , contractType: this.deptBudgetList.contractType , id : this.deptBudgetList.id} })
     },
     selectChapterTwo(e) {
       for (var i = 0; i < this.ChapterTwoList.length; i++) {

+ 1 - 1
src/views/contractManagement/futuresSalesContractExamine.vue

@@ -380,7 +380,7 @@ export default {
     },
     confirmationsheet() {
       this.$router.push({ path: 'priceConfirmationSheet',
-      query: { contractNo: this.deptBudgetList.contractNo , contractType: this.deptBudgetList.contractType , id : this.id} })
+      query: { contractNo: this.deptBudgetList.contractNo , contractType: this.deptBudgetList.contractType , id : this.deptBudgetList.id} })
     },
   },
 }

+ 4 - 4
src/views/contractManagement/priceConfirmationSheet.vue

@@ -236,13 +236,13 @@ 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 , id:this.$route.query.id } 
+        this.$router.push({ path: 'futuresSalesContract'
+        ,query: {  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 , id: this.$route.query.id } 
+        this.$router.push({ path: 'futuresPurchaseContract'
+        ,query: { id: this.$route.query.id } 
         })
         // this.$router.go(-1)
       }

+ 1 - 0
src/views/purchasingManagement/purchaseOrderList.vue

@@ -1511,6 +1511,7 @@ export default {
           id: this.clinchdeal.id,
           commonId: this.clinchdeal.commonId,
           compId: sessionStorage.getItem('ws-pf_compId'),
+          basis:'-'+Math.abs(this.clinchdeal1.basis)
         })
           .toPromise()
           .then((response) => {