新分支

src/xt_pages/stock/Dialog/goodInfoDailog.vue

                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="医保等级 : " prop="medical_insurance_level">
+            <el-form-item label="医保等级 : " >
               <el-select v-model="form.medical_insurance_level" style="width:160px;" placeholder="请选择">
                 <el-option
                   v-for="(item, index) in medicalInsuranceLevelList"
           good_kind: [
             { required: true, message: '请选择耗材种类', trigger: 'change' }
           ],
-          medical_insurance_level: [
-            { required: true, message: '请输入医保等级', trigger: 'blur' }
-          ],
+          // medical_insurance_level: [
+          //   { required: true, message: '请输入医保等级', trigger: 'blur' }
+          // ],
           manufacturer: [
             { required: true, message: '请选择生产厂商', trigger: 'blur' }
           ], good_unit: [

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

       >打印
     </el-button>
      <el-button
+      v-if="org_id != 10265 && org_id != 0"
       style="float: right;margin-right:10px"
       size="small"
       @click="exportListDetai"
       type="primary"
       >明细导出
+    </el-button>
+    <el-button
+      v-if="org_id == 10265 || org_id == 0"
+      style="float: right;margin-right:10px"
+      size="small"
+      @click="exportListDetaiOne"
+      type="primary"
+      >明细导出
     </el-button>
      <el-button
       style="float: right;margin-right:10px"
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100,1000]"
+        :page-sizes="[10, 50, 100,1000,2000,3000,4000,5000]"
         :page-size="10"
         background
         style="margin-top:20px;float: right"
        const data = this.formatJson(filterVal, this.tableData)
 
 
+       excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '药品出库明细'
+         })
+          this.downloadLoading = false
+      })
+    },
+    exportListDetaiOne(){
+      import('@/vendor/Export2Excel').then(excel => {
+       const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','生产厂商','进销商','操作时间','制单人','进货价','出货价','数量','单位','总价']
+       const filterVal = ['index','warehouse_out_order_number', 'drugtype', 'drug_name','specification_name','manufacturer_name','dealer_name','time','user_name','in_retail_price','price','count','count_unit','total_price']
+
+       console.log("hwhhwhwhwhwhw",this.tableData)
+        
+      
+       for(let i=0;i<this.tableData.length;i++){
+         if(this.tableData[i].is_total == 0){
+            this.tableData[i].index = i+1
+            if(this.tableData[i].drug_type == 1){
+              this.tableData[i].drugtype = "西药"
+            }
+            if(this.tableData[i].drug_type == 2){
+              this.tableData[i].drugtype = "草药"
+            }
+            if(this.tableData[i].drug_type == 3){
+              this.tableData[i].drugtype = "成药"
+            }
+            this.tableData[i].specification_name = this.tableData[i].dose + this.tableData[i].dose_unit +"*" + this.tableData[i].min_number + this.tableData[i].min_unit +  "/" + this.tableData[i].max_unit
+            this.tableData[i].time = this.getTime(this.tableData[i].ctime)
+            this.tableData[i].user_name = this.getAdminUser(this.tableData[i].creater)
+            this.tableData[i].manufacturer_name = this.getManufacturerName(this.tableData[i].manufacturer)
+            this.tableData[i].dealer_name = this.getDealerName(this.tableData[i].dealer)
+            this.tableData[i].in_retail_price = (this.tableData[i].in_price/this.tableData[i].min_number).toFixed(2)
+            if(this.org_id == 9919){
+              this.tableData[i].total = (this.tableData[i].count * this.tableData[i].last_price)
+              if(this.tableData[i].count >=this.tableData[i].min_number){
+               this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].last_price)/this.tableData[i].min_number
+              }else{
+                this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].last_price)
+              }
+
+            }else{
+              this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
+              if(this.tableData[i].count_unit == this.tableData[i].min_unit && this.tableData[i].max_unit!=this.tableData[i].min_unit){
+                 this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
+              }
+              if(this.tableData[i].count_unit == this.tableData[i].max_unit && this.tableData[i].max_unit !=this.tableData[i].min_unit){
+                this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)*this.tableData[i].min_number
+              }
+              if(this.tableData[i].count_unit == this.tableData[i].max_unit && this.tableData[i].max_unit ==this.tableData[i].min_unit){
+                this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)*this.tableData[i].min_number
+              }
+            }
+         }
+       }
+       const data = this.formatJson(filterVal, this.tableData)
+
+
        excel.export_json_to_excel({
            header: tHeader,
            data,

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

 
             <el-table-column label="剩余天数" align="center">
               <template slot-scope="scope">
-                {{getDaysBetween(getTime(scope.row.expiry_date),getTime(nowtime))}}
+                <span style="color: red;" v-if="getDaysBetween(getTime(scope.row.expiry_date),getTime(nowtime))<=30">
+                  {{getDaysBetween(getTime(scope.row.expiry_date),getTime(nowtime))}}
+                </span>
+                <span  v-if="getDaysBetween(getTime(scope.row.expiry_date),getTime(nowtime))>30">
+                  {{getDaysBetween(getTime(scope.row.expiry_date),getTime(nowtime))}}
+                </span>
               </template>
             </el-table-column>
           </el-table>

src/xt_pages/stock/drugs/drugStockInOrder.vue

             </template>
           </el-table-column>
         </el-table>
+        
       </span>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
       }
       for (let i = 0; i < this.exportList.length; i++) {
         this.exportList[i].index = i + 1;
+        this.exportList[i].warehousing_time = this.getTime(this.exportList[i].warehousing_time)
         this.exportList[i].unit =
           this.exportList[i].dose +
           this.exportList[i].dose_unit +
           if (this.exportList[i].dealer == 0) {
             this.exportList[i].dealer = "";
           }
+
         }
       }
 
 
         const tHeader = [
           "序号",
+          "单据日期",
           "药品名称",
           "药品类型",
           "规格&单位",
         ];
         const filterVal = [
           "index",
+          "warehousing_time",
           "drug_name",
           "drug_type",
           "unit",
     changeCheckType() {
       this.GetWarehouse();
     },
+   
   },
 };
 </script>

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

             </template>
           </el-table-column>
         </el-table>
