更新页面

src/views/backOfficeSystem/DeploymentDisposal/mpvGroupSh/index.vue

@@ -227,7 +227,7 @@ const pageData = reactive({
     pageSize: 20,
     pageCurrent: 1
   },
-  controlsWidth: 220,
+  controlsWidth: 150,
   tableColumn: [
     { label: "群体基本信息", prop: "jbxx", showSolt: true,width:300 },
     { label: "背景信息", prop: "bgxx", showSolt: true,width:300 },

src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index.vue

@@ -76,14 +76,18 @@
         <template #zdrCzzt="{ row }">
           <DictTag :tag="false" :value="row.zdrCzzt" :options="D_GS_ZDR_CZZT" />
         </template>
+        <template #zdrZt="{ row }">
+          <DictTag :tag="false" :value="row.zdrZt" :options="D_GS_ZDQT_ZT" />
+        </template>
         <template #xtSjzt="{ row }">
           <div> {{ row.xtSjzt == 0 ? "注销" : row.xtSjzt == 1 ? "正常" : "封存" }}</div>
         </template>
 
         <!-- 操作 -->
         <template #controls="{ row }">
-           <el-link size="small" type="success"  @click="handleSend(row.id)">送审</el-link>
+           <el-link size="small" type="success" v-if="row.zdrZt == '01'" @click="handleSend(row.id)">送审</el-link>
-          <el-link size="small" type="primary" @click="addEdit('edit', row)" >编辑</el-link>
+          <el-link size="small" type="primary" v-if="row.zdrZt == '01'" @click="addEdit('edit', row)" >编辑</el-link>
+          <el-link size="small" type="primary" @click="addEdit('detail', row)" >详情</el-link>
           <el-link size="small" type="danger" @click="deleteRow(row)">删除</el-link>
         </template>
       </MyTable>
@@ -118,7 +122,7 @@ import AddForm from "./components/addForm.vue";
 import { qcckGet, qcckPost } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
 const { proxy } = getCurrentInstance();
-const { D_GS_ZDR_RYJB, D_BZ_XB, D_BZ_MZ, D_BZ_XZQHDM, D_GS_ZDR_BK_ZT, D_GS_ZDR_CZZT, D_GS_BQ_ZL, D_GS_BQ_LB, D_GS_BQ_LX, D_GS_ZDR_YJDJ, D_GS_BK_SSJZ, D_GS_BK_SQLX, D_BZ_SF, D_GS_XS_LY, D_BZ_SSZT, D_GS_XS_LX, D_GS_XS_QTLX } = proxy.$dict("D_GS_ZDR_RYJB","D_BZ_XB","D_BZ_MZ","D_BZ_XZQHDM","D_GS_ZDR_BK_ZT","D_GS_ZDR_CZZT","D_GS_BQ_ZL","D_GS_BQ_LB","D_GS_BQ_LX","D_GS_ZDR_YJDJ","D_GS_BK_SSJZ","D_GS_BK_SQLX","D_BZ_SF","D_GS_XS_LY","D_BZ_SSZT","D_GS_XS_LX","D_GS_XS_QTLX");
+const { D_GS_ZDQT_ZT,D_GS_ZDR_RYJB, D_BZ_XB, D_BZ_MZ, D_BZ_XZQHDM, D_GS_ZDR_BK_ZT, D_GS_ZDR_CZZT, D_GS_BQ_ZL, D_GS_BQ_LB, D_GS_BQ_LX, D_GS_ZDR_YJDJ, D_GS_BK_SSJZ, D_GS_BK_SQLX, D_BZ_SF, D_GS_XS_LY, D_BZ_SSZT, D_GS_XS_LX, D_GS_XS_QTLX } = proxy.$dict("D_GS_ZDQT_ZT","D_GS_ZDR_RYJB","D_BZ_XB","D_BZ_MZ","D_BZ_XZQHDM","D_GS_ZDR_BK_ZT","D_GS_ZDR_CZZT","D_GS_BQ_ZL","D_GS_BQ_LB","D_GS_BQ_LX","D_GS_ZDR_YJDJ","D_GS_BK_SSJZ","D_GS_BK_SQLX","D_BZ_SF","D_GS_XS_LY","D_BZ_SSZT","D_GS_XS_LX","D_GS_XS_QTLX");
 const obj = ref({});
 const showzxs = ref(false);
 const zxsDilof = ref();
@@ -184,7 +188,8 @@ const pageData = reactive({
     { label: "户籍居住信息", prop: "jzxx", showSolt: true,width:300, },
     { label: "管辖单位", prop: "gxdw", showSolt: true,width:300, },
     { label: "处置状态", prop: "zdrCzzt", showSolt: true },
-    { label: "状态", prop: "xtSjzt", showSolt: true }
+    { label: "状态", prop: "xtSjzt", showSolt: true },
+    { label: "审核状态", prop: "zdrZt", showSolt: true },
   ]
 });
 
@@ -224,12 +229,12 @@ const getList = () => {
 
 //送审
 const handleSend = (id) => {
-  // proxy.$confirm("确定要送审？", "警告", { type: "warning" }).then(() => {
+  proxy.$confirm("确定要送审？", "警告", { type: "warning" }).then(() => {
-  //   qcckPost({}, "/mosty-gsxt/tbGsxtZdqt/subExamine/"+id).then(() => {
+    qcckPost({id}, "/mosty-gsxt/tbGsxtZdry/subSh").then(() => {
-  //     proxy.$message({ type: "success", message: "送审成功" });
+      proxy.$message({ type: "success", message: "送审成功" });
-  //     getList();
+      getList();
-  //   });
+    });
-  // })
+  })
 };
 
 

src/views/backOfficeSystem/DeploymentDisposal/mpvPeoSh/index.vue

@@ -74,12 +74,48 @@
         <template #xtSjzt="{ row }">
           <div> {{ row.xtSjzt == 0 ? "注销" : row.xtSjzt == 1 ? "正常" : "封存" }}</div>
         </template>
+        <template #zdrZt="{ row }">
+          <DictTag :tag="false" :value="row.zdrZt" :options="D_GS_ZDQT_ZT" />
+        </template>
 
         <!-- 操作 -->
         <template #controls="{ row }">
-          <!-- 送审后数据到审批中 -->
+          <el-popover placement="left" :visible="row.visible" :width="400" trigger="manual">
-           <el-link size="small" type="success" >审核</el-link>
+            <template #reference>
-           <el-link size="small" type="success" >审批</el-link>
+              <el-link size="small" type="warning" v-if="row.zdrZt == '02'" @click="row.visible = !row.visible,chooseRow.id = row.id">审核</el-link>
+            </template>
+            <el-form :model="chooseRow" ref="elRowForm" :inline="true" label-width="100px" :rules="rules">
+              <el-form-item label="是否通过" prop="sftg" class="mt10 mb10" style="width: 100%;">
+                <MOSTY.Select filterable v-model="chooseRow.sftg" :dictEnum="D_BZ_SF" width="100%" clearable  placeholder="请选择是否通过"/>
+              </el-form-item>
+              <el-form-item label="不通过原因" prop="shBtgyy" v-if="chooseRow.sftg == 0" style="width: 100%;">
+                <MOSTY.Other style="width: 100%;" clearable v-model="chooseRow.shBtgyy" type="textarea" placeholder="请输入不通过原因"/>
+              </el-form-item>
+            </el-form>
+            <div class="flex just-center mt10">
+              <el-button @click.stop="cancelRow(row)">取消</el-button>
+              <el-button type="primary"  @click.stop="handleSend(row)"  v-loading="btnloading">确定</el-button>
+            </div>
+          </el-popover>
+
+          <el-popover placement="left" :visible="row.visible1" :width="400" trigger="manual">
+            <template #reference>
+              <el-link size="small" type="primary" v-if="row.zdrZt == '04'" @click="row.visible1 = !row.visible1,chooseRow.id = row.id">审批</el-link>
+            </template>
+            <el-form :model="chooseRow" ref="elRowForm1" :inline="true" label-width="100px" :rules="rules">
+              <el-form-item label="是否通过" prop="sftg" class="mt10 mb10" style="width: 100%;">
+                <MOSTY.Select filterable v-model="chooseRow.sftg" :dictEnum="D_BZ_SF" width="100%" clearable  placeholder="请选择是否通过"/>
+              </el-form-item>
+              <el-form-item label="不通过原因" prop="spBtgyy" v-if="chooseRow.sftg == 0" style="width: 100%;">
+                <MOSTY.Other style="width: 100%;" clearable v-model="chooseRow.spBtgyy" type="textarea" placeholder="请输入不通过原因"/>
+              </el-form-item>
+            </el-form>
+            <div class="flex just-center mt10">
+              <el-button @click.stop="cancelRowSp(row)">取消</el-button>
+              <el-button type="primary"  @click.stop="handleSendSp(row)"  v-loading="btnloading">确定</el-button>
+            </div>
+          </el-popover>
+
           <el-link size="small" type="primary" @click="addEdit('detail', row)" >详情</el-link>
           <el-link size="small" type="danger" @click="deleteRow(row)">删除</el-link>
         </template>
@@ -104,6 +140,7 @@
 </template>
 
 <script setup>
+import * as MOSTY from "@/components/MyComponents/index";
 import { ElMessage } from "element-plus";
 import ChooseUser from "@/components/ChooseList/ChooseUser/index.vue";
 import ZxsForm from "../mpvPeo/components/zxsForm.vue";
@@ -115,7 +152,7 @@ import AddForm from "../mpvPeo/components/addForm.vue";
 import { qcckGet, qcckPost } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
 const { proxy } = getCurrentInstance();
-const { D_GS_ZDR_RYJB, D_BZ_XB, D_BZ_MZ, D_BZ_XZQHDM, D_GS_ZDR_BK_ZT, D_GS_ZDR_CZZT, D_GS_BQ_ZL, D_GS_BQ_LB, D_GS_BQ_LX, D_GS_ZDR_YJDJ, D_GS_BK_SSJZ, D_GS_BK_SQLX, D_BZ_SF, D_GS_XS_LY, D_BZ_SSZT, D_GS_XS_LX, D_GS_XS_QTLX } = proxy.$dict("D_GS_ZDR_RYJB","D_BZ_XB","D_BZ_MZ","D_BZ_XZQHDM","D_GS_ZDR_BK_ZT","D_GS_ZDR_CZZT","D_GS_BQ_ZL","D_GS_BQ_LB","D_GS_BQ_LX","D_GS_ZDR_YJDJ","D_GS_BK_SSJZ","D_GS_BK_SQLX","D_BZ_SF","D_GS_XS_LY","D_BZ_SSZT","D_GS_XS_LX","D_GS_XS_QTLX");
+const { D_GS_ZDQT_ZT,D_GS_ZDR_RYJB, D_BZ_XB, D_BZ_MZ, D_BZ_XZQHDM, D_GS_ZDR_BK_ZT, D_GS_ZDR_CZZT, D_GS_BQ_ZL, D_GS_BQ_LB, D_GS_BQ_LX, D_GS_ZDR_YJDJ, D_GS_BK_SSJZ, D_GS_BK_SQLX, D_BZ_SF, D_GS_XS_LY, D_BZ_SSZT, D_GS_XS_LX, D_GS_XS_QTLX } = proxy.$dict("D_GS_ZDQT_ZT","D_GS_ZDR_RYJB","D_BZ_XB","D_BZ_MZ","D_BZ_XZQHDM","D_GS_ZDR_BK_ZT","D_GS_ZDR_CZZT","D_GS_BQ_ZL","D_GS_BQ_LB","D_GS_BQ_LX","D_GS_ZDR_YJDJ","D_GS_BK_SSJZ","D_GS_BK_SQLX","D_BZ_SF","D_GS_XS_LY","D_BZ_SSZT","D_GS_XS_LX","D_GS_XS_QTLX");
 const obj = ref({});
 const showzxs = ref(false);
 const zxsDilof = ref();
@@ -127,6 +164,16 @@ const ids = ref([]);
 const choosList = ref([]);
 const visible = ref(false);
 const visiblefp = ref(false);
+const chooseRow = ref({})
+const btnloading = ref(false)
+const elRowForm = ref()
+const elRowForm1 = ref()
+const rules = reactive({
+  sftg: [{ required: true, message: "请选择是否通过", trigger: "change" }],
+  shBtgyy: [{ required: true, message: "请输入不通过原因", trigger: "blur" }],
+  spBtgyy: [{ required: true, message: "请输入不通过原因", trigger: "blur" }]
+});
+
 const searchConfiger = ref([
   {
     label: "姓名",
@@ -181,7 +228,8 @@ const pageData = reactive({
     { label: "户籍居住信息", prop: "jzxx", showSolt: true,width:300, },
     { label: "管辖单位", prop: "gxdw", showSolt: true,width:300, },
     { label: "处置状态", prop: "zdrCzzt", showSolt: true },
-    { label: "状态", prop: "xtSjzt", showSolt: true }
+    { label: "状态", prop: "xtSjzt", showSolt: true },
+    { label: "审核状态", prop: "zdrZt", showSolt: true },
   ]
 });
 
@@ -209,7 +257,7 @@ const changeSize = (val) => {
 // 获取列表
 const getList = () => {
   pageData.tableConfiger.loading = true;
-  let data = { ...pageData.pageConfiger, ...queryFrom.value };
+  let data = { ...pageData.pageConfiger, ...queryFrom.value,zdrZt:'02' };
   qcckGet(data, "/mosty-gsxt/tbGsxtZdry/selectPage").then((res) => {
     pageData.tableData = res.records || [];
     pageData.total = res.total;
@@ -277,6 +325,55 @@ const handleZxs = () => {
 };
 
 
+const cancelRow = (row) => {
+  row.visible = false;
+  chooseRow.value = {};
+  btnloading.value = false;
+  elRowForm.value.resetFields()
+};
+
+// 审核
+const handleSend = (val) =>{
+  elRowForm.value.validate((valid) => {
+    if(!valid) return;
+    btnloading.value = true;
+    qcckPost(chooseRow.value, "/mosty-gsxt/tbGsxtZdry/updateSh").then(() => {
+      proxy.$message({ type: "success", message: "审核成功" });
+      val.visible = false;
+      btnloading.value = false;
+      chooseRow.value = {};
+      getList();
+    }).catch(()=>{
+      btnloading.value = false;
+    });
+  })
+}
+
+// 审批
+const cancelRowSp = (row) =>{
+  row.visible1 = false;
+  chooseRow.value = {};
+  btnloading.value = false;
+  elRowForm1.value.resetFields()
+}
+// 审批
+const handleSendSp = () =>{
+  elRowForm1.value.validate((valid) => {
+    if(!valid) return;
+    btnloading.value = true;
+    qcckPost(chooseRow.value, "/mosty-gsxt/tbGsxtZdry/updateSp").then(() => {
+      proxy.$message({ type: "success", message: "审批成功" });
+      val.visible1 = false;
+      btnloading.value = false;
+      chooseRow.value = {};
+      getList();
+    }).catch(()=>{
+      btnloading.value = false;
+    });
+  })
+}
+
+
 //新增编辑
 const addEdit = (type, row) => {
   show.value = true;