新分支

src/xt_pages/device/components/use_registration_pane.vue

             {value:'1',label:'0.22%季铵盐'},
             {value:'2',label:'500mg/l含氯消毒剂'},
             {value:'3',label:'1000mg/l含氯消毒剂'},
-            {value:'4',label:'1500mg/l含氯消毒剂'}
+            {value:'4',label:'1500mg/l含氯消毒剂'},
+            {value: "5", name: "消毒湿巾" },
+            {value:"6", name:"75%酒精"},
+            {value:"7",name:"2000mg/L含氯消毒剂"}
         ],
         disinfectOptions2:[
             {value:'1',label:'0.22%季铵盐'},

src/xt_pages/device/objectRegistration.vue

          { id: 3, name: "1000mg/l含氯消毒剂" },
          { id: 4, name: "1500mg/l含氯消毒剂" },
          { id: 5, name: "消毒湿巾" },
-         {  id:6, name:"75%酒精"}
+         { id:6, name:"75%酒精"},
+         { id:7,name:"2000mg/L含氯消毒剂"}
          ],
          DisinfectionMode: [
             { id: 1, name: "擦拭" },

src/xt_pages/dialysis/bloodPresssWatch.vue

         </div>
       </div>
 
-      <div style="margin-left: 1100px; margin-bottom: 10px;">
+      <div style="margin-left: 10px; margin-bottom: 10px;">
         <el-button type="primary" size="small" @click="printOrder">透析并发症登记打印</el-button>
         <el-button type="primary" size="small" @click="toExport">导出</el-button>
       </div>

src/xt_pages/dialysis/components/consumables.vue

               })
               this.good_types.push(res.data.good_type[a].type_name)
             }
-
+            this.arrKey = []
             this.arrKey.push(...arr)
 
             this.allGoodInfo = res.data.dialysis_goods
         })
        },
       formatJson(filterVal, jsonData) {
+       
         return jsonData.map(v => filterVal.map(j => v[j]));
+        
+       
       },
 
     }

src/xt_pages/dialysis/newDoctorAdvice.vue

           })
       },
       getGoodAllQuery(){
-        this.toExportListThree()
+        this.toStaticFour()
       },
       formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));

src/xt_pages/management/components/EditMachineForm.vue

         { id: 1, name: "0.22%季铵盐" },
         { id: 2, name: "500mg/l含氯消毒剂" },
         { id: 3, name: "1000mg/l含氯消毒剂" },
