更新

src/components/chooseList/chooseTable.vue

@@ -75,6 +75,10 @@
           <template #jwzLx="{ row }">
             <dict-tag :options="props.dic.D_BZ_JWZLX" :value="row.jwzLx" :tag="false"></dict-tag>
           </template>
+          <!-- 巡逻路线类型 -->
+          <template #bxxLx="{ row }">
+            <dict-tag :options="props.dic.D_BZ_BXDLX" :value="row.bxxLx" :tag="false"></dict-tag>
+          </template>
           <!-- 时间段 -->
           <template #sdList="{ row }">
             <div v-for="(it, idxx) in row.sdList" :key="idxx"> {{ it.kssj }} - {{ it.jssj }} </div>
@@ -152,6 +156,10 @@
           <template #xqlx="{ row }">
             <dict-tag :options="props.dic.D_QW_XQLX" :value="row.xqlx" :tag="false"></dict-tag>
           </template>
+          <!-- 巡逻路线类型 -->
+          <template #bxxLx="{ row }">
+            <dict-tag :options="props.dic.D_BZ_BXDLX" :value="row.bxxLx" :tag="false"></dict-tag>
+          </template>
           <!-- 时间段 -->
           <template #sdList="{ row }">
             <div v-for="(it, idxx) in row.sdList" :key="idxx"> {{ it.kssj }} - {{ it.jssj }} </div>
@@ -186,10 +194,6 @@ import {
   ref,
   watch,
   getCurrentInstance,
-  watchEffect,
-  onMounted,
-  onUnmounted,
-  nextTick
 } from "vue";
 const { proxy } = getCurrentInstance();
 const props = defineProps({
@@ -369,11 +373,26 @@ const handleData = (val, type) => {
         ];
       }
       break;
+    case "bxx":
+      title.value = '必巡线'
+      url.value = "/mosty-jmxf/jbldBxx/queryList";
+      pageDataL.tableColumn = [
+        { label: "巡逻路线名称", prop: "bxxMc" },
+        { label: "所属辖区", prop: "ssbm" },
+        { label: "巡逻路线类型", prop: "bxxLx", showSolt: true },
+      ];
+      pageDataR.tableColumn = [
+        { label: "巡逻路线名称", prop: "bxxMc" },
+        { label: "所属辖区", prop: "ssbm" },
+        { label: "巡逻路线类型", prop: "bxxLx", showSolt: true },
+      ];
+      common.searchConfiger = [
+        { showType: "input", prop: "bxxMc", placeholder: "请输入巡逻路线名称", label: "巡逻路线名称"}
+      ];
+      break;
     case "xfq":
     case "bxd":
-    case "bxx":
+      title.value = val == "xfq" ? "巡防区名称" : '必巡点';
-      title.value =
-        val == "xfq" ? "巡防区名称" : val == "bxd" ? "必巡点" : "必巡线";
       url.value = "/mosty-qwzx/tbQwglXfqy/selectPage";
       pageDataL.tableColumn = [
         { label: "名称", prop: "xqmc" },
@@ -470,6 +489,24 @@ const handleData = (val, type) => {
         ];
       }
       break;
+    case 'jmJz':
+      title.value = "警组";
+      url.value = "/mosty-jmxf/tbJcglJz/queryList";
+      pageDataL.tableColumn = [
+        { label: "警组名称", prop: "jzMc" },
+        { label: "所属部门", prop: "ssbm" }
+      ];
+      if (!type) {
+        common.searchConfiger = [
+          {
+            showType: "input",
+            prop: "jzMc",
+            placeholder: "警组名称",
+            label: "警组名称"
+          }
+        ];
+      }
+      break;
     case "jz":
       title.value = "警组";
       url.value = "/mosty-qwzx/tbQwglJz/selectPage";
@@ -600,8 +637,7 @@ const onSearch = (val) => {
 };
 // 获取数据
 const getData = () => {
-  if (getConfiger.lx == "jyqx")
+  if (getConfiger.lx == "jyqx") listQuery.value.pageNo = listQuery.value.pageCurrent;
-    listQuery.value.pageNo = listQuery.value.pageCurrent;
   if (getConfiger.lx == "mj") listQuery.value.fl = "01";
   if (getConfiger.lx == "fj") listQuery.value.fl = "02";
   if (getConfiger.lx == "zbbc") listQuery.value.bcQwBbzl = getConfiger.bclx;
@@ -610,7 +646,8 @@ const getData = () => {
   if (getConfiger.lx == "zfjly") listQuery.value.sblx = "06";
   if (getConfiger.lx == "bxd") listQuery.value.xqlx = "01";
   if (getConfiger.lx == "xfq") listQuery.value.xqlx = "03";
-  if (getConfiger.lx == "bxx") listQuery.value.xqlx = "02";
+  if (getConfiger.lx == "bxx") listQuery.value.zdxllx = "0";
+  if (getConfiger.lx == "jmJz") listQuery.value.Child = 1;
   common.tableConfiger.loading = true;
   console.log(listQuery.value);
 

src/views/backOfficeSystem/qwManagement/qwgl/components/jmqw.vue

@@ -105,7 +105,7 @@
             v-model="dialogForm.jwzMc"
           ></el-input>
         </el-form-item>
-        <el-form-item
+        <!-- <el-form-item
           label="必巡点"
           label-width="96px"
           v-if="['01', '07'].includes(dialogForm.xffwlx)"
@@ -123,7 +123,7 @@
             :key="itchid"
             >{{ itchid.xqmc }}</el-tag
           >
-        </el-form-item>
+        </el-form-item> -->
 
         <el-form-item
           label="必巡线"
@@ -133,12 +133,7 @@
           <ChooseTable
             :deptment="props.dep"
             v-if="!isDetail"
-            :configer="{
+            :configer="{ lx: 'bxx', rowKey: 'id', isRadio: true, placement: 'bottom'}"
-              lx: 'bxx',
-              rowKey: 'id',
-              isRadio: true,
-              placement: 'bottom'
-            }"
             @change="changeDw"
             v-model="dialogForm.bxxList"
             :dic="props.dic"
@@ -147,12 +142,12 @@
             type="primary"
             v-for="itchid in dialogForm.bxxList"
             :key="itchid"
-            >{{ itchid.xqmc }}</el-tag
+            >{{ itchid.bxxMc }}</el-tag
           >
           <template v-if="dialogForm.xffwlx == '06'">
             <div v-for="it in dialogForm.bxdList" :key="it">
               <span v-if="dialogForm.bxdList.length > 0">关联点位：</span>
-              <span class="dwBox">{{ it.xqmc }}</span>
+              <span class="dwBox">{{ it.bxxMc }}</span>
             </div>
           </template>
         </el-form-item>
@@ -182,12 +177,7 @@
           <ChooseTable
             v-if="!isDetail"
             :deptment="props.dep"
-            :configer="{
+            :configer="{ isRadio: true, rowKey: 'id', lx: 'jmJz', }"
-              isRadio: true,
-              rowKey: 'id',
-              lx: 'jz',
-              jzlx: props.bblx
-            }"
             @change="changeJz"
             :dic="props.dic"
           />
@@ -655,44 +645,36 @@ const handleFzr = (val) => {
 
 // 选择警组
 const changeJz = (val) => {
-  console.log(val);
+  console.log(val,'==========将此');
   val.forEach((item) => {
     dialogForm.value.jzMc = item.jzMc;
     dialogForm.value.jzId = item.id;
     dialogForm.value.fzrXm = item.ddMjxm;
     dialogForm.value.fzrSfzh = item.ddMjsfzh;
     dialogForm.value.fzrLxdh = item.ddDh;
-    dialogForm.value.xfzzlx = item.xfzzlx;
-    dialogForm.value.xfwzlx = item.xfwzlx;
 
-    dialogForm.value.bcMc = item.bcMc;
+    dialogForm.value.clList = item.clList || [];
-    dialogForm.value.bcKtsDict = item.bcKtsDict;
+    dialogForm.value.zdList = item.txzbList || [];
-    dialogForm.value.bcId = item.glQwbcId;
-    dialogForm.value.bcKssj = item.bcKssj;
-    dialogForm.value.bcJssj = item.bcJssj;
 
-    dialogForm.value.clList = item.zbclStr ? JSON.parse(item.zbclStr) : [];
+    // let sblist = item.jyqxList || [];
-    dialogForm.value.zdList = item.zbzdsbStr ? JSON.parse(item.zbzdsbStr) : [];
 
-    let sblist = item.tcsbStr ? JSON.parse(item.tcsbStr) : [];
+    // dialogForm.value.tcList = sblist.filter((v) => {
+    //   return v.sblx == "06";
+    // });
+    // const zbzbStr = item.zbzbStr ? JSON.parse(item.zbzbStr) : [];
+    // dialogForm.value.qxList = zbzbStr.length>0? zbzbStr: props.dic.D_JCGL_JYQX_QXLX.map((item) =>{return {
+    //   ...item,qxsl:0
+    // }} );
+    // dialogForm.value.zbmjStr = item.zbmjStr ? JSON.parse(item.zbmjStr) : [];
+    // dialogForm.value.zbfjStr = item.zbfjStr ? JSON.parse(item.zbfjStr) : [];
+    // dialogForm.value.clList.forEach((item) => {
+    //   item.tcryListStr = item.tcryList;
+    // });
 
-    dialogForm.value.tcList = sblist.filter((v) => {
+    // let xlfs = item.xfxlfs ? item.xfxlfs.split(",") : [];
-      return v.sblx == "06";
+    // baseInfo.xlfs.hasChoose = xlfs.map((it) => {
-    });
+    //   return props.dic.D_BZ_XLFS.find((v) => v.value == it).label;
-    const zbzbStr = item.zbzbStr ? JSON.parse(item.zbzbStr) : [];
+    // });
-    dialogForm.value.qxList = zbzbStr.length>0? zbzbStr: props.dic.D_JCGL_JYQX_QXLX.map((item) =>{return {
-      ...item,qxsl:0
-    }} );
-    dialogForm.value.zbmjStr = item.zbmjStr ? JSON.parse(item.zbmjStr) : [];
-    dialogForm.value.zbfjStr = item.zbfjStr ? JSON.parse(item.zbfjStr) : [];
-    dialogForm.value.clList.forEach((item) => {
-      item.tcryListStr = item.tcryList;
-    });
-
-    let xlfs = item.xfxlfs ? item.xfxlfs.split(",") : [];
-    baseInfo.xlfs.hasChoose = xlfs.map((it) => {
-      return props.dic.D_BZ_XLFS.find((v) => v.value == it).label;
-    });
   });
 };
 
@@ -833,7 +815,7 @@ const saveForm = () => {
     }
     if (params.bxxList) {
       params.bxxList = params.bxxList.map((v) => {
-        return { bxxLx: v.xqlx, bxxMc: v.xqmc, bxxid: v.id };
+        return { bxxLx: v.bxxLx, bxxMc: v.bxxMc, bxxid: v.id };
       });
     }
 
@@ -902,7 +884,7 @@ const showData = (val) => {
   // 必巡线
   if (dialogForm.value.bxxList) {
     dialogForm.value.bxxList = dialogForm.value.bxxList.map((v) => {
-      return { xqlx: v.bxxLx, xqmc: v.bxxMc, id: v.bxxid };
+      return { bxxLx: v.bxxLx, bxxMc: v.bxxMc, bxxid: v.id };
     });
   }
   // 必巡点

src/views/backOfficeSystem/qwManagement/qwgl/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <Calendar v-if="isShowCalendar" v-model="isShowCalendar" :dic="{D_BZ_JWZLX,D_QW_BBZT,D_ZDY_XFFWLX, D_BZ_PDDTLX, D_BZ_RYMFJLB, D_BZ_RYJZLB, D_QW_BC_KTS, D_BZ_RYZBBBZW, D_QW_BBZL, D_BZ_SF, D_QW_XQLB, D_QW_XQLX, D_JCGL_ZDSB_SBLB, D_JCGL_ZDSB_SBLX, D_JCGL_JYCL_JYJTGJLB, D_JCGL_JYCL_JYJTFWLB, D_BZ_RYXFBBZW, D_BZ_CLLX,D_BZ_XLFS, D_BZ_WZLX, D_BZ_ZZLX, D_JCGL_JYQX_QXLX,D_QW_ABBB_LX,D_QW_ABBB_CGABLB,D_QW_ABBB_XYJZ,D_QW_ABBB_JRHDZT,D_QW_ABBB_JRHDRSGM,D_BZ_DSZ,D_QW_ABBB_DTBD_LX}" />
+  <Calendar v-if="isShowCalendar" v-model="isShowCalendar" :dic="{D_BZ_BXDLX,D_BZ_JWZLX,D_QW_BBZT,D_ZDY_XFFWLX, D_BZ_PDDTLX, D_BZ_RYMFJLB, D_BZ_RYJZLB, D_QW_BC_KTS, D_BZ_RYZBBBZW, D_QW_BBZL, D_BZ_SF, D_QW_XQLB, D_QW_XQLX, D_JCGL_ZDSB_SBLB, D_JCGL_ZDSB_SBLX, D_JCGL_JYCL_JYJTGJLB, D_JCGL_JYCL_JYJTFWLB, D_BZ_RYXFBBZW, D_BZ_CLLX,D_BZ_XLFS, D_BZ_WZLX, D_BZ_ZZLX, D_JCGL_JYQX_QXLX,D_QW_ABBB_LX,D_QW_ABBB_CGABLB,D_QW_ABBB_XYJZ,D_QW_ABBB_JRHDZT,D_QW_ABBB_JRHDRSGM,D_BZ_DSZ,D_QW_ABBB_DTBD_LX}" />
-  <Tablelist v-if="!isShowCalendar" v-model="isShowCalendar" :dic="{D_BZ_JWZLX,D_QW_BBZT, D_ZDY_XFFWLX,D_BZ_PDDTLX, D_BZ_RYMFJLB, D_BZ_RYJZLB, D_QW_BC_KTS, D_BZ_RYZBBBZW, D_QW_BBZL, D_BZ_SF, D_QW_XQLB, D_QW_XQLX, D_JCGL_ZDSB_SBLB, D_JCGL_ZDSB_SBLX, D_JCGL_JYCL_JYJTGJLB, D_JCGL_JYCL_JYJTFWLB, D_BZ_RYXFBBZW, D_BZ_CLLX,D_BZ_XLFS, D_BZ_WZLX, D_BZ_ZZLX, D_JCGL_JYQX_QXLX,D_QW_ABBB_LX,D_QW_ABBB_CGABLB,D_QW_ABBB_XYJZ,D_QW_ABBB_JRHDZT,D_QW_ABBB_JRHDRSGM,D_BZ_DSZ,D_QW_ABBB_DTBD_LX}" />
+  <Tablelist v-if="!isShowCalendar" v-model="isShowCalendar" :dic="{D_BZ_BXDLX,D_BZ_JWZLX,D_QW_BBZT, D_ZDY_XFFWLX,D_BZ_PDDTLX, D_BZ_RYMFJLB, D_BZ_RYJZLB, D_QW_BC_KTS, D_BZ_RYZBBBZW, D_QW_BBZL, D_BZ_SF, D_QW_XQLB, D_QW_XQLX, D_JCGL_ZDSB_SBLB, D_JCGL_ZDSB_SBLX, D_JCGL_JYCL_JYJTGJLB, D_JCGL_JYCL_JYJTFWLB, D_BZ_RYXFBBZW, D_BZ_CLLX,D_BZ_XLFS, D_BZ_WZLX, D_BZ_ZZLX, D_JCGL_JYQX_QXLX,D_QW_ABBB_LX,D_QW_ABBB_CGABLB,D_QW_ABBB_XYJZ,D_QW_ABBB_JRHDZT,D_QW_ABBB_JRHDRSGM,D_BZ_DSZ,D_QW_ABBB_DTBD_LX}" />
 </template>
 
 <script setup>
@@ -36,7 +36,8 @@ const {
   D_QW_ABBB_JRHDRSGM,
   D_QW_ABBB_JRHDZT,
   D_QW_ABBB_DTBD_LX,
-  D_ZDY_XFFWLX,D_BZ_CLLX
+  D_ZDY_XFFWLX,D_BZ_CLLX,
+  D_BZ_BXDLX
 } = proxy.$dict(
   "D_BZ_JWZLX",
   "D_QW_BBZT",
@@ -65,7 +66,8 @@ const {
   "D_QW_ABBB_JRHDZT",
   "D_QW_ABBB_DTBD_LX",
   "D_JCGL_ZDSB_SBLX",
-  'D_ZDY_XFFWLX',"D_BZ_CLLX"
+  'D_ZDY_XFFWLX',"D_BZ_CLLX",
+  "D_BZ_BXDLX"
 )
 const isShowCalendar = ref(true);
 </script>