add:业务流程

src/view/dialog/dialogMapDp.vue

@@ -6,8 +6,7 @@
       :show-close="false"
       center
       :close-on-click-modal="false"
-      :close-on-press-escape="false"
+      :close-on-press-escape="false">
-    >
       <template #header="{ close, titleId, titleClass }">
         <div class="my-header">
           <el-icon size="26" color="#fff" @click="closeDialog">
@@ -23,20 +22,17 @@
               <img
                 src="@/assets/images/table_l.png"
                 alt=""
-                style="margin-right: 10px"
+                style="margin-right: 10px" />
-              />
               <div class="name">{{ title }}详情</div>
               <img
                 src="@/assets/images/table_r.png"
                 alt=""
-                style="margin-left: 10px"
+                style="margin-left: 10px" />
-              />
             </div>
             <img
               class="title_botton"
               src="@/assets/images/table_c.png"
-              alt=""
+              alt="" />
-            />
           </div>
         </div>
         <div style="width: 100%; height: calc(100% - 110px)">
@@ -45,11 +41,10 @@
             :data="data.tableData"
             height="100%"
             :header-cell-style="{ background: '#008FCD' }"
-            :row-style="{height: '26px'}"
+            :row-style="{ height: '26px' }"
             :key="tableKey"
             @row-click="handleRowClick"
-            class="custom-table-font"
+            class="custom-table-font">
-          >
             <!-- <el-table-column
             v-for="(item, index) in data.columns"
             :key="index"
@@ -58,32 +53,34 @@
             :width="item.width"
             align="center"
           /> -->
-            <template v-for="item in data.columns">
+            <template v-for="item in data.columns" :key="item.label">
               <el-table-column
                 :key="item.label"
-                v-if="item.type === 'slot'"
+                v-if="item.type === 'slot' || item.type === 'render'"
                 :show-overflow-tooltip="true"
                 :label="item.label"
                 :property="item.property"
-                :align="item.align || 'center'"
+                :align="item.align || 'center'">
-              >
                 <template #default="scope">
                   <slot
                     :name="item.property"
                     :currentCol="item"
                     :currentData="scope.row"
-                    @click.stop="item.property === 'sxt' ? openSxt() : null"
+                    @click.stop="item.property === 'sxt' ? openSxt() : null">
-                  ></slot>
+                    <component
+                      v-if="item.render"
+                      :is="item.render(scope)"></component>
+                  </slot>
                 </template>
               </el-table-column>
               <el-table-column
                 v-else
+                :type="item.type"
                 :width="item.width"
                 :property="item.property"
                 :label="item.label"
                 :show-overflow-tooltip="true"
-                :align="item.align || 'center'"
+                :align="item.align || 'center'"></el-table-column>
-              />
             </template>
           </el-table>
         </div>
@@ -98,27 +95,15 @@
             prev-text="上一页"
             next-text="下一页"
             @current-change="handle"
-            v-model:current-page="pagination.currentPage"
+            v-model:current-page="pagination.currentPage" />
-          />
         </div>
       </div>
     </el-dialog>
   </div>
 </template>
 <script setup>
-import {
+import { onMounted, reactive, ref, defineProps, watch } from "vue";
-  onMounted,
-  reactive,
-  ref,
-  onBeforeMount,
-  defineProps,
-  watch,
-  nextTick,
-} from "vue";
 import { CircleCloseFilled } from "@element-plus/icons-vue";
-import { useRouter, useRoute } from "vue-router";
-const router = useRouter();
-const routers = useRoute();
 const props = defineProps({
   dialogShow: {
     type: Boolean,
@@ -345,8 +330,8 @@ const handle = (current) => {
 :deep(.el-pagination) {
   transform: scale(0.8);
 }
-:deep(.el-overlay-dialog){
+:deep(.el-overlay-dialog) {
   bottom: 0 !important;
-  overflow:hidden !important;
+  overflow: hidden !important;
 }
 </style>

src/view/sy_map.vue

@@ -251,7 +251,7 @@
           </div>
           <div class="floating_model_label">机制标准</div>
         </div>
-        <div class="floating_model">
+        <div class="floating_model" @click="onProcess">
           <div class="floating_model_icon">
             <img src="@/assets/images/flow.png" alt="" />
           </div>
@@ -1069,18 +1069,46 @@ const business = reactive({
 //机制标准
 const onMechanism = () => {
   dialogModelConfig.title = "机制标准";
-  let bj = business.bj == "gxjs" ? "gxjs" : "lnst";
+  let bj = business.bj == "gxst" ? "lnst" : business.bj;
   http.get(`/api/ggfwyth/ysyzt/getJzbz?bj=${bj}`).then((res) => {
     if (res.code == 200) {
       dialogModelConfig.render = () => {
+        let html =
+          res.data?.zcnr?.replace(/\n/g, "<br/>") || res?.data?.zcnr || "";
         return h("div", {
-          innerHTML: res.data.zcnr?.replace(/\n/g, "<br/>") || res.data.zcnr,
+          innerHTML: html,
         });
       };
       dialogModelConfig.show = true;
     }
   });
 };
+//业务流程
+const onProcess = () => {
+  dialogModelConfig.title = "业务流程";
+  http.get(`/api/ggfwyth/ysyzt/getYwlc?bj=${business.bj}`).then((res) => {
+    if (res.code == 200) {
+      dialogModelConfig.render = () => {
+        let images = res.data.map((item) => {
+          return h(ElImage, { src: item });
+        });
+        return h(
+          "div",
+          {
+            style: {
+              display: "flex",
+              flexWrap: "wrap",
+              gap: "10px",
+              background: "#fff",
+            },
+          },
+          images
+        );
+      };
+      dialogModelConfig.show = true;
+    }
+  });
+};
 //工作情况
 const onWork = () => {
   dialogModelConfig.title = "工作情况";
@@ -1090,7 +1118,17 @@ const onWork = () => {
         let images = res.data.map((item) => {
           return h(ElImage, { src: item });
         });
-        return h("div", {}, images);
+        return h(
+          "div",
+          {
+            style: {
+              display: "flex",
+              flexWrap: "wrap",
+              gap: "10px",
+            },
+          },
+          images
+        );
       };
       dialogModelConfig.show = true;
     }
@@ -1643,10 +1681,37 @@ const table_column_list = reactive({
       label: "姓名",
       property: "scustomername",
     },
+    {
+      label: "就餐/送餐订单",
+      property: "iordertype",
+      type: "render",
+      render: (data) => {
+        return h("span", data.row.iordertype == 1 ? "就餐" : "送餐");
+      },
+    },
+    {
+      label: "早中晚餐",
+      property: "itimetype",
+      type: "render",
+      render: (data) => {
+        return h(
+          "span",
+          data.row.itimetype == 0
+            ? "早餐"
+            : data.row.itimetype == 1
+            ? "午餐"
+            : "晚餐"
+        );
+      },
+    },
     {
       label: "菜品信息",
       property: "dishesmealnames",
     },
+    {
+      label: "订单结束时间",
+      property: "dtfinishtime",
+    },
   ],
 });