Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/api/finance/contrast.js

@@ -30,7 +30,7 @@ export function addFee(data) {
 export function updateFee(data) {
   return request({
     url: '/finance/contrast/add',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
@@ -55,7 +55,7 @@ export function exportFee(query) {
 // 导入搜索
 export function importFee(TWareHouseFees) {
   return request({
-    url: '/finance/charge/chargeList',
+    url: '/finance/contrast/contrastList',
     method: 'get',
     params: TWareHouseFees,
     tFee:TWareHouseFees,

src/views/finance/contrast/index.vue

@@ -205,7 +205,7 @@
       <!-- <el-table-column label="制单部门" align="center" prop="fId" /> -->
       <el-table-column label="行号" align="center" type="index" width="55" />
       <el-table-column label="系统编号" align="center" prop="fBillno" />
-      <el-table-column label="货权方" align="center" prop="fCtrlcorpid" />
+      <el-table-column label="货权方" align="center" show-overflow-tooltip prop="fCtrlcorpid" />
       <el-table-column label="结算单位" align="center" prop="fCorpid" />
       <el-table-column label="账单日期" align="center" prop="fAccbilldate">
         <template slot-scope="scope">
@@ -216,7 +216,7 @@
       <el-table-column label="应收合计" align="center" prop="fAmtdr" />
       <el-table-column label="应付合计" align="center" prop="fAmtcr" />
       <!--       <el-table-column label="单据类型" align="center" prop="fBilltype" />-->
-      <el-table-column label="备注" align="center" prop="fRemarks" />
+      <el-table-column label="备注" align="center" show-overflow-tooltip prop="fRemarks" />
       <el-table-column label="状态" align="center" prop="fBillstatus">
         <template slot-scope="scope">
           <span v-if="scope.row.fBillstatus == '1'">新建</span>
@@ -375,7 +375,11 @@
         <!-- <el-table-column label="制单部门" align="center" prop="fId" /> -->
         <el-table-column label="行号" align="center" type="index" />
         <el-table-column label="提单号" align="center" prop="fMblno" />
-        <el-table-column label="业务日期" align="center" prop="fBsdate" />
+        <el-table-column label="业务日期" align="center" prop="fBsdate">
+          <template slot-scope="scope">
+            <span>{{scope.row.fBsdate.slice(0,10)}}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="费用名称" align="center" prop="fFeeName" />
         <el-table-column label="收/付" align="center" prop="fSrcdc">
           <template slot-scope="scope">
@@ -384,12 +388,13 @@
           </template>
         </el-table-column>
         <el-table-column label="金额" align="center" prop="fAmt" />
-        <el-table-column label="业务类型" align="center" prop="fBilltype">
+        <el-table-column label="业务1类型" align="center" prop="fBilltype">
           <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-else>{{scope.row.fBilltype}}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -535,8 +540,7 @@
             >
             </el-date-picker>
           </el-form-item>
-
-          <el-form-item label="对账日期" label-width="85px" prop="timeReconci">
+          <el-form-item label="对账日期" label-width="85px" prop="timeReconci" v-if="TWareHouseFees.fReconciliation == '1'">
             <el-date-picker
               v-model="TWareHouseFees.timeReconci"
               size="small"
@@ -552,14 +556,12 @@
           <el-form-item>
             <!-- <el-button class="btnColor" type="info" size="mini">导入</el-button> -->
             <el-button
-              class="btnColor"
               type="cyan"
               size="mini"
               @click="searchFee"
               >搜索</el-button
             >
             <el-button
-              class="btnColor"
               type="info"
               size="mini"
               @click="resetQuery_s"
@@ -740,7 +742,7 @@ export default {
         timeInterval:'',
         fDc:'',
         fReconciliation:'',
-        timeReconci: '',
+        timeReconci:'',
       },
       // 查询参数
       queryParams: {
@@ -752,6 +754,7 @@ export default {
         tMblno: null,
         fAmtdr: null,
         fAmtcr: null,
+        fId:null,
         fBilltype: null,
         fBillstatus: null,
         fRemarks: null,
@@ -766,6 +769,7 @@ export default {
         pageSize: 10,
         fBillno: null,
         fCtrlcorpid: null,
+        fId:null,
         fCorpid: null,
         tMblno: null,
         fAmtdr: null,
@@ -804,9 +808,9 @@ export default {
         fReconciliation: [
           { required:true,message:'不能为空', trigger:'blur'}
         ],
-        // timeExamine: [
-        //   { required:true,message:'不能为空', tigger:'blur'}
-        // ]
+        timeExamine: [
+          { required: true, message: '审核日期不能为空', trigger: 'blur' }
+        ]
         // fBilltype: [
         //   { required: true, message: "单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)不能为空", trigger: "change" }
         // ],
@@ -991,6 +995,7 @@ export default {
         fCorpid: null,
         tMblno: null,
         fAmtdr: null,
+        fId:null,
         fAmtcr: null,
         fBilltype: null,
         fBillstatus: null,
@@ -1011,6 +1016,7 @@ export default {
         fCorpid: null,
         tMblno: null,
         fAmtdr: null,
+        fId:null,
         fAmtcr: null,
         fBilltype: null,
         fBillstatus: null,
@@ -1028,13 +1034,17 @@ export default {
       const fId = row.fId || this.ids
       console.log(fId)
       getFee(fId).then(response => {
+        console.log(this.DzfeeList)
+        console.log(response)
         this.DzfeeList = response.data.feeDoList
-        this.TWareHouseFees = response.data.tFee
         this.fWbuOptions = response.data.feesList
+        this.queryParams = response.data.tFee
+        console.log(this.queryParams)
         this.fMblnoOptions = response.data.corps
         this.open = true;
         this.title = "修改财务数据主";
       });
+      console.log(this.queryParams)
     },
     /** 远程模糊查询用户 */
     corpsRemoteMethod(name) {
@@ -1050,17 +1060,20 @@ export default {
     
     /** 提交按钮 */
     submitForm() {
+      console.log(this.queryParams)
+      // console.log(this.feeList)
       this.$refs["ruless"].validate(valid => {
         if (valid) {
-          if (this.queryParams.fId = null) {
+          if (!this.queryParams.fId) {
             console.log(this.queryParams)
             this.queryParams.fBillstatus = '1'
             let formDate = new window.FormData()
-            formDate.append('tFee',JSON.stringify(this.TWareHouseFees))
-            formDate.append("tFeeDo", JSON.stringify(this.feeList))
+            formDate.append('tFee',JSON.stringify(this.queryParams))
+            formDate.append("tFeeDo", JSON.stringify(this.DzfeeList))
+            
 
             updateFee(formDate).then(response => {
-              this.msgSuccess("修改成功");
+              this.msgSuccess("新增成功");
               this.DzfeeList = []
               this.open = false;
               this.getList();
@@ -1071,9 +1084,9 @@ export default {
             let formDate = new window.FormData()
             formDate.append('tFee',JSON.stringify(this.queryParams))
             formDate.append("tFeeDo", JSON.stringify(this.DzfeeList))
-
+            console.log(this.queryParams)
             addFee(formDate).then(response => {
-              this.msgSuccess("新增成功");
+              this.msgSuccess("修改成功");
               this.DzfeeList = []
               this.open = false;
               this.getList();
@@ -1187,14 +1200,9 @@ export default {
     deleteRow(index, rows) {
       rows.splice(index, 1);
     },
-  }
+  },
 };
 </script>
 <style lang="scss" scoped>
-.btnColor {
-  border: 1px solid #0f5dee;
-}
-.btnColor:hover {
-  color: #0f5dee;
-}
+
 </style>