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

src/components/Editor/index.vue

             'justifycenter', //居中对齐
             'justifyright', //居右对齐
             'justifyjustify', //两端对齐
+            'formatmatch', //格式刷
+            'fontsize', //字体大小
+            'fontfamily', //字体
+            'forecolor', //字体颜色
           ]]
           // scaleEnabled: true,
         })
   .edui-editor {
     z-index: 60 !important;
   }
+  #edui_fixedlayer{
+    z-index: 5000 !important;
+  }
 </style>

src/xt_pages/outpatientCharges/invoicePrint.vue

     },
     printThisPage() {
         const style =
-        '@media print {#invoice-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
+        '@media print {#invoice-print{font-size:12px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
         printJS({
             printable: "invoice-print",
             type: "html",

src/xt_pages/outpatientCharges/invoiceTemplate/printFour.vue

 <template>
-    <div id='invoice-print' style="font-size:14px;">
+    <div id='invoice-print' style="font-size:12px;">
         <div style="display:flex;">
-            <div style="position: absolute;top:65px;left:60px;">{{ list.order_number }}</div>
+            <div style="position: absolute;top:50px;left:60px;">{{ list.order_number }}</div>
             <!-- <div>{{ list.id_card_no }}</div> -->
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ list.department_name }}</div> -->
-            <div  style="position: absolute;top:65px;left:280px">{{ list.id_card_no }}</div>
+            <div  style="position: absolute;top:50px;left:260px">{{ list.id_card_no }}</div>
             <div></div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ list.department_name }}</div> -->
-            <div  style="position: absolute;top:85px;left:90px">门诊</div>
+            <div  style="position: absolute;top:70px;left:90px">门诊</div>
             <div></div>
-            <div  style="position: absolute;top:85px;left:240px">{{ list.number }}</div>
-            <div  style="position: absolute;left:480px;top:85px;">
+            <div  style="position: absolute;top:70px;left:240px">{{ list.number }}</div>
+            <div  style="position: absolute;left:470px;top:70px;">
                 <span>{{ printDate.slice(0,4) }}</span>
             </div>
-            <div  style="position: absolute;left:530px;top:85px;">
-                <span>{{ printDate.slice(5,7) }}</span>
+            <div  style="position: absolute;left:530px;top:70px;">
+                <span>{{ parseInt(printDate.slice(5,7)) }}</span>
             </div>
-            <div  style="position: absolute;left:580px;top:85px;">
-                <span>{{ printDate.slice(8,11) }}</span>
+            <div  style="position: absolute;left:560px;top:70px;">
+                <span>{{ parseInt(printDate.slice(8,11)) }}</span>
             </div>
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:100px;left:120px;"> {{ paramsObj.name }}</div>
-            <div style="position: absolute;top:100px;left:200px;">√</div>
+            <div style="position: absolute;top:85px;left:100px;"> {{ paramsObj.name }}</div>
+            <div style="position: absolute;top:85px;left:180px;">√</div>
             <!-- <div>{{ list.pay_way }}</div> -->