+
+        <div style="margin-top: 20px;">合计金额: {{getTotalPirce() }} </div>
       </el-form>
     </div>
   </div>
     //      }
     //    }
     //  }
+    },
+    getTotalPirce(){
+      
+      var total_price = 0
+      if(this.recordInfo.recordData!=null && this.recordInfo.recordData.length>0){
+        
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+           total_price += this.recordInfo.recordData[i].last_price * parseInt(this.recordInfo.recordData[i].warehousing_count)
+        }
+
+        if(total_price>0){
+          return total_price.toFixed(4)
+        }else{
+         return ""
+        }
+      }
     }
   },
   created() {

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

             </template>
           </el-table-column>
         </el-table>
+
+        <div style="margin-top: 20px;">合计金额: {{getTotalPirce() }} </div>
       </el-form>
     </div>
   </div>
         return uParseTime(val, '{y}-{m}-{d}')
         }
     },
+    getTotalPirce(){
+      
+      var total_price = 0
+      if(this.recordInfo.recordData!=null && this.recordInfo.recordData.length>0){
+        
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+           total_price += this.recordInfo.recordData[i].last_price * parseInt(this.recordInfo.recordData[i].warehousing_count)
+        }
+
+        if(total_price>0){
+          return total_price.toFixed(4)
+        }else{
+         return ""
+        }
+      }
+    }
   },
   created() {
 

src/xt_pages/stock/drugs/drugStockOutOrder.vue

           }
         }
         const tHeader = [
+          "单据日期",
           "药品名称",
           "药品类型",
           "规格&单位",
           "批准文号",
           "出库时间",
           "备注",
+          
         ];
         const filterVal = [
+          "ctime",
           "drug_name",
           "drug_type",
           "unit",

src/xt_pages/stock/drugs/inventory.vue

                    list[i].last_stock_min_number = ""
                    list[i].min_number = list[i].XtBaseDrug.min_number
                    list[i].manufacturer_name  = ""
-                   list[i].type = 6
+                   list[i].type = 4
                    for(let j=0;j<this.manufacturerList.length;j++){
                      if(list[i].manufacturer == this.manufacturerList[j].id){
                         list[i].manufacturer_name = this.manufacturerList[j].manufacturer_name

src/xt_pages/stock/drugs/newDrugInventory.vue

                 list[i].last_stock_min_number = ""
                 list[i].min_number = list[i].XtBaseDrug.min_number
                 list[i].manufacturer_name  = ""
-                list[i].type = 6
+                list[i].type = 4
                 list[i].last_stock_max_number = list[i].stock_max_number
                 list[i].last_stock_min_number = list[i].stock_min_number
                 for(let j=0;j<this.manufacturerList.length;j++){

src/xt_pages/stock/inventory.vue

          if(response.data.state == 1){
            var list = response.data.data.list
            for(let i=0;i<list.length;i++){
-              list[i].type = 6
+              list[i].type = 4
               list[i].good_name = list[i].GoodInfo.good_name
               list[i].specification_name = list[i].GoodInfo.specification_name
               list[i].manufacturer_name = ""

src/xt_pages/stock/newInventory.vue

           this.manufacturerList = response.data.data.manufacturerList
           loading.close()
           for(let i=0;i<list.length;i++){
-              list[i].type = 6
+              list[i].type = 4
               list[i].good_name = list[i].GoodInfo.good_name
               list[i].specification_name = list[i].GoodInfo.specification_name
               list[i].manufacturer_name = ""

src/xt_pages/stock/query/expiryDateQuery.vue

             </el-table-column>
 
             <el-table-column label="剩余天数" align="center">
-              <template slot-scope="scope">
-                {{getDaysBetween(getTime(scope.row.expiry_date),getTime(nowtime))}}
+              <template slot-scope="scope" >
+                <span v-if="getDaysBetween(getTime(scope.row.expiry_date),getTime(nowtime))<=30" style="color: red;">{{getDaysBetween(getTime(scope.row.expiry_date),getTime(nowtime))}}</span>
+                <span v-if="getDaysBetween(getTime(scope.row.expiry_date),getTime(nowtime))>30">   {{getDaysBetween(getTime(scope.row.expiry_date),getTime(nowtime))}}</span>
               </template>
             </el-table-column>
           </el-table>

src/xt_pages/stock/stockInOrder.vue

         this.$message.error("请勾选入库单")
         return
       }
+      console.log("this.wowoowow",this.exportList)
+     
       import('@/vendor/Export2Excel').then(excel => {
       for(let i=0;i<this.exportList.length;i++){
         for(let j=0;j<this.goodType.length;j++){
         if(this.exportList[i].good_type_id == 0){
           this.exportList[i].good_type_id = ""
         }
+        this.exportList[i].warehousing_time  = this.getTime(this.exportList[i].warehousing_time,"{y}-{m}-{d}")
       }
 
-      const tHeader = ['耗材名称','耗材类型', '规格&单位','批号','入库数量','进货价','总价','生产厂家','生产日期','有效期','经销商','批准文号','备注']
-      const filterVal = ['good_name', 'good_type_id', 'unit','number','warehousing_count','price','total_price','manufacturer','product_date','expiry_date','dealer','license_number','remark']
+      const tHeader = ['单据日期','耗材名称','耗材类型', '规格&单位','批号','入库数量','进货价','总价','生产厂家','生产日期','有效期','经销商','批准文号','备注']
+      const filterVal = ['warehousing_time','good_name', 'good_type_id', 'unit','number','warehousing_count','price','total_price','manufacturer','product_date','expiry_date','dealer','license_number','remark']
 
 
 

src/xt_pages/stock/stockInOrderAdd.vue

           </el-table-column>
 
         </el-table>
+
+        <div style="margin-top: 20px;">合计金额: {{getTotalPirce() }} </div>
       </el-form>
 
 
         } else {
           this.recordInfo.recordData.splice(index, 1)
         }
-      }, calculate: function(val) {
+      },
+       calculate: function(val) {
         if (val == 0) {
           return ''
         }
             loading.close()
           }
        })
+     },
+     getTotalPirce(){
+      
+       var total_price = 0
+       if(this.recordInfo.recordData!=null && this.recordInfo.recordData.length>0){
+         
+         for(let i=0;i<this.recordInfo.recordData.length;i++){
+            total_price += this.recordInfo.recordData[i].price * parseInt(this.recordInfo.recordData[i].warehousing_count)
+         }
+
+         if(total_price>0){
+           return total_price.toFixed(4)
+         }else{
+          return ""
+         }
+       }
      }
     }
     ,

src/xt_pages/stock/stockInOrderEdit.vue

             </template>
           </el-table-column>
         </el-table>
+
+        <div style="margin-top: 20px;">合计金额: {{getTotalPirce() }} </div>
       </el-form>
     </div>
   </div>
         return uParseTime(val, '{y}-{m}-{d}')
         }
      },
+     getTotalPirce(){
+      
+      var total_price = 0
+      if(this.recordInfo.recordData!=null && this.recordInfo.recordData.length>0){
+        
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+           total_price += this.recordInfo.recordData[i].price * parseInt(this.recordInfo.recordData[i].warehousing_count)
+        }
+
+        if(total_price>0){
+          return total_price.toFixed(4)
+        }else{
+         return ""
+        }
+      }
+    }
+     
   },
   created() {
     this.GetConfigInfo();

src/xt_pages/stock/stockOutOrder.vue

             list[i].total_price = (list[i].total_count * list[i].price).toFixed(2);
             list[i].expiry_date = this.getTime(list[i].expiry_date,"{y}-{m}-{d}");
             list[i].product_date = this.getTime(list[i].product_date,"{y}-{m}-{d}");
+           
             for (let j = 0; j < this.manufacturer.length; j++) {
               if (list[i].manufacturer == this.manufacturer[j].id) {
                 list[i].manufacturer = this.manufacturer[j].manufacturer_name;
             this.exportList[i].good_type_id = "";
           }
           this.exportList[i].ctime = this.getTime(this.exportList[i].ctime, "{y}-{m}-{d}")
+          this.exportList[i].warehouse_out_time = this.getTime(this.exportList[i].warehouse_out_time,"{y}-{m}-{d}")
         }
 
         const tHeader = [
+          "单据日期",
           "耗材名称",
           "耗材类型",
           "规格&单位",
           "出库时间"
         ];
         const filterVal = [
+          "warehouse_out_time",
           "good_name",
           "good_type_id",
           "unit",

src/xt_pages/user/components/PatientSidebar.vue

             },
           ]
         },
