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

src/api/V2/salesManagement/index.js

@@ -25,4 +25,6 @@ export const API_POST_EDITSTATUS = '/saleOrder/api/editStatus'
 //销售订单删除
 export const API_POST_DELETESALE = '/saleOrder/api/deleteSaleOrder'
 //成交价列表
-export const API_GET_GETPRICELIST = '/transactionRecord/getPriceList'
+export const API_GET_GETPRICELIST = '/transactionRecord/getPriceList'
+//成交价列表销售
+export const API_GET_GETSALEPRICELIST = '/transactionRecord/getSalePriceList'

src/model/salesManagement/index.js

@@ -15,6 +15,7 @@ import {
     API_POST_SALEPLAN_DELETE,
     API_POST_SALEPLAN_EDITSTATUS,
     API_GET_GETPRICELIST,
+    API_GET_GETSALEPRICELIST
 } from '@/api/V2/salesManagement'
 // import { API_GET_PROCUREMENT_LOOK } from '../../api/V2/purchasingManagement'
 //销售订单列表
@@ -44,4 +45,6 @@ export const editStatus = appRx.post(API_POST_EDITSTATUS, errorCatcher,errorHand
 //销售订单删除
 export const deletesale = appRx.post(API_POST_DELETESALE, errorCatcher,errorHandle,filter)
 //成交价列表
-export const getpricelist = appRx.get(API_GET_GETPRICELIST, errorCatcher,errorHandle,filter)
+export const getpricelist = appRx.get(API_GET_GETPRICELIST, errorCatcher,errorHandle,filter)
+//成交价列表销售
+export const getsalepricelist = appRx.get(API_GET_GETSALEPRICELIST, errorCatcher,errorHandle,filter)

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++) {

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 } })
     },
   },
 }

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++) {

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} })
     },
   },
 }

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)
       }

src/views/purchasingManagement/purchaseOrderList.vue

@@ -1190,6 +1190,7 @@ export default {
         })
         return
       }
+      this.closePositionList1.closingBasis='-'+Math.abs(this.closePositionList1.closingBasis)
       closePositionList(this.closePositionList1)
         .toPromise()
         .then((response) => {
@@ -1542,6 +1543,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) => {

src/views/salesManagement/salesPlanList.vue

@@ -547,6 +547,48 @@ export default {
       })
     },
     varietyClick(row) {
+      if(row.salePlanType == '期货'){
+        if (
+        row.basisPrice > 10000 ||
+        row.basisPrice < 1 ||
+        (String(row.basisPrice).indexOf(
+          '.'
+        ) != -1 &&
+          String(row.basisPrice).length -
+            (String(row.basisPrice).indexOf(
+              '.'
+            ) +
+              1) >
+            2)
+      ) {
+        this.$message({
+          message: '基差输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      }
+      if(row.salePlanType == '现货'){
+        if (
+        row.unitPrice > 100000 ||
+        row.unitPrice < 1 ||
+        (String(row.unitPrice).indexOf(
+          '.'
+        ) != -1 &&
+          String(row.unitPrice).length -
+            (String(row.unitPrice).indexOf(
+              '.'
+            ) +
+              1) >
+            2)
+      ) {
+        this.$message({
+          message: '单价输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      }
       if (row.salePlanType == '期货') {
         this.$confirm(`确定要修改基差？`, {
           confirmButtonText: '确定',

src/views/salesManagement/salesPlanOrderList.vue

@@ -112,7 +112,7 @@
               scope.row.basis &&
               scope.row.salePlanType == '期货'
             "
-            >{{ scope.row.basis }}</span
+            >{{ '+'+scope.row.basis }}</span
           >
           <input
             v-if="scope.row.basischange"
@@ -921,7 +921,7 @@ import {
   aduitcontractno,
   editStatus,
   deletesale,
-  getpricelist,
+  getsalepricelist,
 } from '@/model/salesManagement/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
@@ -1369,7 +1369,7 @@ export default {
       this.$set(this.closePositionList1, 'closeRate', item.closeRate)
       this.$set(this.closePositionList1, 'seller', item.seller)
       this.$set(this.closePositionList1, 'commonId', item.commonId)
-      getpricelist({
+      getsalepricelist({
         id: item.id,
       })
         .toPromise()