-        { id: 4, name: "1500mg/l含氯消毒剂" }
+        { id: 4, name: "1500mg/l含氯消毒剂" },
+        { id: 5,  name:"消毒湿巾"},
+        { id:6, name:"75%酒精"},
+        { id:7,name:"2000mg/L含氯消毒剂"}
+
       ],
       // 夜路消毒方式
       sterilizeType: [

src/xt_pages/management/components/PlanForm.vue

         { id: 2, name: "500mg/l含氯消毒剂" },
         { id: 3, name: "1000mg/l含氯消毒剂" },
         { id: 4, name: "1500mg/l含氯消毒剂" },
-        { id: 5,  name:"消毒湿巾"}
+        { id: 5,  name:"消毒湿巾"},
+        { id:6, name:"75%酒精"},
+        { id:7,name:"2000mg/L含氯消毒剂"}
       ],
       // 夜路消毒方式
       sterilizeType: [

src/xt_pages/management/components/UserForm.vue

         { id: 3, name: "1000mg/l含氯消毒剂" },
         { id: 4, name: "1500mg/l含氯消毒剂" },
         { id: 5, name: "消毒湿巾" },
-        { id: 6, name: "1.85g/L季铵盐" }
+        { id: 6, name: "1.85g/L季铵盐" },
+        { id:7,name:"2000mg/L含氯消毒剂"}
       ],
       // 夜路消毒方式
       sterilizeType: [
             if (information[index].disinfectant_type === 6) {
                information[index].disinfectant_type = "1.85g/L季铵盐";
             }
+            if (information[index].disinfectant_type === 7) {
+               information[index].disinfectant_type = "2000mg/l含氯消毒剂";
+            }
 
             if (information[index].disinfection === 1) {
               information[index].disinfection = "已消毒";
             if (information[index].disinfectant_type === 6) {
               information[index].disinfectant_type = "1.85g/L季铵盐";
             }
+            if (information[index].disinfectant_type === 7) {
+              information[index].disinfectant_type = "2000mg/l含氯消毒剂";
+            }
 
             if (information[index].disinfection === 0) {
               information[index].disinfection = "";
               information[index].disinfectant_type = "1.85g/L季铵盐";
             }
 
+            if (information[index].disinfectant_type === 7) {
+              information[index].disinfectant_type = "2000mg/l含氯消毒剂";
+            }
+
             if (information[index].disinfection === 0) {
               information[index].disinfection = "";
             }

src/xt_pages/management/home.vue

           { id: 3, name: '1000mg/l含氯消毒剂' },
           { id: 4, name: '1500mg/l含氯消毒剂' },
           { id: 5,  name:  "消毒湿巾"},
-          { id:6,name:"1.85g/L季铵盐"}
+          { id:6,name:"1.85g/L季铵盐"},
+          { id:7,name:"2000mg/L含氯消毒剂"}
+
         ],
         // 夜路消毒方式
         sterilizeType: [

src/xt_pages/qcd/treatmentControlAnalysis/components/TimeAll.vue

     </div>
     <div class="tableTitle">统计表</div>
     <div>
-      <el-button @click="exportList" type="primary">导出</el-button>
+      <div style="margin-bottom: 10px;">
+        <el-button @click="exportList" type="primary">导出</el-button>
+      </div>
       <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
         <el-table-column
           fixed
   },
   methods: {
     exportList(){
-       console.log("DialysisData",this.tableData)
-       console.log("activeModes",this.activeModes)
+      //  console.log("DialysisData",this.tableData)
+      //  console.log("activeModes",this.activeModes)
 
        if(this.tableData!=null && this.tableData.length>0){
          for(let i=0;i<this.tableData.length;i++){
                this.tableData[i].mode_id_14 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
             }
 
-            if(this.activeModes[j].id == 15){
-               this.tableData[i].mode_id_15 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
-            }
-
-            if(this.activeModes[j].id == 16){
-               this.tableData[i].mode_id_16 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
-            }
-            if(this.activeModes[j].id == 17){
-               this.tableData[i].mode_id_17 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
-            }
-            if(this.activeModes[j].id == 18){
-               this.tableData[i].mode_id_18 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
-            }
+          
 
             if(this.activeModes[j].id == 19){
                this.tableData[i].mode_id_19 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
                this.tableData[i].mode_id_43 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
             }
           
-            // this.tableData[i].HD =  ""
-            // this.tableData[i].HDF =  ""
-            // this.tableData[i].HD+HP =  "
           }
          }
        }
-       console.log("tabledate==============",this.tableData)
+      
       
        import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['序号','日期','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','HDF80','HF16','HD无肝素','HDF17H','总数']
-        const filterVal = ['index','date','mode_id_1','mode_id_2','mode_id_3','mode_id_4','mode_id_5','mode_id_6','mode_id_7','mode_id_8','mode_id_9','mode_id_10','mode_id_11','mode_id_12','mode_id_13','mode_id_14','mode_id_15','mode_id_16','mode_id_17','mode_id_18','mode_id_19','mode_id_20','mode_id_21','mode_id_22','mode_id_23','mode_id_24','mode_id_25','mode_id_26','mode_id_27','mode_id_28','mode_id_29','mode_id_30','mode_id_31','mode_id_32','mode_id_33','mode_id_34','mode_id_35','mode_id_36','mode_id_37','mode_id_38','mode_id_39','mode_id_40','mode_id_41','mode_id_42','mode_id_43']
+        const tHeader = ['序号','日期','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','PHF','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','血浆胆红素吸附+HDF','血浆胆红素吸附','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','HFD','HDF100','HDF600','HDF800','HDF1000','HDF80','HF16','HD(无肝素)','HDF17H','HD.','HD(2)']
+        const filterVal = ['index','date','mode_id_1','mode_id_2','mode_id_3','mode_id_4','mode_id_5','mode_id_6','mode_id_7','mode_id_8','mode_id_9','mode_id_10','mode_id_11','mode_id_12','mode_id_13','mode_id_14','mode_id_19','mode_id_20','mode_id_21','mode_id_22','mode_id_23','mode_id_24','mode_id_25','mode_id_26','mode_id_27','mode_id_28','mode_id_29','mode_id_30','mode_id_31','mode_id_32','mode_id_33','mode_id_34','mode_id_35','mode_id_36','mode_id_37','mode_id_38','mode_id_39','mode_id_40','mode_id_41','mode_id_42','mode_id_43']
 
-        const data = this.formatJson(filterVal, this.DialysisData)
+        const data = this.formatJson(filterVal, this.tableData)
 
         excel.export_json_to_excel({
            header: tHeader,
           this.downloadLoading = false
         })
       },
+      formatJson(filterVal, jsonData) {
+        return jsonData.map(v =>
+          filterVal.map(j => {
+            if (j === "timestamp") {
+              return parseTime(v[j]);
+            } else {
+              return v[j];
+            }
+          })
+       );
+     },
     changeTime(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.listQuery.end_time);
       if (time > 0) {

src/xt_pages/stock/detail/stockInDetail.vue

             </template>
           </el-table-column>
 
+          <!-- <el-table-column label="进销商" align="center">
+            <template slot-scope="scope">
+              {{ getDealerName(scope.row.dealer) }}
+            </template>
+          </el-table-column> -->
+
           <el-table-column label="操作时间" align="center">
             <template slot-scope="scope">
               {{ getTime(scope.row.Warehousing.warehousing_time) }}

src/xt_pages/stock/detail/stockOutDetail.vue

             {{ getManufactuerName(scope.row.manufacturer) }}
           </template>
         </el-table-column>
+<!-- 
+        <el-table-column label="进销商" align="center">
+            <template slot-scope="scope">
+              {{ getDealerName(scope.row.dealer) }}
+            </template>
+          </el-table-column> -->
 
         <!-- <el-table-column label="单据类型" align="center">
           <template slot-scope="scope">

src/xt_pages/stock/drugs/components/drugQuery.vue

                 {{getDrugTypeName(scope.row.drug_type)}}
               </template>
             </el-table-column>
+
+            <el-table-column label="医保等级" align="center" v-if="org_id ==10697 || org_id == 0">
+              <template slot-scope="scope">
+                <span>{{getMedicalInsuranceLeve(scope.row.medical_insurance_level)?getMedicalInsuranceLeve(scope.row.medical_insurance_level):"" }}</span> 
+              </template>
+            </el-table-column>
             <el-table-column label="药品名称" align="center">
               <template slot-scope="scope">
                  {{scope.row.drug_name}}
      checkData:[],
      outData:[],
      drug_id:0,
+     medicalInsuranceLevelList:[]
     }
   
   },
   methods:{
+    getMedicalInsuranceLeve(id){
+      var name = ""
+      for(let i=0;i<this.medicalInsuranceLevelList.length;i++){
+         if(id == this.medicalInsuranceLevelList[i].value){
+            name = this.medicalInsuranceLevelList[i].name
+         }
+      }
+      return name
+    },
     changeStorehouseName(){
       this.getlist()
     },
             // this.tableList = arr;
             this.total = response.data.data.total
             this.drugTypeList = response.data.data.drugTypeList
+
+            this.medicalInsuranceLevelList = response.data.data.medicalInsuranceLevelList
          }
       })
     },

