调整货转、调拨弹窗界面 细节

src/views/finance/charge/index.vue

@@ -1068,6 +1068,7 @@ export default {
     cancel() {
       this.open = false
       this.approve = false
+      this.getList()
       this.reset()
     },
     // 表单重置
@@ -1100,7 +1101,6 @@ export default {
     },
     /** 导入搜索 */
     importSearch() {
-      // .join(',')
       this.chargeList_s = []
       if(this.queryParameter.fStatementNo){
         this.rules = {}
@@ -1126,7 +1126,7 @@ export default {
             if (valid) {
               search(this.queryParameter).then(response => {
                 this.chargeList_s = response.rows
-                this.$message.success('查询成功2');
+                this.$message.success('查询成功');
                 this.totAL = 0
                 this.Ttime = 0
                 for (let item in this.chargeList_s){
@@ -1258,17 +1258,17 @@ export default {
     submitForm() {
       this.$refs['ruless'].validate(valid => {
         if (valid) {
-          if (this.queryParams.fId == null) {
+          if (!this.queryParams.fId) {
             // this.chargeList.fBillstatus = '1'
             this.queryParams.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 => {
+              let feeBills = response.data.tFee
+              this.$set(this.queryParams, 'fId', response.data.tFee.fId)
+              this.$set(this.queryParams, 'fBillno', response.data.tFee.fBillno)
               this.msgSuccess('新增成功')
-              // this.increase_s = []
-              // this.open = false
-              this.getList()
             })
           } else {
             this.queryParams.fBillstatus = '1'
@@ -1277,8 +1277,6 @@ export default {
             formData.append('tFeeDo', JSON.stringify(this.increase_s))
             addCharge(formData).then(response => {
               this.msgSuccess('修改成功')
-              // this.increase_s = []
-              // this.open = false
               this.getList()
             })
           }

src/views/finance/contrast/index.vue

@@ -100,21 +100,10 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['warehouse:fee:edit']"
+          v-hasPermi="['warehouse:contrast:edit']"
           >修改</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:contrast:remove']"-->
-<!--          >删除</el-button-->
-<!--        >-->
-<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -1000,27 +989,11 @@ export default {
       }
       this.innerVisible = true
       this.feeList = []
-      // this.TWareHouseFees.fToCorpid = this.queryParams.fCorpid
-      // this.TWareHouseFees = {
-      //   fCorpid:'',
-      //     fToCorpid:'',
-      //     fMblno:'',
-      //     fStatementNo:'',
-      //     fFeeid :'',
-      //     timeExamine:'',
-      //     timeInterval:'',
-      //     fDc:'D',
-      //     fReconciliation:'0',
-      //     timeReconci:'',
-      // }
     },
     // 默认录入人
     register() {
       queryUserVal().then((response)=>{
         this.Lander = response.user.userName
-      //   this.Lander = response.user.userName
-      //   this.queryParams_s.createBy = response.user.userName
-      // this.queryParams.createBy = response.user.userName
       })
     },
     // 合计
@@ -1231,28 +1204,28 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       // this.resetForm("queryParams_s");
-      this.tableFilter ={
+      this.tableFilter = {
         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,
+        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
       }
       this.queryParams_s = {
         pageNum: 1,
         pageSize: 10,
         fBillno: null,
         fCtrlcorpid: null,
-        fId:null,
+        fId: null,
         fCorpid: null,
         tMblno: null,
         fAmtdr: null,
@@ -1306,20 +1279,23 @@ export default {
     // },
     /** 新增按钮操作 */
     handleAdd() {
+      queryUserVal().then((response) => {
+        this.queryParams.createBy = response.user.userName
+      })
       this.notChange = false
       this.hide = true
-      this.reset();
+      this.reset()
       this.DzfeeList = []
-      this.pass={
-        fAmtdr:'',    //应收合计
-        fAmtcr:'',    //应付合计
-        fMblno:'',    //提单号
-        fName:'',      //货权方
-        fFeesName:'',   //结算单位
-        fCorpid:''     //结算单位ID
-      },
-      this.open = true;
-      this.title = "添加财务数据主";
+      this.pass = {
+        fAmtdr: '',    //应收合计
+        fAmtcr: '',    //应付合计
+        fMblno: '',    //提单号
+        fName: '',      //货权方
+        fFeesName: '',   //结算单位
+        fCorpid: ''     //结算单位ID
+      }
+      this.open = true
+      this.title = '添加财务数据主'
       this.queryParams = {
         pageNum: 1,
         pageSize: 10,
@@ -1328,7 +1304,7 @@ export default {
         fCorpid: null,
         tMblno: null,
         fAmtdr: null,
-        fId:null,
+        fId: null,
         fAmtcr: null,
         fBilltype: null,
         fBillstatus: null,
@@ -1340,7 +1316,7 @@ export default {
       }
     },
     // 查看按钮
-    check(row,res) {
+    check(row, res) {
       this.notChange = true
       getFee(row.fId).then(response => {
         this.Operator = response.data.tFee.createBy
@@ -1349,9 +1325,9 @@ export default {
         this.queryParams = response.data.tFee
         this.fWbuOptions = response.data.feesList
         this.fMblnoOptions = response.data.corps
-        this.open = true;
+        this.open = true
         this.disappear = true
-        this.title = "修改财务数据主";
+        this.title = '修改财务数据主'
         if (res == 1) {
           this.notChange = true
           if (this.Operator == this.Lander) {
@@ -1372,8 +1348,8 @@ export default {
               this.queryParams = response.data.tFee
               this.fWbuOptions = response.data.feesList
               this.fMblnoOptions = response.data.corps
-              this.open = true;
-            });
+              this.open = true
+            })
           } else {
             this.notChange = true
           }
@@ -1395,7 +1371,7 @@ export default {
             this.queryParams = response.data.tFee
             this.fWbuOptions = response.data.feesList
             this.fMblnoOptions = response.data.corps
-            this.open = true;
+            this.open = true
           })
         }
       })
@@ -1435,24 +1411,22 @@ export default {
         this.KHblnoOptions = response.rows;
       });
     },
-
     /** 提交按钮 */
     submitForm() {
-      this.$refs["ruless"].validate(valid => {
+      this.$refs['ruless'].validate(valid => {
         if (valid) {
           if (!this.queryParams.fId) {
             this.queryParams.fBillstatus = '1'
             let formData = new window.FormData()
-            formData.append('tFee',JSON.stringify(this.queryParams))
-            formData.append("tFeeDo", JSON.stringify(this.DzfeeList))
-
+            formData.append('tFee', JSON.stringify(this.queryParams))
+            formData.append('tFeeDo', JSON.stringify(this.DzfeeList))
             updateFee(formData).then(response => {
               this.queryParams = response.data.tFee
-              this.msgSuccess("新增成功");
+              this.msgSuccess('新增成功')
               // this.DzfeeList = []
               // this.open = false;
-              this.getList();
-            });
+              this.getList()
+            })
           } else {
             this.pass.fAmtcr = 0
             this.pass.fAmtdr = 0
@@ -1465,60 +1439,56 @@ export default {
             this.pass.fAmtcr.toFixed(2)
             this.queryParams.fBillstatus = '1'
             let formData = new window.FormData()
-            formData.append('tFee',JSON.stringify(this.queryParams))
-            formData.append("tFeeDo", JSON.stringify(this.DzfeeList))
+            formData.append('tFee', JSON.stringify(this.queryParams))
+            formData.append('tFeeDo', JSON.stringify(this.DzfeeList))
             addFee(formData).then(response => {
-              this.msgSuccess("修改成功");
+              this.msgSuccess('修改成功')
               // this.DzfeeList = []
               // this.open = false;
-              this.getList();
-            });
+              this.getList()
+            })
           }
         }
-      });
+      })
     },
-
-
-
-
     /** 删除按钮操作 */
     handleDelete(row) {
-      const fIds = row.fId || this.ids;
+      const fIds = row.fId || this.ids
       let tips = ''
       detailFee(fIds).then(res => {
         switch (res.msg) {
-          case '0':{
-            this.$message.error("当前数据已被其他操作员操作，请刷新页面")
+          case '0': {
+            this.$message.error('当前数据已被其他操作员操作，请刷新页面')
             break
           }
-          case '1':{
-            tips="当前主表有数据，从表无数据，确认是否删除？"
-            this.delete_s(fIds,tips)
+          case '1': {
+            tips = '当前主表有数据，从表无数据，确认是否删除？'
+            this.delete_s(fIds, tips)
             break
           }
-          case '2':{
-            tips="当前主表有数据，从表有数据，确认是否删除？"
-            this.delete_s(fIds,tips)
+          case '2': {
+            tips = '当前主表有数据，从表有数据，确认是否删除？'
+            this.delete_s(fIds, tips)
             break
           }
-           default:{
-             return this.$message.error("未知错误，无状态")
-           }
+          default: {
+            return this.$message.error('未知错误，无状态')
+          }
         }
       })
     },
-        delete_s(fIds,tips){
-        this.$confirm(tips, "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delFee(fIds);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-      },
+    delete_s(fIds, tips) {
+      this.$confirm(tips, '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        return delFee(fIds)
+      }).then(() => {
+        this.getList()
+        this.msgSuccess('删除成功')
+      })
+    },
     // 远程模糊查询费用名称
     fWRemoteMethod(name) {
       this.fWbuOptions = []
@@ -1534,7 +1504,6 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-
       this.$confirm('是否确认导出所有财务数据主数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

src/views/finance/payment/index.vue

@@ -1125,7 +1125,7 @@ export default {
             if (valid) {
               search(this.queryParameter).then(response => {
                 this.chargeList_s = response.rows
-                this.$message.success('查询成功2');
+                this.$message.success('查询成功');
                 this.totAL = 0
                 this.Ttime = 0
                 for (let item in this.chargeList_s){

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -1626,8 +1626,9 @@
             formData.append("warehouseFees", JSON.stringify(this.warehouseDrList));
             addStorageFeeCalculation(formData).then((response) => {
               this.msgSuccess("操作成功");
-              if (status !== 2) {
+              if (status === 2) {
                 this.open = false;
+                this.reset()
                 this.getList();
               }
             })