-        {
-          name: '5',
-          label: '评估工具',
-          children: [
-            {
-              name: '5-1',
-              label: '跌倒评估'
-            },
-            {
-              name: '5-2',
-              label: '小儿跌倒风险评估'
-            },
-            {
-              name: '5-3',
-              label: '压疮风险评估'
-            },
-            {
-              name: '5-4',
-              label: 'OH压疮评估'
-            },
-            {
-              name: '5-5',
-              label: '日常生活能力评估'
-            },
-            {
-              name: '5-6',
-              label: '导管脱落风险评估'
-            },
-            {
-              name: '5-7',
-              label: 'RASS及疼痛评估'
-            },
-            {
-              name: '5-8',
-              label: '营养状况评估'
-            },
-            {
-              name: '5-9',
-              label: '约束告知单'
-            },
-            {
-              name: '5-10',
-              label: '心理评估'
-            },
-            {
-              name: '5-11',
-              label: '瘙痒评估'
-            },
-            {
-              name: '5-12',
-              label: '血液透析患者评估'
-            },
-            {
-              name: '5-13',
-              label: 'Glasgow昏迷评分量表'
-            },
-            {
-              name: '5-14',
-              label: '肌力评估表'
-            },
-          ]
-        },
+        // {
+        //   name: '5',
+        //   label: '评估工具',
+        //   children: [
+        //     {
+        //       name: '5-1',
+        //       label: '跌倒评估'
+        //     },
+        //     {
+        //       name: '5-2',
+        //       label: '小儿跌倒风险评估'
+        //     },
+        //     {
+        //       name: '5-3',
+        //       label: '压疮风险评估'
+        //     },
+        //     {
+        //       name: '5-4',
+        //       label: 'OH压疮评估'
+        //     },
+        //     {
+        //       name: '5-5',
+        //       label: '日常生活能力评估'
+        //     },
+        //     {
+        //       name: '5-6',
+        //       label: '导管脱落风险评估'
+        //     },
+        //     {
+        //       name: '5-7',
+        //       label: 'RASS及疼痛评估'
+        //     },
+        //     {
+        //       name: '5-8',
+        //       label: '营养状况评估'
+        //     },
+        //     {
+        //       name: '5-9',
+        //       label: '约束告知单'
+        //     },
+        //     {
+        //       name: '5-10',
+        //       label: '心理评估'
+        //     },
+        //     {
+        //       name: '5-11',
+        //       label: '瘙痒评估'
+        //     },
+        //     {
+        //       name: '5-12',
+        //       label: '血液透析患者评估'
+        //     },
+        //     {
+        //       name: '5-13',
+        //       label: 'Glasgow昏迷评分量表'
+        //     },
+        //     {
+        //       name: '5-14',
+        //       label: '肌力评估表'
+        //     },
+        //   ]
+        // },
         
       ],
       name:""