src/xt_pages/stock/drugs/components/purchaseNewDrugQuery.vue

                  {{scope.row.drug_name}}
               </template>
             </el-table-column>
+          
             <el-table-column label="规格&单位" align="center">
                 <template slot-scope="scope">
                   {{scope.row.dose}}{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
                 </template>
             </el-table-column>
+            <el-table-column label="国家编码" align="center">
+              <template slot-scope="scope">
+                 {{scope.row.medical_insurance_number}}
+              </template>
+            </el-table-column>
             <el-table-column label="生产厂商" align="center">
               <template slot-scope="scope">
                  {{getManufacturName(scope.row.manufacturer)}}
       getStorehouseList().then(response=>{
          if(response.data.state == 1){
            var houseList = response.data.data.list
-           var obj = {id:0,storehouse_name:"全部"}
+           var obj = {id:0,storehouse_name:""}
            this.houseList.push(obj)
            for(let i=0;i<houseList.length;i++){
              this.houseList.push(houseList[i])
             }
            
             }
+            
+            if(this.org_id == 0 || this.org_id == 10697){
+              if(list!=null && list.length>0){
+                var obj = {drug_type:"",drug_name:"合计",dose:"",dose_unit:"",min_number:"",min_unit:"",max_unit:"",medical_insurance_number:"",manufacturer:"",dealer:"",drugIn:"",drugInMoney:"",drugSaleMoney:0,drugAdd:"",drugAddPrice:"",drugAddSalePrice:0,drugOut:"",drugOutPrice:"",drugOutSalePrice:0,overDrug:"",overDrugPrice:"",oveDrugSaleMoney:0}
+                for(let i=0;i<list.length;i++){
+                  obj.drugSaleMoney += parseFloat(list[i].drugSaleMoney)
+                  obj.oveDrugSaleMoney += parseFloat(list[i].oveDrugSaleMoney)
+                  obj.drugAddSalePrice += parseFloat(list[i].drugAddSalePrice)
+                  obj.drugOutSalePrice +=parseFloat(list[i].drugOutSalePrice)
+                }
+                obj.drugSaleMoney  = obj.drugSaleMoney.toFixed(2)
+                obj.oveDrugSaleMoney  = obj.oveDrugSaleMoney.toFixed(2)
+                obj.drugAddSalePrice  = obj.drugAddSalePrice.toFixed(2)
+                obj.drugOutSalePrice  = obj.drugOutSalePrice.toFixed(2)
+                list.push(obj)
+
+              }
+            }
+           
             this.tableList = list;
             this.total = response.data.data.total
             this.manufacturerList = response.data.data.manufacturerList
     this.getlist()
    },
    getDrugTypeName(id){
+  
      var type_name = ""
      for(let i=0;i<this.drugTypeList.length;i++){
        if(id == this.drugTypeList[i].value){
          type_name = this.drugTypeList[i].name
        }
      }
-     return type_name
+     if (type_name !="全部"){
+      return type_name
+     }
    },
    getHouseName(id){
      var storehouse_name = ""
 
         }
         import('@/vendor/Export2Excel').then(excel => {
-           const multiHeader = [['序号', '查询日期','  药品类型','药品名称','规格&单位','生产产商','经销商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
-           const header = ['', '','','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
-           const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:G2','H1:J1', 'K1:M1', 'N1:P1', 'Q1:S1']
-           const filterVal = ['index', 'query_date', 'good_type','drug_name','specification_name','manufacturer_name','dealer_name','drugIn','drugInMoney','drugSaleMoney','drugAdd','drugAddPrice','drugAddSalePrice','drugOut','drugOutPrice','drugOutSalePrice','overDrug','overDrugPrice','oveDrugSaleMoney']
+           const multiHeader = [['序号', '查询日期','  药品类型','药品名称','规格&单位','国家编码','生产产商','经销商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
+           const header = ['', '','','','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
+           const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:G2','H1:H2', 'I1:K1', 'L1:N1', 'O1:Q1','R1:T1']
+           const filterVal = ['index', 'query_date', 'good_type','drug_name','specification_name','medical_insurance_number','manufacturer_name','dealer_name','drugIn','drugInMoney','drugSaleMoney','drugAdd','drugAddPrice','drugAddSalePrice','drugOut','drugOutPrice','drugOutSalePrice','overDrug','overDrugPrice','oveDrugSaleMoney']
 
            const data = this.formatJson(filterVal, this.tableList)
 

src/xt_pages/stock/drugs/components/purchaseNewDrugQueryPrint.vue

                                   <td rowspan="2" width="80">药品类型</td>
                                   <td rowspan="2" width="80">药品名称</td>
                                   <td rowspan="2" width="80">规格&单位</td>
+                                  <td rowspan="2" width="80">国家编码</td>
                                   <td rowspan="2" width="80">生产厂商</td>
                                   <td rowspan="2" width="80">经销商</td>
                                   <td width="80" colspan="3">期初结余</td>
                                  <td> {{getDrugTypeName(item.drug_type)}}</td>
                                  <td> {{item.drug_name}}</td>
                                  <td> {{item.dose}}{{item.dose_unit}}*{{item.min_number}}{{item.min_unit}}/{{item.max_unit}}</td>
+                                 <td>{{item.medical_insurance_number}}</td>
                                  <td>{{getManufacturName(item.manufacturer)}}</td>
                                  <td>{{getDearName(item.dealer)}}</td>
                                  <td>{{item.drugIn}}</td>
                   list[i].oveDrugSaleMoney = "/"
                 }
             }
+            if(this.org_id == 0 || this.org_id == 10697){
+              if(list!=null && list.length>0){
+                var obj = {drug_type:"",drug_name:"合计",dose:"",dose_unit:"",min_number:"",min_unit:"",max_unit:"",medical_insurance_number:"",manufacturer:"",dealer:"",drugIn:"",drugInMoney:"",drugSaleMoney:0,drugAdd:"",drugAddPrice:"",drugAddSalePrice:0,drugOut:"",drugOutPrice:"",drugOutSalePrice:0,overDrug:"",overDrugPrice:"",oveDrugSaleMoney:0}
+                for(let i=0;i<list.length;i++){
+                  obj.drugSaleMoney += parseFloat(list[i].drugSaleMoney)
+                  obj.oveDrugSaleMoney += parseFloat(list[i].oveDrugSaleMoney)
+                  obj.drugAddSalePrice += parseFloat(list[i].drugAddSalePrice)
+                  obj.drugOutSalePrice +=parseFloat(list[i].drugOutSalePrice)
+                }
+                obj.drugSaleMoney  = obj.drugSaleMoney.toFixed(2)
+                obj.oveDrugSaleMoney  = obj.oveDrugSaleMoney.toFixed(2)
+                obj.drugAddSalePrice  = obj.drugAddSalePrice.toFixed(2)
+                obj.drugOutSalePrice  = obj.drugOutSalePrice.toFixed(2)
+                list.push(obj)
+
+              }
+            }
             this.tableList = list;
             this.total = response.data.data.total
             this.manufacturerList = response.data.data.manufacturerList
             var drugTypeList = response.data.data.drugTypeList
-            var obj = {value:0,name:"全部"}
+            var obj = {value:0,name:""}
             this.drugTypeList.push(obj)
             for(let i=0;i<drugTypeList.length;i++){
                this.drugTypeList.push(drugTypeList[i])
     this.getlist()
    },
    getDrugTypeName(id){
+  
      var type_name = ""
      for(let i=0;i<this.drugTypeList.length;i++){
        if(id == this.drugTypeList[i].value){
          type_name = this.drugTypeList[i].name
        }
      }
-     return type_name
+     if (type_name !="全部"){
+      return type_name
+     }
+     
    },
    getHouseName(id){
      var storehouse_name = ""

src/xt_pages/stock/query/goodNewQuery.vue

                  {{ scope.row.good_number?scope.row.good_number:"" }}
               </template>
             </el-table-column>
+            <el-table-column label="医保等级" align="center" v-if="org_id ==10697 || org_id == 0">
+              <template slot-scope="scope">
+                <span>{{getMedicalInsuranceLeve(scope.row.medical_insurance_level)?getMedicalInsuranceLeve(scope.row.medical_insurance_level):"" }}</span> 
+              </template>
+            </el-table-column>
             <el-table-column label="耗材类型" align="center">
               <template slot-scope="scope">
                 {{getGoodTypeName(scope.row.good_type_id)}}
      checkdialogVisible:false,
      checkData:[],
      outData:[],
+     medicalInsuranceLevelList:[],
     }
   
   },
   methods:{
+    getMedicalInsuranceLeve(id){
+      var name = ""
+      for(let i=0;i<this.medicalInsuranceLevelList.length;i++){
+         if(id == this.medicalInsuranceLevelList[i].value){
+            name = this.medicalInsuranceLevelList[i].name
+         }
+      }
+      return name
+    },
     changeStorehouseName(){
       this.getlist()
     },
             this.loading = false
             this.tableList = list
             this.total = response.data.data.total
+            this.medicalInsuranceLevelList = response.data.data.medicalInsuranceLevelList
            
          }
       })

src/xt_pages/stock/query/purchaseNewStockQuery.vue

         
             <el-table-column label="耗材编码" align="center" v-if="org_id ==9956 || org_id == 0">
               <template slot-scope="scope">
-                <span v-if="scope.row.good_number>0">{{ scope.row.good_number?scope.row.good_number:"" }}</span> 
+                <span>{{ scope.row.good_number?scope.row.good_number:"" }}</span> 
+              </template>
+            </el-table-column>
+           
+            <el-table-column label="国家编码" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.social_security_directory_code?scope.row.social_security_directory_code:"" }}</span> 
               </template>
             </el-table-column>
             <el-table-column label="耗材类型" align="center">
           },
       },
      dealerList:[],
+     medicalInsuranceLevelList:[]
     }
   
   },
              
 
               list[i].outStock = this.getWarehosueOutInfo(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)//本期减少
