内蒙标注退回操作适配性调整，新增退回提示，退回后需填写退回描述，不再删除asjbz表的标注信息以及asj表的zatz_jyqk信息

src/components/ptCxForm_components.vue

@@ -315,7 +315,6 @@
                       type="primary"
                       size="mini"
                       @click="ajbzSp(scope.row, '1')"
-                      v-if="$route.path == '/checkAjbzInfo'&&scope.row.spzt == '0'"
                   >通过
                   </el-button>
                 </el-button-group>
@@ -395,10 +394,13 @@
 
               <div v-else-if="columnTitle.prop == 'spzt'">
                 <div v-if="scope.row[columnTitle.prop] == 1">
-                  <span>已通过</span>
+                  <span style="color: #1a81e1">已通过</span>
                 </div>
-                <div v-if="scope.row[columnTitle.prop] != 1">
-                  <span style="color: #dc0000">待审批</span>
+                <div v-if="scope.row[columnTitle.prop] == 2">
+                  <span style="color: #dc0000">已退回</span>
+                </div>
+                <div v-if="scope.row[columnTitle.prop] == 0">
+                  <span >待审批</span>
                 </div>
                 <!-- {{ scope.row[columnTitle.prop] == 1 ? '已标注' : '未标注'}} -->
               </div>
@@ -429,6 +431,25 @@
             <el-button type="primary" @click="saveAsjbzHt">确 定</el-button>
           </div>
         </el-dialog>
+
+        <el-dialog
+            :visible="ajbzHtDialogNM"
+            width="40%"
+            center
+            destroy-on-close
+            title="退回描述"
+        >
+          <el-input
+              type="textarea"
+              v-model="ajbzHtParam.htms"
+              placeholder="请输入退回描述"
+              :autosize="{ minRows: 4 }"
+          ></el-input>
+          <div slot="footer" class="dialog-footer ar" style="margin-top: 10%">
+            <el-button @click="ajbzHtDialogNM = false">取 消</el-button>
+            <el-button type="primary" @click="saveAsjbzHtNM">确 定</el-button>
+          </div>
+        </el-dialog>
         <!--分页-->
         <el-pagination
             background
@@ -452,10 +473,8 @@ import SelectTree from "@c/tree_components.vue";
 import SelectTreeDialog from "@c/treeCode_components.vue";
 import LazySelectTreeDialog from "@c/lazy_treeCode.vue";
 import axios from "axios";
-import {esAsjQuery} from "@/api/queryAj.js";
 import Http from "@/utils/http.js";
 import qs from "qs";
