diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..064422a
Binary files /dev/null and b/dist.zip differ
diff --git a/src/view/dialog/dialogRW.vue b/src/view/dialog/dialogRW.vue
index db5a2c7..1e4ab5f 100644
--- a/src/view/dialog/dialogRW.vue
+++ b/src/view/dialog/dialogRW.vue
@@ -41,11 +41,9 @@
           </div>
         </div>
         <div style="width: 100%; height: calc(100% - 110px)" class="table-els">
-          <div class="tabelHead">
-            <div><span>姓名：</span>{{ data.xq.xm }}</div>
+          <div class="tabelHead" v-if="data.name == '许可证编号'">
+            <div><span>姓名：</span>{{ data.xq.dxmc }}</div>
             <div><span>地址：</span>{{ data.xq.dz }}</div>
-            <div><span>年龄：</span>{{ data.xq.nl }}</div>
-            <div><span>标签：</span>{{ data.xq.bq }}</div>
             <div class="status">
               <div class="statusMessage">
                 <span>状态：</span>
@@ -61,6 +59,28 @@
               </div>
             </div>
           </div>
+          <div class="tabelHead" v-else>
+            <div><span>姓名：</span>{{ data.xq.xm }}</div>
+            <div><span>地址：</span>{{ data.xq.dz }}</div>
+            <div><span>年龄：</span>{{ data.xq.nl }}</div>
+            <div><span>标签：</span>{{ data.xq.bq }}</div>
+
+            <div class="status">
+              <div class="statusMessage">
+                <span>状态：</span>
+                <img :src="lampImages[data.xq.deng]" @click="escalation" />
+              </div>
+
+              <div class="lampBox" v-if="clicked">
+                <div class="lampTitle">确定要上报吗?</div>
+                <div class="lampBtn">
+                  <div class="confirm" @click="confirmEvent()">上报</div>
+                  <div class="cancel" @click="cancelEvent()">取消</div>
+                </div>
+              </div>
+            </div>
+          </div>
+
           <div style="border: 1px solid #5284b0">
             <el-table
               :data="data.tableData"
@@ -174,6 +194,12 @@ const props = defineProps({
       return [];
     },
   },