src/xt_pages/user/vascularAccess.vue

         <el-button type="primary" @click="updatedVasularAccess('form')">保存</el-button>
      </span>
      </el-dialog>
-     <sitemap> </sitemap>
+     <!-- <sitemap> </sitemap> -->
     </div>
 
      <multi-select-box

src/xt_pages/workforce/components/editTableData.vue

               style="width: 100%; margin-right: 14px ;"
           >
             <el-table-column
-                prop="name"
                 label="患者名称"
                 align="center"
             >
+             <template slot-scope="scope">
+                <span v-if="scope.row.is_infectious == 2" style="color: red;">{{scope.row.name  }}</span>
+                <span v-if="scope.row.is_infectious != 2" >
+                  {{scope.row.name  }}
+                </span>
+             </template>
             </el-table-column>
           </el-table>
 
         zone_name:"",
         bed_name:"",
         id:"",
+        contagions:[],
       },
       // 左侧患者名称表格数据
       cur_info: {
         patient_id: 0,
         mode_name: "",
         mode_id: 0,
+        contagions:[],
       },
       // 左侧透析模式
       modes: [],
       this.currentData.partition_type = row.zone_type;
       this.currentData.mode_id = this.cur_info.mode_id;
       this.currentData.id = 0;
-      this.currentData.contagions = [];
+      this.currentData.contagions = this.cur_info.contagions;
       this.currentData.patient_id = this.cur_info.patient_id;
       this.currentData.patient = this.cur_info.patient_name;
       this.setSchedule()
         patient_id : this.cur_info.patient_id,
         patient_name : this.cur_info.patient_name,
         mode_id : this.cur_info.mode_id,
