查验

src/api/ajbzDetail.js

@@ -40,6 +40,9 @@ const getAsjbzxx = params =>
   const deleteBsh = params =>
   post("/api/newAsjbz/deleteBsh", params);
 
+  const updateBzStatus = params =>
+  post(`/api/newAsjbz/CheckBackQuery`, params);
+
 
 export {
   getAsjxxDetail,
@@ -53,5 +56,6 @@ export {
   getAsjbzxx,
   getRybhList,
   getBarxxList,
-  deleteBsh
+  deleteBsh,
+  updateBzStatus
 }
\ No newline at end of file

src/assets/styles/rightContent.scss

@@ -19,6 +19,17 @@
     vertical-align: middle;
   }
 }
+.el-textarea__inner{
+  height: 100px;
+}
+.edit {
+  font-size: 14px;
+  font-family: Source Han Sans CN;
+  font-weight: 400;
+  line-height: 22px;
+  color: #007AFF;
+  cursor: pointer;
+}
 
 .rightContent {
   flex: 1;
@@ -108,6 +119,7 @@
         font-weight: 400;
         color: #FFFFFF;
         opacity: 0.8;
+        cursor: pointer;
       }
 
       .bottom {
@@ -116,6 +128,12 @@
         opacity: 1;
         margin-top: 7px;
       }
+
+      .bottom1 {
+        height: 4px;
+        opacity: 1;
+        margin-top: 7px;
+      }
     }
   }
 

src/components/ptCxForm_components.vue

@@ -2,9 +2,17 @@
   <div class="rightContent">
     <div class="topTitle">
       <span>案件标注查询</span>
-      <div class="subTitle">
-        <div class="ajTitle">案件标注信息</div>
-        <div class="bottom"></div>
+      <div
+        class="subTitle"
+        v-for="item in navList"
+        :key="item.name"
+        @click="goNav(item)"
+      >
+        <div class="ajTitle">
+          {{ item.name }}
+          <i class="el-icon-lock" v-if="item.isClock && !isInclude"></i>
+        </div>
+        <div :class="active == item.path ? 'bottom' : 'bottom1'"></div>
       </div>
     </div>
     <div class="Content paneDiv paneDiv2">
@@ -253,6 +261,16 @@
         >
           <el-table-column
             align="center"
+            label="操作"
+            v-if="pageBs == 'queryCheckBj' && cxFormData.bzzt == 1"
+            :width="'200'"
+          >
+            <template slot-scope="scope">
+              <span @click="bjBack(scope.row.asjbh)" class="edit">退回</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
             v-for="columnTitle in propdefaultFormThead"
             :prop="columnTitle.prop"
             :key="columnTitle.label"
@@ -313,6 +331,7 @@
               >
                 {{ scope.row[columnTitle.prop] }}
               </div>
+              <div v-else-if="columnTitle.prop == 'bzzt'">{{ scope.row[columnTitle.prop] == 1 ? '已标注' : '未标注'}}</div>
               <div v-else v-html="scope.row[columnTitle.prop]"></div>
             </template>
           </el-table-column>
@@ -341,6 +360,8 @@ 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";
 
 export default {
   name: "ptCxForm",
@@ -385,16 +406,62 @@ export default {
       propdefaultFormThead: this.cxDefaultFormThead, //表格表头
       excelHeader: "案件标注",
       cz: this.pageFlag,
+      navList: [
+        {
+          name: "案件标注信息",
+          path: "/queryAj",
+          isClock: false,
+        },
+        {
+          name: "标注查验信息",
+          path: "/queryCheckAj",
+          isClock: true,
+        },
+      ],
+      identitycard: JSON.parse(sessionStorage.getItem("userInfo")).identitycard,
+      isInclude: false,
+      active: "/queryAj",
     };
   },
