统计报表合同编号下拉

src/api/V2/statisticalReport/index.js

@@ -1,7 +1,13 @@
 //采购入库报表
 export const API_GET_PURCHRECEIPT = '/purchaseReceiptReport/selectPurchaseOrder'
-// 销售合同
+// 销售平仓合同
 export const API_GET_SALE_CONTRACTNO = '/salesClosingReport/selectContractNoList'
+// 销售出库合同
+export const API_GET_SALE_OUT_CONTRACTNO = '/salesDeliveryReport/selectContractNoList'
+// 采购平仓合同
+export const API_GET_PURCHASE_CONTRACTNO = '/purchaseClosingReport/selectContractNoList'
+// 采购入库合同
+export const API_GET_PURCHASE_IN_CONTRACTNO = '/purchaseReceiptReport/selectContractNoList'
 // 采购入库修改
 export const API_POST_AMEND_PURCHRECEIPT = '/purchaseReceiptReport/api/editProcurementReceiptReport'
 // 采购入库补货结转

src/model/statisticalReport/index.js

@@ -22,13 +22,22 @@ import {
     API_POST_SALES_INVOICING,
     API_POST_SALES_BATCH_INVOICING,
     API_POST_FINAL_SETTLEMENT_PRICE,
-    API_POST_ISSUE_APPROVAL
+    API_POST_ISSUE_APPROVAL,
+    API_GET_SALE_OUT_CONTRACTNO,
+    API_GET_PURCHASE_CONTRACTNO,
+    API_GET_PURCHASE_IN_CONTRACTNO
 
 } from '@/api/V2/statisticalReport'
 //采购入库报表
 export const getpurchreceipt = appRx.get(API_GET_PURCHRECEIPT, errorCatcher, errorHandle, filter)
-//采购合同
-export const getsalecontractno = appRx.get(API_GET_SALE_CONTRACTNO, errorCatcher, errorHandle, filter)
+//销售平仓合同
+export const getsaleclosingcontractno = appRx.get(API_GET_SALE_CONTRACTNO, errorCatcher, errorHandle, filter)
+//销售出库合同
+export const getsaleoutcontractno = appRx.get(API_GET_SALE_OUT_CONTRACTNO, errorCatcher, errorHandle, filter)
+//采购平仓合同
+export const getpurchasecontractno = appRx.get(API_GET_PURCHASE_CONTRACTNO, errorCatcher, errorHandle, filter)
+//采购入库合同
+export const getpurchaseincontractno = appRx.get(API_GET_PURCHASE_IN_CONTRACTNO, errorCatcher, errorHandle, filter)
 //采购入库修改
 export const postamend = appRx.post(API_POST_AMEND_PURCHRECEIPT, errorCatcher, errorHandle, filter)
 //采购入库补货结转

src/views/purchasingManagement/purchaseOrderList.vue

