列表修改

src/components/ptCxForm_components.vue

@@ -302,13 +302,28 @@
             :width="columnTitle.width"
           >
             <template slot-scope="scope">
-              <div v-if="columnTitle.prop == 'operation' ">
+              <div v-if="columnTitle.prop == 'operation'">
                 <el-button-group v-if="$route.path == 'checkAjbzInfo'">
-                  <el-button type="warning" size="mini" @click="ajbzSp(scope.row,'0')">退回</el-button>
-                  <el-button type="primary" size="mini" @click="ajbzSp(scope.row,'1')" v-if="scope.row.spzt != '1'">通过
+                  <el-button
+                    type="warning"
+                    size="mini"
+                    @click="ajbzSp(scope.row, '0')"
+                    >退回</el-button
+                  >
+                  <el-button
+                    type="primary"
+                    size="mini"
+                    @click="ajbzSp(scope.row, '1')"
+                    v-if="scope.row.spzt != '1'"
+                    >通过
                   </el-button>
                 </el-button-group>
-                <el-button type="primary" size="mini" @click="setAjbzHtms(scope.row)">退回</el-button>
+                <el-button
+                  type="primary"
+                  size="mini"
+                  @click="setAjbzHtms(scope.row)"
+                  >退回</el-button
+                >
               </div>
               <div v-if="columnTitle.prop == 'jyaq'">
                 <div class="ajxq_s">
@@ -351,7 +366,7 @@
               </div>
               <div
                 v-else-if="columnTitle.prop == 'asjbh'"
-                  @click="goDetail(scope.row,scope.$index)"
+                @click="goDetail(scope.row, scope.$index)"
                 style="
                   cursor: pointer;
                   color: #096cc9;
@@ -386,17 +401,29 @@
                 </div>
                 <!-- {{ scope.row[columnTitle.prop] == 1 ? '已标注' : '未标注'}} -->
               </div>
-
+              <div v-else-if="columnTitle.prop == 'larqafsj'">
+                <div>{{`立案时间: ${$moment(scope.row['larq']).format("YYYY-MM-DD")}`}}</div>
+                <div>{{scope.row['asjfssjAsjfskssj'] ? `发案时间：${scope.row['asjfssjAsjfskssj']}` :''}}</div>
+              </div>
               <div v-else v-html="scope.row[columnTitle.prop]"></div>
             </template>
           </el-table-column>
         </el-table>
 
-        <el-dialog :visible="ajbzHtDialog" 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-dialog
+          :visible="ajbzHtDialog"
+          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="ajbzHtDialog = false">取 消</el-button>
             <el-button type="primary" @click="saveAsjbzHt">确 定</el-button>
           </div>
@@ -424,7 +451,7 @@ 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 { esAsjQuery } from "@/api/queryAj.js";
 import Http from "@/utils/http.js";
 import qs from "qs";
 import store from "@/store";