-        mode_name : this.cur_info.mode_name
-      }
-      // console.log('拖拽的内容',this.cur_drag_info);
+        mode_name : this.cur_info.mode_name,
+        contagions:this.cur_info.contagions,
+      },
+       console.log('拖拽的内容',this.cur_drag_info);
     },
     // 左侧选择病人（单击）
     patientClick(row) {
+      console.log("row-222--2-2",row)
       this.cur_info.patient_name = row.name;
       this.cur_info.patient_id = row.id;
+      var obj = {
+        created_time:0,
+        disease_id:2,
+        id:0,
+        patient_id:row.patient_id,
+        status:1,
+        updated_time:0
+      }
+      if(row.is_infectious==2){
+        this.cur_info.contagions = []
+        this.cur_info.contagions.push(obj)
+      }else{
+        this.cur_info.contagions = []
+      }
+     
       this.patient_id_hover = row.id
     },
     // 选择透析模式
       this.cur_info.mode_id = row.id;
     },
     setEditData(patients, modes, days, zones) {
+      console.log("patients2oo2o2o2o",patients)
       var date = new Date()
       this.time = date
       var year = date.getFullYear()
                       that.currentData.patient_id = that.cur_drag_info.patient_id
                       that.currentData.patient = that.cur_drag_info.patient_name
                        that.currentData.contagions = that.cur_drag_info.contagions
-                        console.log( that.cur_drag_info.contagions)
+                        console.log("中国hshshshshhs",that.cur_drag_info.contagions)
 
-                        console.log( that.currentData.contagions)
+                      
                         that.setScheduleTwo(this.cur_drag_info.id);
                 }
               }else{ // 非同一天
                 if(row[key].patient_id == 0) { //空床位
                   this.currentData.mode_id = this.cur_drag_info.mode_id;
                   this.currentData.id = 0;
-                  this.currentData.contagions = [];
+                  this.currentData.contagions = this.cur_drag_info.contagions;
                   this.currentData.patient_id = this.cur_drag_info.patient_id;
                   this.currentData.patient = this.cur_drag_info.patient_name;
                   this.setSchedule();
                 }
               }
             }else{
+              console.log("wowowowowowowowow",this.cur_drag_info)
               //接口提交排班数据
               this.currentData.mode_id = this.cur_drag_info.mode_id;
               this.currentData.id = 0;
-              this.currentData.contagions = [];
+              this.currentData.contagions = this.cur_drag_info.contagions;
               this.currentData.patient_id = this.cur_drag_info.patient_id;
               this.currentData.patient = this.cur_drag_info.patient_name;
               this.setSchedule();
           this.patient_id_hover = this.cur_info.patient_id;
           this.cur_info.patient_name = row[column.property].patient
           this.cur_info.mode_name = row[column.property].mode_name
-          // console.log('row的数据',row[column.property]);
+          console.log('单击选中患者',row[column.property]);
 
       } else {
         var week = this.weekDay(column.property);
       }
     },    
     setScheduleTwo(id_two) {
-      console.log("1112222222")
+      console.log("1112222222",this.currentData.contagions.length)
       var that = this;
       // var submitFlag = true;
       // if (this.currentData.patient_id <= 0) {
     },
     // 排班成功调用的方法
     setSchedule() {
+      console.log("6666969696969699",this.currentData.contagions.length)
       var that = this;
       // var submitFlag = true;
       // if (this.currentData.patient_id <= 0) {
       if (this.currentData.contagions.length > 0) {
         var cflag = false;
         this.currentData.contagions.forEach(function (contagion) {
+          console.log("woowowowowowow",that.currentData.partition_type)
           if (contagion.disease_id == that.currentData.partition_type) {
             cflag = true;
           }
         });
+      
         if (!cflag) {
           this.$confirm(
               "此患者有传染病，与此透析机不匹配，确定在此排班吗?",
         } else {
           this.CreateSchedule(this.currentData.patient_id, this.currentData);
         }
+        
       } else if (that.currentData.partition_type > 1) {
         this.$confirm(
             "此患者没有传染病，与此透析机不匹配，确定在此排班吗?",
     this.partitions = this.partitionsProp;
 
     var contagions = this.$store.getters.contagions;
+ 
     if (contagions.length > 0) {
       var that = this;
       contagions.forEach(function (citem) {