-              if(this.org_id == 0){
+              if(this.org_id == 0 || this.org_id == 10697){
                 list[i].stockOutprice = list[i].packing_price
                 list[i].saleOutMoney = (list[i].packing_price * list[i].outStock).toFixed(2)
               }else{
              
             }
             console.log("listwowowoowowowow",list)
+
+            var obj = {good_number:"",medical_insurance_level:"",social_security_directory_code:"合计",good_type_id:"",good_name:"",specification_name:"",packing_unit:"",manufacturer:"",dealer:"",stockIn:"",stock_in_price:"",stockMoney:0,outStock:"",stockOutprice:"",saleStockMoney:0,saleOutMoney:0,overStock:"",overPrice:"",overMoney:0}
+          
+            if(this.org_id == 0 || this.org_id == 10697){
+              if(list.length!=null){
+                for(let i=0;i<list.length;i++){
+                 
+                  //  obj.stock_in_price += (this.tableList[i].stock_in_price).toFixed(2)
+                  obj.stockMoney += parseFloat(list[i].stockMoney) 
+                  //  obj.stockOutprice += (this.tableList[i].stockOutprice).toFixed(2)
+                  obj.saleStockMoney += parseFloat(list[i].saleStockMoney)
+
+                  obj.saleOutMoney += parseFloat(list[i].saleOutMoney)
+                  //  obj.overPrice += (this.tableList[i].overPrice).toFixed(2)
+                  obj.overMoney += parseFloat(list[i].overMoney)
+
+                }
+                obj.stockMoney = obj.stockMoney.toFixed(2)
+                obj.saleStockMoney = obj.saleStockMoney.toFixed(2)
+                obj.overMoney = obj.overMoney.toFixed(2)
+                obj.saleOutMoney = obj.saleOutMoney.toFixed(2)
+              
+                list.push(obj)
+             }
+            }
+           
+            console.log("list233333333333333333333333333333333",list)
             this.tableList = list
             this.total = response.data.data.total
 
            this.manufacturerList = response.data.data.manufacturerList
+
           
+        
            
          }
       })
     },
