前端gjy

src/api/V2/statisticalReport/index.js

@@ -15,4 +15,12 @@ export const API_POST_EDITSTATUS = '/purchaseOrder/api/editStatus'
 //采购状态，基差，单价修改 
 export const API_POST_PROCUREMENT_EDITSTATUS = '/procurementPlanInfo/api/editStatus'
 // 采购订单删除
-export const API_POST_DELETEPURCHASE = '/purchaseOrder/api/deletePurchaseOrder'
+export const API_POST_DELETEPURCHASE = '/purchaseOrder/api/deletePurchaseOrder'
+// 销售平仓审核、通过、驳回
+export const API_POST_SALE_EXAMINE ='/salesClosingReport/api/examine'
+// 销售平仓列表
+export const API_GET_SALE_LIST ='/salesClosingReport/selectSalesClosingOrder'
+// 销售平仓付款
+export const API_POST_PAY_MONEY ='/salesClosingReport/api/payMoney'
+// 销售平仓收款
+export const API_POST_COLLECT_MONEY ='/salesClosingReport/api/collectMoney'

src/model/statisticalReport/index.js

@@ -6,7 +6,11 @@ import {
     API_POST_AMEND_PURCHRECEIPT,
     API_POST_REPLANISHENT,
     API_POST_AUDIT,
-    API_POST_PAYMONEY
+    API_POST_PAYMONEY,
+    API_POST_SALE_EXAMINE,
+    API_GET_SALE_LIST,
+    API_POST_PAY_MONEY,
+    API_POST_COLLECT_MONEY
 } from '@/api/V2/statisticalReport'
 //采购入库报表
 export const getpurchreceipt = appRx.get(API_GET_PURCHRECEIPT, errorCatcher, errorHandle, filter)