+  name: {
+    type: Array,
+    default: () => {
+      return [];
+    },
+  },
 
   tableData: {
     type: Object,
@@ -248,6 +274,8 @@ const data = reactive({
   typeId: "",
   sfzhm: "",
   xh: "",
+
+  dxmc: "",
   // pagination: {},
 });
 // 使用对象存储所有图片路径
@@ -274,6 +302,7 @@ watch(
       // console.log(props.tableData);
       data.xq = props.tableData.data.xq;
       data.typeId = props.tableData.typeId;
+      data.name = props.tableData.name;
       data.sfzhm = props.tableData.data.xq.sfzhm;
       data.xh = props.tableData.data.xq.xh;
       // data.tableData=props.tableData.data;
@@ -281,6 +310,8 @@ watch(
       data.columns = props.tableData.columns;
       data.tableData.length = 0;
 
+      data.dxmc = props.tableData.data.xq.dxmc;
+
       // function maskName(name) {
       //   if (name.length === 2) {
       //     // 两个字的姓名，第二个字替换为 *
@@ -304,8 +335,6 @@ watch(
       // }
 
       function maskName(name) {
-        console.log("name", name);
-
         if (name.length === 2) {
           // 两个字的姓名，第二个字替换为 *
           return name[0] + "*";
diff --git a/src/view/person/rwTable.vue b/src/view/person/rwTable.vue
index 4d99f1e..3f79f22 100644
--- a/src/view/person/rwTable.vue
+++ b/src/view/person/rwTable.vue
@@ -86,7 +86,8 @@
                   <el-button
                     size="small"
                     type="warning"
-                    @click="inconsistent(scope.$index, scope.row, 1)"
+                    v-if="scope.row.eligible == '0'"
+                    @click="inconsistent(scope.$index, scope.row, 2)"
                   >
                     不符合
                   </el-button>
@@ -112,7 +113,7 @@
                     <el-button
                       size="small"
                       type="primary"
-                      @click="handleEdit(scope.$index, scope.row, 1)"
+                      @click="handleEdit(scope.$index, scope.row, 2)"
                     >
                       确认
                     </el-button>
@@ -924,9 +925,9 @@ const onTypel = (val) => {
   chooseTitle.value = val.id;
   data.columns = columnsList["最低生活保障"][val.col];
   data.url = val.url;
-  search1.name = ""
-  search1.date = ""
-  search1.date1 = ""
+  search1.name = "";
+  search1.date = "";
+  search1.date1 = "";
   if (val.id == 1) {
     data.tableData1 = [];
     personDetails();
@@ -1050,10 +1051,11 @@ const handleEdit = (index, row, status) => {
 const pushStatus = (val, status) => {
   http
     .get(
-      `/api/ggfwyth/pg/operate?bm=${val.bm}&xh=${val.xh}&sfzhm=${val.sfzhm}&status=${status}`
+      `/api/ggfwyth/pg/operate?bm=${val.bm}&xh=${val.xh}&sfzhm=${val.sfzhm}&status=${status}&eligibleRemark=${nonCompliance.value}`
     )
     .then((res) => {
       if (res.code == 200) {
+        nonCompliance.value = "";
         ElMessage.success({
           message: "推送成功",
         });
diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue
index b000588..8f50567 100644
--- a/src/view/sy_details.vue
+++ b/src/view/sy_details.vue
@@ -300,6 +300,7 @@ const routers = useRoute();
 const data = reactive({
   name: "",
   identNo: "", //人物ID
+  dxbm: "", //许可证
   first: 1, //随访记录&体检记录切换
   tabelshow: true, //老年人福利补贴切换
   pagedData: [], //服务内容清单(中间)临时分页数据
@@ -500,7 +501,9 @@ const sfType = reactive({
 });
 const tableType = reactive({
   url: `/api/ggfwyth/pg/fwjgqdxq`,
+  url1: `/api/ggfwyth/pg/spypqyxq`,//许可证编号详情
   title: "服务详情",
+  name: "",
   typeId: "",
   data: [],
   columns: [
@@ -570,16 +573,22 @@ const tableType = reactive({
   ],
   // character: [],
 });
+
 // 状态弹框
 const statusDetails = (val) => {
-  data.identNo = val.sfzhm;
-  if (data.identNo == null) {
-    ElMessage.warning({
-      message: `${val.xm}无id!`,
-      offset: 100, // 距离窗口顶部的偏移量
-    });
+  if (data.name == "许可证编号") {
+    data.dxbm = val.dxbm;
+    getTable2(tableType);
   } else {
-    getTable1(tableType);
+    data.identNo = val.sfzhm;
+    if (data.identNo == null) {
+      ElMessage.warning({
+        message: `${val.xm}无id!`,
+        offset: 100, // 距离窗口顶部的偏移量
+      });
+    } else {
+      getTable1(tableType);
+    }
   }
 };
 // 状态弹框关闭
@@ -620,9 +629,15 @@ const closePush = () => {
 const openSf = () => {
   http.get(`/api/ggfwyth/pg/sfljqd?xh=${routers.query.xh}`).then((res) => {
     if (res.code == 200) {
-      sfType.title = routers.query.name;
-      sfType.data = res.data;
-      dialogShowSf.value = true;
+      if (res.data == null) {
+        ElMessage.warning({
+          message: "暂无数据！",
+        });
+      } else {
+        sfType.title = routers.query.name;
+        sfType.data = res.data;
+        dialogShowSf.value = true;
+      }
     }
   });
 };
@@ -667,6 +682,23 @@ const getTable1 = (pagination) => {
     .then((res) => {
       if (res.code == 200) {
         tableType.data = res.data;
+        tableType.name = data.name;
+        tableType.typeId = routers.query.id;
+        dialogShow.value = true;
+      } else {
+        ElMessage.warning({
+          message: res.message,
+        });
+      }
+    });
+};
+const getTable2 = (pagination) => {
+  http
+    .get(`${pagination.url1}?dxbm=${data.dxbm}&xh=${routers.query.xh}`)
+    .then((res) => {
+      if (res.code == 200) {
+        tableType.data = res.data;
+        tableType.name = data.name;
         tableType.typeId = routers.query.id;
         dialogShow.value = true;
       } else {
@@ -692,7 +724,6 @@ const getServiceList = async (pagination, sfxs) => {
         if (sfxs) {
           data.tableData = res.data;
           pagination.total = res.count;
-          console.log(data.tableData2);
         } else {
           data.tableData2 = res.data;
           pagination2.total = res.count;
@@ -703,6 +734,9 @@ const getServiceList = async (pagination, sfxs) => {
 // 跳转人物详情
 const handleRowClick = (row) => {
   console.log(row); // row 是当前行的数据
+  if (data.name == "许可证编号") {
+    return;
+  }
   data.identNo = row.sfzhm;
   if (data.identNo == null) {
     ElMessage.warning({
@@ -786,7 +820,6 @@ onMounted(() => {
     if (data.name == "食品安全监管" || data.name == "药品安全监管") {
       data.columns = [];
       data.column_2 = [];
-
       data.columns = [
         {
           label: "对象名称",
@@ -806,6 +839,13 @@ onMounted(() => {
           label: "对象名称",
           property: "dxmc",
         },
+        {
+          label: "状态",
+          property: "deng",
+          width: "90",
+          align: "center",
+          type: "slot",
+        },
         {
           label: "许可证编号",
           property: "dxbm",
diff --git a/src/view/sy_table.vue b/src/view/sy_table.vue
index 5463d40..a93c96c 100644
--- a/src/view/sy_table.vue
+++ b/src/view/sy_table.vue
@@ -377,7 +377,7 @@ const data = reactive({
       id: "6",
       name: "弱有所扶",
       img: icon7,
-      visible: true,
+      visible: false,
       son: [
         {
           id: "0",
diff --git a/vite.config.js b/vite.config.js
index c21319f..37e4e38 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -15,7 +15,7 @@ export default defineConfig({
       // 第一个代理
       "/api": {
         // 匹配到啥来进行方向代理
-        target: "http://10.0.0.19:8095/", //刘进
+        target: "http://10.0.0.35:8095/", //刘进
         // target: "https://jzzf.longyou.gov.cn:998/", //线上
         // target: "http://220.191.238.50:996/", //线上
         // target: "https://zzdyyfb.dsjj.qz.gov.cn/web/mgop/gov-open/zj/2002428903/reserved/", //线上