+   
     getManufacturName(id){
       var manufacturer_name = ""
       for(let i=0;i<this.manufacturerList.length;i++){
          type_name = this.goodTypeList[i].type_name
        }
      }
-     return type_name
+     if(type_name !='全部'){
+      return type_name
+     }
+    
    },
    getHouseName(id){
      var storehouse_name = ""
    },
    exportList: function() {
 
-       if(this.org_id!=0&& this.org_id!=9956){
+       if(this.org_id!=0&& this.org_id!=9956 && this.org_id!=10697){
          
         for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1
         })
        }
 
-       if(this.org_id == 0 || this.org_id == 9956){
+       if(this.org_id == 9956){
         
         for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1
             })
         })
        }
+
+       if(this.org_id == 10697 || this.org_id == 0){
+        
+        for(let i=0;i<this.tableList.length;i++){
+          this.tableList[i].index = i+1
+          this.tableList[i].query_date = this.start_time+"~"+this.end_time
+          this.tableList[i].good_type = this.getGoodTypeName(this.tableList[i].good_type_id)
+          this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
+          this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
+          this.tableList[i].specification_name_one = this.tableList[i].specification_name + "/"+this.tableList[i].packing_unit
+        }
+        import('@/vendor/Export2Excel').then(excel => {
+           const multiHeader = [['序号','国家编码', '查询日期',' 耗材类型','耗材名称','规格&单位','生产产商','经销商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
+           const header = ['','', '','','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
+           const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:G2','H1:H2','I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1']
+           const filterVal = ['index','social_security_directory_code', 'query_date', 'good_type','good_name','specification_name_one','manufacturer_name','dealer_name','stockIn','stock_in_price','stockMoney','stockAdd','addStockMoney','saleStockMoney','outStock','stockOutprice','saleOutMoney','overStock','overPrice','overMoney']
+    
+           const data = this.formatJson(filterVal, this.tableList)
+        
+           const filename = '进销存查询'
+            
+            excel.export_json_to_excel({
+              multiHeader,
+              header,
+              merges,
+              data,
+              filename
+            })
+        })
+       }
+
+       
    
       },
       formatJson(filterVal, jsonData) {
       return count
     },
     getAllQuery(){
+
      this.getlist()
     }
   },
+  created(){
+ 
+  }
 
 }
 </script>

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

                             <thead>
                                 <tr>
                                   <td rowspan="2" width="80">序号</td>
-                                  <td rowspan="2" width="80" v-if="org_id==9956">耗材编码</td>
+                                  <td rowspan="2" width="80" v-if="org_id==9956 || org_id == 0">耗材编码</td>
+                                  <td rowspan="2" width="80">国家编码</td>
                                   <td rowspan="2" width="80">耗材名称</td>
                                   <td rowspan="2" width="80">耗材类型</td>
                                   <td rowspan="2" width="80">规格&单位</td>
                                 <tr v-for="(item,index) in this.tableList" :key="index">
                                  <td>{{index + 1}}</td>
                                  <td v-if="org_id==9956">{{item.good_number}}</td>
+                                 <td>{{item.social_security_directory_code}}</td>
                                  <td>{{item.good_name}}</td>
                                  <td>{{getGoodTypeName(item.good_type_id)}}</td>
                                  <td>{{item.specification_name}}</td>
                     list[i].outStock = this.getWarehosueOutInfo(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)//本期减少
                    
                      
-                    if(this.org_id == 0){
+                    if(this.org_id == 0 || this.org_id == 10697){
                       list[i].stockOutprice = list[i].packing_price
                       list[i].saleOutMoney = (list[i].packing_price * list[i].outStock).toFixed(2)
                     }else{
                      }
                 
                 }
-                this.tableList = list
+               
+               var obj = {good_number:"",medical_insurance_level:"",social_security_directory_code:"合计",good_type_id:"",good_name:"",specification_name:"",packing_unit:"",manufacturer:"",dealer:"",stockIn:"",stock_in_price:"",stockMoney:0,outStock:"",stockOutprice:"",saleStockMoney:0,saleOutMoney:0,overStock:"",overPrice:"",overMoney:0}
+          
+                if(this.org_id == 0 || this.org_id == 10697){
+                  if(list.length!=null){
+                    for(let i=0;i<list.length;i++){
+                    
+                      //  obj.stock_in_price += (this.tableList[i].stock_in_price).toFixed(2)
+                      obj.stockMoney += parseFloat(list[i].stockMoney) 
+                      //  obj.stockOutprice += (this.tableList[i].stockOutprice).toFixed(2)
+                      obj.saleStockMoney += parseFloat(list[i].saleStockMoney)
+
+                      obj.saleOutMoney += parseFloat(list[i].saleOutMoney)
+                      //  obj.overPrice += (this.tableList[i].overPrice).toFixed(2)
+                      obj.overMoney += parseFloat(list[i].overMoney)
 
+                    }
+                    obj.stockMoney = obj.stockMoney.toFixed(2)
+                    obj.saleStockMoney = obj.saleStockMoney.toFixed(2)
+                    obj.overMoney = obj.overMoney.toFixed(2)
+                    obj.saleOutMoney = obj.saleOutMoney.toFixed(2)
+                  
+                    list.push(obj)
+                 }
+                }
                this.manufacturerList = response.data.data.manufacturerList
             
             }
             type_name = this.goodTypeList[i].type_name
         }
         }