-            <div style="position: absolute;top:100px;left:400px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
-            <div style="position: absolute;top:100px;left:580px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
+            <div style="position: absolute;top:85px;left:380px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
+            <div style="position: absolute;top:85px;left:530px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div> -->
-            <div v-if="paramsObj.gend == 1" style="position: absolute;top:120px;left:60px;">√</div>
-            <div v-else style="position: absolute;top:120px;left:100px;">√</div>
-            <div style="position: absolute;top:130px;left:260px;">{{ totalPrice - list.psn_cash_money }}</div>
-            <div style="position: absolute;top:130px;left:420px;">{{ list.psn_cash_money }}</div>
-            <div style="position: absolute;top:130px;left:580px;">现金</div>
+            <div v-if="paramsObj.gend == 1" style="position: absolute;top:110px;left:100px;">√</div>
+            <div v-else style="position: absolute;top:110px;left:140px;">√</div>
+            <div style="position: absolute;top:110px;left:260px;">{{ (totalPrice - list.psn_cash_money).toFixed(2) }}</div>
+            <div style="position: absolute;top:110px;left:420px;">{{ list.psn_cash_money.toFixed(2) }}</div>
+            <div style="position: absolute;top:110px;left:540px;">现金</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:165px;left:50px">西药</div>
-            <div style="position: absolute;top:165px;left:130px">{{ list.westernMedicineCostTotal }}</div>
-            <div style="position: absolute;top:165px;left:210px">检查费</div>
-            <div style="position: absolute;top:165px;left:280px">{{ list.checkCostTotal }}</div>
-            <div style="position: absolute;top:165px;left:340px">治疗费</div>
-            <div style="position: absolute;top:165px;left:420px">{{ list.treatCostTotal }}</div>
-            <div style="position: absolute;top:165px;left:480px">床位费</div>
-            <div style="position: absolute;top:165px;left:580px">{{ list.bedCostTotal }}</div>
+            <div style="position: absolute;top:145px;left:50px">西药</div>
+            <div style="position: absolute;top:145px;left:130px">{{ list.westernMedicineCostTotal ? list.westernMedicineCostTotal.toFixed(2) : '' }}</div>
+            <div style="position: absolute;top:145px;left:180px">检查费</div>
+            <div style="position: absolute;top:145px;left:260px">{{ list.checkCostTotal ? list.checkCostTotal.toFixed(2) : '' }}</div>
+            <div style="position: absolute;top:145px;left:340px">治疗费</div>
+            <div style="position: absolute;top:145px;left:420px">{{ list.treatCostTotal ? list.treatCostTotal.toFixed(2) : '' }}</div>
+            <div style="position: absolute;top:145px;left:480px">床位费</div>
+            <div style="position: absolute;top:145px;left:540px">{{ list.bedCostTotal ? list.bedCostTotal.toFixed(2) : '' }}</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:185px;left:50px">中成药</div>
-            <div style="position: absolute;top:185px;left:130px">{{ list.chineseTraditionalMedicineCostTotal }}</div>
-            <div style="position: absolute;top:185px;left:210px">化验费</div>
-            <div style="position: absolute;top:185px;left:280px">{{ list.laboratoryCostTotal }}</div>
-            <div style="position: absolute;top:185px;left:340px">手术费</div>
-            <div style="position: absolute;top:185px;left:420px">{{ list.operationCostTotal }}</div>
-            <div style="position: absolute;top:185px;left:480px">其他费</div>
-            <div style="position: absolute;top:185px;left:580px">{{ list.otherCostTotal }}</div>
+            <div style="position: absolute;top:170px;left:50px">中成药</div>
+            <div style="position: absolute;top:170px;left:130px">{{ list.chineseTraditionalMedicineCostTotal ? list.chineseTraditionalMedicineCostTotal.toFixed(2) : '' }}</div>
+            <div style="position: absolute;top:170px;left:180px">化验费</div>
+            <div style="position: absolute;top:170px;left:260px">{{ list.laboratoryCostTotal ? list.laboratoryCostTotal.toFixed(2) : '' }}</div>
+            <div style="position: absolute;top:170px;left:340px">手术费</div>
+            <div style="position: absolute;top:170px;left:420px">{{ list.operationCostTotal ? list.operationCostTotal.toFixed(2) : '' }}</div>
+            <div style="position: absolute;top:170px;left:480px">其他费</div>
+            <div style="position: absolute;top:170px;left:540px">{{ list.otherCostTotal ? list.otherCostTotal.toFixed(2) : '' }}</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:205px;left:50px"></div>
-            <div style="position: absolute;top:205px;left:130px"></div>
-            <div style="position: absolute;top:205px;left:210px"></div>
-            <div style="position: absolute;top:205px;left:280px"></div>
-            <div style="position: absolute;top:205px;left:340px">材料费</div>
-            <div style="position: absolute;top:205px;left:420px">{{ list.materialCostTotal }}</div>
-            <div style="position: absolute;top:205px;left:480px"></div>
-            <div style="position: absolute;top:205px;left:580px"></div>
+            <div style="position: absolute;top:190px;left:50px"></div>
+            <div style="position: absolute;top:190px;left:130px"></div>
+            <div style="position: absolute;top:190px;left:180px"></div>
+            <div style="position: absolute;top:190px;left:260px"></div>
+            <div style="position: absolute;top:190px;left:340px">材料费</div>
+            <div style="position: absolute;top:190px;left:420px">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
+            <div style="position: absolute;top:190px;left:480px"></div>
+            <div style="position: absolute;top:190px;left:540px"></div>
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div style="position: absolute;top:225px;left:50px"></div>
-            <div style="position: absolute;top:225px;left:130px"></div>
-            <div style="position: absolute;top:225px;left:210px"></div>
-            <div style="position: absolute;top:225px;left:280px">{{ list.psn_cash_money }}</div>
-            <div style="position: absolute;top:225px;left:340px"></div>
-            <div style="position: absolute;top:225px;left:420px"></div>
-            <div style="position: absolute;top:225px;left:480px"></div>
-            <div style="position: absolute;top:225px;left:580px"></div>
+            <div style="position: absolute;top:210px;left:50px"></div>
+            <div style="position: absolute;top:210px;left:130px"></div>
+            <div style="position: absolute;top:210px;left:180px"></div>
+            <div style="position: absolute;top:210px;left:260px">{{ list.psn_cash_money ? list.psn_cash_money.toFixed(2) : '' }}</div>
+            <div style="position: absolute;top:210px;left:340px"></div>
+            <div style="position: absolute;top:210px;left:420px"></div>
+            <div style="position: absolute;top:210px;left:480px"></div>
+            <div style="position: absolute;top:210px;left:540px"></div>
         </div>
         <div>
             <span>