@@ -19,4 +23,12 @@ export const postreplanishent = appRx.post(API_POST_REPLANISHENT, errorCatcher,
 //采购入库审核
 export const postaudit = appRx.post(API_POST_AUDIT, errorCatcher, errorHandle, filter)
 //采购入库付款
-export const postpaymoney = appRx.post(API_POST_PAYMONEY, errorCatcher, errorHandle, filter)
+export const postpaymoney = appRx.post(API_POST_PAYMONEY, errorCatcher, errorHandle, filter)
+//销售平仓审核
+export const postsaleaudit = appRx.post(API_POST_SALE_EXAMINE, errorCatcher, errorHandle, filter)
+//销售平仓列表
+export const getsalelist = appRx.get(API_GET_SALE_LIST, errorCatcher, errorHandle, filter)
+//销售平仓付款
+export const postsalepaymoney= appRx.post(API_POST_PAY_MONEY, errorCatcher, errorHandle, filter)
+//销售平仓付款
+export const postsalecollectmoney= appRx.post(API_POST_COLLECT_MONEY, errorCatcher, errorHandle, filter)

src/views/statisticalReport/salesClosingCashierList.vue

@@ -1,35 +1,113 @@
 <!--销售平仓报表-->
 <template>
   <div class="container">
-    <el-scrollbar style="height:100%">
-      <el-scrollbar style="width:130%">
-        <el-row>
-          <el-col :span="12">
-            <h2 class="bg-left title"></h2>
-          </el-col>
-          <el-col :span="12" class="bg-right">
-            <el-button class="bg-bottom" type="primary" size="small" @click="revert()">
-              <img
-                width="6"
-                height="10"
-                style="vertical-align: bottom; margin-right: 3px"
-                src="../../../public/img/lujing.png"
-                alt
-              />返回
-            </el-button>
-          </el-col>
-        </el-row>
         <!-- <div> -->
         <div>
-          <ws-button type="primary" @click="handleAdd()">待审核</ws-button>
-          <ws-button type="primary" @click="handleAdd()">待结算</ws-button>
-          <ws-button type="primary" @click="handleAdd()">已结算</ws-button>
-          <ws-button type="primary" @click="handleAdd()">全部</ws-button>
-          <ws-button type="primary" @click="handleAdd()">驳回</ws-button>
-          <ws-button type="primary" @click="handleAdd()">通过</ws-button>
-          <ws-button type="primary" @click="handleAdd()">审核</ws-button>
-          <ws-button type="primary" @click="dialogFormVisible1=true">付款</ws-button>
-          <el-dialog
+          <ws-button type="primary" @click="handlestatus(1)">待审核</ws-button>
+          <ws-button type="primary" @click="handlestatus(2)">待结算</ws-button>
+          <ws-button type="primary" @click="handlestatus(3)">已结算</ws-button>
+          <ws-button type="primary" @click="handlestatus('')">全部</ws-button>
+          <ws-button v-if='roleId=="9ad8abb997714ef29068f23c2ad3b125"' type="primary" @click="handleAudit(3,2)">驳回</ws-button>
+          <ws-button v-if='roleId=="9ad8abb997714ef29068f23c2ad3b125"' type="primary" @click="handleAudit(3,1)">通过</ws-button>
+          <ws-button v-if='roleId=="cca3cf0ca2814d1e918f5b0a4380fe69"' type="primary" @click="handleAudit(2,2)">驳回</ws-button>
+          <ws-button v-if='roleId=="cca3cf0ca2814d1e918f5b0a4380fe69"' type="primary" @click="handleAudit(2,1)">通过</ws-button>
+          <ws-button v-if='roleId=="4c2d50d8ff2943c1b7a1e947feefe048"' type="primary" @click="handleAudit(1)">审核</ws-button>
+          <ws-button v-if='roleId=="3d7b9179552b4c3e9c2d7af43962e2e4"' type="primary" @click="payment()">付款</ws-button>
+          <ws-button v-if='roleId=="3d7b9179552b4c3e9c2d7af43962e2e4"' type="primary" @click="collection()">收款</ws-button>
+          <ws-select
+            v-model="contractNo"
+            placeholder="请选择合同"
+            clearable
+            @change='contractchange'
+            maxlength="500"
+            type="input"
+            class="findValue"
+          >
+          <ws-option
+                key=""
+                label="全部合同"
+                value=""
+              />
+          <ws-option
+                v-for="item in contractNoList.records"
+                :key="item.constKey"
+                :label="item.contractNo+'('+item.closeaccountstatus+')'"
+                :value="item.contractNo"
+              />
+          </ws-select>
+        </div>
+
+        <el-table
+          class="wenzi"
+          :data="saleList.records"
+          style="width: 100%; margin-top: 20px"
+          @selection-change="handleSelectionChange"
+          ref="warehouseList"
+          border
+          :summary-method="getSummaries"
+          show-summary
+        >
+          <el-table-column type="selection" :selectable="checkSelectable" width="55"></el-table-column>
+          <el-table-column type="index" label="序号" width="50"></el-table-column>
+          <el-table-column class="table_td" prop="contractNo" label="合同编号"></el-table-column>
+          <el-table-column class="table_td" prop="closePositionDate" label="平仓日期"></el-table-column>
+          <el-table-column class="table_td" prop="closingQuantity" label="平仓数量(吨)"></el-table-column>
+          <el-table-column class="table_td" prop="transactionPrice" label="成交价格(元/吨)"></el-table-column>
+          <el-table-column class="table_td" prop="closeRate" label="平仓价格(元/吨)"></el-table-column>
+          <el-table-column class="table_td" prop="basisPrice" label="基差(元/吨)"></el-table-column>
+          <el-table-column class="table_td" prop="amountIngPayable" label="应付金额(元)">
+            <template scope="scope">
+            <span v-if="scope.row.amountIngPayable">{{ scope.row.amountIngPayable }}</span>
+            <span v-else>-</span>
+          </template>
+          </el-table-column>
+          <el-table-column class="table_td" prop="amountEdPayable" label="已付金额(元)">
+            <template scope="scope">
+            <span v-if="scope.row.amountEdPayable">{{ scope.row.amountEdPayable }}</span>
+            <span v-else>-</span>
+          </template>
+          </el-table-column>
+          <el-table-column class="table_td" prop="amountNotPayable" label="未付金额(元)">
+            <template scope="scope">
+            <span v-if="scope.row.amountNotPayable">{{ scope.row.amountNotPayable }}</span>
+            <span v-else>-</span>
+          </template>
+          </el-table-column>
+          <el-table-column class="table_td" prop="paymentDate" label="付款日期"></el-table-column>
+          <el-table-column class="table_td" prop="collectionIngPayable" label="应收金额(元)">
+            <template scope="scope">
+            <span v-if="scope.row.collectionIngPayable">{{ scope.row.collectionIngPayable }}</span>
+            <span v-else>-</span>
+          </template>
+          </el-table-column>
+          <el-table-column class="table_td" prop="collectionEdPayable" label="已收金额(元)">
+            <template scope="scope">
+            <span v-if="scope.row.collectionEdPayable">{{ scope.row.collectionEdPayable }}</span>
+            <span v-else>-</span>
+          </template>
+          </el-table-column>
+          <el-table-column class="table_td" prop="collectionNotPayable" label="未收金额(元)">
+            <template scope="scope">
+            <span v-if="scope.row.collectionNotPayable">{{ scope.row.collectionNotPayable }}</span>
+            <span v-else>-</span>
+          </template>
+          </el-table-column>
+          <el-table-column class="table_td" prop="collectionDate" label="收款日期"></el-table-column>
+          <el-table-column class="table_td"  prop="customerName" label="客户"></el-table-column>
+          <el-table-column class="table_td"  prop="warehouseName" label="库点"></el-table-column>
+          <el-table-column prop="status" label="状态"></el-table-column>
+        </el-table>
+
+        <!-- 页数 -->
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-size="pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="deptBudgetTotal"
+        ></el-pagination>
+        <el-dialog
             width="25%"
             title="付款"
             :visible.sync="dialogFormVisible1"
@@ -37,11 +115,11 @@
           >
             <el-form :model="form">
               <el-form-item label="未付金额（元）" :label-width="formLabelWidth">
-                <!-- <el-input v-model="form.region" autocomplete="off" class="deal"></el-input> -->
+                {{paymentlist.amountNotPayable}}
               </el-form-item>
               <el-form-item label="本次付款金额（元）" :label-width="formLabelWidth">
                 <el-input
-                  v-model="form.region"
+                  v-model="paymentlist.money"
                   autocomplete="off"
                   placeholder="请输入本次付款金额"
                   class="deal"
@@ -54,7 +132,7 @@
                 class="deal"
               >
                 <ws-date-picker
-                  v-model="deptBudgetList.submissionDate"
+                  v-model="paymentlist.paymentDate"
                   type="date"
                   placeholder="请选择付款日期"
                   value-format="yyyy-MM-dd"
@@ -63,23 +141,28 @@
               </el-form-item>
               <el-form-item label="上传付款截图" :label-width="formLabelWidth">
                 <el-upload
+                v-if='paymentlist.paymentScreenshot==""'
                   action="https://www.zthymaoyi.com/upload/admin"
                   list-type="picture-card"
-                  :on-preview="handlePictureCardPreview"
+                  :on-success="
+                  (res, file) => {
+                    handlepaymentScreenshot( res, file)
+                  }
+                "
                   :on-remove="handleRemove"
                   class="photo2"
                 >
                   <i class="el-icon-plus"></i>
                 </el-upload>
+                <img v-if='paymentlist.paymentScreenshot!=""' style='width:100px;height:100px;border:1px solid #ccc;' :src="paymentlist.paymentScreenshot" alt="">
               </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
               <el-button @click="dialogFormVisible1 = false">取 消</el-button>
-              <el-button type="primary" @click="dialogFormVisible1= false">提 交</el-button>
+              <el-button type="primary" @click="paymoneyconfirm">提 交</el-button>
             </div>
           </el-dialog>
-          <ws-button type="primary" @click="dialogFormVisible2=true">收款</ws-button>
-          <el-dialog
+         <el-dialog
             width="25%"
             title="收款"
             :visible.sync="dialogFormVisible2"
@@ -87,126 +170,64 @@
           >
             <el-form :model="form">
               <el-form-item label="未收金额（元）" :label-width="formLabelWidth">
-                <!-- <el-input v-model="form.region" autocomplete="off" class="deal"></el-input> -->
+                {{collectionlist.collectionNotPayable}}
               </el-form-item>
               <el-form-item label="本次收款金额（元）" :label-width="formLabelWidth">
                 <el-input
-                  v-model="form.region"
+                  v-model="collectionlist.money"
                   autocomplete="off"
-                  placeholder="请输入本次收款金额"
+                  placeholder="请输入本次付款金额"
                   class="deal"
                 ></el-input>
               </el-form-item>
               <el-form-item
-                label="付款日期"
+                label="收款日期"
                 prop="submissionDate"
                 :label-width="formLabelWidth"
                 class="deal"
               >
                 <ws-date-picker
-                  v-model="deptBudgetList.submissionDate"
+                  v-model="collectionlist.paymentDate"
                   type="date"
-                  placeholder="请选择付款日期"
+                  placeholder="请选择收款日期"
                   value-format="yyyy-MM-dd"
                   class="deal"
                 />
               </el-form-item>
-              <el-form-item label="上传付款截图" :label-width="formLabelWidth">
+              <el-form-item label="上传收款截图" :label-width="formLabelWidth">
                 <el-upload
+                v-if='collectionlist.collectionScreenshot==""'
                   action="https://www.zthymaoyi.com/upload/admin"
                   list-type="picture-card"
-                  :on-preview="handlePictureCardPreview"
+                  :on-success="
+                  (res, file) => {
+                    handlecollectionScreenshot( res, file)
+                  }
+                "
                   :on-remove="handleRemove"
                   class="photo2"
                 >
                   <i class="el-icon-plus"></i>
                 </el-upload>
+                <img v-if='collectionlist.collectionScreenshot!=""' style='width:148px;height:148px;border:1px solid #ccc;' :src="collectionlist.collectionScreenshot" alt="">
               </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
               <el-button @click="dialogFormVisible2 = false">取 消</el-button>
-              <el-button type="primary" @click="dialogFormVisible2= false">提 交</el-button>
+              <el-button type="primary" @click="collectionconfirm">提 交</el-button>
             </div>
           </el-dialog>
-          <template slot="right">
-            <span style="width: 70px; display: inline-block; color: #8890b1">状态：</span>
-            <ws-select
-              v-model="searchTypeText"
-              class="typeselect"
-              @change="selecttaskType"
-              :value="searchType"
-            >
-              <ws-option
-                v-for="item in taskTypeList"
-                :key="item.value"
-                :label="item.value"
-                :value="item.value"
-                style="color: #8890b1"
-              />
-            </ws-select>
-          </template>
-          <ws-select
-            v-model="searchKeyWord"
-            placeholder="可按照合同编号和任务编号进行查找"
-            clearable
-            maxlength="500"
-            type="input"
-            class="findValue"
-          ></ws-select>
-        </div>
-
-        <el-table
-          class="wenzi"
-          :data="warehouseList.records"
-          style="width: 100%; margin-top: 20px"
-          @selection-change="handleSelectionChange"
-          ref="warehouseList"
-          border
-          :summary-method="getSummaries"
-          show-summary
-        >
-          <el-table-column type="selection" width="55"></el-table-column>
-          <el-table-column type="index" label="序号" width="50"></el-table-column>
-          <el-table-column class="table_td" prop="contractNo" label="合同编号"></el-table-column>
-          <el-table-column class="table_td" prop="procurementPlan" label="平仓日期"></el-table-column>
-          <el-table-column class="table_td" prop="customer" label="平仓数量(吨)"></el-table-column>
-          <el-table-column class="table_td" prop="unitPrice" label="成交价格(元/吨)"></el-table-column>
-          <el-table-column class="table_td" prop="basis" label="平仓价格(元/吨)"></el-table-column>
-          <el-table-column class="table_td" prop="freezingDeposit" label="基差(元/吨)"></el-table-column>
-          <el-table-column class="table_td" prop="defaultDeposit" label="应付金额(元)"></el-table-column>
-          <el-table-column class="table_td" prop="unloadingCharge" label="已付金额(元)"></el-table-column>
-          <el-table-column class="table_td" prop="unloadingCharge" label="未付金额(元)"></el-table-column>
-          <el-table-column class="table_td" prop="invoiceFee" label="付款日期"></el-table-column>
-          <el-table-column class="table_td" prop="send" label="应收金额(元)"></el-table-column>
-          <el-table-column class="table_td" prop="stockInQuantity" label="已收金额(元)"></el-table-column>
-          <el-table-column class="table_td" prop="openPosition" label="未收金额(元)"></el-table-column>
-          <el-table-column class="table_td" prop="closedPosition" label="收款日期"></el-table-column>
-          <el-table-column class="table_td" label="客户"></el-table-column>
-          <el-table-column class="table_td" label="库点"></el-table-column>
-          <el-table-column prop="status" label="状态"></el-table-column>
-        </el-table>
-
-        <!-- 页数 -->
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-size="pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="deptBudgetTotal"
-        ></el-pagination>
-      </el-scrollbar>
-    </el-scrollbar>
   </div>
 
   <!-- </div> -->
 </template>
 <script>
 import {
-  detailsList,
-  chengList,
-  closePositionList
-} from '@/model/purchasingManagement/index'
+  postsaleaudit,
+  getsalelist,
+  postsalepaymoney,
+  postsalecollectmoney
+} from '@/model/statisticalReport/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -243,14 +264,7 @@ export default {
         // resource: '',
         // desc: ''
       },