-        return type_name
+        if(type_name!="全部"){
+          return type_name
+        }
+       
        },
     getWarehouseInfoStart(arr1,arr2,arr3,arr4,arr5){
       var count =0

src/xt_pages/stock/stockFlow.vue

            this.manufacturerList = manufacturerList
            this.houseList = response.data.data.houseList
            this.patientList = response.data.data.patients
+
+          
           }
        })
      },

src/xt_pages/stock/stockInOrderAdd.vue

               </el-form-item>
             </template>
           </el-table-column>
+
+          
            <el-table-column label="经销商" align="center" width="150">
              <template slot-scope="scope">
                <el-select size="small" v-model="scope.row.dealer" filterable placeholder="请选择厂商">

src/xt_pages/stock/stockInventoryModePrint.vue

 
                 <table class="printTable" border="0" cellspacing="0" align="center">
                     <thead class="print_head">
-                        <tr><td colspan="11">{{org_name}}</td></tr>
-                        <tr><td colspan="11">耗材盘点</td></tr>
+                        <tr><td colspan="11">南昌顺友好血液透析中心 {{org_name}}</td></tr>
+                        <tr>
+                          <td colspan="11">耗材盘点</td>
+                         
+                        </tr>
+                        <tr>
+                          <td colspan="11">
+                            <div style="float: right;margin-left: 600px;width: 200px;">{{ getNowTime() }}</div>
+                          </td>
+                        </tr>
+                       
                     </thead>
+                  
                     <tbody class="print_body">
                     <tr>
-                        <td align="center">耗材名称</td>
-                        <td align="center">规格</td>
-                     
-                        <td align="center">本月入库数量</td>
-                        <td align="center">本月出库数量</td>
-                        <td align="center">本月剩余库存</td>
-                        <td align="center">批号</td>
-                        <td align="center">生产日期</td> 
-                        <td align="center">有效日期</td>
-                        <td align="center">生产厂商</td>
-                        <td align="center">盘点数量</td>
+                        <td align="center" style="width: 50px;">序号</td>
+                        <td align="center" style="width: 200px;">耗材名称</td>
+                        <td align="center" style="width: 200px;">规格</td>
+                        <td align="center" style="width: 200px;">上期结余数量</td>
+                        <td align="center" style="width: 200px;">本月入库数量</td>
+                        <td align="center" style="width: 200px;">进货金额</td>
+                        <td align="center" style="width: 200px;">本月入库总金额</td>
+                        <td align="center" style="width: 200px;">本月出库数量</td>
+                        <td align="center" style="width: 200px;">销售价</td>
+                        <td align="center" style="width: 200px;">本月销售总金额</td>
+                        <td align="center" style="width: 200px;" >本月剩余库存数量</td>
+                        <td align="center" style="width: 200px;">进货价</td>
+                        <td align="center" style="width: 200px;">本月剩余总金额</td>
+                        <td align="center" style="width: 200px;">批号</td>
+                        <!-- <td align="center" style="width: 200px;">生产日期</td>  -->
+                        <td align="center" style="width: 200px;">有效日期</td>
+                        <td align="center" style="width: 200px;">生产厂商</td>
+                        <td align="center" style="width: 200px;">盘点数量</td>
                        
                     </tr>
 
                     <tr v-for="(item,index) in tableList" :key="index">
-                        <td align="center">{{ item.good_name }}</td>
-                        <td align="center">{{ item.specification_name }}</td>
-                        <td align="center">{{ getInCount(item.good_id) }}</td>
-                        <td align="center">{{ getOutCount(item.good_id) }}</td> 
-                        <td align="center">{{ getSumCount(item.good_id) }}</td>
                         <td align="center">
