修改

src/api/V2/platformaudit/index.js

@@ -8,7 +8,13 @@ export const API_POST_TRANSACTIONINFORMATIONREVIEW = '/procurementPlanInfo/api/e
 export const API_GET_GRAINMERCHANT_LIST = '/identityAuthenticationInfo/selectIdentityAuthenticationInfoPc'
 //司机列表
 export const API_GET_DRIVER_LIST = '/driverViewInfo/selectDriverInfoPage'
-//交易信息列表
+//交易信息列表(采购)
 export const API_GET_TRANSACTIONINFORMATION_LIST = '/procurementPlanInfo/selectProcurementPlanInfo'
-//交易信息删除
-export const API_POST_DELETETRANSACTIONINFORMATION = '/procurementPlanInfo/api/deleteProcurementPlan'
+//交易信息删除（采购）
+export const API_POST_DELETETRANSACTIONINFORMATION = '/procurementPlanInfo/api/deleteProcurementPlan'
+//交易信息列表(销售)
+export const API_GET_SALE_LIST = '/salePlanInfo/selectSalePlanInfo'
+//交易信息删除（销售）
+export const API_POST_DELETESALE = '/salePlanInfo/api/deleteSalePlanInfo'
+//交易信息审核(销售)
+export const API_POST_SALEREVIEW = '/salePlanInfo/api/examine'

src/api/V2/salesManagement/index.js

@@ -16,7 +16,7 @@ export const API_GET_SALE_ORDER_LIST = '/saleOrder/selectSaleOrder'
 export const API_POST_SALE_ORDER_DEAL = '/saleOrder/api/deal'
 //销售订单平仓
 export const API_POST_SALE_CLOSEPOSITION = '/saleOrder/api/closePosition'
-//销售订单审核编辑
+//销售订单审核
 export const API_POST_ADUIT_SALE = '/saleOrder/api/editSaleOrder'
 //销售订单合同编号下拉列表
 export const API_GET_ADUIT_CONTRACTNO = '/warehouseBaseInfo/selectContractNoList'

src/model/platformaudit/index.js

@@ -7,7 +7,10 @@ import {
     API_GET_GRAINMERCHANT_LIST,
     API_GET_DRIVER_LIST,
     API_GET_TRANSACTIONINFORMATION_LIST,
-    API_POST_DELETETRANSACTIONINFORMATION
+    API_POST_DELETETRANSACTIONINFORMATION,
+    API_GET_SALE_LIST,
+    API_POST_DELETESALE,
+    API_POST_SALEREVIEW,
 } from '@/api/V2/platformaudit'
 // import { app } from 'electron'
 // 粮商审核