-      formLabelWidth: '120px',
-
-      barWidth: 0,
-      barHeight: 0,
-      retioX: 1,
-      ratioY: 1,
-      isTaped: false,
-      isHover: false,
+      formLabelWidth: '140px',
       isShow: !this.autohide,
       //弹出框
       dialogViewSpareMoney: false,
@@ -259,21 +273,18 @@ export default {
       monetaryKey: null,
       // 表格显示数据
       tableDate: [],
-
       // 是否显示
       showType: true,
       // 年
       year: '',
-      pickerOptions: {},
       value2: '',
       deptBudgetTotal: 0,
       currentPage: 1,
-      tranTypeKey: 1,
       pageSize: 10,
-      searchType: 1,
-      searchTypeText: '未完成',
+      searchType:'' ,
       searchKeyWord: '',
       contractType: 2,
+      contractNoList:[],
       enter: {
         closePositionList: []
       },
@@ -286,21 +297,20 @@ export default {
 
       // 提交类型
       submitType: true,
+      multipleSelection:[],
       size: 10,
       spanArr: [],
       contractNo: '',
+      roleFlag:'1',
       inOutTaskNo: '',
       compId: sessionStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      warehouseList: [],
+      roleId: sessionStorage.getItem('ws-pf_roleId'),
+      saleList: [],
       deptBudgetList: {},
       pcFlag: 1,
       historyList: [],
-      pickerBeginDateBefore: {
-        disabledDate: time => {
-          return time.getTime() > Date.now()
-        }
-      },
+      paymentlist:{paymentScreenshot:''},
+      collectionlist:{collectionScreenshot:''},
       accessoryTFs: false
     }
   },