@@ -567,7 +567,7 @@ export default {
       dialogFormVisible7: false,
       dialogFormVisible8: false,
       dialogVisible: false,
-dialogImageUrl:"",
+dialogImageUrl:'',
       form: {
         transactionPrice: '',
         transactionsNumber: '',
@@ -608,7 +608,7 @@ dialogImageUrl:"",
       tranTypeKey: 1,
       pageSize: 10,
       searchType: '',
-      searchTypeText: '未完成',
+      searchTypeText: '全部订单',
       searchKeyWord: '',
       contractType: 2,
       enter: {

src/views/statisticalReport/purchaseClosingCashierList.vue

@@ -32,9 +32,17 @@
                 value=""
               />
           <ws-option
-                v-for="item in contractNoList.records"
+                v-if='item.reportStatus'
+                v-for="item in contractNoList"
                 :key="item.constKey"
-                :label="item.contractNo+'('+item.closeaccountstatus+')'"
+                :label="item.contractNo+'('+item.reportStatus+')'"
+                :value="item.contractNo"
+              />
+          <ws-option
+                v-if='!item.reportStatus'
+                v-for="item in contractNoList"
+                :key="item.constKey"
+                :label="item.contractNo"
                 :value="item.contractNo"
               />
           </ws-select>
@@ -192,7 +200,11 @@
 </template>
 <script>
 import {
-  getclose,closeaudit,closepaymoney,closecollmoney
+  getclose,
+  getpurchasecontractno,
+  closeaudit,
+  closepaymoney,
+  closecollmoney
 } from '@/model/statisticalReport/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
@@ -421,6 +433,15 @@ export default {
         })
     },
     getList() {
+      if(this.roleId=='4c2d50d8ff2943c1b7a1e947feefe048'){
+        this.roleFlag=1
+      }else if(this.roleId=='cca3cf0ca2814d1e918f5b0a4380fe69'){
+        this.roleFlag=2
+      }else if(this.roleId=='9ad8abb997714ef29068f23c2ad3b125'){
+        this.roleFlag=3
+      }else if(this.roleId=='3d7b9179552b4c3e9c2d7af43962e2e4'){
+        this.roleFlag=4
+      }
       getclose({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
@@ -433,7 +454,7 @@ export default {
         .then(response => {
           this.warehouseList = response
         })
-        getclose({
+      getpurchasecontractno({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
@@ -441,15 +462,6 @@ export default {
       })
         .toPromise()
         .then(response => {
-          for (let i = 0; i < response.records.length; i++) {
-            if(response.records[i].amountNotPayable==0){
-              response.records[i].closeaccountstatus='已结算'
-            }else{
-              response.records[i].closeaccountstatus='待结算'
-            }
-            
-            
-          }
            this.contractNoList = response
         })
     },

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -445,7 +445,7 @@
 <script>
 import {
   getpurchreceipt,
-  getcontractno,
+  getpurchaseincontractno,
   postamend,
   postreplanishent,
   postaudit,
@@ -1033,7 +1033,7 @@ export default {
           }
           this.warehouseList = response
         })
-      getpurchreceipt({
+      getpurchaseincontractno({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,

src/views/statisticalReport/salesClosingCashierList.vue

@@ -204,7 +204,7 @@ import {
   getsalelist,
   postsalepaymoney,
   postsalecollectmoney,
-  getsalecontractno
+  getsaleclosingcontractno
 } from '@/model/statisticalReport/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
@@ -614,7 +614,7 @@ export default {
         .then(response => {
           this.saleList = response
         })
-        getsalecontractno({
+      getsaleclosingcontractno({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,

src/views/statisticalReport/salesDeliveryReportList.vue

@@ -33,9 +33,17 @@
                 value=""
               />
           <ws-option
-                v-for="item in contractNoList.records"
+                v-if= 'item.reportStatus'
+                v-for="item in contractNoList"
                 :key="item.constKey"
-                :label="item.contractNo+'('+item.closeaccountstatus+')'"
+                :label="item.contractNo+'('+item.reportStatus+')'"
+                :value="item.contractNo"
+              />
+          <ws-option
+                v-if= '!item.reportStatus'
+                v-for="item in contractNoList"
+                :key="item.constKey"
+                :label="item.contractNo"
                 :value="item.contractNo"
               />
           </ws-select>
@@ -223,7 +231,13 @@
 </template>
 <script>
 import {
-  salelist,getcontractno,finalsettlementprice,issueapproval,cashierpayment,salesinvoicing,salesbatchinvoicing
+  salelist,
+  getsaleoutcontractno,
+  finalsettlementprice,
+  issueapproval,
+  cashierpayment,
+  salesinvoicing,
+  salesbatchinvoicing
 } from '@/model/statisticalReport/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
@@ -319,8 +333,6 @@ export default {
           }
         ]
       },
-      currentPage: 1,
-      pageSize: 10,
       pcFlag: 1,
       modification:[],
       amendlist:{},
@@ -497,8 +509,8 @@ export default {
       }
       else{
         this.dialogFormVisible1=true
-        for(var i = 0 ; i < this.modification.length ; i++){
-       this.collectionNotPayable+= this.modification[i].collectionNotPayable
+        for(var i=0;i<this.modification.length;i++){
+       this.collectionNotPayable +=this.modification[i].collectionNotPayable
       }
       }
     },
@@ -707,7 +719,7 @@ export default {
         .then(response => {
           this.warehouseList = response
         })
-        salelist({
+      getsaleoutcontractno({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
@@ -715,15 +727,6 @@ export default {
       })
         .toPromise()
         .then(response => {
-          for (let i = 0; i < response.records.length; i++) {
-            if(response.records[i].amountNotPayable==0){
-              response.records[i].closeaccountstatus='已结算'
-            }else{
-              response.records[i].closeaccountstatus='待结算'
-            }
-            
-            
-          }
            this.contractNoList = response
         })
     },