Merge branch 'dev_xzeq' of http://47.92.108.28/changchao/founder_vue into dev_xzeq

src/api/rlqbxs.js

@@ -35,6 +35,8 @@ export const TqRlqbxx = params =>
 //一键分析
 export const doAnalyse = params =>
   postform(`${base.alyIP}/rlqb/doAnalyse`, params);
-
+//发送信息
+export const insertUserMessage = params =>
+  postform(`${base.alyIP}/rlqb/insertUserMessage`, params);
   
 

src/components/form.vue

@@ -1669,6 +1669,16 @@ export default {
         }
       }
     },
+    "formLabelAlign.sffs"(val) {
+      var boo = false
+      if(val == 1) {
+        boo = true
+        this.$emit("insertMessage",boo)
+      }else {
+        boo = false
+        this.$emit("insertMessage",boo)
+      }
+    }
   },
   computed: {},
 };

src/components/ptCxForm_components.vue

@@ -363,7 +363,9 @@
                   pageBs != 'sqqxgl' &&
                   pageBs != 'queryMyyhz' &&
                   pageBs != 'hpyprwSp' &&
-                  pageBs != 'queryfzxyr'
+                  pageBs != 'queryfzxyr' &&
+                  pageBs != 'qyeryrlqbxsfs' &&
+                  pageBs != 'qyeryrlqbxsBJ'
                 "
               >
                 <i class="el-icon-plus"></i> 新增
@@ -520,8 +522,11 @@
         width="100%"
         size="small"
         v-if="listMode != 2"
+        @select="select"
         @selection-change="handleSelectionChange"
         @expand-change="rowExpand"
+        @select-all="onSelectAll"
+        @row-click="rowClick"
       >
         <el-table-column type="expand" v-if="pageASs == 'queryZj'">
           <template slot-scope="props">
@@ -595,7 +600,8 @@
             pageBs == 'queryZdjyhd' ||
             pageBs == 'zdxxgl' ||
             pageBs == 'queryZjcl' ||
-            pageBs == 'zdryGl'
+            pageBs == 'zdryGl' ||
+            pageBs == 'qyeryrlqbxsBJ'
           "
         >
         </el-table-column>
@@ -959,7 +965,8 @@
               pageBs == 'bxqjsdzczl' ||
               pageBs == 'queryZjcl' ||
               pageBs == 'queryJcgz' ||
-              pageBs == 'queryZjclLb'
+              pageBs == 'queryZjclLb' ||
+              pageBs == 'qyeryrlqbxsBJ'
             )
           "
         >
@@ -989,6 +996,9 @@
                   pageBs == 'cxyhz' ||
                   pageBs == 'queryHbyp' ||
                   pageBs == 'hpyprwSp' ||
+                  pageBs == 'wfqdzczl' ||
+                  pageBs == 'qyeryrlqbxsfs' ||
+                  pageBs == 'qyeryrlqbxsBJ' ||
                   pageBs == 'queryMyyhz' ||
                   pageBs == 'wfqdzczl'
                 )
@@ -1097,6 +1107,9 @@
                 pageBs != 'wfzdzczl' &&
                 pageBs != 'queryHbyp' &&
                 pageBs != 'hpyprwSp' &&
+                pageBs != 'queryfzxyr' &&
+                pageBs != 'qyeryrlqbxsfs' &&
+                pageBs != 'qyeryrlqbxsBJ' &&
                 pageBs != 'queryMyyhz' &&
                 pageBs != 'queryfzxyr'
               "
@@ -1114,6 +1127,12 @@
               v-if="pageBs == 'queryRlqbxs'"
               >发送消息</span
             >
+            <span
+              @click="sendMessageTo(scope)"
+              class="edit"
+              v-if="pageBs == 'qyeryrlqbxsfs'"
+              >发送消息</span
+            >
             <!-- <span
               @click="$emit('qxfp', scope)"
               class="dele"
@@ -1615,6 +1634,8 @@ export default {
       zjhm: "",
       imageUrl: "",
       imgRaw: {},
+      //选中当前行
+      selectData: [],
     };
   },
   methods: {
@@ -1642,13 +1663,45 @@ export default {
       };
       this.$emit("bjBack", obj);
     },
