前端sdy

src/views/houseSelfCollect/paymentManagement.vue

@@ -8,6 +8,7 @@
         <ws-button type="primary"  @click="screen()">全部</ws-button>
         <ws-button type="primary" @click="reject" v-if="isShowAdopt">驳回</ws-button>
         <ws-button type="primary" @click="adopt" v-if="isShowAdopt">通过</ws-button>
+        <ws-button type="primary" @click="adopt" v-if="isShowAdopt">审核</ws-button>
         <ws-button type="primary" @click="payment">付款</ws-button>
       </template>
       <template slot="right">
@@ -22,8 +23,7 @@
             :key="item.id"
             :label="item.warehouseName"
             :value="item.id"
-          >
-          </el-option>
+          ></el-option>
         </el-select>
         <div></div>
         <ws-input
@@ -34,8 +34,8 @@
           type="input"
         ></ws-input>
         <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
-        <ws-button class="find" type="primary" @click="find()"
-          ><img
+        <ws-button class="find" type="primary" @click="find()">
+          <img
             width="16"
             height="16"
             style="
@@ -44,8 +44,9 @@
               top: 0px;
             "
             src="../../../public/img/sousuo.png"
-            alt=""
-        /></ws-button>
+            alt
+          />
+        </ws-button>
       </template>
     </BaseHeaderLayout>
     <el-table
@@ -56,118 +57,67 @@
       height="780"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column
-        :selectable="selectInit"
-        type="selection"
-        width="55"
-      ></el-table-column>
+      <el-table-column :selectable="selectInit" type="selection" width="55"></el-table-column>
       <el-table-column type="index" label="序号" width="50">
         <template scope="scope">
           <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
           <span v-else>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="paymentNo"
-        width="150"
-        label="编号"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="customerName"
-        label="客户"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="carNo"
-        label="车牌号"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="goodsName"
-        label="货名"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        width="80"
-        prop="type"
-        label="类型"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="tidalGrainPrice"
-        width="140"
-        label="净重单价（元/公斤）"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="solidGrainPrice"
-        width="140"
-        label="纯重单价（元/公斤）"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="netWeight"
-        width="120"
-        label="净重（公斤）"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="pureWeight"
-        width="120"
-        label="纯重（公斤）"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="amountIngPayable"
-        label="应付款(元)"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="amountEdPayable"
-        label="已付款(元)"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="collectionIngPayable"
-        label="更新时间"
-      ></el-table-column>
+      <el-table-column class="table_td" prop="paymentNo" width="150" label="编号"></el-table-column>
+      <el-table-column class="table_td" prop="customerName" label="客户"></el-table-column>
+      <el-table-column class="table_td" prop="carNo" label="车牌号"></el-table-column>
+      <el-table-column class="table_td" prop="goodsName" label="货名"></el-table-column>
+      <el-table-column class="table_td" width="80" prop="type" label="类型"></el-table-column>
+      <el-table-column class="table_td" prop="tidalGrainPrice" width="140" label="净重单价（元/公斤）"></el-table-column>
+      <el-table-column class="table_td" prop="solidGrainPrice" width="140" label="纯重单价（元/公斤）"></el-table-column>
+      <el-table-column class="table_td" prop="netWeight" width="120" label="净重（公斤）"></el-table-column>
+      <el-table-column class="table_td" prop="pureWeight" width="120" label="纯重（公斤）"></el-table-column>
+      <el-table-column class="table_td" prop="amountIngPayable" label="应付款(元)"></el-table-column>
+      <el-table-column class="table_td" prop="amountEdPayable" label="已付款(元)"></el-table-column>
+      <el-table-column class="table_td" prop="collectionIngPayable" label="更新时间"></el-table-column>
       <el-table-column class="table_td" prop="status" label="状态">
         <template scope="scope">