@@ -310,6 +320,222 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    handlestatus(){
+
+    },
+    collectionconfirm(){
+       if(!this.collectionlist.money){
+        this.$message.warning('收款金额不能为空')
+        return
+      }
+      if(this.collectionlist.money>this.collectionlist.collectionNotPayable){
+        this.$message.warning('收款金额不能超过未收金额')
+        return
+      }
+      if(this.collectionlist.money.indexOf('.')!=-1){
+        if(this.collectionlist.money.split('.')[1].length>2){
+          this.$message.warning('收款金额输入错误')
+          return
+        }
+      }
+      if(!this.collectionlist.collectionScreenshot){
+        this.$message.warning('请上传收款截图')
+        return
+      }
+      this.$confirm(`确定提交收款信息？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning'
+      }).then(() => {
+        postsalecollectmoney(this.collectionlist).toPromise()
+        .then(response => {
+          this.$message.success('提交成功')
+          this.collectionlist={collectionScreenshot:''}
+          this.dialogFormVisible2= false
+          this.getList()
+        }) .catch(() => {
+          this.$message.warning('提交失败')
+        })
+      })
+    },
+    paymoneyconfirm(){
+      if(!this.paymentlist.money){
+        this.$message.warning('付款金额不能为空')
+        return
+      }
+      if(this.paymentlist.money>this.paymentlist.amountNotPayable){
+        this.$message.warning('付款金额不能超过未付金额')
+        return
+      }
+      if(this.paymentlist.money.indexOf('.')!=-1){
+        if(this.paymentlist.money.split('.')[1].length>2){
+          this.$message.warning('付款金额输入错误')
+          return
+        }
+      }
+      if(!this.paymentlist.paymentScreenshot){
+        this.$message.warning('请上传付款截图')
+        return
+      }
+      this.$confirm(`确定提交付款信息？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning'
+      }).then(() => {
+        postsalepaymoney(this.paymentlist).toPromise()
+        .then(response => {
+          this.$message.success('提交成功')
+          this.paymentlist={paymentScreenshot:''}
+          this.dialogFormVisible1= false
+          this.getList()
+        }) .catch(() => {
+          this.$message.warning('提交失败')
+        })
+      })
+    },
+    checkSelectable (row) {
+      console.log(row)
+      let mark = 0
+      if(row.status!='全部付款'&&row.status!='全部收款'){
+        return true
+      }else{
+          return false
+      }
+    },
+    handlepaymentScreenshot(res,fire){
+      this.paymentlist.paymentScreenshot=res.url
+    },
+    handlecollectionScreenshot(res,fire){
+      this.collectionlist.collectionScreenshot=res.url
+    },
+    payment(){
+      if(this.multipleSelection.length>0){
+        var amountNotPayable=0
+        for (let i = 0; i < this.multipleSelection.length; i++) {
+          amountNotPayable+=this.multipleSelection[i].amountNotPayable
+          if(this.multipleSelection[i].collectionIngPayable>0){
+            this.$message.warning('请选择应付款的条目')
+            return
+          }
+        }
+        this.dialogFormVisible1=true
+        this.paymentlist.amountNotPayable=amountNotPayable
+        this.paymentlist.salesClosingReportList=this.multipleSelection
+      }else{
+        this.$message.warning('请选择要审核的条目')
+      }
+    },
+    collection(){
+      if(this.multipleSelection.length>0){
+        var collectionNotPayable=0
+        for (let i = 0; i < this.multipleSelection.length; i++) {
+          collectionNotPayable+=this.multipleSelection[i].collectionNotPayable
+          if(this.multipleSelection[i].amountNotPayable>0){
+            this.$message.warning('请选择应收款的条目')
+            return
+          }
+        }
+        this.dialogFormVisible2=true
+        this.collectionlist.collectionNotPayable=collectionNotPayable
+        this.collectionlist.salesClosingReportList=this.multipleSelection
+      }else{
+        this.$message.warning('请选择要审核的条目')
+      }
+    },
+    handleAudit(status,flag){
+      if(status==1){
+        if(this.multipleSelection.length>0){
+          this.$confirm(`审核通过后，任务将发送给财务，是否确定通过？`, {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
+            type: 'warning'
+          }).then(() => {
+            postsaleaudit({salesClosingReportList:this.multipleSelection,roleFlag:1,flag:1}).toPromise()
+            .then(response => {
+              this.$message.success('通过成功')
+              this.getList()
+            }) .catch(() => {
+              this.$message.warning('通过失败')
+            })
+          })
+        }else{
+            this.$message.warning('请选择要审核的条目')
+        }
+      }else if(status==2&&flag==1){
+        if(this.multipleSelection.length>0){
+          this.$confirm(`审核通过后，任务将发送给决策人，是否确定通过？`, {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
+            type: 'warning'
+          }).then(() => {
+            postsaleaudit({salesClosingReportList:this.multipleSelection,roleFlag:2,flag:1}) .toPromise()
+            .then(response => {
+              this.$message.success('通过成功')
+              this.getList()
+            }) .catch(() => {
+              this.$message.warning('通过失败')
+            })
+          })
+        }else{
+            this.$message.warning('请选择要通过的条目')
+        }
+      }else if(status==2&&flag==2){
+        if(this.multipleSelection.length>0){
+          this.$confirm(`驳回后任务将退回到统计，是否确定驳回？`, {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
+            type: 'warning'
+          }).then(() => {
+            postsaleaudit({salesClosingReportList:this.multipleSelection,roleFlag:2,flag:2}) .toPromise()
+            .then(response => {
+              this.$message.success('驳回成功')
+              this.getList()
+            }) .catch(() => {
+              this.$message.warning('驳回失败')
+            })
+          })
+        }else{
+            this.$message.warning('请选择要驳回的条目')
+        }
+      }
+      else if(status==3&&flag==1){
+        if(this.multipleSelection.length>0){
+          this.$confirm(`审核通过后，任务将发送给出纳，是否确定通过？`, {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
+            type: 'warning'
+          }).then(() => {
+            postsaleaudit({salesClosingReportList:this.multipleSelection,roleFlag:3,flag:1}) .toPromise()
+            .then(response => {
+              this.$message.success('通过成功')
+              this.getList()
+            }) .catch(() => {
+              this.$message.warning('通过失败')
+            })
+          })
+        }else{
+            this.$message.warning('请选择要通过的条目')
+        }
+      }else if(status==3&&flag==2){
+        if(this.multipleSelection.length>0){
+          this.$confirm(`驳回后任务将退回到统计，是否确定驳回？`, {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
+            type: 'warning'
+          }).then(() => {
+            postsaleaudit({salesClosingReportList:this.multipleSelection,roleFlag:2,flag:2}) .toPromise()
+            .then(response => {
+              this.$message.success('驳回成功')
+              this.getList()
+            }) .catch(() => {
+              this.$message.warning('驳回失败')
+            })
+          })
+        }else{
+            this.$message.warning('请选择要驳回的条目')
+        }
+      }
+    },
     updated() {
       this.$nextTick(() => {
         this.$refs.warehouseList.doLayout()
@@ -372,18 +598,45 @@ export default {
       })
     },
     getList() {
-      console.log(123456)
-      detailsList({
+      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
+      }
+      getsalelist({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-        pcFlag: this.pcFlag,
         searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord
+        contractNo:this.contractNo,
+        roleFlag:this.roleFlag
       })
         .toPromise()
         .then(response => {
-          this.warehouseList = response
+          this.saleList = response
+        })
+        getsalelist({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        roleFlag:this.roleFlag
+      })
+        .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
         })
     },
     // loaddata(){