+    select(selection, row) {
+      if (this.pageBs == "qyeryrlqbxsBJ") {
+        // 清除所有选中
+        this.$refs.itsmDataTable.clearSelection();
+        if (selection.length === 0) return;
+        // 将当前点击项选中
+        this.$refs.itsmDataTable.toggleRowSelection(row, true);
+      }
+    },
     handleChange(file) {
       this.imageUrl = URL.createObjectURL(file.raw);
       this.imgRaw = file.raw;
     },
     handleSelectionChange(row) {
+      this.selectData = row;
       this.$emit("selectionChange", row);
     },
+    onSelectAll() {
+      if (this.pageBs == "qyeryrlqbxsBJ") {
+        this.$refs.itsmDataTable.clearSelection();
+      }
+    },
+    rowClick(row) {
+      if (this.pageBs == "qyeryrlqbxsBJ") {
+        var selectData = this.selectData;
+        this.$refs.itsmDataTable.clearSelection();
+        if (selectData.length === 1) {
+          selectData.forEach((item) => {
+            if (item === row) {
+              this.$refs.itsmDataTable.toggleRowSelection(row, false);
+            } else {
+              this.$refs.itsmDataTable.toggleRowSelection(row, true);
+            }
+          });
+        } else {
+          this.$refs.itsmDataTable.toggleRowSelection(row, true);
+        }
+      }
+    },
     EditCode() {
       var self = this;
       if (this.zdyCodeEdit.length > 0) {
@@ -1694,6 +1747,9 @@ export default {
     send(scope) {
       this.$emit("send", scope.row);
     },
+    sendMessageTo(scope) {
+      this.$emit("sendMessageTo", scope.row);
+    },
     bqDetail(item, zjhm) {
       this.bqShuju = [];
       if (item == "团伙作案" || item == "结伙作案") {

src/utils/params.js

@@ -355,7 +355,7 @@ const jdcxsgl = [
     value: "",
     placeholder: "请输入",
     col: "2",
-    // prop: "wpNumbers",
+    prop: "wpNumbers",
   },
   {
     name: "警综物品编号:",
@@ -364,7 +364,7 @@ const jdcxsgl = [
     value: "",
     placeholder: "请输入",
     col: "2",
-    // prop: "wpNumbers",
+    prop: "wpNumbers",
   },
   {
     name: "机动车使用性质:",

src/views/rlqbxsxx/adjustRlqbxs.vue

@@ -8,29 +8,23 @@
       :pageBs="pageBs"
       @examine="examine"
       @messageTq="messageTq"
+      @insertMessage="insertMessage"
     >
     </form-compontent>
-    <el-dialog
-      title="提取信息"
-      :visible.sync="dialogVisiable"
-      width="35%"
-    >
-      <el-table
-      :data="resultTq"
-      style="width: 100%">
+    <el-dialog title="提取信息" :visible.sync="dialogVisiable" width="35%">
+      <el-table :data="resultTq" style="width: 100%">
         <el-table-column
           align="center"
           prop="xxzjbh"
           label="信息主键编号"
-        width="500">
+          width="500"
+        >
         </el-table-column>
-      <el-table-column
-        label="操作"
-        width="150">
+        <el-table-column label="操作" width="150">
           <template slot-scope="scope">
             <span
               @click="extra(scope.row)"
-              style="margin-right: 16px;color:blue;cursor: pointer;"
+              style="margin-right: 16px; color: blue; cursor: pointer"
               >提取</span
             >
           </template>
@@ -38,26 +32,43 @@
       </el-table>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisiable = false">取 消</el-button>
-        <el-button type="primary" @click="dialogVisiable = false">确 定</el-button>
+        <el-button type="primary" @click="dialogVisiable = false"
+          >确 定</el-button
+        >
       </span>
     </el-dialog>
+
+    <right-content
+      v-show="listVisiable"
+      style="margin-top: -85px; margin-left: 20px"
+      :pageBs="sendMessage.pageBs"
+      :cxFormData="sendMessage.cxFormData"
+      :cxQueryField="sendMessage.cxQueryField"
+      :cxDefaultFormThead="sendMessage.cxDefaultFormThead"
+      :cxUrl="sendMessage.cxUrl"
+      ref="rightContent"
+      @selectionChange="selectionChange"
+    ></right-content>
   </div>
 </template>
 
 <script>
 import formCompontent from "@c/form.vue";
 import { kysscj, xstgz, ryxsgl, jdcxsgl, fjdcxsgl } from "@/utils/params.js";
+import rightContent from "@c/ptCxForm_components.vue";
+
 import {
   insertKyxs,
   updateKyxsxx,
   getKyxsByxxzjbh,
   insertTqsp,
-  TqRlqbxx
+  TqRlqbxx,
 } from "@/api/rlqbxs.js";
 export default {
   name: "addRlqbxs",
   components: {
     formCompontent,
+    rightContent,
   },
   data() {
     return {
@@ -175,6 +186,26 @@ export default {
             },
           ],
         },
+        {
+          title: "是否发送",
+          id: 6,
+          objStr: "",
+          index: 5,
+          data: [
+            {
+              name: "是否发送:",
+              id: "sffs",
+              type: "radio",
+              radioData: [
+                { name: "是", value: "1" },
+                { name: "否", value: "0" },
+              ],
+              value: "0",
+              placeholder: "请选择",
+              col: "2",
+            },
+          ],
+        },
       ],
       formLabelAlign: {},
       xxzjbh: "",
@@ -208,12 +239,61 @@ export default {
         },
       ],
       dialogVisiable: false,
+      listVisiable: false,
       resultTq: [],
+      identitycard: "",
+      unitcode: "",
+      sendMessage: {
+        pageBs: "qyeryrlqbxsBJ",
+        cxFormData: {
+          page: 1,
+          limit: 5,
+          username: "",
+          identitycard: "",
+        },
+        cxQueryField: [
+          {
+            name: "姓名",
+            id: "username",
+            type: "text",
+            value: "",
+            placeholder: "",
+            col: "3",
+          },
+          {
+            name: "身份证号码",
+            id: "identitycard",
+            type: "text",
+            value: "",
+            placeholder: "",
+            col: "3",
+          },
+        ],
+        cxDefaultFormThead: [
+          {
+            label: "姓名",
+            prop: "username",
+          },
+          {
+            label: "身份证",
+            prop: "identitycard",
+          },
+          {
+            label: "所属单位",
+            prop: "unitname",
+          },
+        ],
+        cxUrl: "/rlqb/getUserListN",
+      },
     };
   },
   methods: {
     submit(params) {
       console.log(params);
+      if (this.listVisiable == true) {
+        params.append("kyxs.identitycard", this.identitycard);
+        params.append("kyxs.unitcode", this.unitcode);
+      }
       let loading = this.$loading({
         lock: true,
         text: "正在保存...",
@@ -254,30 +334,43 @@ export default {
     },
     messageTq(item) {
       console.log(item);
-      var params = new FormData()
-      params.append("xm",item.xm)
-      params.append("zjhm",item.zjhm)
+      var params = new FormData();
+      params.append("xm", item.xm);
+      params.append("zjhm", item.zjhm);
       TqRlqbxx(params).then((res) => {
         if (res.success && res.code == 200) {
-          this.$message.success("提取成功")
-          var result = res.data.rows
+          this.$message.success("提取成功");
+          var result = res.data.rows;
           // this.resultTq =result
-          result.map((item,index) => {
+          result.map((item, index) => {
             // this.resultTq.push({ xxzjbh:item })
-            this.$set(this.resultTq,index,{xxzjbh:item})
-          })
+            this.$set(this.resultTq, index, { xxzjbh: item });
+          });
           console.log(this.resultTq);
-          this.dialogVisiable = true
+          this.dialogVisiable = true;
         } else {
           loading.close();
-          this.$message.error("提取失败")
+          this.$message.error("提取失败");
         }
       });
     },
+    insertMessage(boo) {
+      this.listVisiable = boo;
+    },
     extra(item) {
       console.log(item);
-      this.xxzjbh = item.xxzjbh
-      this.getshuju()
+      this.xxzjbh = item.xxzjbh;
+      this.getshuju();
+    },
+    // addTolist(obj) {
+    //   console.log(obj);
+    //   this.identitycard = obj.identitycard;
+    //   this.unitcode = obj.unitcode;
+    // },
+    selectionChange(obj) {
+      console.log(obj);
+      this.identitycard = obj[0].identitycard;
+      this.unitcode = obj[0].unitcode;
     },
     getshuju() {
       var self = this;