提交收费页面

src/views/finance/charge/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams_s" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="tableFilter" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="系统编号" prop="fCtrlcorpid">
         <el-input
-          v-model="queryParams_s.fBillno"
+          v-model="tableFilter.fBillno"
           placeholder="请输入系统编号"
           clearable
           size="small"
@@ -12,7 +12,7 @@
       </el-form-item>
       <el-form-item label="货权方" prop="fCtrlcorpid">
         <el-input
-          v-model="queryParams_s.fCtrlcorpid"
+          v-model="tableFilter.fCtrlcorpid"
           placeholder="请输入货权方"
           clearable
           size="small"
@@ -21,7 +21,7 @@
       </el-form-item>
       <el-form-item label="对账日期" prop="fAccbilldate">
         <el-date-picker clearable size="small" style="width: 200px"
-                        v-model="queryParams_s.fAccbilldate"
+                        v-model="tableFilter.fAccbilldate"
                         type="date"
                         value-format="yyyy-MM-dd"
                         placeholder="选择账单日期"
@@ -30,7 +30,7 @@
       </el-form-item>
       <el-form-item label="结算单位" prop="fCorpid">
         <el-select
-          v-model="queryParams_s.fCorpid"
+          v-model="tableFilter.fCorpid"
           filterable
           remote
           clearable
@@ -47,17 +47,6 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="状态" prop="fBillstatus">
-        <el-select v-model="queryParams_s.fBillstatus" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.dictLabel"
-            :value="item.dictValue"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -86,17 +75,17 @@
         >修改
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['finance:charge:remove']"
-        >删除
-        </el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['finance:charge:remove']"-->
+<!--        >删除-->
+<!--        </el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -113,8 +102,8 @@
     <el-table v-loading="loading" :data="chargeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="序号" type="index" width="55" align="center"/>
-      <el-table-column label="系统编号" align="center" prop="fBillno"/>
-      <el-table-column label="货权方" align="center" prop="fCtrlcorpid"/>
+      <el-table-column label="系统编号" :show-overflow-tooltip="true" align="center" prop="fBillno"/>
+      <el-table-column label="货权方" :show-overflow-tooltip="true" align="center" prop="fCtrlcorpid"/>
       <!--      <el-table-column label="账单日期" align="center" prop="fAccbilldate" width="180">-->
       <!--        <template slot-scope="scope">-->
       <!--          <span>{{ parseTime(scope.row.fAccbilldate, '{y}-{m}-{d}') }}</span>-->
@@ -143,7 +132,7 @@
               size="mini"
               type="text"
               icon="el-icon-view"
-              @click="check(scope.row)"
+              @click="check(scope.row,0)"
               v-hasPermi="['finance:contrast:edit']"
               v-if="scope.row.fBillstatus == 6"
             >查看</el-button
@@ -152,9 +141,9 @@
               size="mini"
               type="text"
               icon="el-icon-view"
-              @click="check(scope.row)"
+              @click="check(scope.row,1)"
               v-hasPermi="['finance:contrast:edit']"
-              v-if="scope.row.fBillstatus >= 3 && scope.row.fBillstatus <= 6"
+              v-if="scope.row.fBillstatus == 4 || scope.row.fBillstatus == 5"
             >审批进度</el-button
             >
             <el-button
@@ -271,11 +260,12 @@
         </el-form-item>
       </el-form>
       <div style="width: 100%;">
-        <el-button type="warning" size="small" @click="charGe" :disabled="notChange">收费</el-button>
-        <el-button type="primary" size="small" @click="confirmCharge" :disabled="notChange">确认收费</el-button>
+        <el-button type="warning" size="small" @click="charGe" :disabled="notChange" v-if="queryParams.fBillstatus < '4'">收费</el-button>
+        <el-button type="primary" size="small" @click="confirmCharge" :disabled="notChange" v-if="queryParams.fBillstatus < '4'">确认收费</el-button>
         <el-button type="success" size="small" @click="revokeCharge" v-if="queryParams.fBillstatus === '6'">撤销收费</el-button>
         <el-button type="info" size="small" @click="printing" :disabled="notChange">打印</el-button>
