gx

src/view/dialog/dialogRW.vue

@@ -41,14 +41,17 @@
         </div>
         <div style="width: 100%; height: calc(100% - 110px)" class="table-els">
           <div class="tabelHead">
-            <div><span>姓名：</span>{{ data.character.nl }}</div>
+            <!-- <div><span>姓名：</span>{{ data.tableData.xq.xm }}</div> -->
             <div><span>地址：</span>{{ data.character.dz }}</div>
             <div><span>年龄：</span>{{ data.character.age }}</div>
             <div><span>标签：</span>{{ data.character.titleName }}</div>
             <div class="status">
               <div class="statusMessage">
                 <span>状态：</span>
-                <img :src="lampImages[data.character.deng]" @click="escalation" />
+                <img
+                  :src="lampImages[data.character.deng]"
+                  @click="escalation"
+                />
               </div>
               <div class="lampMessage">(工作日早上8:30自动推送浙政钉)</div>
               <div class="lampBox" v-if="clicked">
@@ -62,7 +65,7 @@
           </div>
 
           <el-table
-            :data="data.tableData"
+            :data="data.tableData.tableData.yxs"
             height="100%"
             :key="tableKey"
             :header-cell-style="{ background: 'rgba(0, 143, 205, 0.63)' }"
@@ -207,10 +210,8 @@ const escalation = () => {
 const confirmEvent = () => {
   console.log("confirm!", data.character);
   let ReportedDto = {
-    name: data.character.xm,
-    address: data.character.dz,
-    phone: "13648554657",
-    type: data.character.id,
+    sfzhm: data.tableData.xq.sfzhm,
+    type: data.tableType.typeId,
   };
   http.post(`/api/ggfwyth/pg/reported`, ReportedDto).then((res) => {
     if (res.code == 200) {
@@ -267,16 +268,17 @@ watch(
   () => props.tableData,
   (newVal, oldVal) => {
     data.tableData = props.tableData;
+
     console.log("状态1", data);
     tableKey.value = Math.random();
   }
 );
-watch(
-  () => props.character,
-  (newVal, oldVal) => {
-    data.character = props.character;
-  }
-);
+// watch(
+//   () => props.character,
+//   (newVal, oldVal) => {
+//     data.character = props.character;
+//   }
+// );
 // 使用生命钩子
 onMounted(() => {
   dialogShow.value = props.dialogShow;

src/view/sy_details.vue

@@ -339,8 +339,7 @@ const data = reactive({
   ],
   tableData: [],
   tableData1: [],
-  tableData2: [], //状态筛选数据
-  tableData3: [], //3表格总数据
+  tableData2: [],
 });
 
 // 表格分页1、2、3
@@ -413,7 +412,7 @@ const dialogShow = ref(false);
 const tableType = reactive({
   url: `/api/ggfwyth/pg/fwjgqdxq`,
   title: "",
-  sfzhm: "",
+  typeId: "",
   data: [],
   columns: [
     {
@@ -423,17 +422,44 @@ const tableType = reactive({
       align: "center",
     },
     {
-      label: "服务内容",
-      property: "fwnr",
-      align: "center",
+      label: "姓名",
+      property: "xm",
+      width: "90",
     },
     {
       label: "结果",
-      property: "zt",
-      width: "260",
+      property: "deng",
+      width: "90",
       align: "center",
       type: "slot",
     },
+    {
+      label: "地址",
+      property: "dz",
+    },
+    {
+      label: "年龄",
+      property: "nl",
+      width: "60",
+    },
+    {
+      label: "人口标签",
+      property: "bq",
+      type: "slot",
+    },
+
+    // {
+    //   label: "服务内容",
+    //   property: "fwnr",
+    //   align: "center",
+    // },
+    // {
+    //   label: "结果",
+    //   property: "deng",
+    //   width: "260",
+    //   align: "center",
+    //   type: "slot",
+    // },
   ],
   // character: [],
 });
@@ -497,6 +523,7 @@ const getTable1 = (pagination) => {
   http.get(`${pagination.url}?sfzhm=${data.identNo}`).then((res) => {
     if (res.code == 200) {
       tableType.data = res.data;
+      tableType.typeId = routers.query.id;
     }
   });
 };
@@ -546,8 +573,6 @@ const listAssignment = () => {
   data.tableData = [];
   data.tableData1 = [];
   data.tableData2 = [];
-  data.tableData3 = [];
-  // lampScreen(0, data.tableData3);
   pagination.url = "/api/ggfwyth/pg/fwdxqd";
   pagination1.url = "/api/ggfwyth/pg/fwnrqd";
   pagination2.url = "/api/ggfwyth/pg/fwjgqd";