@@ -425,37 +678,6 @@ export default {
     //     }
     //   })
     // },
-    getSpanArr(data) {
-      let that = this
-
-      //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
-
-      that.spanArr = []
-
-      that.pos = 0
-
-      // //遍历数据
-
-      data.forEach((item, index) => {
-        //判断是否是第一项
-
-        if (index === 0) {
-          this.spanArr.push(1)
-          this.pos = 0
-        } else {
-          //不是第一项时，就根据标识去存储
-          if (data[index].warehouseNumViewList.length > 1) {
-            查找到符合条件的数据时每次要把之前存储的数据 + 1
-            this.spanArr[this.pos] = data[index].warehouseNumViewList.length
-            this.spanArr.push(0)
-          } else {
-            // 没有符合的数据时，要记住当前的index
-            this.spanArr.push(1)
-            this.pos = index
-          }
-        }
-      })
-    },
     //查看
     handleLook(row) {
       this.$router.push({
@@ -469,28 +691,6 @@ export default {
     revert() {
       this.$router.push({ path: 'warehouseManagementList' })
     },
-    dateFormat(fmt, date) {
-      let ret
-      const opt = {
-        'Y+': date.getFullYear().toString(), // 年
-        'm+': (date.getMonth() + 1).toString(), // 月
-        'd+': date.getDate().toString(), // 日
-        'H+': date.getHours().toString() // 时
-        // "M+": date.getMinutes().toString(),         // 分
-        // "S+": date.getSeconds().toString()          // 秒
-        // 有其他格式化字符需求可以继续添加，必须转化成字符串
-      }
-      for (let k in opt) {
-        ret = new RegExp('(' + k + ')').exec(fmt)
-        if (ret) {
-          fmt = fmt.replace(
-            ret[1],
-            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
-          )
-        }
-      }
-      return fmt
-    },
     handleClose() {
       this.accessoryTFs = false
     },

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.116:8090/',
+        target: 'http://192.168.1.120:8090/',
         // target: 'http://192.168.1.112:8090/',
         // target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',