From 09da100729793848bc01b51f7b05ca3f1e7ec64f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 六月 2024 14:05:35 +0800
Subject: [PATCH] 提交一把
---
 company/src/components/business/ApplyChangeDetails.vue |  321 +++++++++++++++++++++++++++++------------------------
 1 files changed, 174 insertions(+), 147 deletions(-)
diff --git a/company/src/components/business/ApplyChangeDetails.vue b/company/src/components/business/ApplyChangeDetails.vue
index 1587990..dd201dc 100644
--- a/company/src/components/business/ApplyChangeDetails.vue
+++ b/company/src/components/business/ApplyChangeDetails.vue
@@ -19,7 +19,8 @@
               <div class="box_table_head_item">淇濋櫓鐢熸晥姝㈡湡</div>
               <div class="box_table_head_item">鍔犱繚浜烘暟</div>
               <div class="box_table_head_item">鍑忎繚浜烘暟</div>
-              <div class="box_table_head_item">鎵瑰崟鐢熸晥鏈�</div>
+              <div class="box_table_head_item">鎵瑰鐢熸晥鏃ユ湡</div>
+              <div class="box_table_head_item">鎵瑰噺鐢熸晥鏃ユ湡</div>
             </div>
             <div class="box_table_content "  >
               <div class="box_table_content_item box_table_content_header">{{ apply.companyName }}</div>
@@ -30,6 +31,7 @@
               <div class="box_table_content_item box_table_content_header">{{ model.addNum}}</div>
               <div class="box_table_content_item box_table_content_header">{{ model.delNum}}</div>
               <div class="box_table_content_item box_table_content_header">{{ model.applyStartTime}}</div>
+              <div class="box_table_content_item box_table_content_header">{{ model.delValidTime}}</div>
             </div>
           </div>
             <div class="box_table">
@@ -41,29 +43,41 @@
                     <div class="box_table_head_item">搴忓彿</div>
                     <div class="box_table_head_item">鍛樺伐濮撳悕</div>
                     <div class="box_table_head_item">韬唤璇佸彿</div>
+<!--
                     <div class="box_table_head_item">鎬у埆</div>
+-->
                     <div class="box_table_head_item">娲鹃仯鍗曚綅</div>
                     <div class="box_table_head_item">鎵�灞炲伐绉�</div>
+                  <div class="box_table_head_item">澶囨敞</div>
                     <div class="box_table_head_item">搴忓彿</div>
                     <div class="box_table_head_item">鍛樺伐濮撳悕</div>
                     <div class="box_table_head_item">韬唤璇佸彿</div>
+<!--
                     <div class="box_table_head_item">鎬у埆</div>
+-->
                     <div class="box_table_head_item">娲鹃仯鍗曚綅</div>
                     <div class="box_table_head_item">鎵�灞炲伐绉�</div>
+                    <div class="box_table_head_item">澶囨敞</div>
                 </div>
                 <div class="box_table_content" v-for="(item, index) in detailList" :key="index">
                     <div class="box_table_content_item">{{item.add.id!=null?(index + 1):''}}</div>
                     <div class="box_table_content_item" >{{ item.add.memberName }}</div>
                     <div class="box_table_content_item">{{ item.add.memberIdcardNo }}</div>
+<!--
                     <div class="box_table_content_item">{{  item.add.sex==0?"鐢�":(item.add.sex==1?"濂�":"" )}}</div>
+-->
                     <div class="box_table_content_item">{{ item.add.duName }}</div>
                     <div class="box_table_content_item">{{item.add.workTypeName}}</div>
+                    <div class="box_table_content_item"  style="align-items: baseline; cursor: pointer; " :title="item.add.remark">{{item.add.remark}}</div>
                     <div class="box_table_content_item">{{item.del.id!=null?(index + 1):''}}</div>
                     <div class="box_table_content_item" >{{ item.del.memberName }}</div>
                     <div class="box_table_content_item">{{ item.del.memberIdcardNo }}</div>
+<!--
                     <div class="box_table_content_item">{{ item.del.sex==0?"鐢�":(item.del.sex==1?"濂�":"" ) }}</div>
+-->
                     <div class="box_table_content_item">{{ item.del.duName }}</div>
                     <div class="box_table_content_item">{{item.del.workTypeName}}</div>
+                    <div class="box_table_content_item" style="align-items: baseline; cursor: pointer; " :title="item.del.remark">{{item.del.remark}}</div>
                 </div>
             </div>
           <div class="box_table" v-if="type==1" style="border-top: 0px solid #b4bbc5;" >
@@ -92,139 +106,139 @@
 </template>
 
 <script>