-            <span  style="position: absolute;top:250px;left:200px">
+            <span  style="position: absolute;top:235px;left:190px">
                 <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
                     {{ zhongwen.substring(0,1) }}
                 </span>
                 <span v-else>零</span>
             </span>
-            <span  style="position: absolute;top:250px;left:230px">
+            <span  style="position: absolute;top:235px;left:220px">
                 <span v-if="zhongwen.indexOf('万') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
                 </span>
                 <span v-else>零</span>
             </span>
-            <span  style="position: absolute;top:250px;left:260px">
+            <span  style="position: absolute;top:235px;left:250px">
                 <span v-if="zhongwen.indexOf('仟') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
                 </span>
                 <span v-else>零</span>
             </span>
-            <span  style="position: absolute;top:250px;left:300px">
+            <span  style="position: absolute;top:235px;left:280px">
                 <span v-if="zhongwen.indexOf('佰') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
                 </span>
                 <span v-else>零</span>
             </span>
-            <span style="position: absolute;top:250px;left:330px">
+            <span style="position: absolute;top:235px;left:320px">
                 <span v-if="zhongwen.indexOf('拾') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
                 </span>
                 <span v-else>零</span>
             </span>
-            <span  style="position: absolute;top:250px;left:370px">
+            <span  style="position: absolute;top:235px;left:350px">
                 <span v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) != '拾'">
                     {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}
                 </span>
                 <span v-else>零</span>
             </span>
-            <span  style="position: absolute;top:250px;left:400px">
+            <span  style="position: absolute;top:235px;left:380px">
                 <span v-if="zhongwen.indexOf('角') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
                 </span>
                 <span v-else>零</span>
             </span>
-            <span  style="position: absolute;top:250px;left:430px">
+            <span  style="position: absolute;top:235px;left:415px">
                 <span v-if="zhongwen.indexOf('分') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
                 </span>
                 <span v-else>零</span>
             </span>
             </span>
-            <span style="position: absolute;top:250px;left:500px">{{ totalPrice }}</span>
+            <span style="position: absolute;top:235px;left:500px">{{ totalPrice.toFixed(2) }}</span>
         </div>
         <!-- <div style="position: absolute;top:300px;left:460px">现金：{{ list.psn_cash_money }}</div> -->
         <div>
-            <div style="position: absolute;top:320px;left:120px">{{ org_name }}</div>
-            <div style="position: absolute;top:320px;left:460px">高慧裕</div>
+            <div style="position: absolute;top:300px;left:120px">{{ org_name }}</div>
+            <div style="position: absolute;top:300px;left:460px">高慧裕</div>
         </div>
     </div>
 </template>

src/xt_pages/workforce/components/tableData.vue

 <script>
 import { uParseTime } from "@/utils/tools";
 import print from 'print-js'
-
+const moment = require('moment')
 import {
   CancelSchedule,
   ChangeSchedule,
       partitions: [],
       jihaos: [],
       weekTitle: ["", "", "", "", "", "", ""],
+      weekList: ["", "", "", "", "", "", ""],
       weekDays: ["", "", "", "", "", "", ""],
       currentData: {
         id: 0,
       getSchedulesOne(params).then(response => {
         if (response.data.state == 1) {
           this.weekTitle = response.data.data.weekTitle;
+
           this.weekDays = response.data.data.days;
           this.toDay = response.data.data.today;
           var theSchedules = response.data.data.schdules;
     },
     search: function() {
       let week_type = 0
+      var weeklist = moment().format('E');//计算今天是这周第几天
+      var first_monday = moment().subtract(weeklist-1, 'days').format('YYYY-MM-DD');//周一日期
+      var end_monday = moment().add(7-weeklist, 'days').format('YYYY-MM-DD')
       if (this.weekTime == 'thisWeek'){
         week_type = 1
       }else if(this.weekTime == 'nextWeek'){
       }else if(this.weekTime == 'nextTwoWeek'){
         week_type = 3
       }
-
-
+     
       const params = {
         keywords: this.keywords,
         week_type: week_type,
+        start_sch:first_monday,
+        end_sch:end_monday,
       };
+      console.log("params",params)
       getSearchResult(params).then(response => {
         if (response.data.state == 1) {
           this.schedulePatients = response.data.data.schdules;
   //    this.tableContainHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 160
   // },
   created() {
+    
     this.getAllZones()
  
     this.changeScheduleType(1)