+                          <span v-if="item.is_total == 0">{{ index+1 }}</span>
+                          <span v-if="item.is_total == 1">{{ item.index }}</span>
+                        </td>
+                        <td align="center">
+                          <span v-if="item.is_total == 0">{{ item.good_name }}</span> 
+                        </td>
+                        <td align="center">
+                          <span v-if="item.is_total == 0">{{ item.specification_name }}</span> 
+                        </td>
+                        <td align="center">
+                          <span v-if="item.is_total == 0">{{ getLastOver(item.good_id) }}</span> 
+                          <span v-if="item.is_total == 1">{{ item.last_over}}</span> 
+                        </td>
+                        <td align="center">
+                          <span v-if="item.is_total == 0">{{ getInCount(item.good_id) }}</span> 
+                          <span v-if="item.is_total == 1">{{ item.month_in_total }}</span> 
+                        </td>
+                        <td align="center">
+                          <span v-if="item.is_total == 0">{{ getBuyPrice(item.good_id) }}</span> 
+                          <span v-if="item.is_total == 1">{{ item.buy_price }}</span> 
+                        </td>
+                        <td align="center">
+                          <span v-if="item.is_total == 0">{{ (getInCount(item.good_id)*getBuyPrice(item.good_id)).toFixed(2) }}</span> 
+                          <span v-if="item.is_total == 1">{{ item.month_in_total_price }}</span> 
+                        </td>
+                        <td align="center">
+                          <span v-if="item.is_total == 0"> {{ getOutCount(item.good_id) }}</span>
+                          <span v-if="item.is_total == 1"> {{ item.month_out_total}}</span>
+                        </td> 
+                        <td align="center">
+                          <span v-if="item.is_total==0"> {{ getPackingPrice(item.good_id) }}</span>
+                          <span v-if="item.is_total==1"> {{item.packing_price }}</span>
+                        </td>
+                        <td align="center">
+                          <span v-if="item.is_total == 0"> {{ (getOutCount(item.good_id)*getPackingPrice(item.good_id)).toFixed(2) }}</span>
+                          <span v-if="item.is_total == 1">{{ item.month_out_total_price }}</span>
+                        </td>
+                        <td align="center">
+                          <span v-if="item.is_total == 0">{{ getSumCount(item.good_id) }}</span>
+                          <span v-if="item.is_total == 1">{{item.month_over_total }}</span>
+                        </td>
+                        <td align="center">
+                          <span v-if="item.is_total == 0"> {{ getBuyPrice(item.good_id) }}</span> 
+                          <span v-if="item.is_total == 1"> {{ item.buy_price }}</span> 
+                        </td>
+                        <td align="center">
+                          <span v-if="item.is_total == 0"> {{ (getSumCount(item.good_id) * getBuyPrice(item.good_id)).toFixed(2)}}</span>
+                          <span v-if="item.is_total == 1"> {{ item.month_over_total_price}}</span>
+                        </td>
+                        <td align="center">
+                          <span v-if="item.is_total == 0">
                             <table
                                 class="ware_table"
                                 style="width: 100%; border-collapse: collapse"
                                     </td>
                               </tr>
                             </table>
+                          </span>
                         </td>
                        
-                        <td align="center">
+                        <!-- <td align="center">
                             <table
                                 class="ware_table"
                                 style="width: 100%; border-collapse: collapse"
                                     </td>
                               </tr>
                             </table>
-                        </td>
+                        </td> -->
                         <td align="center">
+                          <span v-if="item.is_total == 0">
                             <table
                                 class="ware_table"
                                 style="width: 100%; border-collapse: collapse"
                                     </td>
                               </tr>
                             </table>
+                          </span> 
                         </td>
                         <td align="center">
-
+                           <span v-if="item.is_total == 0">
                             <table
                                 class="ware_table"
                                 style="width: 100%; border-collapse: collapse"
                                     </td>
                               </tr>
                             </table>
+                          </span>
 
                         </td>
                         <td align="center">
                    
                     </tbody>
                 </table>
+
+                <div style="float: left;">盘点人签字:</div>
+                <div style="float: right;">监盘人签字:</div>
             </div>
         </div>
     </div>
         crumbs: [
             { path: false, name: '库存管理' },
             { path: false, name: '耗材管理' },
-            { path: false, name: '耗材模版打印' },
+            { path: false, name: '耗材盘点模版打印' },
           ],
           tableList:[],
-          org_name: this.$store.getters.xt_user.org.org_name,
           start_time:"",
           end_time:"",
           manufacturerList:[],
           outinfo:[],
           flowProList:[],
           flowNoProList:[],
