Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/outpatientCharges/invoiceTemplate/printFour.vue

@@ -15,13 +15,13 @@
             <div></div>
             <div  style="position: absolute;top:70px;left:240px">{{ list.number }}</div>
             <div  style="position: absolute;left:470px;top:70px;">
-                <span>{{ paramsObj.setl_time.split(' ')[0].slice(0,4) }}</span>
+                <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
             </div>
             <div  style="position: absolute;left:530px;top:70px;">
-                <span>{{ parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) }}</span>
+                <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</span>
             </div>
             <div  style="position: absolute;left:560px;top:70px;">
-                <span>{{ parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) }}</span>
+                <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</span>
             </div>
         </div>
         <div style="display:flex;justify-content: space-between;">
@@ -143,6 +143,7 @@
 
 <script>
 import { getInvoice } from '@/api/project/project'
+import { uParseTime } from '@/utils/tools'
 export default {
     props:{
         paramsObj:Object
@@ -231,7 +232,15 @@ export default {
             this.zhongwen =  str.replace(/零(仟|佰|拾|角)/g, "零").replace(/(零)+/g, "零").replace(/零(万|亿|元)/g, "$1").replace(/(亿)万|壹(拾)/g, "$1$2").replace(/^元零?|零分/g, "").replace(/元$/g, "元整");
             console.log(this.zhongwen)
         },
-
+        getTime(value, temp) {
+            if (value == 0) {
+                return ''
+            }
+            if (value != undefined) {
+                return uParseTime(value, temp)
+            }
+            return ''
+        },
     },
     watch:{
         paramsObj:{//深度监听，可监听到对象、数组的变化