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

package.json

@@ -80,6 +80,7 @@
     "vue-i18n": "7.3.2",
     "vue-json-excel": "^0.3.0",
     "vue-multiselect": "2.0.8",
+    "vue-pdf": "^4.3.0",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "3.0.1",
     "vue-splitpane": "1.0.2",

src/xt_pages/dialysis/batch_print/batch_print_order_fortyeight.vue

@@ -1201,8 +1201,6 @@ export default {
       return vascular_access_part_name
     },
     printThisPage() {
-      
-      
       var ptime = Math.round(new Date().getTime() / 1000)
       this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
       const style =

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -988,6 +988,18 @@
         >
         </div>
       </template>
+      <template v-if="org_template_info.template_id == 80">
+        <div>
+          <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+        </div>
+      </template>
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -1507,8 +1519,11 @@
 
           <DialysisPrintOrderSeventynine v-bind:childResponse="childResponse"
           v-if="org_template_info.template_id == 79">
-
           </DialysisPrintOrderSeventynine>
+
+          <DialysisPrintOrdereighty v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 80">
+          </DialysisPrintOrdereighty>
         </div>
       </el-container>
     </div>
@@ -1606,6 +1621,7 @@ import DialysisPrintOrderSeventysix from './template/DialysisPrintOrderSeventysi
 import DialysisPrintOrderSeventyseven from './template/DialysisPrintOrderSeventyseven'
 import DialysisPrintOrderSeventyeight from './template/DialysisPrintOrderSeventyeight'
 import DialysisPrintOrderSeventynine from './template/DialysisPrintOrderSeventynine'
+import DialysisPrintOrdereighty from './template/DialysisPrintOrdereighty'
 import DialysisPrintOrderZero from './template/DialysisPrintOrderZero'
 export default {
   name: "dialysisPrintOrder",
@@ -1689,6 +1705,7 @@ export default {
     DialysisPrintOrderSeventyseven,
     DialysisPrintOrderSeventyeight,
     DialysisPrintOrderSeventynine,
+    DialysisPrintOrdereighty,
     DialysisPrintOrderZero,
     LabelBox,
     BreadCrumb,
@@ -2248,9 +2265,7 @@ export default {
           scanStyles: false,
         });
 
-      }else if (
-        this.org_template_info.template_id == 52
-      ) {
+      }else if ( this.org_template_info.template_id == 52) {
         printJS({
           printable: "dialysis-print-box-1",
           type: "html",
@@ -2402,6 +2417,13 @@ export default {
           style: style4,
           scanStyles: false,
         });
+      }else if (this.org_template_info.template_id == 80) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style2,
+          scanStyles: false,
+        });
       }
        else if (this.org_template_info.template_id == 199 ) {
         printJS({

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -281,6 +281,11 @@
                       <p>HDF100:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
                       <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
+
+                  <span v-if="item.mode_id == 'HDF1000'">
+                      <p>HDF1000:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
                   <span v-if="item.mode_id == 'HDF600'">
                       <p>HDF600:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
                       <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>

src/xt_pages/stock/stockInventoryModePrint.vue

@@ -299,6 +299,7 @@ export default {
       warehouseinfoList: [],
       warehouseOutInfoList: [],
       cancelInfoList: [],
+      cancelFlowList:[]
 
     }
   },
@@ -368,6 +369,8 @@ export default {
           this.warehouseOutInfoList = warehouseOutInfo
           var cancelInfoList = response.data.data.cancelInfo
           this.cancelInfoList = cancelInfoList
+
+          this.CancelFlowList = response.data.data.CancelFlowList
           loading.close()
           //  console.log("list===============",list)
 
@@ -559,14 +562,32 @@ export default {
 
       var newArr = []
       var newArrOne = []
+      
       var total_count = 0
       var total_count_one = 0
+      var total_count_two = 0
       var total = 0
+
+      var cancelNewArr = []
       for (let i = 0; i < this.outinfo.length; i++) {
         if (good_id == this.outinfo[i].good_id) {
           newArr.push(this.outinfo[i])
         }
       }
+
+      for(let i=0;i<this.cancelFlowList.length;i++){
+         if(good_id == this.cancelFlowList[i].good_id){
+            cancelNewArr.push(this.cancelFlowList[i])
+         }
+      }
+
+      if(cancelNewArr!=null){
+        for(let i=0;i<cancelNewArr.length;i++){
+            total_count_two += cancelNewArr[i].count
+        }
+      }
+
+
       if (newArr != null) {
         for (let i = 0; i < newArr.length; i++) {
           total_count += parseInt(newArr[i].count)
@@ -585,7 +606,7 @@ export default {
       }
 
 
-      total = total_count + total_count_one
+      total = total_count + total_count_one - total_count_two
       return total
     },
     getSumCount(good_id) {

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))