+  created() {
+    let arr = [
+      "34222419830726005X",
+      "350628197501115019",
+      "33020197911103615",
+      "32038219900701789X",
+    ];
+    this.isInclude = arr.some((item) => item == this.identitycard);
+  },
   methods: {
+    bjBack(ajbh) {
+      this.$emit("bjBack", ajbh);
+    },
+    goNav(item) {
+      if (item.isClock && !this.isInclude) {
+        return;
+      } else {
+        this.active = item.path;
+        this.$router.push(item.path);
+      }
+    },
     goDetail(scope) {
-      this.$router.pushToTab({
-        path: "ajbzDetail",
-        query: {
-          asjbh: scope.asjbh,
-        },
-      });
+      if (this.pageBs == "queryCheckBj") {
+        this.$router.pushToTab({
+          path: "ajbzDetail",
+          query: {
+            asjbh: scope.asjbh,
+            isCheck: "Check",
+            bzzt: this.cxFormData.bzzt,
+          },
+        });
+      } else {
+        this.$router.pushToTab({
+          path: "ajbzDetail",
+          query: {
+            asjbh: scope.asjbh,
+          },
+        });
+      }
     },
     export2Excel() {
       /*导出*/
@@ -432,7 +499,7 @@ export default {
           tHeader.push(val.label);
           filterVal.push(val.prop);
         });
-        esAsjQuery(json).then((res) => {
+        self.doQueryRequest(json).then((res) => {
           if (res.code === 200) {
             require.ensure([], () => {
               const { export_json_to_excel } = require("../utils/Export2Excel");
@@ -571,7 +638,8 @@ export default {
         }
       }
       if (flag) {
-        esAsjQuery(json)
+        self
+          .doQueryRequest(json)
           .then((response) => {
             if (response.code === 200) {
               self.tableData = response.data.rows;
@@ -591,9 +659,24 @@ export default {
           });
       }
     },
+    doQueryRequest(form, relurl) {
+      /*post方法*/
+      let currentUrl = "";
+      currentUrl = `/api${this.cxUrl}`;
+
+      return Http({
+        url: currentUrl,
+        data: qs.stringify(form),
+        method: "post",
+        headers: {
+          "blade-auth": sessionStorage.getItem("token"),
+        },
+      });
+    },
   },
   mounted() {
     let self = this;
+    self.active = self.$route.path;
     /*获取字典*/
     self.propQueryField.forEach((val) => {
       if (val.type == "code" || val.type == "codeTreeDialog") {
@@ -703,3 +786,8 @@ export default {
   margin-right: 13px;
 }
 </style>
+<style lang="scss">
+.el-textarea__inner {
+  height: 100px;
+}
+</style>

src/router/modules/index.js

@@ -58,6 +58,15 @@ export default [
     component: () => import("@/views/queryAj.vue")
   },
   {
+    path: "/queryCheckAj",
+    name: "queryCheckAj",
+    meta: {
+      title: "标注查验信息",
+      auth: 5
+    },
+    component: () => import("@/views/queryCheckAj.vue")
+  },
+  {
     path: "/zdgl",
     name: "zdgl",
     meta: {

src/views/ajbzDetail.vue

@@ -421,12 +421,7 @@
               <el-card v-if="!bzFlag" class="box-card">
                 <div class="incidentTitle incidentTitle1">
                   <span>案事件标注</span>
-                  <div
-                    class="btn"
-                    @click="hanldTableBar()"
-                  >
-                    取消
-                  </div>
+                  <div class="btn" @click="hanldTableBar()">取消</div>
                 </div>
                 <!-- <div class="incidentBtn">
                   <div
@@ -485,9 +480,18 @@
                   </div>
                 </div>
                 <div class="wcbzButton">
-                  <el-button type="primary" @click="submitBz"
+                  <el-button
+                    type="primary"
+                    @click="submitBz"
+                    v-if="isCheck != 'Check'"
                     >完成标注</el-button
                   >
+                  <el-button
+                    type="primary"
+                    @click="bjBack"
+                    v-if="isCheck == 'Check' && bzzt == 1 && !bzztFlag"
+                    >退回</el-button
+                  >
                   <el-button type="warning" @click="bzDetail"
                     >查看标注详情</el-button
                   >
@@ -498,7 +502,7 @@
                   <span>案事件标注</span>
                   <span @click="ajbzRrturn" class="titleSpan">返回</span>
                 </div>
-                <div class="incidentCon" style="margin-top:90px">
+                <div class="incidentCon" style="margin-top: 90px">
                   <div class="bztag-wrap">
                     <div class="bztag" v-show="bzxqtag1">
                       <span>{{ ajzlbStr }}</span>
@@ -599,6 +603,29 @@
         <el-button type="primary" @click="handSumits()">确 定</el-button>
       </span>
     </el-dialog>
+    <el-dialog title="提示" :visible.sync="czmsdm1" width="30%">
+      <p style="margin: 10px">您标注的案件已经被退回，退回理由为:{{ htms }}</p>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="czmsdm1 = false">确 定</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog title="描述" :visible.sync="dialogVisible" width="30%">
+      <div style="padding:10px">
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容"
+          v-model="textarea"
+        >
+        </el-input>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogVisible = false"
+          >取 消</el-button
+        >
+        <el-button @click="cz">确认</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -616,6 +643,7 @@ import {
   getRybhList,
   getBarxxList,
   deleteBsh,
+  updateBzStatus,
 } from "@/api/ajbzDetail.js";
 import { queryCodeByType } from "@/api/queryAj.js";
 export default {
@@ -630,6 +658,10 @@ export default {
   },
   data() {
     return {
+      bzztFlag:false,
+      textarea: "",
+      dialogVisible: false,
+      czmsdm1: false,
       elementPos: {
         left: null,
         top: null,
@@ -852,6 +884,9 @@ export default {
         label: "label",
       },
       xcbhUrl: "",
+      isCheck: "",
+      htms: "",
+      bzzt: "",
     };
   },
   created() {
@@ -859,8 +894,33 @@ export default {
     this.getQuerys();
     this.query();
     this.getBz();
+    this.isCheck = this.$route.query.isCheck;
+    this.bzzt = this.$route.query.bzzt;
   },
   methods: {
+    bjBack() {
+      debugger;
+      var self = this;
+      self.dialogVisible = true;
+    },
+    cz() {
+      var self = this;
+      if (self.textarea) {
+        updateBzStatus({
+          htms: self.textarea,
+          asjbh: self.asjbh,
+        }).then((res) => {
+          this.getBz()
+          self.dialogVisible = false;
+        });
+      } else {
+        this.$confirm("请输入描述", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {});
+      }
+    },
     toXk() {
       window.open(this.xcbhUrl, "_blank");
     },
@@ -894,6 +954,14 @@ export default {
         asjbh: this.asjbh,
       }).then((res) => {
         self.bzztMs = res.data.rows.bzztMs;
+        if (res.data.rows.bzzt == "" && res.data.rows.htms) {
+          self.czmsdm1 = true;
+          self.bzztFlag = true
+          self.htms = res.data.rows.htms;
+        } else {
+          self.czmsdm1 = false;
+          self.bzztFlag = false
+        }
         self.selectIndex1 = parseInt(res.data.rows.asjflzt);
         if (res.data.rows != null) {
           self.ajzlbStr = res.data.rows.ajzlbStr;
@@ -1177,8 +1245,8 @@ export default {
       }
     },
     hanldTableBar() {
-      this.getQuery()
-      this.getQuerys()
+      this.getQuery();
+      this.getQuerys();
       // if (this.selectIndex1 == val) {
       //   this.selectIndex1 = 0;
       //   debugger;
@@ -1305,6 +1373,9 @@ export default {
   background-color: #3670ff !important;
   color: #fff;
 }
+.el-textarea__inner{
+  height: 100px;
+}
 </style>
 <style lang="scss" scoped>
 .bztag-wrap {
@@ -1615,7 +1686,6 @@ export default {
   border-bottom: 1px solid #c2c2c2;
   display: flex;
   align-items: center;
- 
 }
 .btn {
   margin-left: 8px;
@@ -1630,7 +1700,7 @@ export default {
   text-align: center;
   line-height: 32px;
   cursor: pointer;
-   margin-right: 20px;
+  margin-right: 20px;
 }
 /deep/ .el-avatar > img {
   width: 100%;

src/views/index/home.vue

@@ -116,7 +116,6 @@ export default {
   },
   created(){
     let arr = ['34222419830726005X','350628197501115019','33020197911103615','32038219900701789X']
-    debugger
     this.isInclude = arr.some(item=>item == this.identitycard)
   },
 };

src/views/index/jump.vue

@@ -36,7 +36,7 @@ export default {
           sessionStorage.setItem("token", "bearer " + res.data.accessToken);
           sessionStorage.setItem("userInfo", JSON.stringify(res.data));
           self.saveLoading.close();
-          this.$router.push("/home");
+          this.$router.push("/kshData");
         } else {
           self
             .$confirm(res.message, "提示", {

src/views/queryAj.vue

@@ -19,7 +19,7 @@ export default {
     return {
       cxFormData: {
         page: 1,
-        rows: 10,
+        limit: 10,
         asjbh: '',
         Ladw_gajgjgdms: '',
         lasjRqsjKssj: '',
@@ -163,6 +163,11 @@ export default {
           width: '260'
         },
         {
+          label: '标注状态',
+          prop: 'bzzt',
+          width: '260'
+        },  
+        {
           label: '案件类别',
           prop: 'ajlbdmMc',
           width: '200'
@@ -173,6 +178,16 @@ export default {
           width: '220'
         },
         {
+          label: "标注员姓名",
+          prop: "bzrXm",
+          width: "200",
+        },
+        {
+          label: "标注人单位",
+          prop: "bzrDwdmMc",
+          width: "220",
+        },
+        {
           label: '类案类别',
           prop: 'ajxzlbMc',
           width: '220'
@@ -229,7 +244,7 @@ export default {
   },
   created () {
     // this.getAj()
-  }
+  },
 }
 </script>
 <style>

src/views/queryCheckAj.vue

+<template>
+  <div class="Content">
+    <right-content
+      :cxFormData="cxFormData"
+      :cxQueryField="cxQueryField"
+      :cxDefaultFormThead="cxDefaultFormThead"
+      :cxUrl="cxUrl"
+      :pageBs="pageBs"
+      @bjBack="bjBack"
+      ref='rightContent'
+    ></right-content>
+    <el-dialog title="描述" :visible.sync="dialogVisible" width="30%">
+      <el-input
+        style="margin: 10px 0; height: 100px"
+        type="textarea"
+        :rows="2"
+        placeholder="请输入内容"
+        v-model="textarea"
+      >
+      </el-input>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogVisible = false"
+          >取 消</el-button
+        >
+        <el-button @click="cz">确认</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import rightContent from "@c/ptCxForm_components.vue";
+import { updateBzStatus } from "@/api/ajbzDetail.js";
+export default {
+  name: "queryAj",
+  components: {
+    rightContent,
+  },
+  data() {
+    return {
+        pageBs: "queryCheckBj",
+      cxFormData: {
+        page: 1,
+        limit: 10,
+        bzrXm: "",
+        asjbh: "",
+        bzrDwdm: "",
+        bzzt: "",
+      },
+      cxQueryField: [
+        /*立案信息  侦查终结信息   立案信息审批  侦查终结审批通用开始*/
+        {
+          name: "标注人姓名",
+          id: "bzrXm",
+          type: "text",
+          value: "",
+          placeholder: "请输入",
+          col: "3",
+        },
+        {
+          name: "案件编号",
+          id: "asjbh",
+          type: "text",
+          value: "",
+          placeholder: "请输入",
+          col: "3",
+        },
+         {
+          name: '立案单位',
+          id: 'bzrDwdm',
+          type: 'lazyCodeTreeDialog',
+          props: [], //字典弹框需要的字段
+          value: '',
+          col: '3',
+          codeOptions: [],
+          codeTree: 'CODE_QGUNIT'
+        },
+        {
+          name: "标注状态",
+          id: "bzzt",
+          type: "radio",
+          value: "1",
+          placeholder: "",
+          col: "3",
+          radioData: [
+            { label: "全部", val: "" },
+            { label: "已标注", val: "1" },
+            { label: "未标注", val: "2" },
+          ],
+        },
+        {
+          name: "查验处理情况",
+          id: "cyclzt",
+          type: "radio",
+          value: "",
+          placeholder: "",
+          col: "3",
+          radioData: [
+            { label: "全部", val: "" },
+            { label: "已退回", val: "3" },
+          ],
+        },
+      ],
+      cxDefaultFormThead: [
+        {
+          label: "标注员姓名",
+          prop: "bzrXm",
+          width: "200",
+        },
+        {
+          label: "标注人单位",
+          prop: "bzrDwdmMc",
+          width: "220",
+        },
+        {
+          label: "案件编号",
+          prop: "asjbh",
+          width: "260",
+          toInfor: true,
+        },
+        {
+          label: "标注状态",
+          prop: "bzzt",
+        },
+        {
+          label: "案件名称",
+          prop: "ajmc",
+          width: "220",
+        },
+                {
+          label: "主案类别",
+          prop: "ajzlbMc",
+          width: "150",
+        },
+        {
+          label: "类案类别",
+          prop: "ajxzlbMc",
+          width: "280",
+        },
+        {
+          label: "简要案情",
+          prop: "jyaq",
+          width: "260",
+        },
+        {
+          label: "案件类别",
+          prop: "ajlbdmMc",
+          width: "220",
+        },
+        {
+          label: "发案地点",
+          prop: "asjfsddDzmc",
+          width: "180",
+        },
+        {
+          label: "损失价值",
+          prop: "ssjzrmby",
+          width: "180",
+        },
+        {
+          label: "立案日期",
+          prop: "larq",
+          width: "200",
+        },
+        {
+          label: "案发开始时间",
+          prop: "asjfssjKssjStr",
+          width: "220",
+        },
+      ],
+      cxUrl: `/newAsjbz/esAsjCheckQuery`,
+      textarea: "",
+      dialogVisible: false,
+      asjbh:"",
+    };
+  },
+  methods: {
+    bjBack(asjbh) {
+        debugger
+      var self = this;
+      self.asjbh = asjbh;
+      self.dialogVisible = true;
+    },
+    cz() {
+      var self = this;
+      if (self.textarea) {
+        updateBzStatus({
+          htms: self.textarea,
+          asjbh: self.asjbh,
+        }).then((res) => {
+          this.$refs.rightContent.doQuery("yes");
+          self.dialogVisible = false;
+        });
+      } else {
+        this.$confirm("请输入描述", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {});
+      }
+    },
+  },
+  created() {
+    // this.getAj()
+  },
+      watch: {
+    'cxFormData.bzzt'(val,old){
+      if(val != old){
+         this.$refs.rightContent.doQuery("yes");
+      }
+    },
+  },
+};
+</script>
+<style>
+.el-dialog__body {
+  padding: 10px 15px !important;
+}
+.rightContent .el-input__inner,
+#formCommonPage .el-input__inner {
+  height: 32px;
+  line-height: 32px;
+  font-family: inherit;
+  background: #f3f3f3;
+}
+.el-table__header-wrapper th,
+.el-table__header-wrapper tr {
+  background: #f4f6f7;
+}
+.rightContent .el-input__icon,
+#formCommonPage .el-input__icon,
+.el-input__suffix-inner {
+  line-height: 36px;
+}
+.rightContent .el-range-separator {
+  position: relative;
+  top: -4px;
+}
+.rightContent .el-textarea__inner,
+#formCommonPage .el-textarea__inner {
+  width: 100%;
+  font-family: inherit;
+}
+.rightContent .el-range-input,
+#formCommonPage .el-range-input {
+  vertical-align: top;
+}
+.rightContent .el-date-editor .el-range__close-icon {
+  margin-top: -4px;
+}
+.rightContent .el-form-item__error {
+  left: calc(66% - 27px);
+  top: 12px;
+}
+.success-row {
+  background-color: #fbf9f4 !important;
+}
+.Content .el-input,
+.Content .el-date-editor--daterange.el-input__inner {
+  width: 100% !important;
+}
+</style>
+<style scoped lang="scss">
+@import "../assets/styles/rightContent.scss";
+</style>