案件标注、有组织犯罪团伙、附件回显

src/components/form.vue

@@ -1276,7 +1276,7 @@ export default {
         }
         if (isLt1M) {
           this.fileLists[item.id].push(file);
-          this.$refs.formLabelAlign.clearValidate();
+          // this.$refs.formLabelAlign.clearValidate();
         } else {
           this.$confirm("上传文件不能超过100M", "提示", {
             confirmButtonText: "确定",

src/components/form_compontent.vue

@@ -762,7 +762,7 @@ export default {
     ajFocus(item) {
       this.$emit("ajFocus", item);
     },
-     initFields() {
+    initFields() {
       var self = this;
       var ifInitRules = false;
       ifInitRules = JSON.stringify(self.rules) == "{}";
@@ -1179,13 +1179,13 @@ export default {
               }
             });
           });
-          // for (var fileItem in self.fileLists) {
-          //   for (var i = 0; i < self.fileLists[fileItem].length; i++) {
-          //     if (self.fileLists[fileItem][i].raw) {
-          //       params.append(fileItem, self.fileLists[fileItem][i].raw);
-          //     }
-          //   }
-          // }
+          for (var fileItem in self.fileLists) {
+            for (var i = 0; i < self.fileLists[fileItem].length; i++) {
+              if (self.fileLists[fileItem][i].raw) {
+                params.append(fileItem, self.fileLists[fileItem][i].raw);
+              }
+            }
+          }
 
           this.$emit("submit", params);
         } else {
@@ -1398,7 +1398,41 @@ export default {
       });
     });
   },
-  watch: {},
+  watch: {
+    "formLabelAlign.editing": {
+      handler(newName, oldName) {
+        var self = this;
+        if (this.formLabelAlign.hasOwnProperty("editing")) {
+          this.propFormField.forEach((i, iIndex) => {
+            if (i.data && i.data.length > 0) {
+              i.data.forEach((j, jIndex) => {
+                if (j.childrenAsAdd) {
+                  j.childrenAsAdd.forEach((m, mIndex) => {
+                    if (m.type == "file") {
+                      if (this.formLabelAlign[m.id]) {
+                        self.$set(
+                          self.fileLists[j.id][jIndex],
+                          m.id,
+                          self.formLabelAlign[j.id][jIndex][m.id]
+                        );
+                      } else {
+                        this.$set(this.formLabelAlign, m.id, []);
+                      }
+                    }
+                  });
+                } else {
+                  if (j.type == "file") {
+                    this.fileLists[j.id] = this.formLabelAlign[j.id];
+                  }
+                }
+              });
+            }
+          });
+        }
+      },
+      deep: true,
+    },
+  },
   computed: {},
 };
 </script>

src/components/ptCxForm_components.vue

@@ -230,7 +230,7 @@
             @click="$emit('yjbtn')"
             style="background: #007aff; color: #ffffff"
             class="zdybtn"
-            v-if="pageBs == 'queryCheckBj'"
+            v-if="pageBs == 'zdryGl'"
           >
             批量预警
           </div>
@@ -309,7 +309,8 @@
                   pageBs != 'sqqxgl' &&
                   pageBs != 'wfqdzczl' &&
                   pageBs != 'jszls' &&
-                  pageBs != 'wfzdzczl'
+                  pageBs != 'wfzdzczl' &&
+                  pageBs != 'queryCheckBj'
                 "
               >
                 <i class="el-icon-plus"></i> 新增
@@ -491,7 +492,7 @@
               >排除</span
             >
             <span
-              @click="bjBack(scope.row.asjbh, '1', '2')"
+              @click="bjBack(scope.row.asjbh, '1')"
               class="edit"
               style="margin-left: 16px"
               v-if="pageBs == 'queryCheckBj' && cxFormData.asjbzzt == '2'"