-import store from "@/store";
 
 export default {
   name: "ptCxForm",
@@ -489,8 +508,10 @@ export default {
       ajbzHtParam: {
         asjbh: "",
         htms: "",
+        spzt: ""
       },
       ajbzHtDialog: false,
+      ajbzHtDialogNM: false,
       tPage: null,
       checkResult: true,
       asjbh: "",
@@ -566,6 +587,21 @@ export default {
       this.ajbzHtDialog = true;
       this.ajbzHtParam.asjbh = row.asjbh;
     },
+    saveAsjbzHtNM() {
+      if (this.ajbzHtParam.asjbh == "" || this.ajbzHtParam.asjbh == null) {
+        this.$message.warning("未找到有效的案事件编号，请刷新后重试");
+        return;
+      }
+      if (this.ajbzHtParam.htms == "" || this.ajbzHtParam.htms == null) {
+        this.$message.warning("请输入退回描述后再保存");
+        return;
+      }
+      this.$emit("ajbzSp", this.ajbzHtParam);
+      this.ajbzHtDialogNM = false;
+      setTimeout(() => {
+        this.doQuery(true);
+      }, 500);
+    },
     saveAsjbzHt() {
       if (this.ajbzHtParam.asjbh == "" || this.ajbzHtParam.asjbh == null) {
         this.$message.warning("未找到有效的案事件编号，请刷新后重试");
@@ -583,23 +619,9 @@ export default {
     },
     ajbzSp(row, spStatus) {
       if (spStatus == "0") {
-        this.$confirm("标注退回后不可恢复，是否退回？", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-            .then(() => {
-              this.$emit("ajbzSp", {asjbh: row.asjbh, spzt: spStatus});
-              setTimeout(() => {
-                this.doQuery(true);
-              }, 500);
-            })
-            .catch(() => {
-              this.$message({
-                type: "info",
-                message: "已取消退回",
-              });
-            });
+        this.ajbzHtDialogNM = true;
+        this.ajbzHtParam.asjbh = row.asjbh;
+        this.ajbzHtParam.spzt = spStatus;
       } else {
         this.$emit("ajbzSp", {asjbh: row.asjbh, spzt: spStatus});
         setTimeout(() => {

src/views/neimengBZ/ajbzDetailNM.vue

@@ -46,6 +46,13 @@
           >
             <el-tag style="font-size: 24px">{{ bzztMs }}</el-tag>
           </div>
+          <div
+              class="titleFlexTH"
+              style="width: 10%"
+              v-if="bzztMs && bzztMs == '已退回'"
+          >
+            <el-tag :title="htms" style="font-size: 24px;color: red; border: 1px solid #888">{{ bzztMs }}</el-tag>
+          </div>
         </div>
       </el-header>
       <el-main v-loading="mainLoading">
@@ -96,20 +103,26 @@
                         <td width="300">{{ ajxlbStr }}</td>
                         <td width="80">涉案价值:</td>
                         <td width="300">
-                          <span v-if="!ssjzrmbyShow">{{ ssjzrmby }}</span>
-                          <el-button type="text" v-if="(bzzt==2 || bzztMs == '未标注') && !ssjzrmbyShow"
-                                     style="margin-left: 5%"
-                                     icon="el-icon-edit"
-                                     @click="ssjzrmbyShow=true">修改
-                          </el-button>
-                          <el-input v-model="ssjzrmbyEditNum" v-if="bzzt==2 &&ssjzrmbyShow"
-                                    style="width: 40%"></el-input>
-                          <el-button type="text" v-if="ssjzrmbyShow" style="margin-left: 5%" icon="el-icon-check"
-                                     @click="ssjzrmbyEditCommit">确定
-                          </el-button>
-                          <el-button type="text" v-if="(bzzt==2 || bzztMs == '未标注') &&ssjzrmbyShow" icon="el-icon-close"
-                                     @click="ssjzrmbyShow=false">取消
-                          </el-button>
+                          <div v-if="!ssjzrmbyShow">
+                            <span>{{ ssjzrmby }}</span>
+                            <el-button type="text"
+                                       v-if="(bzzt==2 || bzztMs == '未标注' || bzztMs == '已退回') && $route.query.fromPath!='checkAjbzInfo'"
+                                       style="margin-left: 5%"
+                                       icon="el-icon-edit"
+                                       @click="ssjzrmbyShow=true">修改
+                            </el-button>
+                          </div>
+                          <div v-if="ssjzrmbyShow">
+                            <el-input v-model="ssjzrmbyEditNum"
+                                      v-if="(bzzt==2 || bzztMs == '未标注' || bzztMs == '已退回') && $route.query.fromPath!='checkAjbzInfo'"
+                                      style="width: 40%"></el-input>
+                            <el-button type="text" style="margin-left: 5%" icon="el-icon-check"
+                                       @click="ssjzrmbyEditCommit">确定
+                            </el-button>
+                            <el-button type="text" icon="el-icon-close"
+                                       @click="ssjzrmbyShow=false">取消
+                            </el-button>
+                          </div>
                         </td>
                       </tr>
                       <tr>
@@ -583,7 +596,7 @@
                     <el-button
                         type="primary"
                         @click="submitBz"
-                        v-if="bzzt == 2 || bzztMs == '未标注'"
+                        v-if="(bzzt == 2 || bzztMs == '未标注' || bzztMs == '已退回') && $route.query.fromPath!='checkAjbzInfo'"
                     >完成标注
                     </el-button>
                     <el-button
@@ -718,7 +731,7 @@
       </span>
     </el-dialog>
     <el-dialog title="提示" :visible.sync="czmsdm1" width="30%">
-      <p style="margin: 10px">您标注的案件已经被退回，退回理由为:{{ htms }}</p>
+      <p style="margin: 10px">该案件已经被退回，退回理由为:{{ htms }}</p>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="czmsdm1 = false">确 定</el-button>
       </span>
@@ -740,6 +753,25 @@
         <el-button @click="cz">确认</el-button>
       </span>
     </el-dialog>
+
+    <el-dialog
+        :visible="ajbzHtDialog"
+        width="40%"
+        center
+        destroy-on-close
+        title="退回描述"
+    >
+      <el-input
+          type="textarea"
+          v-model="htms"
+          placeholder="请输入退回描述"
+          :autosize="{ minRows: 4 }"
+      ></el-input>
+      <div slot="footer" class="dialog-footer ar">
+        <el-button @click="ajbzHtDialog = false">取 消</el-button>
+        <el-button type="primary" @click="saveAsjbzHt">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -777,6 +809,7 @@ export default {
   },
   data() {
     return {
+      ajbzHtDialog: false,
       ssjzrmbyShow: false,
       mainLoading: false,
       ssjzrmbyEditNum: 0,
@@ -1239,7 +1272,7 @@ export default {
         asjbh: this.asjbh,
       }).then((res) => {
         self.bzztMs = res.data.rows.bzztMs;
-        if (res.data.rows.bzzt == "" && res.data.rows.htms) {
+        if (res.data.rows.spzt == "2" && res.data.rows.htms && this.$route.query.fromPath != 'checkAjbzInfo') {
           self.czmsdm1 = true;
           self.bzztFlag = true;
           self.htms = res.data.rows.htms;
@@ -1394,7 +1427,7 @@ export default {
         this.spzt = res.data.rows.spzt;
 
         this.bzztMs = res.data.rows.bzztMs;
-        if (res.data.rows.bzzt == "" && res.data.rows.htms) {
+        if (res.data.rows.spzt == "2" && res.data.rows.htms && this.$route.query.fromPath!='checkAjbzInfo') {
           this.czmsdm1 = true;
           this.bzztFlag = true;
           this.htms = res.data.rows.htms;
@@ -1560,34 +1593,30 @@ export default {
         }
       });
     },
-
-    ajbzSp(spStatus) {
-      if (spStatus == "0") {
-        this.$confirm("标注退回后不可恢复，是否退回？", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }).then(() => {
-          asjbzSp({asjbh: this.asjbh, spzt: spStatus}).then((res) => {
-            if (res.code == 200) {
-              this.$message.success("操作成功");
-              this.bzzt = 2;
-            } else {
-              this.$message({
-                type: "error",
-                message: "操作失败",
-              });
-            }
-          });
-          setTimeout(() => {
-            this.query();
-          }, 500);
-        }).catch(() => {
+    saveAsjbzHt() {
+      if (this.htms == null || this.htms == '') {
+        this.$message.error("请先填写回退描述");
+        return;
+      }
+      asjbzSp({asjbh: this.asjbh, spzt: '0', htms: this.htms}).then((res) => {
+        if (res.code == 200) {
+          this.$message.success("操作成功");
+          this.bzzt = 2;
+        } else {
           this.$message({
-            type: "info",
-            message: "已取消退回",
+            type: "error",
+            message: "操作失败",
           });
-        });
+        }
+        this.ajbzHtDialog = false;
+      });
+      setTimeout(() => {
+        this.query();
+      }, 500);
+    },
+    ajbzSp(spStatus) {
+      if (spStatus == "0") {
+        this.ajbzHtDialog = true;
       } else {
         asjbzSp({asjbh: this.asjbh, spzt: spStatus}).then((res) => {
           if (res.code == 200) {
@@ -1917,6 +1946,17 @@ export default {
   text-align: center;
 }
 
+.titleFlexTH {
+  width: 45%;
+  height: 56px;
+  color: red;
+  line-height: 56px;
+  font-size: 14px;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  text-align: center;
+}
+
 .titleFlexG {
   width: 45%;
   height: 56px;

src/views/neimengBZ/checkAjbzInfo.vue

@@ -139,6 +139,7 @@ export default {
             {label: "全部", val: ""},
             {label: "待审批", val: "0"},
             {label: "已通过", val: "1"},
+            {label: "已退回", val: "2"},
           ],
         },
         // {

src/views/neimengBZ/queryAjNM.vue

@@ -38,7 +38,7 @@ export default {
         ajlbdm: [],
         jyaq: "",
         asjfsddDzmc: "",
-        zbrXm:"",
+        zbrXm: "",
       },
       panelList: [
         {
@@ -139,6 +139,20 @@ export default {
             {label: "未标注", val: "2"},
           ],
         },
+        {
+          name: "审批状态",
+          id: "spzt",
+          type: "radio",
+          value: "",
+          placeholder: "",
+          col: "3",
+          radioData: [
+            {label: "全部", val: ""},
+            {label: "待审批", val: "0"},
+            {label: "已通过", val: "1"},
+            {label: "已退回", val: "2"},
+          ],
+        },
         // {
         //   name: "案件分类",
         //   id: "ajlbdm",
@@ -193,6 +207,11 @@ export default {
           width: "100",
         },
         {
+          label: "审批状态",
+          prop: "spzt",
+          width: "100",
+        },
+        {
           label: "案件名称",
           prop: "ajmc",
           width: "300",