-        <el-button type="danger" size="small" :disabled="notChange" v-show="Lander == Operator">撤销审批</el-button>
+<!--        <el-button type="danger" size="small" :disabled="notChange" v-show="Lander == Operator">撤销审批</el-button>-->
+        <el-button type="danger" size="small" :disabled="tablefilter" v-show="queryParams.fBillstatus === '4'">撤销审批</el-button>
       </div>
       <el-table v-loading="loading" :data="increase_s" @selection-change="handleSelectionChange_s">
         <!-- <el-table-column type="selection" width="55" align="center"/> -->
@@ -540,6 +530,7 @@ export default {
       approve:true,
       addOrUpdateVisible: false,
       contrastId:220,
+      tablefilter:false,
       hide:false,
       openPrint:false,
       notChange:false,
@@ -614,7 +605,7 @@ export default {
         fDeptid: null
       },
       // 主表查询参数
-      queryParams_s: {
+      tableFilter: {
         pageNum: 1,
         pageSize: 10,
         fBillno: null,
@@ -702,33 +693,77 @@ export default {
       backCharge(formDate).then(response => {
         console.log(response)
         this.msgSuccess('操作成功')
+        this.getList()
       })
-      // this.open = false
-      this.getList()
     },
 
     // 查看按钮
-    check(row){
+    check(row,res){
+      console.log(row.fId)
       this.notChange = true
-      this.reset()
-      this.pass = {
-        fAmtdr: '',    //应收合计
-        fAmtcr: '',    //应付合计
-        fMblno: '',    //提单号
-        fName: '',      //货权方
-        fFeesName: '',   //结算单位
-        fCorpid: ''     //结算单位ID
-      }
-      const fId = row.fId || this.ids
-      console.log(fId)
-      getCharge(fId).then(response => {
-          console.log(response)
-          this.increase_s = response.data.feeDoList
-          this.fWbuOptions = response.data.feesList
-          this.queryParams = response.data.tFee
-          this.fWbuOptions = response.data.feesList
-          this.fMblnoOptions = response.data.corps
-          this.open = true
+      getCharge(row.fId).then(response => {
+        console.log(response)
+        this.Operator = response.data.tFee.createBy
+        this.increase_s = response.data.feeDoList
+        this.fWbuOptions = response.data.feesList
+        this.queryParams = response.data.tFee
+        this.fWbuOptions = response.data.feesList
+        this.fMblnoOptions = response.data.corps
+        this.open = true
+        this.title = '收费列表'
+        console.log(this.Lander)
+        console.log(this.Operator)
+        if (res == 1){
+          this.notChange = true
+          this.tablefilter = false
+          if (this.Operator == this.Lander){
+            this.reset()
+            this.pass = {
+              fAmtdr: '',    //应收合计
+              fAmtcr: '',    //应付合计
+              fMblno: '',    //提单号
+              fName: '',      //货权方
+              fFeesName: '',   //结算单位
+              fCorpid: ''     //结算单位ID
+            }
+            const fId = row.fId || this.ids
+            console.log(fId)
+            getCharge(fId).then(response => {
+              console.log(response)
+              this.increase_s = response.data.feeDoList
+              this.fWbuOptions = response.data.feesList
+              this.queryParams = response.data.tFee
+              this.fWbuOptions = response.data.feesList
+              this.fMblnoOptions = response.data.corps
+              this.open = true
+            })
+          }else {
+            this.notChange = true
+            // this.$message.error('未知异常，请联系管理员')
+          }
+        }else {
+          this.notChange = true
+          this.reset()
+          this.pass = {
+            fAmtdr: '',    //应收合计
+            fAmtcr: '',    //应付合计
+            fMblno: '',    //提单号
+            fName: '',      //货权方
+            fFeesName: '',   //结算单位
+            fCorpid: ''     //结算单位ID
+          }
+          const fId = row.fId || this.ids
+          console.log(fId)
+          getCharge(fId).then(response => {
+            console.log(response)
+            this.increase_s = response.data.feeDoList
+            this.fWbuOptions = response.data.feesList
+            this.queryParams = response.data.tFee
+            this.fWbuOptions = response.data.feesList
+            this.fMblnoOptions = response.data.corps
+            this.open = true
+          })
+        }
       })
     },
     //打印功能
@@ -764,17 +799,25 @@ export default {
     },
     // 确认收费
     confirmCharge() {
-      this.queryParams.fBillstatus = '4'
-      let formDate = new window.FormData()
-      formDate.append('tFee', JSON.stringify(this.queryParams))
-      formDate.append('tFeeDo', JSON.stringify(this.increase_s))
-
-      collectFee(formDate).then(response => {
-        console.log(response)
-        this.msgSuccess('操作成功')
+      console.log(this.increase_s)
+      this.$refs['ruless'].validate(valid => {
+        if (valid) {
+          if(this.increase_s.length){
+            this.queryParams.fBillstatus = '4'
+            let formDate = new window.FormData()
+            formDate.append('tFee', JSON.stringify(this.queryParams))
+            formDate.append('tFeeDo', JSON.stringify(this.increase_s))
+            collectFee(formDate).then(response => {
+              console.log(response)
+              this.open = false
+              this.msgSuccess('操作成功')
+              this.getList()
+            })
+          }else {
+            this.$message.error('表单为空不允许操作');
+          }
+        }
       })
-      this.open = false
-      this.getList()
     },
     charGe() {
       this.queryParameter.fToCorpid = this.queryParams.fCorpid
@@ -879,7 +922,7 @@ export default {
       this.getDicts('approval_process').then((response) => {
         this.options = response.data
       })
-      listCharge(this.queryParams_s).then(response => {
+      listCharge(this.tableFilter).then(response => {
         console.log(response)
         this.chargeList = response.rows
         this.total = response.total
@@ -946,7 +989,21 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm('queryParams_s')
+      this.tableFilter = {
+        pageNum: 1,
+          pageSize: 10,
+          fBillno: null,
+          fCtrlcorpid: null,
+          fCorpid: null,
+          tMblno: null,
+          fAmtdr: null,
+          fAmtcr: null,
+          fBilltype: null,
+          fBillstatus: null,
+          fRemarks: null,
+          fAccbilldate: null,
+          fDeptid: null
+      }
       this.handleQuery()
     },
     //导入重置按钮
@@ -1062,7 +1119,7 @@ export default {
             addCharge(formData).then(response => {
               this.msgSuccess('新增成功')
               this.increase_s = []
-              this.open = false
+              // this.open = false
               this.getList()
             })
           } else {
@@ -1075,7 +1132,7 @@ export default {
             addCharge(formData).then(response => {
               this.msgSuccess('修改成功')
               this.increase_s = []
-              this.open = false
+              // this.open = false
               this.getList()
             })
           }

src/views/finance/contrast/index.vue

@@ -89,9 +89,9 @@
         </el-select>
       </el-form-item> -->
 
-      <el-form-item label="对账日期" prop="fAccbilldate">
+      <el-form-item label="对账日期" prop="dateRange">
         <el-date-picker
-          v-model="dateRange"
+          v-model="queryParams_s.dateRange"
           size="small"
           style="width: 240px"
           value-format="yyyy-MM-dd"
@@ -1143,7 +1143,24 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryParams_s");
+      console.log(this.queryParams_s)
+      this.queryParams_s = {
+        pageNum: 1,
+        pageSize: 10,
+        fBillno: null,
+        fCtrlcorpid: null,
+        fId:null,
+        fCorpid: null,
+        tMblno: null,
+        fAmtdr: null,
+        fAmtcr: null,
+        fBilltype: null,
+        fBillstatus: null,
+        fRemarks: null,
+        fAccbilldate: null,
+        fDeptid: null
+      }
+      console.log(this.queryParams_s)
       this.handleQuery();
       this.TWareHouseFees={
         fCorpid:'',