518合并代码

src/api/warehouse.js

@@ -131,14 +131,7 @@ export function updatedrugout(params) {
     params: params
   })
 }
-// 获取管理员列表(已渲染)
-export function getusername(params) {
-  return request({
-    url: '/api/secondary/getusername',
-    method: 'get',
-    params: params
-  })
-}
+
 // 获取当前登录人的id(已渲染)
 export function getcreaterid(params) {
   return request({
@@ -147,7 +140,7 @@ export function getcreaterid(params) {
     params: params
   })
 }
-//获取管理员列表(已渲染)
+// 获取管理员列表(已渲染)
 export function getusername(params) {
   return request({
     url: '/api/secondary/getusername',
@@ -155,11 +148,3 @@ export function getusername(params) {
     params: params
   })
 }
-//获取当前登录人的id(已渲染)
-export function getcreaterid(params) {
-  return request({
-    url: '/api/secondary/getcreaterid',
-    method: 'get',
-    params: params
-  })
-}

src/xt_pages/dialysis/PatientBox.vue

@@ -42,9 +42,9 @@
             </span>
           </div>
 
-          <!-- <div class="difficult">
+          <div class="difficult" v-if="schedule.patient.troble_shoot == 1">
             疑难内瘘
-          </div> -->
+          </div>
         </div>
         </div>
         <div>

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -2697,7 +2697,7 @@ export default {
       this.$refs.additionalCharges.show()
     },
     selectDrugs(selection, row) {
-        if (row.sum_count <= 0) {
+    if (row.sum_count <= 0) {
       if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217) {
         if (row.count <= 0) {
           if (selection) {
@@ -2739,8 +2739,8 @@ export default {
       //     }
       //     this.$message.error(row.drug_name + '库存不足')
       //     return
-      //   }
-      // }
+        }
+      }
       this.curDrugs = selection
     },
 
@@ -2997,142 +2997,164 @@ export default {
     }, changeAllGoodInfoTableDataTwo(row) {
       this.teamList = row
     },
-    selectChange(selection, row) {
-      if(row.sum_count <=0){
-       if(selection){
-          selection.forEach(row => {
-            if (row.sum_count <= 0) {
-              this.$refs.tables.toggleRowSelection(row)
-            }else{
-               this.$refs.tables.clearSelection()
-      console.log('row', row)
-      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 10188  || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217) {
-        if (row.stock_count <= 0) {
-          if (row.type == 3) {
-            if (selection) {
+         selectChange(selection, row) {
+        if(row.sum_count <=0){
+          if(selection){
               selection.forEach(row => {
-                if (row.stock_count <= 0) {
+                if (row.sum_count <= 0) {
                   this.$refs.tables.toggleRowSelection(row)
+                }else{
+                  this.$refs.tables.clearSelection()
                 }
+                this.$message.error(row.project_name + '库存不足')
+                return
               })
-            } else {
-              this.$refs.tables.clearSelection()
-            }
-             this.$message.error(row.project_name + '库存不足')
-             return
-          })
-       }
-      }
-      // if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 10188  || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278) {
-      //   if (row.stock_count <= 0) {
-      //     if (row.type == 3) {
-      //       if (selection) {
-      //         selection.forEach(row => {
-      //           if (row.stock_count <= 0) {
-      //             this.$refs.tables.toggleRowSelection(row)
-      //           }
-      //         })
-      //       } else {
-      //         this.$refs.tables.clearSelection()
-      //       }
-      //       this.$message.error(row.project_name + '库存不足')
-      //       return
-      //     }
-      //   }
-      // } else {
-      //   if (row.total <= 0) {
-      //     if (row.type == 3) {
-      //       if (selection) {
-      //         selection.forEach(row => {
-      //           if (row.total <= 0) {
-      //             this.$refs.tables.toggleRowSelection(row)
-      //           }
-      //         })
-      //       } else {
-      //         this.$refs.tables.clearSelection()
-      //       }
-      //       this.$message.error(row.project_name + '库存不足')
-      //       return
-      //     }
-      //   }
+          }
+        }
+        // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278){
+        //    if (row.stock_count <= 0) {
+        //     if (row.type == 3) {
+        //       if (selection) {
+        //         selection.forEach(row => {
+        //           if (row.stock_count <= 0) {
+        //             this.$refs.tables.toggleRowSelection(row)
+        //           }
+        //         })
+        //       } else {
+        //         this.$refs.tables.clearSelection()
+        //       }
+        //       this.$message.error(row.project_name + '库存不足')
+        //       return
+        //     }
+        //   }
+        // }else{
+        //    if (row.total <= 0) {
+        //     if (row.type == 3) {
+        //       if (selection) {
+        //         selection.forEach(row => {
+        //           if (row.total <= 0) {
+        //             this.$refs.tables.toggleRowSelection(row)
+        //           }
+        //         })
+        //       } else {
+        //         this.$refs.tables.clearSelection()
+        //       }
+        //       this.$message.error(row.project_name + '库存不足')
+        //       return
+        //     }
+        //   }
+        // console.log('row', row)
+        // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217){
+        //    if (row.stock_count <= 0) {
+        //     if (row.type == 3) {
+        //       if (selection) {
+        //         selection.forEach(row => {
+        //           if (row.stock_count <= 0) {
+        //             this.$refs.tables.toggleRowSelection(row)
+        //           }
+        //         })
+        //       } else {
+        //         this.$refs.tables.clearSelection()
+        //       }
+        //       this.$message.error(row.project_name + '库存不足')
+        //       return
+        //     }
+        //   }
+        // }else{
+        //    if (row.total <= 0) {
+        //     if (row.type == 3) {
+        //       if (selection) {
+        //         selection.forEach(row => {
+        //           if (row.total <= 0) {
+        //             this.$refs.tables.toggleRowSelection(row)
+        //           }
+        //         })
+        //       } else {
+        //         this.$refs.tables.clearSelection()
+        //       }
+        //       this.$message.error(row.project_name + '库存不足')
+        //       return
+        //     }
+        //   }
+        // }
+        this.teamList.push(row)
+      },
+      getlist() {
+        this.tabProject = []
+        getHisProject().then(response => {
+          if (response.data.state == 1) {
+            var project = response.data.data.project
+            console.log("项目列表",project)
+            for (let i = 0; i < project.length; i++) {
+              let obj = {
+                id: project[i].id,
+                project_name: project[i].project_name,
+                statistical_classification: '',
+                single_dose: project[i].single_dose,
+                delivery_way: project[i].delivery_way,
+                execution_frequency: project[i].execution_frequency,
+                number_days: project[i].number_days,
+                price: project[i].price,
+                medical_code: project[i].medical_code,
+                cus_total: 1,
+                unit: project[i].unit,
+                type: 2,
+                total: project[i].total,
+                is_special_diseases: project[i].disease_directory,
+                project: project[i],
+                stock_count:0,
+                sum_count:0,
+                batch_retai_price:0,
+              }
 
-      // }
-      this.teamList.push(row)
-    },
-    getlist() {
-      this.tabProject = []
-      getHisProject().then(response => {
-        if (response.data.state == 1) {
-          var project = response.data.data.project
-          for (let i = 0; i < project.length; i++) {
-            let obj = {
-              id: project[i].id,
-              project_name: project[i].project_name,
-              statistical_classification: '',
-              single_dose: project[i].single_dose,
-              delivery_way: project[i].delivery_way,
-              execution_frequency: project[i].execution_frequency,
-              number_days: project[i].number_days,
-              price: project[i].price,
-              medical_code: project[i].medical_code,
-              cus_total: 1,
-              unit: project[i].unit,
-              type: 2,
-              total: project[i].total,
-              is_special_diseases: project[i].disease_directory,
-              project: project[i],
-              stock_count: 0,
-              sum_count:0,
-              batch_retai_price:0,
+              this.tabProject.push(obj)
             }
 
-            this.tabProject.push(obj)
-          }
+            var good_info = response.data.data.good_info
+            console.log("good_info2323232323232323",good_info)
 
-          var good_info = response.data.data.good_info
+            for (let i = 0; i < good_info.length; i++) {
+               good_info[i].stock_count = 0
 
-          for (let i = 0; i < good_info.length; i++) {
-            good_info[i].stock_count = 0
-            if (good_info[i].good_stock_in&&good_info[i].good_stock_in.length > 0) {
-              for (let j = 0; j < good_info[i].good_stock_in.length; j++) {
-                good_info[i].stock_count += good_info[i].good_stock_in[j].stock_count
+               if(good_info[i].batch_retai_price > 0){
+                  good_info[i].packing_price = 0
+                  good_info[i].packing_price = good_info[i].batch_retai_price
+               }
+              if(good_info[i].good_stock_in&&good_info[i].good_stock_in.length >0 ){
+                for(let j=0;j<good_info[i].good_stock_in.length;j++){
+                   good_info[i].stock_count += good_info[i].good_stock_in[j].stock_count
+                }
               }
-            if(good_info[i].batch_retai_price > 0){
-              good_info[i].packing_price = 0
-              good_info[i].packing_price = good_info[i].batch_retai_price
-            }
-            let obj = {
-              id: good_info[i].id,
-              project_name: good_info[i].good_name,
-              statistical_classification: '',
-              single_dose: good_info[i].specification_name,
-              delivery_way: '',
-              execution_frequency: '',
-              number_days: 1,
-              cus_total: 1,
-              price: good_info[i].packing_price,
-              medical_code: good_info[i].medical_insurance_number,
-              unit: this.getGoodUnit(good_info[i].good_unit),
-              type: 3,
-              total: good_info[i].total,
-              is_special_diseases: good_info[i].is_special_diseases,
-              good_info: good_info[i],
-              stock_count: good_info[i].stock_count,
-              sum_count:good_info[i].sum_count,
-              batch_retai_price:good_info[i].batch_retai_price
+               console.log("耗材列表2323232322332",good_info)
+              let obj = {
+                id: good_info[i].id,
+                project_name: good_info[i].good_name,
+                statistical_classification: '',
+                single_dose: good_info[i].specification_name,
+                delivery_way: '',
+                execution_frequency: '',
+                number_days: 1,
+                cus_total: 1,
+                price: good_info[i].packing_price,
+                medical_code: good_info[i].medical_insurance_number,
+                unit: this.getGoodUnit(good_info[i].good_unit),
+                type: 3,
+                total: good_info[i].total,
+                is_special_diseases: good_info[i].is_special_diseases,
+                good_info: good_info[i],
+                stock_count:good_info[i].stock_count,
+                sum_count:good_info[i].sum_count,
+                batch_retai_price:good_info[i].batch_retai_price
+              }
+              this.tabProject.push(obj)
             }
-            this.tabProject.push(obj)
-          }
-
-          this.allProject = this.tabProject
-
-
 
-
-        }
-      })
-
-    }, deepClone(source) {
+            console.log("猎豹33323232323223323223233223",this.tabProject)
+            this.allProject = this.tabProject
+          }
+        })
+      }, 
+      deepClone(source) {
       if (!source && typeof source !== 'object') {
         throw new Error('error arguments', 'shallowClone')
       }

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -3043,40 +3043,39 @@
         //       return
         //     }
         //   }
-        console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217){
-           if (row.stock_count <= 0) {
-            if (row.type == 3) {
-              if (selection) {
-                selection.forEach(row => {
-                  if (row.stock_count <= 0) {
-                    this.$refs.tables.toggleRowSelection(row)
-                  }
-                })
-              } else {
-                this.$refs.tables.clearSelection()
-              }
-              this.$message.error(row.project_name + '库存不足')
-              return
-            }
-          }
-        }else{
-           if (row.total <= 0) {
-            if (row.type == 3) {
-              if (selection) {
-                selection.forEach(row => {
-                  if (row.total <= 0) {
-                    this.$refs.tables.toggleRowSelection(row)
-                  }
-                })
-              } else {
-                this.$refs.tables.clearSelection()
-              }
-              this.$message.error(row.project_name + '库存不足')
-              return
-            }
-          }
-
+       // console.log('row', row)
+        // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217){
+        //    if (row.stock_count <= 0) {
+        //     if (row.type == 3) {
+        //       if (selection) {
+        //         selection.forEach(row => {
+        //           if (row.stock_count <= 0) {
+        //             this.$refs.tables.toggleRowSelection(row)
+        //           }
+        //         })
+        //       } else {
+        //         this.$refs.tables.clearSelection()
+        //       }
+        //       this.$message.error(row.project_name + '库存不足')
+        //       return
+        //     }
+        //   }
+        // }else{
+        //    if (row.total <= 0) {
+        //     if (row.type == 3) {
+        //       if (selection) {
+        //         selection.forEach(row => {
+        //           if (row.total <= 0) {
+        //             this.$refs.tables.toggleRowSelection(row)
+        //           }
+        //         })
+        //       } else {
+        //         this.$refs.tables.clearSelection()
+        //       }
+        //       this.$message.error(row.project_name + '库存不足')
+        //       return
+        //     }
+        //   }
         // }
         this.teamList.push(row)
       },
@@ -3155,8 +3154,9 @@
 
           }
         })
-
-      }, deepClone(source) {
+      
+      }, 
+      deepClone(source) {
         if (!source && typeof source !== 'object') {
           throw new Error('error arguments', 'shallowClone')
         }

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -21,7 +21,7 @@
               :label="option.storehouse_name"
               :value="option.id">
             </el-option>
-        </el-select>
+        </el-select> 
         <el-input
           size="small"
           style="width: 200px;"
@@ -135,7 +135,7 @@
           </template>
         </el-table-column>
 
-
+  
         <el-table-column label="操作" align="center" width="240">
           <template slot-scope="scope">
 
@@ -233,11 +233,10 @@
           </el-table-column>
           <el-table-column label="出库对象" align="center" v-if="is_sys == 0">
             <template slot-scope="scope">
-              <span>{{getXuserName(scope.row.admin_user_id)}} </span>
+              <span>{{getXuserName(scope.row.admin_user_id)}} </span>  
             </template>
           </el-table-column>
           <el-table-column label="出货单价" align="center">
-          <el-table-column label="出库单价" align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.price > 0"> {{scope.row.price}}</span>
               <span v-if="scope.row.price == 0"> {{scope.row.retail_price}}</span>
@@ -250,8 +249,8 @@
           </el-table-column> -->
           <el-table-column label="总价" align="center">
             <template slot-scope="scope">
-              <span v-if="scope.row.price > 0">{{(getAllPriceOne(scope.row.drug_id,scope.row.price,scope.row.price/scope.row.min_number)/scope.row.min_number).toFixed(2)}}</span>
-              <span v-if="scope.row.price == 0">{{(getAllPriceOne(scope.row.drug_id,scope.row.retail_price,scope.row.min_price)/scope.row.min_number).toFixed(2)}}</span>
+              <span v-if="scope.row.price > 0">{{getAllPriceOne(scope.row.drug_id,scope.row.price,scope.row.price).toFixed(2)}}</span>
+              <span v-if="scope.row.price == 0">{{getAllPriceOne(scope.row.drug_id,scope.row.retail_price,scope.row.min_price).toFixed(2)}}</span>
             </template>
           </el-table-column>
           <el-table-column label="生产厂家" align="center">
@@ -967,7 +966,7 @@ export default {
          this.manufacturerList = response.data.data.manufacturerList
          this.dealerList = response.data.data.dealerList
          var drugFlowList = response.data.data.drugFlowList
-
+        
          if (is_sys == 1){
            if(drugFlowList.length >0){
             for(let i=0;i<drugFlowList.length;i++){
@@ -980,7 +979,7 @@ export default {
 
             }
            }
-
+        
             this.drugFlowList = drugFlowList
          }
          if(is_sys == 0 || is_sys == 12){
@@ -1006,7 +1005,7 @@ export default {
               list[i].number = ""
            }
          }
-
+        
          this.tableList = list
         }
      })

src/xt_pages/stock/inventoryTransfer/index.vue

@@ -407,6 +407,7 @@ export default {
         page: this.page,
         limit: this.limit,
       };
+      console.log("params32232332323",params)
       getAllSecondOrderList(params).then((response) => {
         if (response.data.state == 1) {
           var list = response.data.data.list;

src/xt_pages/supply/components/addGoodReturn.vue

@@ -1040,8 +1040,6 @@ export default {
                 orderInfo[i].drug.min_number,
                 orderInfo[i].warehouse_out_id
               );
-              }
-             orderInfo[i].count = this.getWarehoseInfoSix(orderInfo[i].drug_warehouse_info,orderInfo[i].drug.max_unit,orderInfo[i].drug.min_unit,orderInfo[i].drug.min_number,orderInfo[i].warehouse_out_id)
               // orderInfo[i].count = orderInfo[i].count + orderInfo[i].supply_unit
             }
 
@@ -1067,7 +1065,6 @@ export default {
 
           this.recordInfo.tableList = [];
           console.log("相亲233232322332323223322323", orderInfo);
-          console.log("乡里233232322332323223322323",orderInfo)
           this.recordInfo.tableList = orderInfo;
           this.tableDataList = [];
           this.tableDataList = orderInfo;
@@ -1463,30 +1460,6 @@ export default {
           for (let i = 0; i < this.recordInfo.tableList.length; i++) {
             if (index == i) {
               this.recordInfo.tableList[i].supply_count = supply_count;
-    getSupplyCount(supply_count,sum_count,supply_unit,type,min_number,max_unit,min_unit,index){
-     console.log("val23322323",sum_count)
-      var total_count = 0
-
-      if(type == 1){
-       if(supply_unit == max_unit){
-          total_count = supply_count * min_number
-       }
-       if(supply_unit == min_unit){
-         total_count = supply_count
-       }
-       console.log("sum_counts",sum_count)
-       console.log("count232232332",total_count)
-       if(total_count > sum_count){
-         this.$message.error("数量不能大于可退数量!")
-         for(let i=0;i<this.recordInfo.tableList.length;i++){
-           if(index == i){
-             this.recordInfo.tableList[i].supply_count = ""
-           }
-         }
-       }else{
-           for(let i=0;i<this.recordInfo.tableList.length;i++){
-            if(index == i){
-              this.recordInfo.tableList[i].supply_count = supply_count
             }
           }
         }
@@ -1514,8 +1487,6 @@ export default {
     },
 
     getWarehoseInfoSix(arr, max_unit, min_unit, min_number, warehouse_out_id) {
-
-   getWarehoseInfoSix(arr, max_unit, min_unit, min_number,warehouse_out_id) {
       var total = 0;
       var max_str = "";
       var min_str = "";

src/xt_pages/user/components/PatientDetail.vue

@@ -266,7 +266,8 @@
               </el-form-item>
 
               <el-form-item label="疑难内瘘:">
-                <el-radio-group v-model="form.troble_shoot">
+
+                <el-radio-group v-model="form.troble_shoot" disabled>
                   <el-radio :label="1">是</el-radio>
                   <el-radio :label="2">否</el-radio>
                 </el-radio-group>

src/xt_pages/user/components/PatientForm.vue

@@ -336,36 +336,16 @@
                   </el-checkbox-group>
                 </el-form-item>
 
-                  <el-form-item label="疑难内瘘:">
-                    <el-radio-group v-model="form.troble_shoot">
-                      <el-radio :label="1">是</el-radio>
-                      <el-radio :label="2">否</el-radio>
-                    </el-radio-group>
-                   </el-form-item>
               </el-col>
               
-              <!-- <el-col :span="8">
+              <el-col :span="8">
                 <el-form-item label="疑难内瘘 : " prop="contagions">
-                  <el-radio-group v-model="form.is_infectious" @change="changeInfectious">
-                    <el-radio :label="1">是</el-radio>
-                    <el-radio :label="2">否</el-radio>
-                  </el-radio-group>
-                  <el-checkbox-group
-                    v-model="form.contagions"
-                    v-if="form.is_infectious == '2'"
-                  >
-                    <el-checkbox
-                      v-for="item in contagionList"
-                      v-if="item.type == 2"
-                      :label="item.id"
-                      :key="item.id"
-                      name="contagions"
-                      :value="item.id"
-                      >{{ item.name }}</el-checkbox
-                    >
-                  </el-checkbox-group>
+                 <el-radio-group v-model="form.troble_shoot">
+                      <el-radio :label="1">是</el-radio>
+                      <el-radio :label="2">否</el-radio>
+                    </el-radio-group>
                 </el-form-item>
-              </el-col> -->
+              </el-col>
 
               <el-col :span="16" v-if="!isEdit">
                 <el-form-item label="检查结果日期 : ">