Merge branch 'master' of http://gitlab.91isoft.com:90/gaoying/psa-web

src/views/costManage/examineAndApprove/components/projectCostReimbursementApprove.vue

@@ -36,35 +36,34 @@
       </el-form>
     </div  >
 
-  <div class="app-container">
+  <div class="contentTable">
     <!--    按钮-->
-    <div class="shadow_box_bottom_add">
-      <div>
+      <div style="margin-bottom: 30px">
         <el-button class="el-button-defalut" type="default" @click="">一键驳回</el-button>
         <el-button  class="el-button-primary" style="margin-left: 20px" type="primary" @click="">一键通过</el-button>
       </div>
-    </div>
     <!-- 列表 -->
-    <div class="contentTable" >
       <el-table :data="ReimbursementRequestList" border>
         <el-table-column type="selection" align="center"></el-table-column>
         <el-table-column width="180px" prop="shenqingren" label="申请人" align="center"></el-table-column>
-        <el-table-column width="180px" prop="updateTime" label="申请时间" align="center"></el-table-column>
+        <el-table-column width="180px" prop="updateTime" label="申请时间" align="center" min-width="100px"></el-table-column>
         <el-table-column prop="projectName" label="项目名称" align="center"></el-table-column>
         <el-table-column prop="projectType" label="项目类型" align="center"></el-table-column>
-        <el-table-column  prop="timeOfExpense" label="费用发生时间" align="center"></el-table-column>
+        <el-table-column  prop="timeOfExpense" label="费用发生时间" align="center" min-width="100px"></el-table-column>
         <el-table-column prop="costType" label="费用类型" align="center"></el-table-column>
         <el-table-column prop="actualAmount" label="实际金额（元）" align="center"></el-table-column>
         <el-table-column prop="approvalStatus" label="审批状态" align="center"></el-table-column>
         <el-table-column prop="detail" label="详情" align="center" width="100px">
-          <template #default="scope">
-            <span style="color: #0062FF;font-size: 15px;">查看详情</span>
-          </template>
+          <el-tooltip content="详情" placement="top">
+            <el-button link type="text"  @click="handleView(scope.row)">
+              <img src="@/assets/icons/common/check.png" height="32" width="32"/>
+            </el-button>
+          </el-tooltip>
         </el-table-column>
         <!--   操作按钮-->
         <el-table-column label="操作" align="center">
           <template #default="scope" >
-            <el-button link   type="success" size="small" style="font-size: 15px">通过</el-button>
+            <el-button link   type="primary" size="small" style="font-size: 15px">通过</el-button>
             <el-button link   type="danger" size="small" style="font-size: 15px">驳回</el-button>
           </template>
         </el-table-column>
@@ -79,7 +78,6 @@
             @pagination="ReimbursementRequestList"
         />
       </div>
-    </div>
   </div>
 </template>
 