@@ -458,8 +485,8 @@ export default {
   data() {
     return {
       ajbzHtParam: {
-        asjbh: '',
-        htms: '',
+        asjbh: "",
+        htms: "",
       },
       ajbzHtDialog: false,
       tPage: null,
@@ -527,11 +554,11 @@ export default {
       this.ajbzHtParam.asjbh = row.asjbh;
     },
     saveAsjbzHt() {
-      if (this.ajbzHtParam.asjbh == '' || this.ajbzHtParam.asjbh == null) {
+      if (this.ajbzHtParam.asjbh == "" || this.ajbzHtParam.asjbh == null) {
         this.$message.warning("未找到有效的案事件编号，请刷新后重试");
         return;
       }
-      if (this.ajbzHtParam.htms == '' || this.ajbzHtParam.htms == null) {
+      if (this.ajbzHtParam.htms == "" || this.ajbzHtParam.htms == null) {
         this.$message.warning("请输入退回描述后再保存");
         return;
       }
@@ -542,28 +569,29 @@ export default {
       }, 500);
     },
     ajbzSp(row, spStatus) {
-      if (spStatus == '0') {
+      if (spStatus == "0") {
         this.$confirm("标注退回后不可恢复，是否退回？", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
-        }).then(() => {
-          this.$emit("ajbzSp", {asjbh: row.asjbh, spzt: spStatus});
+        })
+          .then(() => {
+            this.$emit("ajbzSp", { asjbh: row.asjbh, spzt: spStatus });
             setTimeout(() => {
               this.doQuery(true);
             }, 500);
-        }).catch(() => {
+          })
+          .catch(() => {
             this.$message({
               type: "info",
               message: "已取消退回",
             });
           });
       } else {
-        this.$emit("ajbzSp", {asjbh: row.asjbh, spzt: spStatus});
+        this.$emit("ajbzSp", { asjbh: row.asjbh, spzt: spStatus });
         setTimeout(() => {
           this.doQuery(true);
         }, 500);
-
       }
     },
 
@@ -589,7 +617,10 @@ export default {
           },
         });
       } else {
-        if (this.pageBszfc == "queryAjNM" || this.pageBszfc == 'checkAjbzInfo') {
+        if (
+          this.pageBszfc == "queryAjNM" ||
+          this.pageBszfc == "checkAjbzInfo"
+        ) {
           this.$router.pushToTab({
             path: "ajbzDetailNM",
             query: {
@@ -597,11 +628,14 @@ export default {
               bzzt: scope.bzzt,
             },
           });
-        } else if (this.pageBs == "queryAjHN" || this.pageBszfc == 'checkAjbzInfoHN') {
+        } else if (
+          this.pageBs == "queryAjHN" ||
+          this.pageBszfc == "checkAjbzInfoHN"
+        ) {
           this.formData.currentIndex = index;
-          let bzDetailStatus = '0';
-          if (this.pageBszfc == 'checkAjbzInfoHN') {
-            bzDetailStatus = '1';
+          let bzDetailStatus = "0";
+          if (this.pageBszfc == "checkAjbzInfoHN") {
+            bzDetailStatus = "1";
           }
           this.$router.pushToTab({
             path: "ajbzDetailHN",
@@ -609,7 +643,7 @@ export default {
               asjbh: scope.asjbh,
               bzzt: scope.bzzt,
               searchData: JSON.stringify(this.formData),
-              bzDetailStatus: bzDetailStatus
+              bzDetailStatus: bzDetailStatus,
             },
           });
         } else {
@@ -662,7 +696,7 @@ export default {
         self.doQueryRequest(json).then((res) => {
           if (res.code === 200) {
             require.ensure([], () => {
-              const {export_json_to_excel} = require("../utils/Export2Excel");
+              const { export_json_to_excel } = require("../utils/Export2Excel");
               const list = res.data.rows;
               const data = self.formatJson(filterVal, list);
               export_json_to_excel(tHeader, data, self.excelHeader);
@@ -686,8 +720,7 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       })
-          .then(() => {
-          })
+        .then(() => {})
         .catch(() => {
           this.$message({
             type: "info",
@@ -698,14 +731,14 @@ export default {
     toXg(item, type) {
       let routeData = this.$router.resolve({
         path: "/malamodify",
-        query: {asjbh: item.asjbh, type: type},
+        query: { asjbh: item.asjbh, type: type },
       });
       window.open(routeData.href, "_blank");
     },
     toLasxxg(asjbh, type, type2) {
       let routeData = this.$router.resolve({
         path: "/malasxmodify",
-        query: {asjbh: asjbh, type: type, type2},
+        query: { asjbh: asjbh, type: type, type2 },
       });
       window.open(routeData.href, "_blank");
     },
@@ -762,7 +795,7 @@ export default {
       this.formData.page = val;
       this.doQuery("yes");
     },
-    tableRowClassName({rowIndex}) {
+    tableRowClassName({ rowIndex }) {
       if (rowIndex % 2 == 0) {
         return "";
       } else {
@@ -780,6 +813,35 @@ export default {
       this.showLoading();
       let self = this,
         json = {};
+      if (this.$route.path == "/checkAjbzInfoHN" && self.formData.bzzt == 2) {
+        if (self.propdefaultFormThead[0].prop == "operation") {
+          self.propdefaultFormThead.splice(0, 1);
+        }
+        if (self.propdefaultFormThead[2].prop != "htms") {
+          let obj = {
+            label: "退回描述",
+            prop: "htms",
+            width: "300",
+          };
+          self.propdefaultFormThead.splice(2, 0, obj);
+        }
+      } else if (
+        this.$route.path == "/checkAjbzInfoHN" &&
+        self.formData.bzzt == 1
+      ) {
+        if (self.propdefaultFormThead[0].prop != "operation") {
+          let obj = {
+            label: "操作",
+            prop: "operation",
+            width: "180",
+          };
+          self.propdefaultFormThead.unshift(obj);
+          
+        }
+        if (self.propdefaultFormThead[3].prop == "htms") {
+          self.propdefaultFormThead.splice(3, 1);
+        }
+      }
       for (let i in self.formData) {
         if (i == "ajlbdm") {
           if (self.formData[i].length > 0) {
@@ -804,9 +866,9 @@ export default {
             .then((response) => {
               if (response.code === 200) {
                 response.data.rows.forEach((item) => {
-                  item.larqafsj = `${item.larq}
-
-                ${item.asjfssjAsjfskssj}`;
+                  // let fasj = item.asjfssjAsjfskssj ? `发案时间：${item.asjfssjAsjfskssj}` :''
+                  // item.larqafsj = `立案时间: ${this.$moment(item.larq).format("YYYY-MM-DD")}  
+                  // ${fasj}`;
                   /*                item.alllb = item.ajxzlbMc
                                     ? `${item.ajlbdmMc}/${item.ajzlbMc}/${item.ajxzlbMc}`
                                     : item.ajzlbMc ? `${item.ajlbdmMc}/${item.ajzlbMc}` : `${item.ajlbdmMc}`;*/

src/views/hainanBZ/ajbzDetailHN.vue

@@ -1259,10 +1259,17 @@ export default {
         this.$message.error("请标注细案类别后再完成标注");
         return;
       }
-      this.$confirm("此操作将进行案件标注, 是否继续?", "提示", {
+
+      
+      this.$confirm(`您选择的小案类别为：<b style='color:red'>${this.ajxzlbStr}</b></br>   
+                      <span style='margin-left: 55px'>细案类别为：<b style='color:red'>${this.ajxlbStr ? this.ajxlbStr : '无'}</b></span>  </br>
+                      <span style='margin-left: 55px'>是否进行标注？</span>  `,
+          "提示",
+          {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning",
+            dangerouslyUseHTMLString: true
           }).then(() => {
         var self = this;
         saveAsjbzxx({

src/views/hainanBZ/checkAjbzInfoHN.vue

@@ -14,7 +14,7 @@
 
 <script>
 import rightContent from "@c/ptCxForm_components.vue";
-import {ajbzHt} from '@/views/hainanBZ/ajbzdetailHN.js'
+import { ajbzHt } from "@/views/hainanBZ/ajbzdetailHN.js";
 
 export default {
   name: "checkAjbzInfoHN",
@@ -29,8 +29,8 @@ export default {
         asjbh: "",
         Ladw_gajgjgdms: "",
         bzzt: "1",
-        checkAjbzStatus:"",
-        bzrXm:"",
+        checkAjbzStatus: "",
+        bzrXm: "",
       },
       panelList: [
         // {
@@ -80,21 +80,22 @@ export default {
           placeholder: "",
           col: "3",
           radioData: [
-            {label: "已标注", val: "1"},
-          ],
-        },
-        {
-          name: "查验处理情况",
-          id: "checkAjbzStatus",
-          type: "radio",
-          value: "1",
-          placeholder: "",
-          col: "3",
-          radioData: [
-            {label: "全部", val: ""},
-            {label: "已退回", val: "1"},
+            { label: "已标注", val: "1" },
+            { label: "未标注", val: "2" },
           ],
         },
+        // {
+        //   name: "查验处理情况",
+        //   id: "checkAjbzStatus",
+        //   type: "radio",
+        //   value: "1",
+        //   placeholder: "",
+        //   col: "3",
+        //   radioData: [
+        //     { label: "全部", val: "" },
+        //     { label: "已退回", val: "1" },
+        //   ],
+        // },
       ],
       cxDefaultFormThead: [
         {
@@ -138,14 +139,14 @@ export default {
           width: "300",
         },
         {
-          label: '案发地点',
-          prop: 'asjfsddDzmc',
-          width: '280'
+          label: "案发地点",
+          prop: "asjfsddDzmc",
+          width: "280",
         },
         {
-          label: '损失总价值',
-          prop: 'ssjzrmby',
-          width: '180'
+          label: "损失总价值",
+          prop: "ssjzrmby",
+          width: "180",
         },
         {
           label: "立案时间",
@@ -153,11 +154,10 @@ export default {
           width: "150",
         },
         {
-          label: '案发开始时间',
-          prop: 'asjfssjAsjfskssj',
-          width: '220'
+          label: "案发开始时间",
+          prop: "asjfssjAsjfskssj",
+          width: "220",
         },
-
       ],
       cxUrl: "/newAsjbz/getAsjCYDataHaiNan",
     };
@@ -174,7 +174,7 @@ export default {
           });
         }
       });
-    }
+    },
   },
   created() {
     // this.getAj()
@@ -182,7 +182,7 @@ export default {
     var start = new Date("1/1/" + thisYear);
     var defaultStart = this.$moment(start.valueOf()).format("YYYY-MM-DD");
 
-    this.cxFormData.lasjRqsjKssj = defaultStart
+    this.cxFormData.lasjRqsjKssj = defaultStart;
     this.cxFormData.lasjRqsjJssj = this.$moment().format("YYYY-MM-DD");
   },
 };

src/views/hainanBZ/queryAjHN.vue

@@ -220,9 +220,9 @@ export default {
           width: "300",
         },
          {
-          label: "立案日期/案发时间",
+          label: "立/发案时间",
           prop: "larqafsj",
-          width: "300",
+          width: "220",
         },
         {
           label: '简要案情',