-          <span v-if="scope.row.approveStatus">{{
+          <span v-if="scope.row.approveStatus">
+            {{
             scope.row.approveStatus
-          }}</span>
+            }}
+          </span>
           <span v-else>{{ scope.row.status }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="collectionEdPayable"
-        label="操作"
-        width="350"
-      >
+      <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="350">
         <template scope="scope">
-          <el-button  type="danger" v-if="!scope.row.approveStatus && scope.row.status != '已驳回'" @click="del(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.delete`">删除</el-button>
-          <el-button v-if="!scope.row.approveStatus && scope.row.status != '已驳回'" @click="settlement(1, scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.add`">结算</el-button >
-          <el-button v-if="scope.row.approveStatus || scope.row.status == '已驳回'" @click="settlement(2, scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.view`">查看</el-button >
-          <el-button v-if=" scope.row.approveStatus || scope.row.status == '已驳回' || userJurisdiction " @click="print(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.print`">打印</el-button>
+          <el-button
+            type="danger"
+            v-if="!scope.row.approveStatus && scope.row.status != '已驳回'"
+            @click="del(scope.row)"
+            v-hasPermission="`acquisitionManagement.acquisitionPay.delete`"
+          >删除</el-button>
+          <el-button
+            v-if="!scope.row.approveStatus && scope.row.status != '已驳回'"
+            @click="settlement(1, scope.row)"
+            v-hasPermission="`acquisitionManagement.acquisitionPay.add`"
+          >结算</el-button>
+          <el-button
+            v-if="scope.row.approveStatus || scope.row.status == '已驳回'"
+            @click="settlement(2, scope.row)"
+            v-hasPermission="`acquisitionManagement.acquisitionPay.view`"
+          >查看</el-button>
+          <el-button
+            v-if=" scope.row.approveStatus || scope.row.status == '已驳回' || userJurisdiction "
+            @click="print(scope.row)"
+            v-hasPermission="`acquisitionManagement.acquisitionPay.print`"
+          >打印</el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 付款弹窗 -->
-    <el-dialog
-      width="40%"
-      :visible.sync="paymentForm"
-      :append-to-body="true"
-      title="付款"
-    >
+    <el-dialog width="40%" :visible.sync="paymentForm" :append-to-body="true" title="付款">
       <div class="tanchuang">
         <ws-form>
           <ws-info-table>
-            <ws-form-item label="未付金额（元）" prop="amountNotPayable">
-              {{ payments.amountNotPayable }}
-            </ws-form-item>
+            <ws-form-item label="未付金额（元）" prop="amountNotPayable">{{ payments.amountNotPayable }}</ws-form-item>
             <ws-form-item label="本次付款金额（元）" prop="money">
               <ws-input
                 v-model="payments.money"
@@ -177,15 +127,9 @@
               />
             </ws-form-item>
             <ws-form-item label="付款日期" prop=" paymentDate">
-              <el-date-picker
-                v-model="payments.paymentDate"
-                type="date"
-                placeholder="选择日期"
-              >
-              </el-date-picker>
-            </ws-form-item>
-            <ws-form-item label="上传截图" prop=" paymentScreenshot">
+              <el-date-picker v-model="payments.paymentDate" type="date" placeholder="选择日期"></el-date-picker>
             </ws-form-item>
+            <ws-form-item label="上传截图" prop=" paymentScreenshot"></ws-form-item>
             <div class="upLoad">
               <el-upload
                 class="avatar-uploader"
@@ -213,8 +157,7 @@
         :page-size="deptCircularPage.pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="deptBudgetTotal"
-      >
-      </el-pagination>
+      ></el-pagination>
       <el-dialog
         width="70%"
         class="table-content"
@@ -224,9 +167,7 @@
       >
         <paymentPrint :printData="printData"></paymentPrint>
         <div style="text-align: center">
-          <el-button type="primary" @click="isShowPrint = false"
-            >关闭</el-button
-          >
+          <el-button type="primary" @click="isShowPrint = false">关闭</el-button>
           <!-- <el-button type="primary" @click="printSmall">打印小票</el-button> -->
           <el-button type="primary" @click="printBig">打印单据</el-button>
         </div>
@@ -241,7 +182,7 @@ import {
   delpayment,
   auditpayment,
   getpaymentexamine,
-  paymentCommit,
+  paymentCommit
 } from '@/model/houseSelfCollect/index'
 import { posthandle } from '@/model/purchasingManagement/index'
 import paymentPrint from './component/paymentPrint.vue'
@@ -274,11 +215,11 @@ export default {
       userJurisdiction: true,
       payments: {
         amountNotPayable: 0,
-        paymentDate:"",
+        paymentDate: ''
       },
       isShowAdopt:false,
       //上传截图路径
-      imageUrl: '',
+      imageUrl: ''
     }
   },
   activated() {
@@ -296,33 +237,43 @@ export default {
     //     this.getList()
     //   })
     this.getWarehouse()
-    this.warehouseName = this.WAREHOUSE.payname
-    console.log(this.WAREHOUSE.payname)
     this.getList()
   },
   methods: {
-    getWarehouse(){
-       selectWarehouseSelf({
-      compId: sessionStorage.getItem('ws-pf_compId'),
-    })
-      .toPromise()
-      .then((response) => {
-        this.warehouseList = response
-        this.warehouseNameKey = this.warehouseList[0].id
-        this.warehouseName = this.warehouseList[0].warehouseName
-        // this.getList()
+    getWarehouse() {
+      selectWarehouseSelf({
+        compId: sessionStorage.getItem('ws-pf_compId')
       })
+        .toPromise()
+        .then(response => {
+          this.warehouseList = response
+          console.log(this.WAREHOUSE.payname)
+          this.warehouseNameKey = this.warehouseList[0].id
+          if (this.warehouseName) {
+            this.warehouseNameKey = this.WAREHOUSE.payname
+          } else {
+            this.WAREHOUSE.payname = this.warehouseList[0].id
+          }
 
+          // this.getList()
+        })
     },
     //上传付款截图
     handleAvatarSuccess(e) {
       this.imageUrl = e.url
     },
     printSmall() {
-      window.open('../../../../../static/payprint.html?type=1&dataList=' + JSON.stringify(this.printData))
+      window.open(
+        '../../../../../static/payprint.html?type=1&dataList=' +
+          JSON.stringify(this.printData)
+      )
     },
     printBig() {
-      window.open('../../../../../static/payprint.html?type=2&dataList=' +JSON.stringify(this.printData),"结算凭证")
+      window.open(
+        '../../../../../static/payprint.html?type=2&dataList=' +
+          JSON.stringify(this.printData),
+        '结算凭证'
+      )
     },
     getList() {
       getpayment({
@@ -331,13 +282,12 @@ export default {
         searchKeyWord: this.searchKeyWord,
         searchType: this.searchType,
         warehouseName: this.warehouseName,
-        managementType : 1 
+        managementType: 1
       })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.paymentList = response
-           this.deptBudgetTotal = response.total
-           this.WAREHOUSE.payname = this.warehouseName 
+          this.deptBudgetTotal = response.total
         })
      getpayment({
         currentPage: 1,
@@ -364,13 +314,13 @@ export default {
         {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
-          type: 'warning',
+          type: 'warning'
         }
       )
         .then(() => {
           delpayment({ id: row.id })
             .toPromise()
-            .then((response) => {
+            .then(response => {
               this.$message.success('删除成功')
               this.getList()
             })
@@ -379,12 +329,12 @@ export default {
           return false
         })
     },
-    screen(num){
+    screen(num) {
       this.searchType = num
       this.getList()
     },
-    find(){
-       this.getList()
+    find() {
+      this.getList()
     },
     settlement(index, row) {
       var data = {}
@@ -402,7 +352,7 @@ export default {
       if (row.goodsName)
         this.$router.push({
           path: 'settlement',
-          query: { type: index, id: row.id, waterMin: data1.waterMin },
+          query: { type: index, id: row.id, waterMin: data1.waterMin }
         })
     },
     payment() {
@@ -423,28 +373,28 @@ export default {
       if (!this.payments.money) {
         this.$message({
           message: '付款金额不能为空',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
       if (this.payments.money > this.payments.amountNotPayable) {
         this.$message({
           message: '付款金额不能超过未付金额',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
       if (!this.payments.paymentDate) {
         this.$message({
           message: '付款日期不能为空',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
       if (!this.imageUrl) {
         this.$message({
           message: '请上传付款截图 ',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
@@ -454,19 +404,19 @@ export default {
       this.$confirm('确定提交付款信息？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
           //付款提交
           paymentCommit(this.payments)
             .toPromise()
-            .then((response) => {
+            .then(response => {
               this.$notify.success({
                 title: '成功',
-                message: '付款成功',
+                message: '付款成功'
               })
-               this.paymentForm = false
-               this.getList()
+              this.paymentForm = false
+              this.getList()
             })
         })
         .catch(() => {
@@ -480,7 +430,7 @@ export default {
         this.$confirm('是否确定驳回？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
-          type: 'warning',
+          type: 'warning'
         })
           .then(() => {
             this.audit(this.modification[0], 0, false, '', '')
@@ -495,10 +445,10 @@ export default {
         if (status == true && item.status == '已驳回') {
           auditpayment({
             compId: sessionStorage.getItem('ws-pf_compId'),
-            id: item.id,
+            id: item.id
           })
             .toPromise()
-            .then((response) => {
+            .then(response => {
               this.audit(
                 this.modification[index + 1],
                 index + 1,
@@ -512,10 +462,10 @@ export default {
             taskId: item.taskId,
             approved: status,
             auditMind: reason != undefined ? '已驳回' : '34',
-            needReapply: status2 != undefined ? true : false,
+            needReapply: status2 != undefined ? true : false
           })
             .toPromise()
-            .then((response) => {
+            .then(response => {
               this.audit(
                 this.modification[index + 1],
                 index + 1,
@@ -524,7 +474,7 @@ export default {
                 reason
               )
             })
-            .catch((req) => {
+            .catch(req => {
               this.$message.warning(req.message)
             })
         }
@@ -546,7 +496,7 @@ export default {
         this.$confirm('是否确定通过？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
-          type: 'warning',
+          type: 'warning'
         })
           .then(() => {
             this.audit(this.modification[0], 0, true)
@@ -559,11 +509,17 @@ export default {
     print(row) {
       getpaymentexamine({ id: row.id })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.isShowPrint = true
           this.printData = response
           let date = new Date()
-          this.printData.currentTime = date.getFullYear() +"年"+ date.getMonth() +"月"+ date.getDay()+"日"
+          this.printData.currentTime =
+            date.getFullYear() +
+            '年' +
+            date.getMonth() +
+            '月' +
+            date.getDay() +
+            '日'
         })
     },
     examine() {
@@ -573,7 +529,7 @@ export default {
         this.$confirm('审核通过后，任务将发送给财务，是否确定通过？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
-          type: 'warning',
+          type: 'warning'
         })
           .then(() => {})
           .catch(() => {
@@ -584,13 +540,16 @@ export default {
     selectInit(row) {
       //在这里一定要记得类型匹配的上。
       if (row.status != '已驳回') {
-        if (row.taskId == null&&row.status != '已通过'&&row.status!='部分付款') {
+        if (
+          row.taskId == null &&
+          row.status != '已通过' &&
+          row.status != '部分付款'
+        ) {
           return false
         } else {
-           return true
+          return true
         }
-      } 
-      else {
+      } else {
         return true
       }
     },
@@ -601,7 +560,7 @@ export default {
       for (let i = 0; i < this.warehouseList.length; i++) {
         if (this.warehouseList[i].id == this.warehouseNameKey) {
           this.warehouseName = this.warehouseList[i].warehouseName
-          this.WAREHOUSE.payname = this.warehouseList[i].warehouseName
+          this.WAREHOUSE.payname = this.warehouseList[i].id
         }
       }
       this.getList()
@@ -615,8 +574,8 @@ export default {
       this.currentPage = val
       console.log(`当前页: ${val}`)
       this.getList()
-    },
-  },
+    }
+  }
 }
 </script>
 <style lang="scss" scoped>