Merge remote-tracking branch 'origin/dev_xzeq' into dev_xzeq

src/api/zczl/xxgl.js

@@ -28,4 +28,9 @@ export const getUserInfo = params =>
 //审批人员添加
 export const addSpy = params =>
   post(`${base.alyIP}/zczl/addSpy`, params);
-
+//移交前查询
+export const doSearchOtherLlyxx = params =>
+  post(`${base.alyIP}/zczl/doSearchOtherLlyxx`, params);
+//移交
+export const doUpdateZlxxByLly = params =>
+  post(`${base.alyIP}/zczl/doUpdateZlxxByLly`, params);

src/components/ptCxForm_components.vue

@@ -657,7 +657,6 @@
             pageBs == 'queryRole' ||
             pageBs == 'queryZdjyhd' ||
             pageBs == 'zdxxgl' ||
-            pageBs == 'queryZjcl' ||
             pageBs == 'zdryGl' ||
             pageBs == 'queryQzlb' ||
             pageBs == 'qyeryrlqbxsBJ'

src/views/dswtzxx/bzxx/adddna.vue

@@ -33,7 +33,7 @@
             index: 0,
             data: [
               {
-                name: "比对目标:",
+                name: "比对目标编号:",
                 id: "bdmbXxzjbh",
                 type: "text",
                 value: "",
@@ -41,7 +41,7 @@
                 col: "2",
               },
               {
-                name: "比对源:",
+                name: "比对源编号:",
                 id: "bdyXxzjbh",
                 type: "text",
                 value: "",

src/views/dswtzxx/bzxx/addzw.vue

@@ -32,7 +32,7 @@
             index: 0,
             data: [
               {
-                name: "比对目标_信息主键编号:",
+                name: "比对目标编号:",
                 id: "bdmbXxzjbh",
                 type: "text",
                 value: "",
@@ -40,7 +40,7 @@
                 col: "2",
               },
               {
-                name: "比对源_信息主键编号:",
+                name: "比对源编号:",
                 id: "bdyXxzjbh",
                 type: "text",
                 value: "",
@@ -106,7 +106,7 @@
                 col: "2",
               },
               {
-                name: "比中单位_公安机关名称:",
+                name: "比中单位:",
                 id: "bzdwGajgmc",
                 type: "text",
                 value: "",
@@ -114,7 +114,7 @@
                 col: "2",
               },
               {
-                name: "比中人_姓名:",
+                name: "比中人姓名:",
                 id: "bzrXm",
                 type: "text",
                 value: "",

src/views/dswtzxx/bzxx/dna.vue

@@ -35,7 +35,7 @@
       return {
         tableOperation:true,
         tableOperationWidth:100,
-        header: "DNA比中结果",
+        header: "多生物特征信息",
         pageBs: "dswtzxxlbxx",
         cxFormData: {
           xyrZjhm: "",
@@ -56,11 +56,11 @@
         ],
         cxDefaultFormThead: [
           {
-            label: "比对目标",
+            label: "比对目标编号",
             prop: "bdmbXxzjbh",
           },
           {
-            label: "比对源",
+            label: "比对源编号",
             prop: "bdyXxzjbh",
           },
           {

src/views/dswtzxx/bzxx/zj.vue

@@ -35,7 +35,7 @@
       return {
         tableOperation:true,
         tableOperationWidth:100,
-        header: "DNA比中结果",
+        header: "多生物特征信息",
         pageBs: "dswtzxxlbxx",
         cxFormData: {
           sfzh: "",

src/views/dswtzxx/bzxx/zw.vue

@@ -35,7 +35,7 @@
       return {
         tableOperation:true,
         tableOperationWidth:100,
-        header: "DNA比中结果",
+        header: "多生物特征信息",
         pageBs: "dswtzxxlbxx",
         cxFormData: {
           xyrZjhm: "",
@@ -56,11 +56,11 @@
         ],
         cxDefaultFormThead: [
           {
-            label: "比对目标",
+            label: "比对目标编号",
             prop: "bdmbXxzjbh",
           },
           {
-            label: "比对源",
+            label: "比对源编号",
             prop: "bdyXxzjbh",
           },
           {

src/views/dswtzxx/jbxx/lbxx.vue

@@ -12,7 +12,6 @@
                 @edit="edit"
                 @dele="dele"
                 @add="add"
-                @toInfor="toInfor"
                 ref="rightContent"
         >
             <template #btnGroup="scope">
@@ -42,7 +41,7 @@
       return {
         tableOperation:true,
         tableOperationWidth:800,
-        header: "人员信息列表",
+        header: "多生物特征信息",
         pageBs: "dswtzxxlbxx",
         cxFormData: {
           rybh: "",
@@ -118,7 +117,6 @@
           {
             label: "人员编号",
             prop: "rybh",
-            toInfor: true,
           },
           {
             label: "姓名",

src/views/zczl/xxgl/llycx.vue

@@ -2,6 +2,8 @@
   <div class="Content">
     <right-content
       :pageBs="pageBs"
+      :tableOperation="true"
+      :tableOperationWidth="300"
       :header="header"
       :cxFormData="cxFormData"
       :cxQueryField="cxQueryField"
@@ -11,14 +13,20 @@
       @toRyYj="llyyj"
       @dele="dele"
       ref="rightContent"
-    ></right-content>
+    >
+      <template #btnGroup="scope">
+        <el-button v-if="scope.scope.row.sflly === '1'" @click="llyyj(scope.scope)" type="text">移交</el-button>
+        <el-button v-if="scope.scope.row.sflly === '1'" @click="dele(scope.scope)" type="text">删除</el-button>
+        <el-button v-if="scope.scope.row.sflly === '0' " @click="szlly(scope.scope)" type="text">设置联络员</el-button>
+       </template>
+    </right-content>
   </div>
 </template>
 
 <script>
 import rightContent from "@c/ptCxForm_components.vue";
 import { checkLly, setLly } from "@/api/zczl/xxgl.js";
-import { llyDel } from "@/api/zczl/xxgl.js";
+import { llyDel,doSearchOtherLlyxx, doUpdateZlxxByLly } from "@/api/zczl/xxgl.js";
 export default {
   name: "rlqbxsxx",
   components: {
@@ -27,7 +35,7 @@ export default {
   data() {
     return {
       header: "联络员管理",
-      pageBs: "llycx",
+      pageBs: "xywspdzczl",
       cxFormData: {
         unitcode: "",
         truename: "",
@@ -148,7 +156,51 @@ export default {
           });
         });
     },
-    llyyj(){
+    llyyj(scope){
+      let xxzjbh = scope.row.xxzjbh
+      doSearchOtherLlyxx({xxzjbh}).then(res=>{
+        if(res.code === 200){
+          if(res.data.xxzjbh){
+            this.$alert(`是否继续移交${res.data.trueName}`, '', {
+              confirmButtonText: '确定',
+              callback: action => {
+                if(action === 'cancel'){
+                  this.$message({
+                    message: '移交取消'
+                  });
+                }
+                else {
+                  doUpdateZlxxByLly({oldXxzjbh:xxzjbh,newXxzjbh:res.data.xxzjbh}).then(put=>{
+                    if(put.code===200 && put.data.message === '1'){
+                      this.$message({
+                        type: "success",
+                        message: '移交成功'
+                      });
+                      this.$refs.rightContent.doQuery("yes");
+                    }else {
+                      this.$message({
+                        type: "error",
+                        message: '移交失败'
+                      });
+                    }
+                  })
+
+                }
+              }
+            });
+          }
+          else {
+            this.$message('您是该单位唯一的联络员，无法移交');
+          }
+
+        }
+        else {
+          this.$message({
+            type: "error",
+            message: '移交失败'
+          });
+        }
+      })
       console.log("人员移交")
     },
     dele(scope) {