@@ -112,30 +110,5 @@ const queryParams = reactive({
 
 
 <style scoped lang="scss">
-//标题 、 按钮
-.shadow_box_bottom_add {
-  display: flex;
-  width: 98%;
-  justify-content: space-between;
-  align-items: center;
-  padding:10px;
-  .topDiv{
-    margin-bottom: 30px;
-    padding-left: 8px ;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-  .bold-text1 {
-    border-bottom: 4px solid #0062FF;
-    padding-bottom: 22px;
-    height: 15px;
-    font-family: PingFangSC-Medium;
-    font-weight: 900;
-    font-size: 18px;
-    color: #0D162A;
-    letter-spacing: 0;
-    line-height: 15px;
-  }
-}
+
 </style>

src/views/costManage/examineAndApprove/components/projectCostRequestApprove.vue

@@ -36,20 +36,17 @@
       </el-form>
     </div  >
 
-  <div class="app-container">
+  <div class="contentTable">
     <!--    按钮-->
-    <div class="shadow_box_bottom_add">
-      <div>
+      <div style="margin-bottom: 30px">
         <el-button class="el-button-defalut" type="default" @click="">一键驳回</el-button>
         <el-button  class="el-button-primary" style="margin-left: 20px" type="primary" @click="">一键通过</el-button>
       </div>
-    </div>
     <!-- 列表 -->
-    <div class="contentTable" >
       <el-table  :data="projectCostRequestList" border>
         <el-table-column type="selection" align="center"></el-table-column>
         <el-table-column  prop="shenqingren" label="申请人" align="center"></el-table-column>
-        <el-table-column  prop="createTime" label="申请时间" align="center"></el-table-column>
+        <el-table-column  prop="createTime" label="申请时间" align="center" min-width="100px"> </el-table-column>
         <el-table-column prop="projectName" label="项目名称" align="center"></el-table-column>
         <el-table-column prop="projectType" label="项目类型" align="center"></el-table-column>
 <!--        <el-table-column prop="userName" label="事业部负责人" align="center"></el-table-column>-->
@@ -58,15 +55,17 @@
         <el-table-column prop="sumMoney" label="预计金额（元）" align="center"></el-table-column>
         <el-table-column prop="approvalStatus" label="审批状态" align="center"></el-table-column>
         <el-table-column prop="detail" label="详情" align="center" width="100px">
-          <template #default="scope">
-              <span style="color: #0062FF;font-size: 15px;">查看详情</span>
-          </template>
+          <el-tooltip content="详情" placement="top">
+            <el-button link type="text"  @click="handleView(scope.row)">
+              <img src="@/assets/icons/common/check.png" height="32" width="32"/>
+            </el-button>
+          </el-tooltip>
         </el-table-column>
 
         <!--   操作按钮-->
         <el-table-column label="操作" align="center">
           <template #default="scope" >
-              <el-button link   type="success" size="small" style="font-size: 15px">通过</el-button>
+              <el-button link   type="primary" size="small" style="font-size: 15px">通过</el-button>
               <el-button link   type="danger" size="small" style="font-size: 15px">驳回</el-button>
           </template>
         </el-table-column>
@@ -82,7 +81,6 @@
             @pagination="getList"
         />
       </div>
-    </div>
   </div>
 </template>
 
@@ -117,30 +115,5 @@ const queryParams = reactive({
 
 
 <style scoped lang="scss">
-//标题 、 按钮
-.shadow_box_bottom_add {
-  display: flex;
-  width: 98%;
-  justify-content: space-between;
-  align-items: center;
-  padding:10px;
-  .topDiv{
-    margin-bottom: 30px;
-    padding-left: 8px ;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-  .bold-text1 {
-    border-bottom: 4px solid #0062FF;
-    padding-bottom: 22px;
-    height: 15px;
-    font-family: PingFangSC-Medium;
-    font-weight: 900;
-    font-size: 18px;
-    color: #0D162A;
-    letter-spacing: 0;
-    line-height: 15px;
-  }
-}
+
 </style>

src/views/costManage/examineAndApprove/components/tripApplicationApprove.vue

@@ -92,14 +92,13 @@
       </el-form>
     </div>
 
-  <div>
+  <div class="contentTable">
+    <!--    按钮-->
+    <div style="margin-bottom: 30px">
+    <el-button class="el-button-defalut" type="default" @click="">一键驳回</el-button>
+    <el-button  class="el-button-primary" style="margin-left: 20px" type="primary" @click="">一键通过</el-button>
+    </div>
     <!-- 表格数据 -->
-    <div class="contentTable" >
-      <!--    按钮-->
-      <div>
-        <el-button class="el-button-defalut" type="default" @click="">一键驳回</el-button>
-        <el-button  class="el-button-primary" style="margin-left: 20px" type="primary" @click="">一键通过</el-button>
-      </div>
     <el-table  :data="projectList" border style="width: 100%">
       <el-table-column type="selection" width="40" align="right"/>
       <el-table-column label="申请人" align="center" prop="shenqingren"/>
@@ -113,19 +112,20 @@
       <el-table-column label="项目经理" align="center" prop="projectManagerName" />
       <el-table-column label="审批状态" align="center" prop="projectStatus" ></el-table-column>
       <el-table-column prop="detail" label="详情" align="center" width="100px">
-        <template #default="scope">
-          <span style="color: #0062FF;font-size: 15px;">查看详情</span>
-        </template>
+        <el-tooltip content="详情" placement="top">
+          <el-button link type="text"  @click="handleView(scope.row)">
+            <img src="@/assets/icons/common/check.png" height="32" width="32"/>
+          </el-button>
+        </el-tooltip>
       </el-table-column>
       <!--   操作按钮-->
       <el-table-column label="操作" align="center">
         <template #default="scope" >
-          <el-button link   type="success" size="small" style="font-size: 15px">通过</el-button>
-          <el-button link   type="danger" size="small" style="font-size: 15px">驳回</el-button>
+          <el-button link   type="primary" size="small" style="font-size: 15px">通过</el-button>
+          <el-button link  @click="dialogFormVisible = true"  type="danger" size="small" style="font-size: 15px">驳回</el-button>
         </template>
       </el-table-column>
     </el-table>
-    </div>
     <div style="padding-right: 35%;">
       <pagination
           v-show="total > 0"
@@ -135,18 +135,41 @@
           @pagination="getList"
       />
     </div>
-
   </div>
 
+
+<!--  驳回弹出框-->
+    <el-dialog  top="200px" style="width: 745px;height: 300px"  v-model="dialogFormVisible" title="驳回" >
+      <template #header>
+        <div style="margin-bottom:30px;color: #0D162AFF;font-family: PingFangSC-Regular;font-weight: 600;font-size: 16px;">驳回<el-divider /></div>
+      </template>
+      <div style="padding:5px" >
+        <div style="font-family: PingFangSC-Regular;font-weight: 550;font-size: 16px;color: #0D162A">驳回原因</div>
+        <div style="width: 680px;margin-top:10px"> <el-input  :rows="3" type="textarea" v-model="form.name" placeholder="请输入驳回原因" /></div>
+      </div>
+      <template #footer>
+        <div style="position: absolute;left: 60%;display: flex">
+          <el-button @click="dialogFormVisible = false"  class="btn-B">取消</el-button>
+          <el-button  @click="dialogFormVisible"  class="btn-A" type="primary">确定</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+
+
 </template>
 
-<script setup name="Role">
+<script setup  lang="ts">
 import {ArrowDown} from "@element-plus/icons-vue";
+import {ElMessageBox} from "element-plus";
+import {useRouter} from "vue-router";
 
 const router = useRouter();
 const { proxy } = getCurrentInstance();
 const { project_status, project_type } = proxy.useDict('project_status', 'project_type');
 
+
+const dialogFormVisible = ref(false)
 const projectList = ref([
   {
     shenqingren:'张三',
@@ -201,16 +224,14 @@ function resetQuery() {
 }
 
 
+
 </script>
 
 
 <style scoped lang="scss">
 
-//标题 、 按钮
-.shadow_box_bottom_add {
-  display: flex;
-  width: 98%;
-  justify-content: space-between;
-  align-items: center;
+.el-dialog:not(.is-fullscreen){
+  margin-top: 10vh !important;
+
 }
 </style>

src/views/costManage/examineAndApprove/components/tripReimburseApprove.vue

@@ -85,20 +85,17 @@
       </el-form>
     </div>
 
-  <div class="app-container">
+  <div class="contentTable">
     <!--    按钮-->
-    <div class="shadow_box_bottom_add">
-      <div>
+      <div style="margin-bottom: 30px;">
         <el-button class="el-button-defalut" type="default" @click="">一键驳回</el-button>
         <el-button  class="el-button-primary" style="margin-left: 20px" type="primary" @click="">一键通过</el-button>
       </div>
-    </div>
     <!-- 表格数据 -->
-    <div class="contentTable" >
     <el-table v-loading="loading" :data="projectList" border style="width: 100%">
       <el-table-column type="selection" width="40" align="right"/>
       <el-table-column label="申请人" align="center" prop="shenqingren"/>
-      <el-table-column label="项目编号" align="center" prop="projectNumber" />
+      <el-table-column label="项目编号" align="center" prop="projectNumber" min-width="100px"/>
       <el-table-column label="项目名称" align="center" prop="projectName"  show-overflow-tooltip/>
       <el-table-column label="项目类型" align="center" prop="projectType" >
 <!--        <template #default="scope">-->
@@ -115,19 +112,21 @@
 <!--        </template>-->
       </el-table-column>
       <el-table-column prop="detail" label="详情" align="center" width="100px">
-        <template #default="scope">
-          <span style="color: #0062FF;font-size: 15px;">查看详情</span>
-        </template>
+        <el-tooltip content="详情" placement="top">
+          <el-button link type="text"  @click="handleView(scope.row)">
+            <img src="@/assets/icons/common/check.png" height="32" width="32"/>
+          </el-button>
+        </el-tooltip>
       </el-table-column>
       <!--   操作按钮-->
       <el-table-column label="操作" align="center">
         <template #default="scope" >
-          <el-button link   type="success" size="small" style="font-size: 15px">通过</el-button>
-          <el-button link   type="danger" size="small" style="font-size: 15px">驳回</el-button>
+          <el-button link   type="primary" size="small" style="font-size: 15px">通过</el-button>
+          <el-button link @click="dialogFormVisible = true"  type="danger" size="small" style="font-size: 15px">驳回</el-button>
         </template>
       </el-table-column>
     </el-table>
-    </div>
+
     <div style="padding-right: 35%;">
       <pagination
           v-show="total > 0"
@@ -137,14 +136,33 @@
           @pagination="getList"
       />
     </div>
-
   </div>
+
+  <!--  驳回弹出框-->
+  <el-dialog v-model="dialogFormVisible" title="驳回" :top="'30'" width="700" style="height: 300px;margin-top: 500px">
+    <template #header>
+      <div style="margin-bottom:30px;color: #0062FF;font-family: PingFangSC-Regular;font-weight: 400;font-size: 20px;">驳回</div>
+    </template>
+    <el-form :model="form">
+      <el-form-item label="驳回原因" >
+        <el-input  :rows="4" type="textarea" v-model="form.name" placeholder="请输入驳回原因" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <div style="position: absolute;left: 60%;display: flex">
+        <el-button @click="dialogFormVisible = false"  class="btn-B">取消</el-button>
+        <el-button  @click="dialogFormVisible"  class="btn-A" type="primary">确定</el-button>
+      </div>
+    </template>
+  </el-dialog>
 </template>
 
 <script setup>
 import {reactive, ref} from "vue";
 import {ArrowDown} from "@element-plus/icons-vue";
 
+
+const dialogFormVisible = ref(false)
 const projectList = ref([
   {
     shenqingren:'张三',
@@ -200,30 +218,5 @@ function resetQuery() {
 
 
 <style scoped lang="scss">
-//标题 、 按钮
-.shadow_box_bottom_add {
-  display: flex;
-  width: 98%;
-  justify-content: space-between;
-  align-items: center;
-  padding:10px;
-  .topDiv{
-    margin-bottom: 30px;
-    padding-left: 8px ;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-  .bold-text1 {
-    border-bottom: 4px solid #0062FF;
-    padding-bottom: 22px;
-    height: 15px;
-    font-family: PingFangSC-Medium;
-    font-weight: 900;
-    font-size: 18px;
-    color: #0D162A;
-    letter-spacing: 0;
-    line-height: 15px;
-  }
-}
+
 </style>

src/views/costManage/examineAndApprove/index.vue

@@ -19,10 +19,11 @@
         </template>
         <trip-reimburse-approve />
       </el-tab-pane>
-      <el-tab-pane label="项目费用申请" name="fourth">
+      <el-tab-pane label="项目费用申请" name="fourth" style="margin-bottom: 0">
         <template #label>
         <span :class="activeName === 'fourth' ? 'tabs_span_colorChange':'tabs_span_color' " >项目费用申请</span>
       </template>
+
         <project-cost-request-approve />
       </el-tab-pane>
       <el-tab-pane label="项目费用报销" name="fifth">
@@ -61,19 +62,24 @@ const handleClick = (tab) =>{
 
 </script>
 
-
-
 <style scoped lang="scss">
+:deep(.el-tabs__nav-scroll) {
+  background-color: white;
+  padding: 16px 32px;
+}
+:deep(.el-tabs__header) {
+  margin: 0;
+}
 // 标签字体颜色
 .tabs_span_color{
-  font-size:16px;
-  color: #000000a6;
-  font-family: PingFangSC-Regular;
+  font-size: 16px;
+  color: #5B5B5B;
+  font-family: "Microsoft YaHei", sans-serif;
 }
 .tabs_span_colorChange{
   font-size: 16px;
   color: #0062FF;
-  font-family: PingFangSC-Regular;
+  font-family: "Microsoft YaHei", sans-serif;
 }
 
 </style>

src/views/costManage/projectCostReimbursement/index.vue

@@ -37,6 +37,8 @@
       </el-form>
     </div  >
 
+
+    <div class="contentTable">
     <!--    导航、按钮-->
     <div class="shadow_box_bottom_add">
       <div class="topDiv">
@@ -65,7 +67,6 @@
         </el-tooltip>
       </div>
     </div>
-
     <!--    步骤条-->
     <div class="shadow_box_bottom_step">
       <text class="text1">审批流程</text>
@@ -78,9 +79,7 @@
 
       </div>
     </div>
-
-    <!--      列表-->
-    <div class="contentTable">
+    <!--     列表-->
       <el-table v-loading="loading" :data="ReimbursementRequestList" border @cell-mouse-enter="handleHover" @cell-mouse-leave="handleLeave">
         <el-table-column type="selection" align="center"></el-table-column>
         <el-table-column width="180px" prop="updateTime" label="申请时间" align="center">
@@ -358,17 +357,14 @@ const handleDelete=(row)=> {
 </script>
 
 <style scoped lang="scss">
-
 //导航 、 按钮
 .shadow_box_bottom_add {
   display: flex;
-  width: 98%;
+  width: 100%;
   justify-content: space-between;
   align-items: center;
-  padding:10px;
+  padding:10px 0;
   .topDiv{
-    margin-bottom: 30px;
-    padding-left: 8px ;
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -384,17 +380,16 @@ const handleDelete=(row)=> {
     letter-spacing: 0;
     line-height: 15px;
   }
-
 }
 
 
-
 //步骤条
 .shadow_box_bottom_step {
   display: flex;
-  margin: 10px 13px;
+  margin-top: 10px;
+  margin-bottom: 20px;
   padding: 20px 0px;
-  width: 98%;
+  width: 100%;
   justify-content: space-evenly;
   align-items: center;
   background-color: #F9F9FA;

src/views/costManage/projectCostReimbursement/waitReimbursement.vue

@@ -40,6 +40,7 @@
       </el-form>
     </div  >
 
+    <div class="contentTable">
     <!--    导航、按钮-->
     <div class="shadow_box_bottom_add">
       <div class="topDiv">
@@ -48,7 +49,6 @@
     </div>
 
     <!--      列表-->
-    <div class="contentTable">
       <el-table v-loading="loading" :data="waitReimbursementList" border>
         <el-table-column type="selection" align="center"></el-table-column>
         <el-table-column  prop="createTime" label="申请时间" align="center">
@@ -211,13 +211,12 @@ const handleToAdd=({id})=> {
 //导航 、 按钮
 .shadow_box_bottom_add {
   display: flex;
-  width: 98%;
+  width: 100%;
   justify-content: space-between;
   align-items: center;
-  padding:10px;
+  padding:10px 0;
+  margin-bottom: 20px;
   .topDiv{
-    margin-bottom: 30px;
-    padding-left: 8px ;
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -236,30 +235,6 @@ const handleToAdd=({id})=> {
 }
 
 
-//步骤条
-.shadow_box_bottom_step {
-  display: flex;
-  margin: 10px 13px;
-  padding: 20px 0px;
-  width: 98%;
-  justify-content: space-evenly;
-  align-items: center;
-  background-color: #F9F9FA;
-  .text1 {
-    font-size: 18px;
-    font-weight: 550;
-  }
-  .text2 {
-    display: flex;
-    flex-direction: column;
-    font-size: 18px;
-    align-items: center;
-  }
-  .step {
-    width: 80%;
-  }
-}
-
 .list_icon {
   color: #477bf5;
   margin: 8px;