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

src/views/track/costModification/AddOrUpdate.vue

@@ -553,12 +553,12 @@
         @click.native.prevent="deleteRow(scope,scope.$index)"
     >删除</el-button>
     <el-button
-        size="mini"
-        type="text"
-        icon="el-icon-delete"
-        :disabled="scope.row.fBillstatus === 6"
-        v-if="scope.row.fId"
-        @click.native.prevent="changerequest(scope)"
+      size="mini"
+      type="text"
+      icon="el-icon-delete"
+      :disabled="scope.row.fBillstatus === 6"
+      v-if="scope.row.fId"
+      @click.native.prevent="changerequest(scope)"
     >请核</el-button>
 </template>
 </el-table-column>
@@ -935,12 +935,12 @@ export default {
           cancelButtonText: "取消",
           type: "warning",
         }).then(() => {
-          this.chiFeesList = this.chiFeesList.filter(
-              (e) => e.fBillstatus == 6 || e.actId != "1080"
-          );
-          console.log(this.chiFeesList);
-          this.addRelevt3();
-        })
+              this.chiFeesList = this.chiFeesList.filter(
+                  (e) => e.fBillstatus == 6 || e.actId != "1080"
+              );
+              console.log(this.chiFeesList);
+              this.addRelevt3();
+            })
             .catch(() => {
               this.$message({
                 type: "info",
@@ -1381,8 +1381,8 @@ export default {
       //   this.msgSuccess("不允许修改");
       //   this.disabledtwo = true
       // } else {
-      this.msgSuccess("允许修改");
-      this.disabledtwo = false
+        this.msgSuccess("允许修改");
+        this.disabledtwo = false
       // }
     },
     driversubmitForm() {