浏览代码

完善财务

lichao 3 年之前
父节点
当前提交
9630f58999
共有 3 个文件被更改,包括 17 次插入6 次删除
  1. 7 2
      src/views/finance/charge/index.vue
  2. 2 0
      src/views/finance/contrast/index.vue
  3. 8 4
      src/views/finance/payment/index.vue

+ 7 - 2
src/views/finance/charge/index.vue

@@ -364,7 +364,8 @@
               v-if="
               scope.row.fBillstatus == '保存' ||
               scope.row.fBillstatus == '暂存' ||
-              scope.row.fBillstatus == '审批驳回'
+              scope.row.fBillstatus == '审批驳回' ||
+              scope.row.fBillstatus == '新建'
             "
             >修改
             </el-button>
@@ -377,7 +378,8 @@
               v-if="
               scope.row.fBillstatus == '保存' ||
               scope.row.fBillstatus == '暂存' ||
-              scope.row.fBillstatus == '审批驳回'
+              scope.row.fBillstatus == '审批驳回' ||
+              scope.row.fBillstatus == '新建'
             "
             >删除
             </el-button>
@@ -923,6 +925,7 @@
                   <el-option label="入库" value="SJRK"></el-option>
                   <el-option label="出库" value="SJCK"></el-option>
                   <el-option label="货权转移" value="HQZY"></el-option>
+                  <el-option label="调拨" value="CKDB"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -2147,6 +2150,7 @@ export default {
           if (data.code === 200) {
             this.$message.success("撤销成功");
             this.open = false;
+            this.mainTable = false
             this.getList();
           }
         });
@@ -2677,6 +2681,7 @@ export default {
                 this.open = false;
                 this.msgSuccess("操作成功");
                 this.getList();
+                this.handleAdd();
               });
             } else if(Cookies.get("sysType") == 2){
               collectFees(formDate).then((response) => {

+ 2 - 0
src/views/finance/contrast/index.vue

@@ -1201,6 +1201,7 @@
                     <el-option label="入库" value="SJRK"></el-option>
                     <el-option label="出库" value="SJCK"></el-option>
                     <el-option label="货权转移" value="HQZY"></el-option>
+                    <el-option label="调拨" value="CKDB"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -3202,6 +3203,7 @@ export default {
           this.msgSuccess("撤销审批成功");
           this.disappear = true;
           this.open = false;
+          this.mainTable = false;
           this.getList();
         });
       }

+ 8 - 4
src/views/finance/payment/index.vue

@@ -337,7 +337,8 @@
                 v-if="
                   scope.row.fBillstatus == '保存' ||
                   scope.row.fBillstatus == '暂存' ||
-                  scope.row.fBillstatus == '审批驳回'
+                  scope.row.fBillstatus == '审批驳回' ||
+                  scope.row.fBillstatus == '新建'
                 "
                 >修改
               </el-button>
@@ -350,7 +351,8 @@
                 v-if="
                   scope.row.fBillstatus == '保存' ||
                   scope.row.fBillstatus == '暂存' ||
-                  scope.row.fBillstatus == '审批驳回'
+                  scope.row.fBillstatus == '审批驳回' ||
+                  scope.row.fBillstatus == '新建'
                 "
                 >删除
               </el-button>
@@ -963,6 +965,7 @@
                     <el-option label="入库" value="SJRK"></el-option>
                     <el-option label="出库" value="SJCK"></el-option>
                     <el-option label="货权转移" value="HQZY"></el-option>
+                    <el-option label="调拨" value="CKDB"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -2932,9 +2935,9 @@ export default {
         hash: "",
         matched: Array(2),
         meta: Object,
-        name: "Charge",
+        name: "Payment",
         params: Object,
-        path: "/finance/charge",
+        path: "/finance/payment",
         query: Object,
         title: "付费",
       };
@@ -3460,6 +3463,7 @@ export default {
                 this.msgSuccess("操作成功");
                 this.open = false;
                 this.getList();
+                this.handleAdd();
               });
             } else if (Cookies.get("sysType") == 2) {
               collectFees(formDate).then((response) => {