修改对账主页

src/views/finance/contrast/index.vue

@@ -47,9 +47,8 @@
 
       <el-form-item label="录入人" prop="createBy">
         <el-input
-          v-model="TWareHouseFees.createBy"
-          :disabled="true"
-          placeholder="默认录入人"
+          v-model="queryParams_s.createBy"
+          placeholder="请输入录入人"
           clearable
           size="small"
         />
@@ -208,12 +207,12 @@
       <el-table-column label="系统编号" align="center" prop="fBillno" />
       <el-table-column label="货权方" align="center" prop="fCtrlcorpid" />
       <el-table-column label="结算单位" align="center" prop="fCorpid" />
-      <el-table-column label="账单日期" align="center" prop="createTime">
+      <el-table-column label="账单日期" align="center" prop="fAccbilldate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fAccbilldate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="提单号" align="center" prop="fMblno" />
+      <el-table-column label="提单号" align="center" prop="tMblno" />
       <el-table-column label="应收合计" align="center" prop="fAmtdr" />
       <el-table-column label="应付合计" align="center" prop="fAmtcr" />
       <!--       <el-table-column label="单据类型" align="center" prop="fBilltype" />-->
@@ -337,7 +336,11 @@
         </el-form-item>
 
         <el-form-item label="录入人" prop="createBy">
-          <el-input v-model="queryParams.createBy" />
+          <el-input v-model="queryParams.createBy" disabled/>
+        </el-form-item>
+
+        <el-form-item label="备注" prop="fRemarks">
+          <el-input v-model="queryParams.fRemarks"/>
         </el-form-item>
 
         <div style="width: 100%">
@@ -385,7 +388,7 @@
               size="mini"
               type="text"
               icon="el-icon-delete"
-              @click.native.prevent="deleteRow(scope.$index, increase_s)"
+              @click.native.prevent="deleteRow(scope.$index,DzfeeList)"
             >删除
             </el-button>
           </template>
@@ -393,7 +396,7 @@
       </el-table>
 
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm">保 存</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
 
@@ -598,7 +601,7 @@
               </template>
             </el-table-column>
             <el-table-column label="费用名称" align="center" prop="fFeeName" />
-            <el-table-column label="备注" align="center" prop="f_remarks">
+            <el-table-column label="备注" align="center" prop="fRemarks">
               <el-input placeholder="请输入内容"></el-input>
             </el-table-column>
           </el-table>
