From 060f17b70425a34ea779811c8dce426cb880ae33 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Thu, 30 Sep 2021 14:49:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=8A=B6=E6=80=81=E6=8F=92?=
 =?UTF-8?q?=E6=A7=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/imgs/error.png               | Bin 0 -> 690 bytes
 src/assets/imgs/finished.png            | Bin 0 -> 801 bytes
 src/assets/imgs/half.png                | Bin 0 -> 689 bytes
 src/assets/imgs/zero.png                | Bin 0 -> 457 bytes
 src/components/tools/StatusSlot.vue     | 171 ++++++++++++++++++++++++
 src/views/mineContract/MineContract.vue |   5 +-
 src/views/mineProject/MineProject.vue   |  27 +++-
 src/views/workTeam/WorkTeam.vue         |  27 +++-
 8 files changed, 214 insertions(+), 16 deletions(-)
 create mode 100644 src/assets/imgs/error.png
 create mode 100644 src/assets/imgs/finished.png
 create mode 100644 src/assets/imgs/half.png
 create mode 100644 src/assets/imgs/zero.png
 create mode 100644 src/components/tools/StatusSlot.vue

diff --git a/src/assets/imgs/error.png b/src/assets/imgs/error.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3fc7cf4252396e94928f946a20c8377e6d8fbb8
GIT binary patch
literal 690
zcmV;j0!{siP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px%Y)M2xR5(wilub*NQ5462=TXC4I6^Xly3jzWBw9$61!<dFOf!+r)Gj|kLWFH9
z`T{L-X|^av$9Cmx`~uZRjmf|utHn$VhK5w?q&0KmJa=Yf%wC|odElP={Q19}b3_#p
zK>@V8yM|z}gX%p|&;gMBK$X>iJdj3p3e6`d6c%NAdb3zVN<bP8*C7%@<r>fl1OTt}
z(Eq9`$QR%(A|puQi6oO>tt5WkKngO5C&Q?=mF^M0ynPJE9n<jv)w_6%8JK7+Rz+?r
zg6JJziajnA+;h*P47T&$(MW^dB%6IC8V(;oy@#Mj{Zef$w6ws=3aqX=FgpfbUk||`
zEG@ytMu}O9JcFX4$SuTt(E#~8w70>~5M(kiKH+|{)3^_!QRq4ZWA|a<wPPz{9*v5I
z&%XeU_{JJgAONu_^!38b9E``|`ww?_x({aOAd!IOm6B`=U{Um3<TE1m#Z;Vxh6d>G
zhm$?<a^A@}ehlVcL1Gd<8AyeH>&D2$?kz`SrW%8W07M7i>>20N)8`P6JMU_0wnK0~
z<_u^ZsQWw6Gl-A>0qD2VF2IQ%NTuN0W~DS^RoNOQEs_E`Txs?I^!CBbjALOTT)GIo
zr(kv#CMF#-*Ra-{@6GJnAXm5JZ-=2PkWRyd#s9Gwf1~rPtE(9QLMi?=R7XWap@T^E
zgNlZ1ZH49K-5av039?zp<#sgWe~pM_pm4(<k@C>0Tt?*jKMt+Q${;!d++!-aRvz!-
z1_<FX4AKEulkUDoMBkw@f~Svd^8Hm*u_bJ=H8*#nRWU^Sf%ab(8zjk-K)2qM7MlV6
Y1bJgJ?iMaQw*UYD07*qoM6N<$f@!fkuK)l5

literal 0
HcmV?d00001

diff --git a/src/assets/imgs/finished.png b/src/assets/imgs/finished.png
new file mode 100644
index 0000000000000000000000000000000000000000..55e5a3314d8de0be230f98542b20f06285928297
GIT binary patch
literal 801
zcmV++1K#|JP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px%+et)0R5(wCl;3L<R}{xT=gww!;!ZY5!6ag_plp(@?Sp;j-_VEzL4prOltMue
zL=i!xG=v6ig@RBhQu>fUDJ&(ijV}7+KOnY3G(S|37}P``Og72xCOh}Yo!v>(B*l5T
zF!!9#{ho8b=ZY#Kg5th=*PHw|9XS(4#}GZDuoo2%ahn<mGK1=0HpOqN3$<zb`c~sS
zK-NKbhBLkmdyJLyD&z!O-F_0-SXE(B;ISw_mY3JY=<8dGL2<zFa3=jh_?3v9#i`f|
z*u+Coo-2B-TJwIPx3?q|3Z5T&M+9?K;G@kMTM4d81rbD<5#(ZdM{7a+;*Gpf9YXl*
zeM(f72rw?tf$GS=Rpo>P#gRe9oE9`2cRV?5lN9Uz1ABrU>`n)aFD<YVMGja3y)HrV
z#yDs`ZhXv9EZ{Xxb;%A=Q>7~m>Cfc}#N+hCe|S+TlQPDoJ(YBE)ZIdh3vTv2@?n;_
zYL(f_%DN^8$z?(YI`edgSuQ`B<j=X6tXhj#_s+7UZ;h^q&|I^Y_8{PD_a`)o&_6xN
zqtZeQ>kM0BNM|O?;FAe%&c9^M)(z;cU6t}WC{o2YhQn<gT-x8o)KZCWrp9B?K<5Fv
z!WO=JJi%C^#F%xH)j^HYlKwP_;ZR#U7xv|NU9HBTUFm=yo=$BGiSNgi78FM(fn3t;
z$Xc3=p=Vb+-{!h;;s>TDxHaGC$p$5f+fkl5Mc<>G5}~C*$HAIY9tX2KWBK<N-m((a
z@U}uwVF}Bx;@|$`W24>>%E82tNtqk1lr(mm*?VA(o)G%`Q~u|l9yKag8gmxMZiM|0
z#D&d*T&g^u`@KH2g+iFlq`nrBGr))M8<mEtSwVg(<NvH*^pyU6Chp!1gYsgpV$T8l
zok_O?s#1!b4A&~MJVMWxi}6$RpPC;Qe1FDtN#q?DL$5+dJfp5o!3w-m7_-XI+Wgx|
fPM)kZ##7z_Y(hQ{Cy-$)00000NkvXXu0mjfpwfJ$

literal 0
HcmV?d00001

diff --git a/src/assets/imgs/half.png b/src/assets/imgs/half.png
new file mode 100644
index 0000000000000000000000000000000000000000..63ead380f75c69db143dc70f8a0a908ad8fa68d3
GIT binary patch
literal 689
zcmV;i0#5yjP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px%Ye_^wR5(wKlut+$aTLeDZ-$xOrLt%ZmNgZUu(A#wEH;VSAoL;x<qFatf-XVl
zpok6<9f}}?%2Q<jk!&?{73nORv3apFZP)c*kOy<!KQlYK^I~SxX8p75yUl!m?=$ax
z-|r1EgNVSegsrcuj#zJIP%Xe^1QMB{0vsU{x<TBg)SsRPk-m~fR*>BDcAp@MPXKtF
zl8ocdVmL$*0}H>gkW#JRiV)*^GOl&P=Svv^t*G`s{|RR5-X%*#w=1jA>@I~Q2#6#S
zI5#?i&r6F|5E!fhxS__<tp>~l$sgYBCxM0zZY?T$U*mz>?pRHlPA1S49L8vLDF<Xc
zFpv_ME+t1s-<TkKz&}_l%buZHFG?&BLklJ1@CAo4wj5mt%D&)PUDQue)>!UuJ5-H}
zyUW)d{uz&<>C2})Ab^=$$sXuxcS_QQ@X319leJL@2;dOe0{+P}E_cPt>cbnB9!|v3
zn71|4E7brg*Y@nSwNzGZ2%0cj3l8I3Y<UxpvPR_v{n0c$or&OXXdH{0G3`ym1WlfG
zl~lZ_uE{xNK%UP=@E|;iU#gOO_1Eys*6h9hXHHo@Z#6q=RAPbTE9IXywQl^$Oa`y!
zXK-iYJLXlT0ETJy<D3im@yIcZ#iF=5{uRcw3XFMO<htyN1Ue27q#>8hw#^}km`WxJ
zVlbeQu3u5M>}>zPw7s2|nS_S~$c0dtpfS*rTGsA!qfc1{VX(s?N2LZKgL@#9<%jVc
zfLqFr^lKdTCCy(^P6D%FALuFPbml6+4Iq>f$d=u7QVBfAME%TolyYqU0k1c0Y7F`d
Xz%nBLy)&4?00000NkvXXu0mjfiU>QF

literal 0
HcmV?d00001

diff --git a/src/assets/imgs/zero.png b/src/assets/imgs/zero.png
new file mode 100644
index 0000000000000000000000000000000000000000..adb371a68c3b44bca0c4b3ad092896065a9e60f0
GIT binary patch
literal 457
zcmV;)0XF`LP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$gGod|R5(wql)+BIKoExiza=po^bHII52#O|oVejhue3xDKA4FL-E!2E-aLVC
zpohW%-ar%50NF9STC!G*C{D7?wzK{6&&<wH1SBDFtkdZ<NQNY9B)5%AM8+c06OpLZ
zYTdi%&7LkOilSYT7XS|P2XpUz5jhXT@HzX=Y@?K_1GoXO^#dexzW_K1g5bd_GLJZp
z_eA9J7mx*v<UzC9e6pY@ih3k}3TGkICRG+`?FT_nqe-mid3P&@v-FtO`iOBHUy8`t
zIv@boR7xcPc3e=QP=N3I_Fm*|KA*#^oDGbkR75shN4Z=^sZ_Est+jP!c^QpHFe?X}
zE(KMqRa7b!7-g;*=x{hhk|dbTX0B_xG_+!|2(vuTTT~}gG?`40rm0&s0~{F86@b&V
zll^byH%gRJy%qZFJJIhK(s<kL_P+1?{k2=<LseZwZb@#gk}nZ?C3$R`)=m)jr@xMo
zFQ5$C?RFbl>lT0-06W+Ki~-oe7KY)c-ZY>$qZ`F2`xt9C00000NkvXXu0mjf^9jab

literal 0
HcmV?d00001

diff --git a/src/components/tools/StatusSlot.vue b/src/components/tools/StatusSlot.vue
new file mode 100644
index 0000000..0191007
--- /dev/null
+++ b/src/components/tools/StatusSlot.vue
@@ -0,0 +1,171 @@
+<template>
+  <div>
+    <template v-if="statusType && statusNo">
+      <a-tooltip
+        overlay-class-name="status-tooltip"
+        placement="topLeft"
+        :title="currentTitle"
+        arrow-point-at-center
+        :mouse-enter-delay="0.1"
+        @visibleChange="visibleChange"
+      >
+        <img :src="status" @click="s"/>
+      </a-tooltip>
+    </template>
+    <template v-else>
+      <img :src="status" @click="s"/>
+    </template>
+
+  </div>
+</template>
+
+<script>
+import zero from '../../assets/imgs/zero.png'
+import finished from '../../assets/imgs/finished.png'
+import half from '../../assets/imgs/half.png'
+import error from '../../assets/imgs/error.png'
+// 获得当前行数据的方法，默认写的是 普通项目获得数据的方法，其他模块需要以传参的方式修改相应的方法
+import { queryCommonProjectById } from '../../api/incomePaymentsApi'
+
+export default {
+  name: 'StatusSlot',
+  data() {
+    return {
+      currentTitle: ' ', // 气泡中显示的文字,必须有内容，否则dom选择时不会解析
+      hasInfo: false, // 是否有详情信息可以显示，即是否通过接口请求过数据
+    }
+  },
+  props: {
+    /*
+    *  表格行对象
+    * */
+    statuObj: {
+      type: Object,
+      required: false
+    },
+    /*
+    *  false 代表是打包 和需要发票
+    *  true 代表其他三个
+    * */
+    statusType: {
+      type: Boolean,
+      required: false,
+      default:false
+    },
+    /*
+    *  具体的状态值
+    * */
+    statusNo: {
+      type: Number,
+      required: false
+    },
+    // 当前需要转换key的属性, 悬浮显示实际具体内容信息时需要
+    // paymentRecord 来款  mail -- 邮寄 bill--邮寄
+    statusKey:{
+      type: String,
+      required: false,
+      default: 'paymentRecord'
+    },
+    // 获得tooltip详情信息的方法
+    getInfoFunc: {
+      type: Function,
+      required: false,
+      default: queryCommonProjectById
+    }
+  },
+  computed: {
+    // eslint-disable-next-line vue/return-in-computed-property
+    status() {
+      if (this.statuObj.amountReceivable === '0.00' || this.statuObj.receivableAmount === '0.00' ) {
+        if(this.statusType){
+          // 应收金额为0  未到账 未邮寄 未开票的状态
+          return zero
+        }else {
+          // 应收金额为0  打包 与需要开票的状态
+          if(this.statusNo === 0 ){
+            return error
+          }else if(this.statusNo === 1){
+            return finished
+          }else if(this.statusNo === 2){
+            return half
+          }
+        }
+
+      }else {
+        // 应收金额不为0 都正常判断
+        if(this.statusNo === 0 ){
+          return error
+        }else if(this.statusNo === 1){
+          return finished
+        }else if(this.statusNo === 2){
+          // 如果不是打包和需要发票
+          if(this.statusType){
+            return half
+          }else {
+            return finished
+          }
+        }
+      }
+    },
+    // 操作返回数据的key值，此处是根据业务逻辑处理的
+    opeStatusKey() {
+      let result = this.statusKey
+      if(this.statusKey === 'mail' || this.statusKey === 'bill') {
+        result = 'mailBill'
+      }
+      return result
+    }
+  },
+  methods: {
+    s() {
+      console.log(this.statuObj)
+    },
+    visibleChange(visible) {
+      // 到账、开票、邮寄 的时候，请求接口获得相应的数据
+      // 判断条件  tooltip显示、 有不同的统计状态，统计状态值不为0 没有请求过详情数据
+      if(visible && this.statusType && this.statusNo && !this.hasInfo) {
+        this.getInfoFunc({id: this.statuObj.id}).then(res =>{
+          if(res.success) {
+            let arr = res.result[this.opeStatusKey] || []
+            let result = []
+            arr.map(tt => {
+              result.push(this.showTemplate(tt))
+            })
+            // 对tooltip中的文字进行替换
+            this.currentTitle = result.join('\n')
+            this.hasInfo = true
+          }
+        })
+      }
+    },
+    /**
+     * 显示的模板数据，即根据返回值怎么处理数据
+     * @param item -传入的item的值
+     * @return 返回一个模板字符串用于后续显示，可按照需求进行更改
+     */
+    showTemplate(item) {
+      let result = ''
+      console.log(item)
+      // 来款
+      if(this.statusKey === 'paymentRecord') {
+        result = `${item.paymentDate}到账${item.amountReceived}`
+      } else if(this.statusKey === 'bill') {
+        result = `${item.billDate}新增发票，发票单号：${item.billNo}`
+      } else if(this.statusKey === 'mail') {
+        result = `${item.sendDate}新增邮寄信息，邮寄单号：${item.postNo}`
+      }
+      return result
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>
+<style>
+/* 自定义tooltip下样式问题*/
+.status-tooltip .ant-tooltip-inner{
+  white-space: pre-wrap!important;
+}
+</style>
diff --git a/src/views/mineContract/MineContract.vue b/src/views/mineContract/MineContract.vue
index 2b5fe95..3050c6f 100644
--- a/src/views/mineContract/MineContract.vue
+++ b/src/views/mineContract/MineContract.vue
@@ -27,7 +27,7 @@
           <project-table :column-data="columns" :table-data="dataSource" @change="handlePageChange">
             <!--          打包、需要发票、到账、开票、邮寄-->
             <template v-slot:status="{record, text}">
-              <div @click="d(record)">{{ text }}</div>
+              <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="mail"></status-slot>
             </template>
             <!--          项目名称-->
             <template v-slot:projectName="{record, text}">
@@ -62,10 +62,11 @@
 import { JeroListMixin } from '@/mixins/JeroListMixin'
 import ProjectTable from '@comp/table/ProjectTable'
 import MineContractModule from '@views/mineContract/modules/MineContractModule'
+import StatusSlot from '@comp/tools/StatusSlot'
 
 export default {
   name: 'MineContract',
-  components: { ProjectTable, MineContractModule },
+  components: { ProjectTable, MineContractModule, StatusSlot },
   mixins: [JeroListMixin],
   data() {
     return {
diff --git a/src/views/mineProject/MineProject.vue b/src/views/mineProject/MineProject.vue
index 1b80cbb..aff372f 100644
--- a/src/views/mineProject/MineProject.vue
+++ b/src/views/mineProject/MineProject.vue
@@ -38,9 +38,21 @@
       <div>
         <a-spin :spinning="loading">
           <project-table :column-data="columns" :table-data="dataSource" @change="handlePageChange">
-            <!--          打包、需要发票、到账、开票、邮寄-->
+            <!--          打包、需要发票-->
+            <template v-slot:status-pack="{record, text}">
+              <status-slot :statu-obj="record" :status-no="text"></status-slot>
+            </template>
+            <!--            到账-->
             <template v-slot:status="{record, text}">
-              <div @click="d(record)">{{ text }}</div>
+              <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
+            </template>
+            <!--            开票-->
+            <template v-slot:status-bill="{record, text}">
+              <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="bill"></status-slot>
+            </template>
+            <!--            邮寄-->
+            <template v-slot:status-mail="{record, text}">
+              <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="mail"></status-slot>
             </template>
             <!--          项目名称-->
             <template v-slot:projectName="{record}">
@@ -75,10 +87,11 @@
 import { JeroListMixin } from '@/mixins/JeroListMixin'
 import ProjectTable from '@comp/table/ProjectTable'
 import ProjectDetailModal from '@views/MessagePage/ProjectDetailModal'
+import StatusSlot from '@comp/tools/StatusSlot'
 
 export default {
   name: 'MineProject',
-  components: { ProjectTable, ProjectDetailModal },
+  components: { ProjectTable, ProjectDetailModal, StatusSlot },
   mixins: [JeroListMixin],
   data() {
     return {
@@ -111,13 +124,13 @@ export default {
         }, {
           title: '打包',
           dataIndex: 'pack',
-          scopedSlots: 'status',
+          scopedSlots: 'status-pack',
           col: 2
         }, {
           title: '需要发票',
           col: 2,
           dataIndex: 'needInvoice',
-          scopedSlots: 'status',
+          scopedSlots: 'status-pack',
           slot: 'status'
         }, {
           title: '到账',
@@ -127,12 +140,12 @@ export default {
         }, {
           title: '开票',
           dataIndex: 'makeInvoice',
-          scopedSlots: 'status',
+          scopedSlots: 'status-bill',
           col: 2
         }, {
           title: '邮寄',
           dataIndex: 'mail',
-          scopedSlots: 'status',
+          scopedSlots: 'status-mail',
           col: 2
         }
       ],
diff --git a/src/views/workTeam/WorkTeam.vue b/src/views/workTeam/WorkTeam.vue
index c718d61..d528cc2 100644
--- a/src/views/workTeam/WorkTeam.vue
+++ b/src/views/workTeam/WorkTeam.vue
@@ -38,9 +38,21 @@
       <div>
         <a-spin :spinning="loading">
           <project-table :column-data="columns" :table-data="dataSource" show-meeting-btn button-text="工作组会议" @change="handlePageChange">
-            <!--          打包、需要发票、到账、开票、邮寄-->
+            <!--          打包、需要发票-->
+            <template v-slot:status-pack="{record, text}">
+              <status-slot :statu-obj="record" :status-no="text"></status-slot>
+            </template>
+            <!--            到账-->
             <template v-slot:status="{record, text}">
-              <div @click="d(record)">{{ text }}</div>
+              <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
+            </template>
+            <!--            开票-->
+            <template v-slot:status-bill="{record, text}">
+              <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="bill"></status-slot>
+            </template>
+            <!--            邮寄-->
+            <template v-slot:status-mail="{record, text}">
+              <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="mail"></status-slot>
             </template>
             <!--          项目名称-->
             <template v-slot:projectName="{record}">
@@ -71,10 +83,11 @@
 import { JeroListMixin } from '@/mixins/JeroListMixin'
 import ProjectTable from '@comp/table/ProjectTable'
 import ProjectDetailModal from '@views/MessagePage/ProjectDetailModal'
+import StatusSlot from '@comp/tools/StatusSlot'
 
 export default {
   name: 'WorkTeam',
-  components: { ProjectTable, ProjectDetailModal },
+  components: { ProjectTable, ProjectDetailModal, StatusSlot },
   mixins: [JeroListMixin],
   data() {
     return {
@@ -102,13 +115,13 @@ export default {
         }, {
           title: '打包',
           dataIndex: 'pack',
-          scopedSlots: 'text',
+          scopedSlots: 'status-pack',
           col: 2
         }, {
           title: '需要发票',
           col: 2,
           dataIndex: 'needInvoice',
-          scopedSlots: 'status',
+          scopedSlots: 'status-pack',
           slot: 'status'
         }, {
           title: '到账',
@@ -118,12 +131,12 @@ export default {
         }, {
           title: '开票',
           dataIndex: 'makeInvoice',
-          scopedSlots: 'status',
+          scopedSlots: 'status-bill',
           col: 2
         }, {
           title: '邮寄',
           dataIndex: 'mail',
-          scopedSlots: 'status',
+          scopedSlots: 'status-mail',
           col: 2
         }
       ],