cz il y a 1 an
Parent
commit
f39c48cc4f

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
src/assets/icons/svg/chuan.svg


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
src/assets/icons/svg/chuhuo.svg


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
src/assets/icons/svg/lunchuan.svg


+ 1 - 0
src/assets/icons/svg/yidaohuo.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="16px" height="16.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#ffffff" d="M736 96V320h151.552L992 490.688V832h-144.896a144 144 0 1 1-286.208 0H447.104a144 144 0 1 1-286.208 0H64V96h672zM624 848a80 80 0 1 0 158.4-16h-156.8a80.576 80.576 0 0 0-1.6 16zM382.4 832h-156.8a80 80 0 1 0 156.8 0zM672 160H128V768h544V160zM851.712 384H736v384h192V508.736L851.712 384z m-288.64-44.48l45.248 45.312L382.08 611.072 223.68 452.672l45.248-45.248 113.088 113.088 181.12-180.992z"  /></svg>

+ 101 - 7
src/components/headerBar/header-bar.vue

@@ -190,10 +190,7 @@
         <h4>set title by slot</h4>
       </template> -->
       <template #default>
-        <div style="margin-bottom:20px">
-          <TitleInfo :content="'通知提醒'"></TitleInfo>
-        </div>
-        <div style="color:#fff;margin-bottom:20px;font-size:12px">开发中</div>
+
         <div class="job-box">
           <div style="margin-bottom:20px">
             <TitleInfo :content="'工作事项'"></TitleInfo>
@@ -273,6 +270,20 @@
           </div>
 
         </div>
+        <div style="margin:20px 0">
+          <TitleInfo :content="'通知提醒'"></TitleInfo>
+        </div>
+        <div class="notice">
+          <div class="item" v-for="(item,index) in noticeData" :key="item.id">
+            <svg-icon :icon-class="item.type==1?'lunchuan':'yidaohuo'" className="icon" />
+            <div class="text">
+              {{item.type==1?item.shipmentTime:item.arrivalTime}}单号为
+              &nbsp;<span class="code" @click="openDetails(item)">{{item.code}}</span>&nbsp;
+              <span v-if="item.type==1">销售合同需出货,请及时跟进。</span><span v-if="item.type==2">采购合同将到货,请及时跟进。</span>
+            </div>
+          </div>
+
+        </div>
       </template>
     </el-drawer>
 
@@ -524,11 +535,61 @@ const handlePushRouter = (type) => {
     params: {},
   });
 };