-    import BaseOpera from '@/components/base/BaseOpera'
-    import GlobalWindow from '@/components/common/GlobalWindow'
-    import {getChangeDetailList, exportJiajianBaoExcel} from "@/api/business/insuranceApply";
-    import {check } from "@/api/business/applyChange";
-    import {exportComFiles} from "@/api/business/company";
-    export default {
-        name: 'ApplyChangeDetails',
-        extends: BaseOpera,
-        components: { GlobalWindow },
-        data () {
-            return {
-                model:{},
-                apply:{},
-              type:0,
-              detailList:[],
-                // 琛ㄥ崟鏁版嵁
-                form: {
-                    id: null,
-                    dealBackApply:0,
-                    checkInfo: ''
-                },
-                // 楠岃瘉瑙勫垯
-                rules: {
-                },
-                reverse: false,
-                tableData: []
-            }
-        },
-        created () {
-            this.config({
-                api: '/business/insuranceApply',
-                'field.id': 'id'
-            })
-        },
-        methods: {
-            open(title,target,target2,target3){
-              this.title=title
-              this.visible=true
-              this.apply = target
-              this.model = target2
-              this.form.id=target2.id
-              this.type=target3
-              this.getDetailListDo()
-            },
-           check (type) {
-            this.form.dealBackApply = type
-            this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
-                .then(() => {
-                  this.isWorking = true
-                  check(this.form)
-                      .then(response => {
-                        this.visible = false
-                        this.$emit('success')
-                      }).catch(err => {
-                    this.$tip.apiFailed(err)
-                  })
-                })
-                .catch(() => {
-                })
-          },
-           getDetailListDo() {
-             this.detailList = []
-             var that = this
-             getChangeDetailList({applyChangeId: this.model.id})
-                 .then(res => {
-                   var addDetailList = []
-                   var delDetailList = []
-                   res.forEach(item1 => {
-                     if (item1.type == 1) {
-                       delDetailList.push(item1);
-                     } else {
-                       addDetailList.push(item1);
-                     }
-                   })
-                   var index = addDetailList.length > delDetailList.length?addDetailList.length : delDetailList.length
-                   for (var i = 0;i<index;i++) {
-                     var addModel = addDetailList.length > i?addDetailList[i]:{}
-                     var delModel = delDetailList.length > i?delDetailList[i]:{}
-                     that.detailList.push({add:addModel,del:delModel});
-                     console.log(detailList)
-                   }
-                 }).catch(err => {})
-           },
-          exportDetail(){
-            this.$dialog.exportConfirm('纭瀵煎嚭璇﹀崟鍚楋紵')
-                .then(() => {
-                  this.isWorking = true
-                  exportJiajianBaoExcel({ id: this.model.id })
-                      .then(response => {
-                        this.download(response)
-                      })
-                      .catch(e => {
-                        console.log(e)
-                        this.$message.error('鏁版嵁涓嬭浇澶辫触锛�')
-                      })
-                      .finally(() => {
-                        this.isWorking = false
-                      })
-                })
-                .catch(() => {
-                })
-          },
-          exportComFilesDo(){
-            this.$dialog.exportConfirm('纭瀵煎嚭浼佷笟璇佷欢鍚楋紵')
-                .then(() => {
-                  this.isWorking = true
-                  exportComFiles({ id: this.apply.companyId })
-                      .then(response => {
-                        this.download(response)
-                      })
-                      .catch(e => {
-                        console.log(e)
-                        this.$message.error('鏁版嵁涓嬭浇澶辫触锛�')
-                      })
-                })
-                .catch(() => {
-                })
-
-          },
-            handleSizeChange(val) {
-                console.log(`姣忛〉 ${val} 鏉);
-            },
-            handleCurrentChange(val) {
-                console.log(`褰撳墠椤�: ${val}`);
-            },
-            handleClick(tab, event) {
-                console.log(tab, event);
-            },
-            onSubmit() {
-
-            }
-        }
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalWindow from '@/components/common/GlobalWindow'
+import { getChangeDetailList, exportJiajianBaoExcel } from '@/api/business/insuranceApply'
+import { check } from '@/api/business/applyChange'
+import { exportComFiles } from '@/api/business/company'
+export default {
+  name: 'ApplyChangeDetails',
+  extends: BaseOpera,
+  components: { GlobalWindow },
+  data () {
+    return {
+      model: {},
+      apply: {},
+      type: 0,
+      detailList: [],
+      // 琛ㄥ崟鏁版嵁
+      form: {
+        id: null,
+        dealBackApply: 0,
+        checkInfo: ''
+      },
+      // 楠岃瘉瑙勫垯
+      rules: {
+      },
+      reverse: false,
+      tableData: []
     }
+  },
+  created () {
+    this.config({
+      api: '/business/insuranceApply',
+      'field.id': 'id'
+    })
+  },
+  methods: {
+    open (title, target, target2, target3) {
+      this.title = title
+      this.visible = true
+      this.apply = target
+      this.model = target2
+      this.form.id = target2.id
+      this.type = target3
+      if(this.form.id){
+        this.getDetailListDo()
+      }
+    },
+    check (type) {
+      this.form.dealBackApply = type
+      this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
+        .then(() => {
+          this.isWorking = true
+          check(this.form)
+            .then(response => {
+              this.visible = false
+              this.$emit('success')
+            }).catch(err => {
+              this.$tip.apiFailed(err)
+            })
+        })
+        .catch(() => {
+        })
+    },
+    getDetailListDo () {
+      this.detailList = []
+      var that = this
+      getChangeDetailList({ applyChangeId: this.model.id })
+        .then(res => {
+          var addDetailList = []
+          var delDetailList = []
+          res.forEach(item1 => {
+            if (item1.type == 1) {
+              delDetailList.push(item1)
+            } else {
+              addDetailList.push(item1)
+            }
+          })
+          var index = addDetailList.length > delDetailList.length ? addDetailList.length : delDetailList.length
+          for (var i = 0; i < index; i++) {
+            var addModel = addDetailList.length > i ? addDetailList[i] : {}
+            var delModel = delDetailList.length > i ? delDetailList[i] : {}
+            that.detailList.push({ add: addModel, del: delModel })
+          }
+        }).catch(err => {})
+    },
+    exportDetail () {
+      this.$dialog.exportConfirm('纭瀵煎嚭璇﹀崟鍚楋紵')
+        .then(() => {
+          this.isWorking = true
+          exportJiajianBaoExcel({ id: this.model.id })
+            .then(response => {
+              this.download(response)
+            })
+            .catch(e => {
+              console.log(e)
+              this.$message.error('鏁版嵁涓嬭浇澶辫触锛�')
+            })
+            .finally(() => {
+              this.isWorking = false
+            })
+        })
+        .catch(() => {
+        })
+    },
+    exportComFilesDo () {
+      this.$dialog.exportConfirm('纭瀵煎嚭浼佷笟璇佷欢鍚楋紵')
+        .then(() => {
+          this.isWorking = true
+          exportComFiles({ id: this.apply.companyId })
+            .then(response => {
+              this.download(response)
+            })
+            .catch(e => {
+              console.log(e)
+              this.$message.error('鏁版嵁涓嬭浇澶辫触锛�')
+            })
+        })
+        .catch(() => {
+        })
+    },
+    handleSizeChange (val) {
+      console.log(`姣忛〉 ${val} 鏉)
+    },
+    handleCurrentChange (val) {
+      console.log(`褰撳墠椤�: ${val}`)
+    },
+    handleClick (tab, event) {
+      console.log(tab, event)
+    },
+    onSubmit () {
+
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
@@ -316,12 +330,12 @@
                     border-right: 1px solid #b4bbc5;
                     border-bottom: 1px solid #b4bbc5;
                     box-sizing: border-box;
-                  &:nth-child(3) {
-                    flex: 1.5;;
-                  }
-                  &:nth-child(9) {
-                    flex: 1.5;;
-                  }
+                  //&:nth-child(3) {
+                  //  flex: 1.5;;
+                  //}
+                  //&:nth-child(9) {
+                  //  flex: 1.5;;
+                  //}
                 }
               .box_table_head_item5 {
                 flex: 1;
@@ -336,7 +350,7 @@
                 border-bottom: 1px solid #b4bbc5;
                 box-sizing: border-box;
                 &:nth-child(2) {
-                   flex: 5.5;
+                   flex: 5;
                 }
               }
               .box_form_item {
@@ -364,22 +378,35 @@
                   border-bottom: 0px solid #b4bbc5 !important;
                 }
               .box_table_content_item {
-                    flex: 1;
-                    height: 50px;
+                //white-space: nowrap;
+                overflow: hidden;
+                //text-overflow: ellipsis;
+                flex: 1;
+                height: 50px;
+                padding: 10px;
                     background: #ffffff;
                     display: flex;
                     align-items: center;
                     justify-content: center;
                     font-size: 14px;
                     color: black;
+                    word-wrap: break-word;
+                    word-break: break-all;
                     border-right: 1px solid #b4bbc5;
                     border-bottom: 1px solid #b4bbc5;
                     box-sizing: border-box;
-                &:nth-child(3) {
-                  flex: 1.5;
-                }
-                &:nth-child(9) {
-                  flex: 1.5;
+                //&:nth-child(3) {
+                //  flex: 1.5;
+                //}
+                //&:nth-child(9) {
+                //  flex: 1.5;
+                //}
+                span{
+                  width: 100%;
+                  white-space: nowrap;
+                  word-wrap: break-word;
+                  text-overflow: ellipsis;
+                  overflow: hidden;
                 }
                 }
             }
--
Gitblit v1.9.3