From 94327108e2b474cfd0d6b228b818e52acc194dfb Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Mon, 29 Jul 2024 14:01:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E9=A1=B5=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/assets/styles/index.scss          |  3 +
 sgzb-ui/src/assets/styles/sidebar.scss        |  1 +
 sgzb-ui/src/layout/components/AppMain.vue     | 78 ++++++++--------
 .../component/finishAndDetails.vue            | 91 ++++++++++++++++---
 .../cost/csotSettlement/costApplyList.vue     | 14 ++-
 5 files changed, 132 insertions(+), 55 deletions(-)

diff --git a/sgzb-ui/src/assets/styles/index.scss b/sgzb-ui/src/assets/styles/index.scss
index 3fafc321..613036c5 100644
--- a/sgzb-ui/src/assets/styles/index.scss
+++ b/sgzb-ui/src/assets/styles/index.scss
@@ -122,6 +122,9 @@ aside {
 //main-container全局样式
 .app-container {
   padding: 20px;
+  height: calc(100vh - 104px);
+  min-height:calc(100vh - 104px) ;
+  overflow: auto;
 }
 
 .components-container {
diff --git a/sgzb-ui/src/assets/styles/sidebar.scss b/sgzb-ui/src/assets/styles/sidebar.scss
index abe5b631..e85851ac 100644
--- a/sgzb-ui/src/assets/styles/sidebar.scss
+++ b/sgzb-ui/src/assets/styles/sidebar.scss
@@ -5,6 +5,7 @@
     transition: margin-left .28s;
     margin-left: $base-sidebar-width;
     position: relative;
+    overflow: hidden;
   }
 
   .sidebarHide {
diff --git a/sgzb-ui/src/layout/components/AppMain.vue b/sgzb-ui/src/layout/components/AppMain.vue
index cd5135ce..4b70b443 100644
--- a/sgzb-ui/src/layout/components/AppMain.vue
+++ b/sgzb-ui/src/layout/components/AppMain.vue
@@ -1,75 +1,75 @@
 <template>
-  <section class="app-main">
-    <transition name="fade-transform" mode="out-in">
-      <keep-alive :include="cachedViews">
-        <router-view v-if="!$route.meta.link" :key="key" />
-      </keep-alive>
-    </transition>
-    <iframe-toggle />
-  </section>
+    <section class="app-main">
+        <transition name="fade-transform" mode="out-in">
+            <keep-alive :include="cachedViews">
+                <router-view v-if="!$route.meta.link" :key="key" />
+            </keep-alive>
+        </transition>
+        <iframe-toggle />
+    </section>
 </template>
 
 <script>
-import iframeToggle from "./IframeToggle/index"
+import iframeToggle from './IframeToggle/index'
 
 export default {
-  name: 'AppMain',
-  components: { iframeToggle },
-  computed: {
-    cachedViews() {
-      return this.$store.state.tagsView.cachedViews
+    name: 'AppMain',
+    components: { iframeToggle },
+    computed: {
+        cachedViews() {
+            return this.$store.state.tagsView.cachedViews
+        },
+        key() {
+            return this.$route.path
+        },
     },
-    key() {
-      return this.$route.path
-    }
-  }
 }
 </script>
 
 <style lang="scss" scoped>
 .app-main {
-  /* 50= navbar  50  */
-  min-height: calc(100vh - 50px);
-  width: 100%;
-  position: relative;
-  overflow: hidden;
+    /* 50= navbar  50  */
+    min-height: calc(100vh - 50px);
+    width: 100%;
+    position: relative;
+    overflow: hidden;
 }
 
 .fixed-header + .app-main {
-  padding-top: 50px;
+    padding-top: 50px;
 }
 
 .hasTagsView {
-  .app-main {
-    /* 84 = navbar + tags-view = 50 + 34 */
-    min-height: calc(100vh - 84px);
-  }
+    .app-main {
+        /* 84 = navbar + tags-view = 50 + 34 */
+        min-height: calc(100vh - 84px);
+    }
 
-  .fixed-header + .app-main {
-    padding-top: 84px;
-  }
+    .fixed-header + .app-main {
+        padding-top: 84px;
+    }
 }
 </style>
 
 <style lang="scss">
 // fix css style bug in open el-dialog
 .el-popup-parent--hidden {
-  .fixed-header {
-    padding-right: 6px;
-  }
+    .fixed-header {
+        padding-right: 6px;
+    }
 }
 
 ::-webkit-scrollbar {
-  width: 12px;
-  height: 12px;
+    width: 12px;
+    height: 12px;
 }
 
 ::-webkit-scrollbar-track {
-  background-color: #f1f1f1;
+    background-color: #f1f1f1;
 }
 
 ::-webkit-scrollbar-thumb {
-  background-color: #c0c0c0;
-  border-radius: 3px;
+    background-color: #c0c0c0;
+    border-radius: 3px;
 }
 </style>
diff --git a/sgzb-ui/src/views/cost/csotSettlement/component/finishAndDetails.vue b/sgzb-ui/src/views/cost/csotSettlement/component/finishAndDetails.vue
index 69bbd77f..c5dad621 100644
--- a/sgzb-ui/src/views/cost/csotSettlement/component/finishAndDetails.vue
+++ b/sgzb-ui/src/views/cost/csotSettlement/component/finishAndDetails.vue
@@ -2,15 +2,21 @@
     <!-- 完工结算和结算明细页面 -->
     <div>
         <PageHeader :pageContent="pageContent" @goBack="goBack" />
-        <el-row>
-            <el-col :span="8">领用单位：</el-col>
-            <el-col :span="8">工程名称：</el-col>
-        </el-row>
+        <div class="row-header">
+            <div>领用单位：{{ currRowInfo.unitName }}</div>
+            <div>工程名称：{{ currRowInfo.projectName }}</div>
+            <div>总合计：xxxxx元</div>
+            <div>
+                <el-button size="mini" type="primary">导出全部明细表</el-button>
+            </div>
+        </div>
+        <!-- 01承担方 -->
         <FinishTable
             :tableColumns="settleTableColumns"
             :tableTitle="`设备结算清单`"
             :isCostBear="true"
         />
+        <!-- 03承担方 -->
         <FinishTable
             :tableColumns="settleTableColumns"
             :tableTitle="`设备结算清单`"
@@ -29,6 +35,16 @@
             :tableColumns="scrapTableColumns"
             :tableTitle="`工机具报废赔偿清单`"
         />
+        <FinishTable
+            :tableColumns="stayScrapTableColumns"
+            :tableTitle="`工机具待报废清单`"
+        />
+
+        <el-row class="submit-btn">
+            <el-button size="mini" type="primary" @click="submitComSett"
+                >确认完工结算</el-button
+            >
+        </el-row>
     </div>
 </template>
 
@@ -41,10 +57,16 @@ export default {
         FinishTable,
     },
     props: {
+        // 页面标题
         pageContent: {
             type: String,
             default: () => '完工结算',
         },
+        // 当前行的数据信息
+        currRowInfo: {
+            type: Object,
+            default: () => null,
+        },
     },
     data() {
         return {
@@ -69,33 +91,41 @@ export default {
             repairTableColumns: [
                 { t_prop: '', t_label: '设备名称' },
                 { t_prop: '', t_label: '规格型号' },
-                { t_prop: '', t_label: '单位' },
+                { t_prop: 'date', t_label: '单位' },
                 { t_prop: '', t_label: '维修配件名称' },
                 { t_prop: '', t_label: '维修配件型号' },
                 { t_prop: '', t_label: '使用数量' },
                 { t_prop: '', t_label: '配件单价' },
-                { t_prop: '', t_label: '配件总价' },
+                { t_prop: 'price', t_label: '配件总价' },
                 { t_prop: '', t_label: '委外维修费用' },
                 { t_prop: '', t_label: '费用总价' },
             ],
             noReturnTableColumns: [
                 { t_prop: '', t_label: '设备名称' },
                 { t_prop: '', t_label: '规格型号' },
-                { t_prop: '', t_label: '单位' },
+                { t_prop: 'unit', t_label: '单位' },
                 { t_prop: '', t_label: '设备编码' },
-                { t_prop: '', t_label: '未还数量' },
+                { t_prop: 'date', t_label: '未还数量' },
                 { t_prop: '', t_label: '赔偿单价' },
                 { t_prop: '', t_label: '赔偿金额' },
             ],
             scrapTableColumns: [
                 { t_prop: '', t_label: '设备名称' },
-                { t_prop: '', t_label: '规格型号' },
+                { t_prop: 'type', t_label: '规格型号' },
                 { t_prop: '', t_label: '单位' },
                 { t_prop: '', t_label: '设备编码' },
-                { t_prop: '', t_label: '报废数量' },
+                { t_prop: 'date', t_label: '报废数量' },
                 { t_prop: '', t_label: '赔偿单价' },
                 { t_prop: '', t_label: '赔偿金额' },
             ],
+            stayScrapTableColumns: [
+                { t_prop: '', t_label: '设备名称' },
+                { t_prop: 'type', t_label: '规格型号' },
+                { t_prop: '', t_label: '单位' },
+                { t_prop: '', t_label: '设备编码' },
+                { t_prop: 'date', t_label: '报废数量' },
+                { t_prop: '', t_label: '状态' },
+            ],
         }
     },
     methods: {
@@ -103,15 +133,48 @@ export default {
         goBack() {
             this.$emit('closeCurrPage')
         },
+        /** 确认完工结算 */
+        submitComSett() {
+            this.$confirm(
+                '确定后则会生成财务报表，数据将不可修改，请确认检查无误',
+                '提示',
+                {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                },
+            ).then(() => {
+                console.log('确定，后续走确定逻辑')
+            })
+        },
     },
 }
 </script>
 
-<style scoped>
-.el-row {
-    height: 32px;
-    line-height: 32px;
+<style scoped lang="scss">
+.row-header {
+    margin-top: 20px;
+    display: flex;
+    align-items: center;
     font-size: 16px;
     font-weight: bold;
+
+    div {
+        margin-right: 30px;
+    }
+
+    & div:nth-child(3) {
+        margin-right: 15px;
+        color: red;
+    }
+}
+
+.submit-btn {
+    margin-top: 20px;
+    text-align: right;
+
+    .el-button {
+        padding: 10px 14px;
+    }
 }
 </style>
diff --git a/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue b/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue
index 71205f73..47e8b0b1 100644
--- a/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue
+++ b/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue
@@ -184,7 +184,11 @@
             />
         </template>
         <template v-else>
-            <FinishAndDetails @closeCurrPage="closeCurrPage" />
+            <FinishAndDetails
+                :currRowInfo="currRowInfo"
+                :pageContent="pageContent"
+                @closeCurrPage="closeCurrPage"
+            />
         </template>
     </div>
 </template>
@@ -254,6 +258,10 @@ export default {
             monthRecordDialogVisible: false,
             // 是否显示主页
             isHome: true,
+            // 当前行信息
+            currRowInfo: null,
+            // 页面标题
+            pageContent: '',
         }
     },
     created() {
@@ -352,7 +360,9 @@ export default {
             this.monthRecordDialogVisible = true
         },
         /** 完工结算  结算明细*/
-        handleFinishCostAndDetails() {
+        handleFinishCostAndDetails(row) {
+            this.currRowInfo = row
+            this.pageContent = '结算明细'
             this.isHome = false
         },
         /** 关闭月结记录弹框 */