@@ -660,6 +663,7 @@ export default {
   },
   data() {
     return {
+      state_s: true,
       browseStatus:false,
       options:'',
       value1:"",
@@ -701,6 +705,13 @@ export default {
       DzfeeList: [],
       // 财务主页面表格
       contrastList: [],
+      //导入从表传主表
+      pass:{
+        fAmtdr:'',    //应收合计
+        fAmtcr:'',    //应付合计
+        fMblno:'',    //提单号
+        fName:''      //货权方
+      },
       // 传值对象
       TWareHouseFees:{
         fCorpid:'',
@@ -730,6 +741,7 @@ export default {
         fAccbilldate: null,
         fDeptid: null,
         createBy: null,
+        timeReconci: null
       },
       // 主表查询参数
       queryParams_s: {
@@ -792,7 +804,7 @@ export default {
   },
   created() {
     this.getList();
-    // this.register()
+    this.register()
   },
   methods: {
     // 金额筛选
@@ -807,11 +819,12 @@ export default {
       }
     },
     // 默认录入人
-    // register() {
-    //   queryUserVal().then((response)=>{
-    //   this.contrastList.createBy = response.user.userName
-    //   })
-    // },
+    register() {
+      queryUserVal().then((response)=>{
+      this.contrastList.createBy = response.user.userName
+      console.log(response.user.userName)
+      })
+    },
     
     getSummaries(param) {
         const { columns, data } = param;
@@ -944,6 +957,44 @@ export default {
       this.DzfeeList = []
       this.open = true;
       this.title = "添加财务数据主";
+      this.queryParams = {
+        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,
+        createBy: null,
+        timeReconci: null
+      }
+      queryUserVal().then((response)=>{
+      this.contrastList.createBy = response.user.userName
+      console.log(response.user.userName)
+      this.queryParams = {
+        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,
+        createBy: response.user.userName,
+        timeReconci: null
+      }
+      })
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -971,20 +1022,23 @@ export default {
     
     /** 提交按钮 */
     submitForm() {
-      this.$refs["rules"].validate(valid => {
+      this.$refs["ruless"].validate(valid => {
         if (valid) {
-          if (this.form.fId != null) {
+          if (this.queryParams.fId != null) {
+            this.queryParams.fBillstatus = '1'
             let formDate = new window.FormData()
             formDate.append('tFee',JSON.stringify(this.TWareHouseFees))
             formDate.append("tFeeDo", JSON.stringify(this.feeList))
 
             updateFee(formDate).then(response => {
               this.msgSuccess("修改成功");
+              this.DzfeeList = []
               this.open = false;
               this.getList();
             });
             
           } else {
+            this.queryParams.fBillstatus = '1'
             let formDate = new window.FormData()
             formDate.append('tFee',JSON.stringify(this.queryParams))
             formDate.append("tFeeDo", JSON.stringify(this.DzfeeList))
@@ -995,9 +1049,6 @@ export default {
               this.open = false;
               this.getList();
             });
-            for (let item in this.selection){
-          console.log(this.selection[item])
-            }
           }
         }
       });
@@ -1014,35 +1065,47 @@ export default {
     },
     /* 添加财务数据主 导入*/
     confirmImport(){
-      if (this.selection.length == '0') {
-        console.log('未选择')//写入提示
-      } else {
-        console.log(this.selection[0].fMblno)
-        for (let item in this.selection){
-          console.log(this.selection[item])
-          console.log(this.selection[item].fMblno)
-          if(item > 1){
-            this.fMblno = this.selection[item].fMblno + "..."
-          }else if(item == 0){
-            this.fMblno = this.selection[item].fMblno
+      if(this.state_s == true) {
+        if (this.selection.length == '0') {
+          console.log('未选择')//写入提示
+        } else {
+          console.log(this.selection[0].fMblno)
+          for (let item in this.selection){
+            console.log(this.selection[item])
+            console.log(this.selection[item].fMblno)
+            
+            if(item >= 1){
+
+              this.pass.fMblno = this.selection[item].fMblno + "..."
+              this.pass.fName = this.selection[item].fName + "..."
+            }else if(item == 0){
+              this.pass.fMblno = this.selection[item].fMblno
+              this.pass.fName = this.selection[item].fName
+            }
           }
+          console.log(this.pass)
+        this.DzfeeList = this.selection
+        this.queryParams.tMblno = this.pass.fMblno //提单号
+        this.queryParams.fCtrlcorpid = this.pass.fName
+        this.queryParams.fAmtcr = this.pass.fAmtcr
+        this.queryParams.fAmtdr = this.pass.fAmtdr
+        console.log(this.TWareHouseFees)
+        this.innerVisible = false
+        this.feeList = []
+        //  this.feeList = this.DzfeeList
+        this.TWareHouseFees = {
+          fCorpid:'',
+          fToCorpid:'',
+          fMblno:'',
+          fStatementNo:'',
+          fFeeid :'',
+          timeExamine:'',
+          timeInterval:'',
+          fSrcdc:'',
+          fReconciliation:'',
+          timeReconci: ''
         }
-       this.DzfeeList = this.selection
-       this.innerVisible = false
-       this.feeList = []
-      //  this.feeList = this.DzfeeList
-       this.TWareHouseFees = {
-        fCorpid:'',
-        fToCorpid:'',
-        fMblno:'',
-        fStatementNo:'',
-        fFeeid :'',
-        timeExamine:'',
-        timeInterval:'',
-        fSrcdc:'',
-        fReconciliation:'',
-        timeReconci: ''
-       }
+      }
     }
   },