+
+const noticeData = ref([]);
+const getNoticeData = () => {
+  proxy.get("/statistics/getRecentContractShipmentList").then((res) => {
+    if (res && res.data && res.data.length > 0) {
+      noticeData.value = [
+        ...noticeData.value,
+        ...res.data.map((x) => ({
+          ...x,
+          type: 1,
+        })),
+      ];
+    }
+  });
+  proxy.get("/statistics/getRecentPurchaseArrivalList").then((res) => {
+    console.log(res, "ss");
+    if (res && res.data && res.data.length > 0) {
+      noticeData.value = [
+        ...noticeData.value,
+        ...res.data.map((x) => ({
+          ...x,
+          type: 2,
+        })),
+      ];
+    }
+  });
+};
+getNoticeData();
+const openDetails = (row) => {
+  if (row.type == 1) {
+    proxy.$router.push({
+      name: "contractDetails",
+      query: {
+        currentContractId: row.id,
+      },
+    });
+  } else {
+    let submitType = row.dataResource > 0 ? "10" : "20";
+    proxy.$router.push({
+      path: "/platform_manage/process/processApproval",
+      query: {
+        flowKey: submitType == "10" ? "ehsd_purchase_flow" : "purchase_flow",
+        id: row.flowId,
+        processType: 20,
+        businessId: row.id,
+        submitType,
+      },
+    });
+  }
+};
 </script>
 
 <style lang="scss">
 .drawerClass {
-  width: 350px !important;
+  width: 360px !important;
   background: rgba(62, 62, 62, 0.99);
   // position: relative !important;
   .el-drawer__header {
@@ -540,9 +601,13 @@ const handlePushRouter = (type) => {
 }
 
 .job-box {
-  position: absolute;
-  bottom: 20px;
+  // position: absolute;
+  // bottom: 20px;
   // height: 270px;
+  margin-bottom: 20px;
+  min-height: 135px;
+  max-height: 250px;
+  overflow: auto;
   .job-list {
     display: flex;
     flex-wrap: wrap;
@@ -568,4 +633,33 @@ const handlePushRouter = (type) => {
     }
   }
 }
+.notice {
+  font-size: 14px;
+  .item {
+    margin-bottom: 15px;
+    background: #515151;
+    color: #fff;
+    padding: 5px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    &:hover {
+      background: #616161;
+      // border: 1px solid #fff;
+    }
+    .icon {
+      // font-size: 20px;
+      width: 40px;
+      height: 20px;
+    }
+    .text {
+      margin-left: 10px;
+      line-height: 22px;
+      .code {
+        color: #23a0e7;
+        cursor: pointer;
+      }
+    }
+  }
+}
 </style>

+ 8 - 30
src/views/EHSD/procurement/purchasedEHSD/index.vue

@@ -1,28 +1,12 @@
 <template>
   <div class="tenant">
-    <byTable
-      :source="sourceList.data"
-      :pagination="sourceList.pagination"
-      :config="config"
-      :loading="loading"
-      :selectConfig="selectConfig"
-      :row-class-name="getRowClass"
-      highlight-current-row
-      @get-list="getList"
-    >
+    <byTable :source="sourceList.data" :pagination="sourceList.pagination" :config="config" :loading="loading" :selectConfig="selectConfig"
+             :row-class-name="getRowClass" highlight-current-row @get-list="getList">
       <template #code="{ item }">
-        <div
-          v-if="Number(item.sumPayMoney) > Number(item.amount)"
-          style="cursor: pointer; color: #f54a45"
-          @click="handleClickCode(item)"
-        >
+        <div v-if="Number(item.sumPayMoney) > Number(item.amount)" style="cursor: pointer; color: #f54a45" @click="handleClickCode(item)">
           {{ item.code }}
         </div>
-        <div
-          v-else
-          style="cursor: pointer; color: #409eff"
-          @click="handleClickCode(item)"
-        >
+        <div v-else style="cursor: pointer; color: #409eff" @click="handleClickCode(item)">
           {{ item.code }}
         </div>
       </template>
@@ -44,15 +28,9 @@
       <PurchasePDFOneNew :rowData="rowData" ref="PdfDom"></PurchasePDFOneNew>
       <template #footer ref="printBtn">
         <el-button @click="openPdf = false" size="large">关闭</el-button>
-        <el-button type="primary" v-print="printObj" size="large"
-          >打印</el-button
-        >
-        <el-button type="primary" @click="clickDownload()" size="large"
-          >下载PDF</el-button
-        >
-        <el-button type="primary" @click="exportExcel()" size="large"
-          >导出Excel</el-button
-        >
+        <el-button type="primary" v-print="printObj" size="large">打印</el-button>
+        <el-button type="primary" @click="clickDownload()" size="large">下载PDF</el-button>
+        <el-button type="primary" @click="exportExcel()" size="large">导出Excel</el-button>
       </template>
     </el-dialog>
   </div>
@@ -381,7 +359,7 @@ const handleClickCode = (row) => {
   proxy.$router.push({
     path: "/platform_manage/process/processApproval",
     query: {
-      flowKey: row.processInstanceId,
+      flowKey: submitType == "10" ? "ehsd_purchase_flow" : "purchase_flow",
       id: row.flowId,
       processType: 20,
       businessId: row.id,

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff