更新

src/views/backOfficeSystem/Report/ReportingCenter/index.vue

@@ -25,7 +25,7 @@
           <el-link type="primary" @click="addEdit('edit', row)">编辑</el-link>
           <el-link type="primary" @click="delDictItem(row.id)">删除</el-link>
           <el-link type="primary" @click="addEdit('detail', row)">详情</el-link>
-          <el-link type="primary" @click="endreporting( row.id)" v-if="row.bbZt !== '03'">结束报备</el-link>
+          <el-link type="primary" @click="endreporting( row.id)" v-if="row.bbzt  && row.bbzt !== '03'">结束报备</el-link>
         </template>
       </MyTable>
       <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{

src/views/backOfficeSystem/peopleManag/peoplePolice/components/editAddForm.vue

@@ -11,7 +11,7 @@
       <div class="my_transfer">
         <div class="tree">
           <MOSTY.DepartmentTree width="300px" placeholder="管理部门ID" clearable filterable :isBmId="true"
-            v-model="listQuery.deptId" />
+            v-model="linQuery.deptId" />
         </div>
         <div class="left">
           <div class="serch">
@@ -48,8 +48,8 @@
             </el-table>
             <div>
               <el-pagination class="pagination" @size-change="handleSizeChangeUser"
-                @current-change="handleCurrentChangeUser" :current-page="linQuery.pageCurrent"
-                :page-sizes="[10, 20, 50, 100]" :page-size="linQuery.pageSize"
+                @current-change="handleCurrentChangeUser" :current-page="linQuery.current"
+                :page-sizes="[10, 20, 50, 100]" :page-size="linQuery.size"
                 layout="total, sizes, prev, pager, next, jumper" :total="totalUser">
               </el-pagination>
             </div>
@@ -74,7 +74,7 @@
 </template>
 
 <script setup>
-import { ref, reactive, getCurrentInstance, onMounted } from "vue";
+import { ref, reactive, getCurrentInstance, onMounted,watch } from "vue";
 import * as MOSTY from "@/components/MyComponents/index";
 import { jcztbQwXfll } from "@/api/mosty-jcz.js";
 import { Right, Back } from "@element-plus/icons-vue";
@@ -84,10 +84,6 @@ const { D_BZ_SF } = proxy.$dict("D_BZ_SF");
 
 const formRef = ref(null);
 const dialogForm = ref(false);
-const listQuery = ref({
-  file: "",
-  spbt: ""
-});
 const pageInfo = {
   edit: {
     title: "编辑",
@@ -111,7 +107,7 @@ const searchConfiger = ref({
   idEntityCard: "",
   fzzt: ""
 });
-const linQuery = reactive({ pageSize: 10, pageCurrent: 1 });
+const linQuery = reactive({ size: 10, current: 1,deptId:"" });
 const totalUser = ref(0);
 const getBaseselectPage = () => {
   const promes = { ...linQuery, ...searchConfiger.value };
@@ -121,6 +117,7 @@ const getBaseselectPage = () => {
   });
 };
 getBaseselectPage();
+
 //左边选中数据
 const leftdata = ref([]);
 //右边选中数据
@@ -205,13 +202,21 @@ const _onSave = () => {
 
 // 分页查询
 const handleSizeChangeUser = (e) => {
-  linQuery.pageSize = e;
-  getBaseselectPage;
+  linQuery.size = e;
+  getBaseselectPage();
 };
 const handleCurrentChangeUser = (e) => {
-  linQuery.pageCurrent = e;
-  getBaseselectPage;
+  linQuery.current = e;
+  getBaseselectPage();
 };
+watch(()=>linQuery.deptId,(val)=>{
+  if(val){
+    getBaseselectPage()
+  }
+},
+{
+  deep:true,immediate: true
+})
 //页面关闭
 const close = () => {
   dialogForm.value = false;

src/views/backOfficeSystem/peopleManag/peoplePolice/index.vue

@@ -45,14 +45,10 @@
         </div>
       </div>
       <el-form ref="elform" :model="addForm" :rules="rules" :inline="true" label-position="top">
-        <div style="
-            width: 16%;
-            display: flex;
-            margin-bottom: 10px;
-          ">
-                  <div style=" width: 100%; ">
-            <MOSTY.Upload width="100%" :limit="1" :isImg="true"  v-model="addForm.tp" :disableds="forbidden"/>
-        </div>
+        <div style="width: 16%; display: flex; margin-bottom: 10px">
+          <div style="width: 100%">
+            <MOSTY.Upload width="100%" :limit="1" :isImg="true" v-model="addForm.tp" :disableds="forbidden" />
+          </div>
           <!-- <div style="position: relative; height: 100px">
             <el-upload class="avatar-uploader" action="/mosty-api/mosty-base/minio/image/upload/id" :on-success="upImg"
               :show-file-list="false">
@@ -147,24 +143,26 @@ import EditAddForm from "./components/editAddForm.vue";
 import { jczgetXfllList } from "@/api/mosty-jcz.js";
 import { reactive, ref, onMounted, getCurrentInstance } from "vue";
 const { proxy } = getCurrentInstance();
-const { D_BZ_SF, D_BZ_MZ, D_BZ_XB, D_BZ_ZZMM, D_BZ_WHCD, D_BZ_HYZK } = proxy.$dict(
-  "D_BZ_SF",
-  "D_BZ_MZ",
-  "D_BZ_XB",
-  "D_BZ_ZZMM",
-  "D_BZ_WHCD",
-  "D_BZ_HYZK"
-);
+const { D_BZ_SF, D_BZ_MZ, D_BZ_XB, D_BZ_ZZMM, D_BZ_WHCD, D_BZ_HYZK } =
+  proxy.$dict(
+    "D_BZ_SF",
+    "D_BZ_MZ",
+    "D_BZ_XB",
+    "D_BZ_ZZMM",
+    "D_BZ_WHCD",
+    "D_BZ_HYZK"
+  );
 const urlImg = ref("/mosty-api/mosty-base/minio/image/download/");
 const imgUrl = ref("");
 const dialogFormVisible = ref(false);
 const searchConfiger = ref([
-{
+  {
     showType: "department",
     prop: "ssbmdm",
     placeholder: "请选择所属部门",
     label: "所属部门"
-  },{
+  },
+  {
     label: "姓名",
     prop: "xm",
     placeholder: "请输入姓名",
@@ -175,7 +173,7 @@ const searchConfiger = ref([
     prop: "sfzh",
     placeholder: "请输入证件号码",
     showType: "input"
-  },
+  }
   // {
   //   label: "是否离职",
   //   prop: "xtSjzt",
@@ -183,9 +181,8 @@ const searchConfiger = ref([
   //   showType: "select",
   //   options: D_BZ_SF
   // },
-
 ]);
-const elform = ref(null)
+const elform = ref(null);
 const detailDiloag = ref();
 const pageData = reactive({
   tableData: [], //表格数据
@@ -209,7 +206,7 @@ const pageData = reactive({
     { label: "专业技能", prop: "zyjn" }
   ]
 });
-const addForm = ref({})
+const addForm = ref({});
 onMounted(() => {
   tabHeightFn();
 });
@@ -241,9 +238,9 @@ function submit() {
   elform.value.validate((valid) => {
     if (valid) {
       let data = addForm.value;
-      qcckPut(data, '/mosty-jcz/tbQwXfll').then(res => {
-        dialogFormVisible.value = false
-      })
+      qcckPut(data, "/mosty-jcz/tbQwXfll").then((res) => {
+        dialogFormVisible.value = false;
+      });
     }
   });
 }
@@ -257,17 +254,17 @@ function deletImg() {
 }
 const changeNo = (val) => {
   pageData.pageConfiger.pageNum = val;
-  getjczgetXfllList()
+  getjczgetXfllList();
 };
 const changeSize = (val) => {
   pageData.pageConfiger.pageSize = val;
-  getjczgetXfllList()
+  getjczgetXfllList();
 };
 
 // 新增
 const addEdit = (type, row) => {
-  if (type == 'edit') {
-    getMjDetail(row.id)
+  if (type == "edit") {
+    getMjDetail(row.id);
   } else {
     detailDiloag.value.init(type, row);
   }
@@ -292,12 +289,12 @@ function delDictItem(e) {
     });
 }
 const getMjDetail = (id) => {
-  qcckGet({}, `/mosty-jcz/tbQwXfll/${id}`).then(res => {
+  qcckGet({}, `/mosty-jcz/tbQwXfll/${id}`).then((res) => {
     addForm.value = res;
     imgUrl.value = res.tp ? urlImg.value + res.tp : "";
-    dialogFormVisible.value = true
-  })
-}
+    dialogFormVisible.value = true;
+  });
+};
 const searchBox = ref(null);
 // 表格高度计算
 const tabHeightFn = () => {