@@ -23,4 +26,10 @@ export const driverList = appRx.get(API_GET_DRIVER_LIST, errorCatcher, errorHand
 //交易信息列表
 export const transactionInformationList = appRx.get(API_GET_TRANSACTIONINFORMATION_LIST, errorCatcher, errorHandle, filter)
 // 交易信息删除
-export const deleteTransactionInformation = appRx.post(API_POST_DELETETRANSACTIONINFORMATION, errorCatcher, errorHandle, filter)
+export const deleteTransactionInformation = appRx.post(API_POST_DELETETRANSACTIONINFORMATION, errorCatcher, errorHandle, filter)
+//销售交易信息列表
+export const saleList = appRx.get(API_GET_SALE_LIST, errorCatcher, errorHandle, filter)
+// 销售交易信息删除
+export const deletesale = appRx.post(API_POST_DELETESALE, errorCatcher, errorHandle, filter)
+// 销售交易信息审核
+export const saleexamine = appRx.post(API_POST_SALEREVIEW, errorCatcher, errorHandle, filter)

src/views/platformaudit/transactioninformationreview.vue

@@ -151,7 +151,7 @@
   </div>
 </template>
 <script>
-import { getTransactionInformation, transactionInformationList ,deleteTransactionInformation} from '@/model/platformaudit/index'
+import { getTransactionInformation, transactionInformationList ,deleteTransactionInformation , saleList ,deletesale ,saleexamine} from '@/model/platformaudit/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 import { EventBus } from 'base-core-lib'
@@ -397,6 +397,11 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
+    //采购
+    purchase() {
+      this.getList()
+    },
+    //采购列表
     getList() {
       transactionInformationList({
         compId: sessionStorage.getItem('ws-pf_compId'),
@@ -413,6 +418,27 @@ export default {
           this.deptBudgetTotal = response.total
         })
     },
+    //销售
+    sale() {
+        this.getList1()
+    },
+    //销售列表
+    getList1() {
+      saleList({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        searchType: this.searchType,
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchKeyWord: this.searchKeyWord,
+      })
+        .toPromise()
+        .then((response) => {
+          this.tranManagementList = response
+          this.deptCircularPage.currentPage = response.current
+          this.deptCircularPage.pageSize = response.size
+          this.deptBudgetTotal = response.total
+        })
+    },
     editClick(row) {
       var status = ''
       if (row.processStatus == '待执行' || row.processStatus == '已完成') {

src/views/purchasingManagement/purchaseOrderList.vue

@@ -182,7 +182,7 @@
                   </el-form-item>
                   <el-form-item label="成交日期" prop="submissionDate" :label-width="formLabelWidth" class="deal">
                     <ws-date-picker
-                      v-model="clinchdeal.dealDate"
+                      v-model="clinchdeal1.dealDate"
                       type="date"
                       placeholder="请选择成交日期"
                       value-format="yyyy-MM-dd"
@@ -669,6 +669,7 @@ dialogImageUrl:"",
     makeabargain(item){
         this.dialogFormVisible1 = true
         this.clinchdeal.id=item.id
+        this.clinchdeal.commonId=item.commonId
     },
     deletehandle(item){
       this.$confirm(`采购订单删除后不可恢复，是否确定删除？`, {
@@ -919,7 +920,7 @@ dialogImageUrl:"",
         type: 'warning'
       })
       .then(() => {
-      chengList({transactionRecord:this.clinchdeal1,id:this.clinchdeal.id,compId:sessionStorage.getItem('ws-pf_compId'),dealDate:this.clinchdeal.dealDate})
+      chengList({transactionRecord:this.clinchdeal1,id:this.clinchdeal.id,commonId:this.clinchdeal.commonId,compId:sessionStorage.getItem('ws-pf_compId')})
         .toPromise()
         .then((response) => {
           this.$message.success('成交成功')

src/views/salesManagement/salesPlanOrderList.vue

@@ -269,7 +269,7 @@
           <el-button
             v-if="scope.row.status == '已通过' || scope.row.status == '已成交'"
             class="record"
-            @click="dialogFormVisible1 = true"
+            @click="makeabargain(scope.row)"
             >成交</el-button
           >
           <!-- 补充定金 -->
@@ -325,20 +325,21 @@
       layout="total, sizes, prev, pager, next, jumper"
       :total="deptBudgetTotal"
     ></el-pagination>
+    <!--成交-->
     <el-dialog
       width="30%"
       title="成交"
       :visible.sync="dialogFormVisible1"
       :append-to-body="true"
     >
-      <el-form ref="warehouseList" :model="warehouseList">
+      <el-form ref="warehouseList">
         <el-form-item
           label="成交价(元/吨)"
           prop="transactionPrice"
           :label-width="formLabelWidth"
         >
           <el-input
-            v-model="warehouseList.transactionPrice"
+            v-model="clinchdeal1.transactionPrice"
             autocomplete="off"
             placeholder="请输入成交价"
             class="deal"
@@ -350,7 +351,7 @@
           :label-width="formLabelWidth"
         >
           <el-input
-            v-model="warehouseList.transactionsNumber"
+            v-model="clinchdeal1.turnover"
             autocomplete="off"
             placeholder="请输入成交量"
             class="deal"
@@ -362,7 +363,7 @@
           :label-width="formLabelWidth"
         >
           <el-input
-            v-model="warehouseList.basis"
+            v-model="clinchdeal1.basis"
             autocomplete="off"
             placeholder="请输入基差"
             class="deal"
@@ -375,7 +376,7 @@
           class="deal"
         >
           <ws-date-picker
-            v-model="deptBudgetList.submissionDate"
+            v-model="clinchdeal1.dealDate"
             type="date"
             placeholder="请选择成交日期"
             value-format="yyyy-MM-dd"
@@ -385,9 +386,10 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible1 = false">取 消</el-button>
-        <el-button type="primary" @click="submit()">确 定</el-button>
+        <el-button type="primary" @click="chengjiao()">确 定</el-button>
       </div>
     </el-dialog>
+    <!-- 补充定金 -->
     <el-dialog
       width="40%"
       title="补充定金"
@@ -416,6 +418,7 @@
         <el-button type="primary" @click="replenish">确 定</el-button>
       </div>
     </el-dialog>
+    <!-- 平仓 -->
     <el-dialog
       width="40%"
       title="平仓"
@@ -424,12 +427,19 @@
     >
       <el-form class="closeposition">
         <el-form-item label="成交价格（元/吨）" prop="transactionPrice">
-          <el-select
-            v-model="closePositionList1.transactionPrice"
-            autocomplete="off"
-            placeholder="请输入成交价"
-            class="deal"
-          ></el-select>
+           <ws-select
+              v-model="closePositionList1.transactionPrice"
+              placeholder
+              class="deal"
+              placeholder="请输入成交价"
+            >
+              <ws-option
+                v-for="item in transactionRecordList"
+                :key="item.constKey"
+                :label="item.transactionPrice"
+                :value="item.transactionPrice"
+              />
+            </ws-select>
         </el-form-item>
         <el-form-item label="可平仓数量（吨）" prop="openPosition">
           <el-input
@@ -456,7 +466,7 @@
         </el-form-item>
         <el-form-item label="平仓基差（元/吨）" prop="closingBasis">
           <el-input
-            v-model="closePositionList1.closingBasis"
+            v-model="closePositionList1.basis"
             autocomplete="off"
             placeholder="请输入平仓基差"
             class="deal"
@@ -487,7 +497,7 @@
         >
       </div>
     </el-dialog>
-
+    <!-- 审核 -->
     <el-dialog
       width="40%"
       title="审核"
@@ -600,6 +610,7 @@
         <el-button type="primary" @click="aduitconfirm">通过</el-button>
       </div>
     </el-dialog>
+    <!-- 客户信息 -->
     <el-dialog
       width="30%"
       title="客户信息"
@@ -674,6 +685,7 @@
         <el-button @click="dialogFormVisible8 = false">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- 成交记录 -->
     <el-dialog
       width="40%"
       title="成交记录"
@@ -706,6 +718,7 @@
         <el-table-column prop="dealDate" label="成交日期"> </el-table-column>
       </el-table>
     </el-dialog>
+    <!--改价记录-->
     <el-dialog
       width="30%"
       title="改价记录"
@@ -775,6 +788,8 @@ export default {
       },
       formLabelWidth: '120px',
       basischange: false,
+      clinchdeal:{},
+      clinchdeal1:{},
       barWidth: 0,
       barHeight: 0,
       retioX: 1,
@@ -819,7 +834,7 @@ export default {
       submitType: true,
       size: 10,
       spanArr: [],
-      contractNo: '',
+      // contractNo: '',
       customerlist: {},
       packingTypeList: [],
       inOutTaskNo: '',
@@ -827,6 +842,7 @@ export default {
       deptCircularPage: {},
       warehouseList: [],
       deptBudgetList: {},
+      transactionRecordList:{},
       pcFlag: 1,
       invoiceList: [],
       contractNolist: [],
@@ -859,6 +875,31 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    handle(item){
+         this.$confirm(`状态修改为已完成后不可再进行交易操作，是否确定修改？`, {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        })
+          .then(() => {
+            editStatus({id:item.id,flag:2}).toPromise()
+            .then(response => {
+            this.$message.success('修改成功')
+            this.getList()
+            }).catch(req => {
+              this.$message.success('修改失败')
+            })
+          })
+    },
+    makeabargain(item){
+      this.dialogFormVisible1 = true
+      this.clinchdeal.id=item.id
+      this.clinchdeal.contractNo=item.contractNo
+      this.clinchdeal.goodsName=item.goodsName
+      this.clinchdeal.planId=item.planId
+      this.clinchdeal.buyer=item.buyer
+      this.clinchdeal.commonId=item.commonId
+    },
     deletehandle(item) {
       this.$confirm(`销售订单删除后不可恢复，是否确定删除？`, {
         confirmButtonText: '确定',
@@ -876,21 +917,27 @@ export default {
           })
       })
     },
-    closepositionconfirm() {
-      closePositionList(this.closePositionList1)
-        .toPromise()
-        .then((response) => {
-          this.$message.success('修改基差成功')
+    closepositionconfirm(){
+      this.closePositionList1.compId=sessionStorage.getItem('ws-pf_compId')
+      closePositionList(this.closePositionList1).toPromise()
+        .then(response => {
+          this.$message.success('平仓成功')
           this.getList()
-        })
-        .catch((req) => {
-          this.$message.success('修改基差失败')
+        }).catch(req => {
+          this.$message.warning('平仓失败')
         })
     },
-    cloaeposition1(item) {
+    cloaeposition1(item){
       this.dialogFormVisible2 = true
-      this.$set(this.closePositionList1, 'id', item.id)
-      this.$set(this.closePositionList1, 'openPosition', item.openPosition)
+      this.$set(this.closePositionList1,'id',item.id)
+      this.transactionRecordList=item.transactionRecordList
+      this.$set(this.closePositionList1,'openPosition',item.openPosition)
+      this.$set(this.closePositionList1,'transactionsNumber',item.transactionsNumber)
+      this.$set(this.closePositionList1,'contractNo',item.contractNo)
+      this.$set(this.closePositionList1,'planId',item.planId)
+      this.$set(this.closePositionList1,'closeRate',item.closeRate)
+      this.$set(this.closePositionList1,'seller',item.seller)
+      this.$set(this.closePositionList1,'commonId',item.commonId)
     },
     changebasis(item) {
       editStatus({ basis: this.basis, id: item.id, flag: 3 })
@@ -1073,18 +1120,13 @@ export default {
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        console.log(this.aduitlist)
         aduitsale(this.aduitlist)
-          .toPromise()
-          .then((response) => {
-            console.log(response)
               .toPromise()
-              .then((response) => {
-                this.$message.success('审核成功')
-                this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
-              })
-          })
-      })
+              .then(response => {
+              this.$message.success('审核成功')
+              this.getList()
+            })
+        })
     },
     Changepricerecord(item) {
       this.dialogFormVisible5 = true
@@ -1115,8 +1157,8 @@ export default {
     },
 
     //成交
-    submit() {
-      if (!this.warehouseList.transactionPrice) {
+    chengjiao() {
+      if (!this.clinchdeal1.transactionPrice) {
         this.$message({
           message: '成交价不能为空',
           type: 'warning',
@@ -1128,19 +1170,19 @@ export default {
         confirmButtonText: '确定',
         type: 'warning',
       }).then(() => {
-        console.log(23456678790)
-        chengList(this.warehouseList)
-          .toPromise()
-          .then((response) => {
-            this.$message.success('添加成功')
-
-            // this.$router.go(-1)
-          })
-          .catch(() => {
-            console.log(1111111111)
-            return false
-          })
+        chengList({transactionRecord:this.clinchdeal1,id:this.clinchdeal.id,compId:sessionStorage.getItem('ws-pf_compId'),
+        contractNo:this.clinchdeal.contractNo,planId:this.clinchdeal.planId,goodsName:this.clinchdeal.goodsName,buyer:this.clinchdeal.buyer,commonId:this.clinchdeal.commonId})
+        .toPromise()
+        .then((response) => {
+          this.$message.success('成交成功')
+         this.dialogFormVisible1 = false
+          // this.$router.go(-1)
+        })
+        .catch(() => {
+          return false
+        })
       })
+      
     },
     selectpackingType(e) {
       for (var i = 0; i < this.packingTypeList.length; i++) {
@@ -1157,7 +1199,6 @@ export default {
       }
     },
     getList() {
-      console.log(123456)
       detailsList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
@@ -1170,6 +1211,7 @@ export default {
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
             response.records[i].basischange = false
+            response.records[i].openPosition=response.records[i].cumulativeTurnover-response.records[i].closedPosition-response.records[i].stockInQuantity
           }
           this.warehouseList = response
           this.deptCircularPage.currentPage = response.current
@@ -1191,7 +1233,7 @@ export default {
       // 合同编号
       aduitcontractno({
         compId: sessionStorage.getItem('ws-pf_compId'),
-        flag: 0,
+        flag: 1,
       })
         .toPromise()
         .then((response) => {