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

src/views/finance/contrast/index.vue

@@ -1095,11 +1095,12 @@ export default {
 
         this.pass.fAmtcr = Number(this.pass.fAmtcr)
         this.pass.fAmtdr = Number(this.pass.fAmtdr)
-        this.pass.fAmtcr += Number(this.selection[item].fAmt.toFixed(2))
+        this.pass.fAmtcr += Number(this.selection[item].fAmt)
         this.pass.fAmtdr += Number(this.selection[item].fAmtdr.toFixed(2))
 
 
       }
+      this.pass.fAmtcr.toFixed(2)
       console.log(this.pass.fAmtdr)
       console.log(this.pass.fAmtcr)
       if(this.state_s == true) {
@@ -1450,29 +1451,43 @@ export default {
         if (valid) {
           if (!this.queryParams.fId) {
             this.queryParams.fBillstatus = '1'
-            let formDate = new window.FormData()
-            formDate.append('tFee',JSON.stringify(this.queryParams))
-            formDate.append("tFeeDo", JSON.stringify(this.DzfeeList))
+            let formData = new window.FormData()
+            formData.append('tFee',JSON.stringify(this.queryParams))
+            formData.append("tFeeDo", JSON.stringify(this.DzfeeList))
 
-
-            updateFee(formDate).then(response => {
+            updateFee(formData).then(response => {
               this.queryParams = response.data.tFee
               this.msgSuccess("新增成功");
               // this.DzfeeList = []
               // this.open = false;
               this.getList();
             });
-
           } else {
+            this.pass.fAmtcr = 0
+            this.pass.fAmtdr = 0
+            for (let item in this.DzfeeList) {
+              this.pass.fAmtcr += Number(this.DzfeeList[item].fAmt)
+              this.pass.fAmtdr += Number(this.DzfeeList[item].fAmtdr)
+            }
+            this.queryParams.fAmtcr = Number(this.pass.fAmtcr.toFixed(2))
+            this.queryParams.fAmtdr = Number(this.pass.fAmtdr.toFixed(2))
+            console.log(this.pass.fAmtcr)
+            console.log(this.pass.fAmtdr)
+            this.pass.fAmtcr.toFixed(2)
             this.queryParams.fBillstatus = '1'
-            let formDate = new window.FormData()
-            formDate.append('tFee',JSON.stringify(this.queryParams))
-            formDate.append("tFeeDo", JSON.stringify(this.DzfeeList))
-            addFee(formDate).then(response => {
+            let formData = new window.FormData()
+            formData.append('tFee',JSON.stringify(this.queryParams))
+            formData.append("tFeeDo", JSON.stringify(this.DzfeeList))
+            console.log(this.queryParams)
+            console.log(this.DzfeeList)
+            console.log(formData)
+            addFee(formData).then(response => {
+              console.log(formData)
               this.msgSuccess("修改成功");
               // this.DzfeeList = []
               // this.open = false;
               this.getList();
+
             });
           }
         }

src/views/finance/payment/index.vue

@@ -1305,6 +1305,18 @@ export default {
               this.getList()
             })
           } else {
+            this.pass.fAmtcr = 0
+            this.pass.fAmtdr = 0
+            for (let item in this.increase_s) {
+              this.pass.fAmtcr += Number(this.increase_s[item].fAmt)
+              this.pass.fAmtdr += Number(this.increase_s[item].fAmtdr)
+            }
+            this.queryParams.fAmtcr = Number(this.pass.fAmtcr.toFixed(2))
+            this.queryParams.fAmtdr = Number(this.pass.fAmtdr.toFixed(2))
+            console.log(this.pass.fAmtcr)
+            console.log(this.pass.fAmtdr)
+            this.pass.fAmtcr.toFixed(2)
+
             console.log(this.queryParams)
             this.queryParams.fBillstatus = '1'
             let formData = new window.FormData()

src/views/warehouseBusiness/agreement/index.vue

@@ -298,7 +298,6 @@
         </el-form-item>
       </el-form>
       <el-button type="primary" @click="submit" :disabled="notChange" v-if="form.fBillstatus < 4">请 核</el-button>
-      <el-button type="success" @click="BackSubmit" v-if="form.fBillstatus === '6'">撤销请核</el-button>
 
       <div class="dialogTableTitle flex a-center jlr">
         <h2>标题</h2>
@@ -430,7 +429,8 @@
         <el-button v-if="approve === true" @click="goApproval">审批</el-button>
         <el-button type="danger" :disabled="disappear" @click="approvalRevocation" v-if="form.fBillstatus === '4'">撤销审批</el-button>
         <el-button type="info" v-if="notChange" @click="addOrUpdateHandle()">查看审批流</el-button>
-        <el-button type="primary" @click="submitForm" :disabled="notChange">保 存</el-button>
+        <el-button type="success" @click="BackSubmit" v-if="form.fBillstatus === '6'">撤销请核</el-button>
+        <el-button type="primary" @click="submitForm" :disabled="notChange">确 定</el-button>
         <el-button v-if="cancelButton === true" @click="cancel">取 消</el-button>
         <el-button v-if="cancelButton === false" @click="homePage">取消</el-button>
       </div>
@@ -582,6 +582,7 @@ export default {
     // this.getDicts("data_unitfees").then(response => {
     //   this.jFeetunitOptions = response.data;
     // });
+    this.register()
   },
   activated(){
     this.Jump()
@@ -815,17 +816,17 @@ export default {
     // 仓储费状态修改
     handleStatusChange(row) {
       if(row.fBillstatus == '6'){
-        let text = row.fBillstatus === '0' ? '启用' : '停用'
+        let text = row.fStatus === '0' ? '启用' : '停用'
         this.$confirm('确认要"' + text + '""' + row.fCorpid + '"用户吗?', '警告', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(function() {
-          return updateAgreement_s(row.fId, row.fBillstatus)
+          return updateAgreement_s(row.fId, row.fStatus)
         }).then(() => {
           this.msgSuccess(text + '成功')
         }).catch(function() {
-          row.fBillstatus = row.fBillstatus === '0' ? '1' : '0'
+          row.fStatus = row.fStatus === '0' ? '1' : '0'
         })
       }else{
         row.fStatus = 0