收费修改

src/views/finance/charge/index.vue

@@ -127,7 +127,14 @@
       <el-table-column label="应付合计" align="center" prop="fAmtcr"/>
       <el-table-column label="备注" align="center" prop="fRemarks"/>
       <el-table-column label="状态" align="center" prop="fBillstatus">
-        已入账
+        <template slot-scope="scope">
+          <span v-if="scope.row.fBillstatus == '1'">新建</span>
+          <span v-else-if="scope.row.fBillstatus == '2'">暂存</span>
+          <span v-else-if="scope.row.fBillstatus == '3'">审批驳回</span>
+          <span v-else-if="scope.row.fBillstatus == '4'">提交审核</span>
+          <span v-else-if="scope.row.fBillstatus == '5'">审核中</span>
+          <span v-else-if="scope.row.fBillstatus == '6'">审核完成</span>
+        </template>
       </el-table-column>
 
       <!--      <el-table-column label="单据类型" align="center" prop="fBilltype"/>-->
@@ -237,21 +244,32 @@
         <el-table-column label="存货单号" align="center" prop="fBscorpno"/>
         <el-table-column label="品名" align="center" prop="fProductName"/>
         <el-table-column label="业务日期" align="center" prop="fBsdate"/>
-        <el-table-column label="费用名称" align="center" prop="fFeeName"/>
-        <el-table-column label="收/付" align="center" prop="fDc">
+        <el-table-column label="费用1名称" align="center" prop="fFeeid">
           <template slot-scope="scope">
-            <span v-if="scope.row.fDc =='D'">收</span>
-            <span v-else="scope.row.fDc =='C'">付</span>
+            <el-select
+              v-model="scope.row.fFeeid"
+              filterable
+              remote
+              :disabled="browseStatus"
+              :remote-method="fWRemoteMethod"
+              placeholder="费用名称"
+            >
+              <el-option
+                v-for="(dict, index) in fWbuOptions"
+                :key="index.fId"
+                :label="dict.fName"
+                :value="dict.fId"
+              ></el-option>
+            </el-select>
           </template>
         </el-table-column>
-        <el-table-column label="业务类型" align="center" prop="fBilltype">
+        <el-table-column label="收/付" align="center" prop="fDc">
           <template slot-scope="scope">
-            <span v-if="scope.row.fBilltype =='SJRK'">入库</span>
-            <span v-else-if="scope.row.fBilltype == 'SJCK'">出库</span>
-            <span v-else-if="scope.row.fBilltype == 'CKDB'">调拨</span>
-            <span v-else-if="scope.row.fBilltype == 'HQZY'">货权转移</span>
+            <span v-if="scope.row.fDc =='D'">收</span>
+            <span v-else="scope.row.fDc =='C'">付</span>
           </template>
         </el-table-column>
+        <el-table-column label="业务类型" align="center" prop="fBilltype"/>
         <el-table-column label="本次金额" align="center" prop="fAmt"/>
         <el-table-column label="备注" align="center" prop="fRemarks"/>
       </el-table>
@@ -414,13 +432,14 @@ import {
   listCorps
 } from '@/api/finance/charge'
 import { listFees } from '@/api/basicdata/fees'
+import log from '@/views/monitor/job/log'
 
 export default {
   name: 'Charge',
   components: {},
   data() {
     return {
-      browseStatus: false,
+      browseStatus: true,
       fWbuOptions: [],
       options:'',
       // 遮罩层
@@ -682,13 +701,17 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      console.log(row)
       this.reset()
       const fId = row.fId || this.ids
+      console.log(fId)
       getCharge(fId).then(response => {
         console.log(response)
-        this.increase_s = response.data.tFeeDoList
+        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 = '修改财务数据主'
       })
@@ -699,17 +722,23 @@ export default {
       this.$refs['ruless'].validate(valid => {
         console.log(valid)
         if (valid) {
-          if (this.form.fId != null) {
-            updateCharge(this.form).then(response => {
+          console.log(this.chargeList[0].fId)
+          if (this.chargeList[0].fId != null) {
+            this.chargeList.fBillstatus = '1'
+            let formData = new window.FormData()
+            formData.append('tFee', JSON.stringify(this.queryParams))
+            formData.append('tFeeDo', JSON.stringify(this.increase_s))
+            addCharge(formData).then(response => {
               this.msgSuccess('修改成功')
+              this.increase_s = []
               this.open = false
               this.getList()
             })
           } else {
+            this.chargeList.fBillstatus = '1'
             let formData = new window.FormData()
             formData.append('tFee', JSON.stringify(this.queryParams))
             formData.append('tFeeDo', JSON.stringify(this.increase_s))
-
             addCharge(formData).then(response => {
               this.msgSuccess('新增成功')
               this.increase_s = []