-          goodInfo:[]
+          goodInfo:[],
+          org_name:"",
+          warehouseinfoList:[],
+          warehouseOutInfoList:[],
+          cancelInfoList:[],
+       
        }
      },
      methods:{
+        getNowTime: function () {
+          let dateTime;
+          let yy = new Date().getFullYear();
+          let mm = new Date().getMonth() + 1;
+          let dd = new Date().getDate();
+        
+          dateTime = yy + '年' + mm + '月' + dd + '日'
+          return dateTime
+        },
         printAction: function() {
             const style = '@page{size:landscape;margin: 10mm;} @media print { print_content{width:960px;margin:0} .flex{display: flex;justify-content: space-between;} .printTable{width:100%;border-collapse: collapse;border:0px;margin:10px 0;} .printTable thead{text-align:center}.printTable td{padding:5px;} .print_body tr td{border: 1px solid;font-size:12px;border-collapse:collapse;} }';
             printJS({ 
             start_time:this.$route.query.start_time,
             end_time:this.$route.query.end_time,
           }
-          console.log("params-------",params)
           const loading = this.$loading({
             lock: true,
             text: 'Loading',
           getStockInventroyModePrintList(params).then(response=>{
               if(response.data.state == 1){
                  var list  =  response.data.data.list
+                 var manufacturerList = response.data.data.manufacturerList
+                 this.manufacturerList = manufacturerList
+
+                 this.infoList = response.data.data.infoList
+
+                 this.outinfo = response.data.data.outinfo
+
+                 this.flowNoProList = response.data.data.flowNoProList
+
+                 this.flowProList = response.data.data.flowProList
+
+                 this.goodInfo = response.data.data.goodInfo
+
+                 var warehouseinfo =  response.data.data.warehouseinfo
+               
+                 this.warehouseinfoList = warehouseinfo
+                 var warehouseOutInfo =  response.data.data.warehouseOutInfo
+                 
+                 this.warehouseOutInfoList = warehouseOutInfo
+                 var cancelInfoList = response.data.data.cancelInfo
+                 this.cancelInfoList = cancelInfoList
                   loading.close()
-                 console.log("list===============",list)
+                //  console.log("list===============",list)
 
                 if(list!=null && list.length > 0){
                   let dataInfo = {}
                       count:0,
                       specification_name:item.specification_name,
                       good_name:item.good_name,
+                      last_over:0, //上期结余数量
+                      month_in_total:0,//本月入库数量
+                      buy_price:0,//进货金额
+                      month_in_total_price:0,//本月入库总金额
+                      month_out_total:0,//本月出库数量,
+                      packing_price:0,//销售价,
+                      month_out_total_price:0,//本月销售总金额,
+                      month_over_total:0,//本月剩余库存
+                      month_over_total_price:0,
+                      is_total:0,
+
+
                     }
                   }
                 })
                           arr[i].child.push(list[j])
                        }
                    }
+
                 }
                 
-                this.tableList = arr
-                console.log("arr--------------",arr)
-                }
-                 var manufacturerList = response.data.data.manufacturerList
-                 this.manufacturerList = manufacturerList
+                for(let s=0;s < arr.length;s++){
+                  arr[s].last_over = this.getLastOver(arr[s].good_id)
+                  arr[s].month_in_total = this.getInCount(arr[s].good_id)
+                  arr[s].buy_price = this.getBuyPrice(arr[s].good_id)
+                  arr[s].month_in_total_price = (this.getInCount(arr[s].good_id) * this.getBuyPrice(arr[s].good_id)).toFixed(2)
+                  arr[s].month_out_total = this.getOutCount(arr[s].good_id)
+                  arr[s].packing_price = this.getPackingPrice(arr[s].good_id)
+                  arr[s].month_out_total_price = (this.getOutCount(arr[s].good_id) *this.getPackingPrice(arr[s].good_id)).toFixed(2)
 
-                 this.infoList = response.data.data.infoList
+                  arr[s].month_over_total = this.getSumCount(arr[s].good_id)
 
-                 this.outinfo = response.data.data.outinfo
+                  arr[s].month_over_total_price = (this.getBuyPrice(arr[s].good_id) * this.getSumCount(arr[s].good_id)).toFixed(2)
 
-                 this.flowNoProList = response.data.data.flowNoProList
-
-                 this.flowProList = response.data.data.flowProList
-
-                 this.goodInfo = response.data.data.goodInfo
+                }
+                console.log("arr------------------------------------------",arr)
+                this.tableList = arr
+              
+                }
+               
+                
+                var obj = {is_total:1,index:"合计",last_over:"",month_in_total:"",buy_price:"",month_in_total_price:0,month_out_total:"",packing_price:"",month_out_total_price:0,month_over_total:"",month_over_total_price:0}
+                for(let i=0;i<this.tableList.length;i++){
+                   obj.month_in_total_price += parseFloat(this.tableList[i].month_in_total_price) 
+                   obj.month_out_total_price += parseFloat(this.tableList[i].month_out_total_price) 
+                   obj.month_over_total_price +=parseFloat(this.tableList[i].month_over_total_price) 
+                }
+                console.log("obj===============================",obj)
+                 this.tableList.push(obj)
+                 console.log("tableLIDT========",this.tableList)
+                
               }
           })
         },
            }
            return manufacturer_name
         },
+        getLastOver(good_id){
+          var in_count = 0 
+          var out_count = 0
+          var cancel_count = 0
+          var total_count = 0
+          var in_arr = []
+          var out_arr = []
+          var cancel_arr = []
+          for(let i=0;i<this.warehouseinfoList.length;i++){
+             if(good_id == this.warehouseinfoList[i].good_id){
+              in_arr.push(this.warehouseinfoList[i])
+             }
+             
+          }
+
+          for(let i=0;i<in_arr.length;i++){
+            in_count += parseInt(in_arr[i].count)
+          }
+          for(let i=0;i<this.warehouseOutInfoList.length;i++){
+            if(good_id == this.warehouseOutInfoList[i].good_id){
+              out_arr.push(this.warehouseOutInfoList[i])
+             
+            }
+          }
+          for(let i=0;i<out_arr.length;i++){
+            out_count += parseInt(out_arr[i].count)
+          }
+
+          for(let i=0;i<this.cancelInfoList.length;i++){
+            if(good_id == this.cancelInfoList[i].good_id){
+              cancel_arr.push(this.cancelInfoList[i])
+            
+            }
+          }
+
+          for(let i=0;i<cancel_arr.length;i++){
+            cancel_count += parseInt(cancel_arr[i].count)
+          }
+
+          // console.log("good_id",good_id)
+          // console.log("in_count",in_count)
+          // console.log("cancel_count",cancel_count)
+          // console.log("out_count",out_count)
+
+
+          total_count = in_count +cancel_count - out_count
+
+          return  total_count
+
+
+        },
+
+        getBuyPrice(good_id){
+          var buy_price = ""
+          for(let i=0;i<this.goodInfo.length;i++){
+           if(good_id == this.goodInfo[i].id){
+              buy_price = this.goodInfo[i].buy_price
+           }
+          }
+          return buy_price
+        },
+        getPackingPrice(good_id){
+          var packing_price = ""
+          for(let i=0;i<this.goodInfo.length;i++){
+           if(good_id == this.goodInfo[i].id){
+            packing_price = this.goodInfo[i].packing_price
+           }
+          }
+          return packing_price
+        },
+        
         
         getInCount(good_id){
           
           total = total_count + total_count_one
           return total
         },
+        getInPrice(good_id){
+          var packing_price = ""
+          for(let i=0;i<this.goodInfo.length;i++){
+             if(good_id == this.goodInfo[i].id){
+              packing_price = this.goodInfo[i].packing_price
+             }
+          }
+          return packing_price
+        },
         getOutCount(good_id){
 
           var newArr =[]
         
      },
      created(){
-        
+      var xtuser = this.$store.getters.xt_user;
+      this.org_name = xtuser.org.org_name;
         this.getlist()
      }
 

src/xt_permission.js

 
 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))