@@ -1972,7 +1973,9 @@ export default {
 </script>
 <style>
 @import url("../assets/iconfont/iconfont.css");
-
+.rightContent .el-textarea__inner, #formCommonPage .el-textarea__inner{
+  height: 100px;
+}
 .flTtitle .el-radio-button:first-child .el-radio-button__inner {
   width: 46px;
   font-size: 14px;

src/views/ajbz/ajbzDetail.vue

 <template>
-  <div>
+  <div id="ajbzDetail">
     <div class="top_title">
       <img src="../../assets/img/login/jinhui.png" alt="" />
       <div class="name">案件详情</div>
@@ -303,7 +303,11 @@
                       :class="topSamllCard"
                       v-show="sswpqh"
                     >
-                      <table v-for="(data, index) in sswpList" :key="index" style="border-bottom:1px solid #ddd;">
+                      <table
+                        v-for="(data, index) in sswpList"
+                        :key="index"
+                        style="border-bottom: 1px solid #ddd"
+                      >
                         <tr>
                           <td width="100">物品名称:</td>
                           <td width="200">{{ data.wpmc }}</td>
@@ -331,7 +335,11 @@
                       :class="topSamllCard"
                       v-show="zagjqh"
                     >
-                      <table v-for="(data, index) in zagjList" :key="index"  style="border-bottom:1px solid #ddd;">
+                      <table
+                        v-for="(data, index) in zagjList"
+                        :key="index"
+                        style="border-bottom: 1px solid #ddd"
+                      >
                         <tr>
                           <td width="80">物品名称:</td>
                           <td width="200">{{ data.wpmc }}</td>
@@ -677,7 +685,7 @@
                     </div>
                   </div>
 
-                  <div class="wcbzButton">
+                  <div class="wcbzButton" v-if="!isDetail">
                     <el-button type="primary" @click="submitBz" v-if="ischeck"
                       >完成标注</el-button
                     >
@@ -694,17 +702,23 @@
                     >
                     <el-button
                       type="primary"
-                      @click="bjBack('1', '2')"
+                      @click="bjBack('1')"
                       v-if="!ischeck && bzztMs == '待标注'"
                       >解决</el-button
                     >
                     <el-button type="warning" @click="bzDetail"
                       >查看标注详情</el-button
                     >
-                    <el-button type="primary" @click="dbzDetail"
+                    <el-button type="primary" @click="dbzDetail" v-if="ischeck"
                       >标为待标注</el-button
                     >
                   </div>
+                   <div class="wcbzButton" v-if="isDetail">
+                   
+                    <el-button type="warning" @click="bzDetail"
+                      >查看标注详情</el-button
+                    >
+                  </div>
                 </el-card>
                 <el-card v-else class="box-card">
                   <div class="incidentTitle incidentTitle1">
@@ -905,7 +919,7 @@
     </div>
     <el-dialog title="描述" :visible.sync="dialogVisibleCheck" width="30%">
       <el-input
-        style="margin: 10px 0"
+        style="margin:10px 1%;width:98%"
         type="textarea"
         :rows="2"
         placeholder="请输入内容"
@@ -921,7 +935,7 @@
     </el-dialog>
     <el-dialog title="待标注描述" :visible.sync="bzmsVisiable" width="30%">
       <el-input
-        style="margin: 10px 0"
+        style="margin:10px 1%;width:98%"
         type="textarea"
         :rows="2"
         placeholder="例：缺少具体标签，是否可以添加 标签"
@@ -1269,12 +1283,21 @@ export default {
       jsonZagjStr: "",
       htms: "",
       jjms: "",
+      isDetail:false
     };
   },
   created() {
     this.query("yes");
     this.getBz("yes");
     this.ischeck = this.$route.query.flag ? false : true;
+    if(this.$route.query.flags == 'details'){
+      this.isDetail = true
+      this.bzFlag = true;
+    }else{
+      this.isDetail = false
+      this.bzFlag = false;
+    }
+    
     this.getJson();
   },
   methods: {
@@ -1313,7 +1336,6 @@ export default {
             self.dialogVisibleCheck = false;
             window.opener.location.reload();
             window.close();
-            self.$router.pushToTab({ path: "/queryCheckBj" });
           });
         });
       } else {
@@ -1328,15 +1350,15 @@ export default {
       var self = this;
       if (self.textarea) {
         updateBzStatus({
-          htms: self.textarea,
+          htms: self.objCheck.czmsdm == 3 ? self.textarea : '',
           czmsdm: self.objCheck.czmsdm,
+          jjms:self.objCheck.czmsdm == 1 ? self.textarea : '',
           asjbh: self.asjbh,
           bzzt: self.objCheck.bzzt,
         }).then((res) => {
           self.dialogVisible = false;
           window.opener.location.reload();
           window.close();
-          self.$router.pushToTab({ path: "/queryCheckBj" });
         });
       } else {
         this.$confirm("请输入描述", "提示", {
@@ -2164,6 +2186,9 @@ export default {
   background-color: #3670ff !important;
   color: #fff;
 }
+#ajbzDetail .el-textarea__inner{
+  height: 100px;
+}
 </style>
 <style lang="scss" scoped>
 .top_title {

src/views/ajbz/queryCheckBj.vue

@@ -13,7 +13,7 @@
     ></right-content>
     <el-dialog title="描述" :visible.sync="dialogVisible" width="30%">
       <el-input
-        style="margin: 10px 0"
+        style="margin: 10px 0;height:100px"
         type="textarea"
         :rows="2"
         placeholder="请输入内容"
@@ -247,8 +247,9 @@ export default {
       var self = this;
       if (self.textarea) {
         updateBzStatus({
-          htms: self.textarea,
+          htms: self.obj.czmsdm == 3 ? self.textarea : '',
           czmsdm: self.obj.type,
+          jjms:self.obj.czmsdm == 1 ? self.textarea : '',
           asjbh: self.obj.ajbh,
           bzzt: self.obj.bzzt,
         }).then((res) => {

src/views/yzzfzxsyp/thxs/addAj.vue

@@ -166,11 +166,11 @@ export default {
             type: "success",
             callback: () => {
               this.$router.push("/queryThxs");
-              loading.close();
+              // loading.close();
             },
           });
         } else {
-          loading.close();
+          // loading.close();
         }
       });
     },

src/views/yzzfzxsyp/thxs/addThxs.vue

@@ -252,7 +252,7 @@ export default {
             },
             {
               name: "附件:",
-              id: "file",
+              id: "fileList",
               type: "file",
               value: "",
               requestUrl: "/xsfj/addXsfj",
@@ -344,7 +344,7 @@ export default {
       this.$router.pushToTab({
         path: path,
         query: {
-          xsbh: this.xxzjbh,
+          xsbh: this.xsbh,
         },
       });
     },
@@ -467,9 +467,9 @@ export default {
         background: "rgba(255, 255, 255, 0.7)",
       });
       getThxsByZjbh({
-        xsbh: this.xxzjbh,
+        xsbh: this.xsbh,
       }).then((res) => {
-        var result = res.data.xs;
+        var result = res.data.xs.xs;
         self.propFormField.forEach((i, iIndex) => {
           if (i.data && i.data.length > 0) {
             i.data.forEach((j, jIndex) => {
@@ -488,16 +488,31 @@ export default {
                   }
                 });
               } else {
-                self.$set(
-                  self.formLabelAlign,
-                  j.id,
-                  i.objStr ? result[i.objStr][j.id] : result[j.id]
-                );
+                if (j.type == "file") {
+                  self.$set(self.formLabelAlign, j.id, []);
+                  if (res.data.xs.fjList) {
+                    res.data.xs.fjList.forEach((fileItem, fileIndex) => {
+                      const fileObj = {
+                        name: fileItem.xsfjDzwjbt,
+                        url: fileItem.xsfjDzwjwz,
+                        xxzjbh: fileItem.xxzjbh,
+                      };
+                      self.$set(self.formLabelAlign[j.id], fileIndex, fileObj);
+                    });
+                  }
+                } else {
+                  self.$set(
+                    self.formLabelAlign,
+                    j.id,
+                    i.objStr ? result[i.objStr][j.id] : result[j.id]
+                  );
+                }
               }
             });
           }
         });
         self.$forceUpdate();
+        self.$set(self.formLabelAlign, 'editing', true)
         setTimeout(() => {
           loading.close();
         }, 500);
@@ -507,11 +522,13 @@ export default {
   created() {
     if (this.$route.query.xxzjbh) {
       this.title = "修改团伙线索";
-      this.xxzjbh = this.$route.query.xxzjbh;
+      this.xsbh = this.$route.query.xxzjbh;
       this.getshuju();
     } else {
       this.getBh();
     }
+    this.getXyrList()
+    this.getAjList()
   },
 };
 </script>

src/views/yzzfzxsyp/thxs/queryThxs.vue

@@ -180,7 +180,7 @@ export default {
       this.$router.pushToTab("/addThxs");
     },
     edit(scope) {
-      this.$router.push({
+      this.$router.pushToTab({
         path: "/addThxs",
         query: { xxzjbh: scope.row.xsbh },
       });