diff --git a/src/views/Program.vue b/src/views/Program.vue
index 0a10dc8..ff252fa 100644
--- a/src/views/Program.vue
+++ b/src/views/Program.vue
@@ -14,7 +14,7 @@
         <el-button v-if="!isView"
                    type="primary"
                    size="mini"
-                   @click="saveAll">保存</el-button>
+                   @click="submit">保存</el-button>
       </div>
     </div>
 
@@ -76,6 +76,10 @@
                        type="primary"
                        size="mini"
                        @click="batchDel">批量删除</el-button>
+            <el-button v-if="!isView"
+                       type="primary"
+                       size="mini"
+                       @click="saveAll">一键保存</el-button>
             <el-button v-if="!isView"
                        type="primary"
                        size="mini"
@@ -320,7 +324,7 @@ export default {
         });
       }
     },
-    saveAll () { // 保存判分点
+    submit () { // 保存判分点
       if (this.isNameRepeat) {
         this.$message.warning(`当前判分点名称已存在`);
         return;
@@ -446,14 +450,16 @@ export default {
       this.tableDataCopy = deepCopy(this.tableData); // 深拷贝
       row.isDisabled = false;
     },
-    handleSave (row) { // 处理保存规则
+    handleSave (row, i) { // 处理保存规则
+      const pre = typeof i === 'number' ? `第${i + 1}项，` : ''
       if (!row.required && !row.result) {
-        this.$message.warning(`规则与结果至少填写一个`);
+        this.$message.warning(pre + `规则与结果至少填写一个`);
         return;
       }
       row.isSave = true;
       row.isDisabled = true;
       this.isAddRule = false;
+      return true
     },
     handleCancel (row, index) { // 处理取消编辑规则
       if (row.isSave) {
@@ -507,6 +513,17 @@ export default {
         this.$message.error('请先选择数据 ！')
       }
     },
+    // 一键保存
+    saveAll () {
+      for (const e of this.tableData) {
+        if (e.isSubject) {
+          const result = this.handleSave(e, e.index)
+          if (!result) break
+          e.isDisabled = true
+          e.isSave = true
+        }
+      }
+    },
     // 表头样式设置
     headClass () {
       return "text-align: center;";
diff --git a/src/views/Transaction.vue b/src/views/Transaction.vue
index f2b59b0..71051a6 100644
--- a/src/views/Transaction.vue
+++ b/src/views/Transaction.vue
@@ -466,7 +466,7 @@
                 <el-button v-show="!scope.row.isDisabled"
                            size="mini"
                            type="text"
-                           @click="handleSave(scope.row, scope.$index)">保存
+                           @click="handleSave(scope.row)">保存
                 </el-button>
                 <!-- <el-button v-show="!scope.row.isDisabled"
                            size="mini"
@@ -1176,53 +1176,51 @@ export default {
       row.isDisabled = false;
       row.isSave = false;
     },
-    handleSave (row, index) { // 处理保存规则
+    handleSave (row, i) { // 处理保存规则
+      const pre = typeof i === 'number' ? `第${i + 1}项，` : ''
       if (!row.operationIds) {
-        this.$message.warning(`请选择操作点`);
+        this.$message.warning(pre + `请选择操作点`);
         return;
       } else {
         //题目类型(1选择 2判断 3填空 4问答 5指标结果)
         if (row.type == 1 || row.type == 2) {
           if (row.type == 1 && this.isSt) {
             if (!row.value1.length) {
-              this.$message.warning(`请选择正确答案`);
+              this.$message.warning(pre + `请选择正确答案`);
               return;
             }
           } else if (!row.value1) {
-            this.$message.warning(`请选择正确答案`);
+            this.$message.warning(pre + `请选择正确答案`);
             return;
           }
         } else if (row.type == 3) {
           if (!row.value1) {
-            this.$message.warning(`请输入字段要求`);
-            return;
+            this.$message.warning(pre + `请输入字段要求`);
+            return
           }
         } else if (row.type == 4) {
           if (!row.value1) {
-            this.$message.warning(`请选择字数要求`);
+            this.$message.warning(pre + `请选择字数要求`);
             return;
           } else if (row.value1 !== "无限制" && !row.value2) {
-            this.$message.warning(`请输入字数要求`);
+            this.$message.warning(pre + `请输入字数要求`);
             return;
           } else if (!row.value3) {
-            this.$message.warning(`请输入字段要求`);
+            this.$message.warning(pre + `请输入字段要求`);
             return;
           }
         } else if (row.type == 5) {
-          if ((!row.value2 || !row.value5) && !this.isSt) {
-            this.$message.warning(`请选择交易指标区间`);
-            return;
-          } else if ((!row.value3 || !row.value5) && !this.isSt) {
-            this.$message.warning(`请输入交易指标区间`);
+          if (!row.value2 && !row.value3 && !row.value4 && !row.value5 && !row.value6 && !row.value7) {
+            this.$message.warning(pre + `请输入交易指标区间`);
             return;
           } else if (row.value3 && row.value5 && !isNaN(row.value3) && !isNaN(row.value5) && +row.value3 > +row.value5) {
-            this.$message.warning(`第一个指标必须小于第二个指标`);
+            this.$message.warning(pre + `第一个指标必须小于第二个指标`);
             return;
           }
         } else if (row.type == 6) {
           for (let i = 1; i < 9; i++) {
             if (row['check' + i] && row['val' + i] === '') {
-              this.$message.warning(`请输入数量`)
+              this.$message.warning(pre + `请输入数量`)
               return
             }
           }
@@ -1231,6 +1229,7 @@ export default {
       row.isSave = true;
       row.isDisabled = true;
       this.isAddRule = false;
+      return true
     },
     handleCancel (row, index) { // 处理取消编辑规则
       if (this.judgePoints == true) {
@@ -1314,10 +1313,14 @@ export default {
     },
     // 一键保存
     saveAll () {
-      this.tableData.forEach(e => {
-        e.isDisabled = true
-        e.isSave = true
-      })
+      for (const e of this.tableData) {
+        if (e.isSubject) {
+          const result = this.handleSave(e, e.index)
+          if (!result) break
+          e.isDisabled = true
+          e.isSave = true
+        }
+      }
     },
     // 表头样式设置
     headClass () {