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

src/xt_pages/dialysis/allSummaryDialog_print.vue

@@ -70,7 +70,7 @@ export default {
         return{
             crumbs: [
                 { path: false, name: '耗材药品' },
-                { path: false, name: '药品打印' }
+                { path: false, name: '打印' }
             ],
             tableData:[],
             start_time:"",

src/xt_pages/dialysis/components/allSummaryDialog.vue

@@ -110,7 +110,7 @@ export default {
         },
         toPrint(){
             this.$router.push({
-                path: '/dialysis/allsummarydialog_print?startime='+this.start_time+"&endtime="+this.end_time,
+                path: '/dialysis/allsummarydialog_print?startime='+this.start_time+"&endtime="+this.end_time + "&type=3",
                 // query: { date: date }
             })
         },

src/xt_pages/dialysis/components/consumablesDialog.vue

@@ -24,7 +24,7 @@
 
     </div>
     <div style="margin-top:10px;">
-      <el-table :data="tableData" border style="width: 100%" height="100%">
+      <el-table :data="tableData" border style="width: 100%" height="300px">
         <el-table-column align="center" prop="date" label="商品类型" width="180">
           <template slot-scope="scope">
             {{scope.row.good_type_name}}

src/xt_pages/dialysis/components/dialysisParameters.vue

@@ -317,7 +317,7 @@ export default {
              sch_ids.push(this.selecting_schs[index].id);
          }
          this.$store.dispatch("SetBatchPrintDialysisRecordIDs", sch_ids);
-         this.$router.push("/dialysis/dialysisParameters_print?startime="+this.start_time)
+         this.$router.push("/dialysis/dialysisParameters_print?startime="+this.start_time + "&type=2")
         },
        handleSizeChange(val) {
         this.limit = val;

src/xt_pages/dialysis/components/dialysisParametersDialog.vue

@@ -111,7 +111,7 @@ export default {
             this.$router.push({
                 // path: '/dialysis/dialysisParameters_print',
                 // query: { date: date }
-                path:"/dialysis/dialysisdrugs_print?startime="+this.query.start_time+"&endtime="+this.query.end_time
+                path:"/dialysis/dialysisdrugs_print?startime="+this.query.start_time+"&endtime="+this.query.end_time + "&type=2"
             })
         },
        selectStartime() {

src/xt_pages/dialysis/consumableDrugs.vue

@@ -5,16 +5,16 @@
         </div>
         <div class="app-container">
             <el-tabs v-model="activeName" @tab-click="handleClick">
-                <el-tab-pane label="透析耗材" name="first">
+                <el-tab-pane label="透析耗材" name="1">
                     <consumables></consumables>
                 </el-tab-pane>
                 <!-- <el-tab-pane label="透析药品" name="second">
                     <dialysis-drugs></dialysis-drugs>
                 </el-tab-pane> -->
-                <el-tab-pane label="透析参数" name="third">
+                <el-tab-pane label="透析参数" name="2">
                     <dialysis-parameters></dialysis-parameters>
                 </el-tab-pane>
-                <el-tab-pane label="汇总" name="fourth">
+                <el-tab-pane label="汇总" name="3">
                     <all-summary></all-summary>
                 </el-tab-pane>
             </el-tabs>
@@ -43,11 +43,18 @@ export default {
                 { path: false, name: "透析管理" },
                 { path: false, name: "耗材药品" }
             ],
-            activeName:'first'
+            activeName:'1'
         }
     },
     methods:{
         handleClick(){}
-    }
+    },
+    beforeRouteEnter: (to, from, next) => {
+        next(vm => {
+            if(from.query.type){
+                vm.activeName = from.query.type
+            }
+        });
+    },
 }
 </script>

src/xt_pages/dialysis/consumables_print.vue

@@ -67,7 +67,7 @@ export default {
           },
             crumbs: [
                 { path: false, name: '耗材药品' },
-                { path: false, name: '药品打印' }
+                { path: false, name: '打印' }
             ],
             start_time:"",
             end_time:"",

src/xt_pages/dialysis/dialysisDrugs_print.vue

@@ -67,7 +67,7 @@ export default {
         return{
             crumbs: [
                 { path: false, name: '耗材药品' },
-                { path: false, name: '药品打印' }
+                { path: false, name: '打印' }
             ],
             tableData:[],
             start_time:"",

src/xt_pages/dialysis/dialysisParameters_print.vue

@@ -121,7 +121,7 @@ export default {
         return{
             crumbs: [
                 { path: false, name: '耗材药品' },
-                { path: false, name: '参数打印' }
+                { path: false, name: '打印' }
             ],
             tableData:[],
             nowDate:"",

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -64,7 +64,7 @@
       </div>
       <div v-if="way == 0" class="cell clearfix" style="align-items:normal">
         <div style="float:left">
-          <div class="infoBox">
+          <div class="infoBox" style="width:370px;">
             <div class="infoOne">
               <div class="titleBox">
                 <span class="point"></span>
@@ -274,10 +274,12 @@
         </div>
       </div>
       <div v-else>
-        <div  style="margin-bottom:20px;">
+        <div style="margin-bottom:20px;">
+          <p style="font-size: 16px;font-weight: bold;color: #000;">透析总量</p>
           <line-chart :options="chart"></line-chart>
         </div>
-        <div >
+        <div>
+          <p style="font-size: 16px;font-weight: bold;color: #000;">转归统计</p>
           <line-chart :options="bar"></line-chart>
         </div>
       </div>
@@ -351,8 +353,8 @@ export default {
 
       way: 0,
       wayArr: [
-        { value: 0, label: "统计表", state: 0 },
-        { value: 1, label: "统计图", state: 1 }
+        { value: 0, label: "统计图", state: 0 },
+        { value: 1, label: "趋势图", state: 1 }
       ],
       modesData: {
        xAxis: [],

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -198,7 +198,7 @@
         crumbs: [
           { path: false, name: "质控管理" },
           { path: false, name: "工作量分析统计" },
-          { path: false, name: "医生" }
+          { path: false, name: "护士" }
         ],
         activeName: "second",
         listQuery: {

src/xt_pages/stock/stockQuery.vue

@@ -52,7 +52,6 @@
           <template slot-scope="scope">
             <span
               @click="showStockInDetailDialog(scope.row.good_id)"
-              style="color: #579ef8"
               >{{ stockInCount(scope.row) }}</span
             >
           </template>
@@ -61,7 +60,6 @@
           <template slot-scope="scope">
             <span
               @click="showSaleReturnDetailDialog(scope.row)"
-              style="color: #F56C6C"
               >{{ salesReturnCount(scope.row) }}</span
             >
           </template>
@@ -75,7 +73,6 @@
           <template slot-scope="scope">
             <span
               @click="showStockOutDetailDialog(scope.row.good_id)"
-              style="color: #579ef8"
               >{{ stockOutCount(scope.row) }}</span
             >
           </template>
@@ -84,7 +81,6 @@
           <template slot-scope="scope">
             <span
               @click="showCancelStockDetailDialog(scope.row)"
-              style="color: #F56C6C"
               >{{ cancelStockCount(scope.row) }}</span
             >
           </template>
@@ -97,7 +93,7 @@
 
         <el-table-column label="剩余库存" align="center">
           <template slot-scope="scope">
-            <span style="color: red">{{
+            <span>{{
               stockInCount(scope.row) -
                 salesReturnCount(scope.row) -
                 stockOutCount(scope.row) +