518合并代码

src/router/modules/patient.js

@@ -226,17 +226,17 @@ export default {
       noCache: true
     }
   },
-  {
-    path: '/patient/patient/templateSummary/print_1',
-    component: () => import('@/xt_pages/user/templateSummaryPrint_1'),
-    hidden: true,
-    is_menu: false,
-    name: 'templateSummary_1',
-    meta: {
-      title: 'templateSummary_1',
-      noCache: true
-    }
-  },
+  // {
+  //   path: '/patient/patient/templateSummary/print_1',
+  //   component: () => import('@/xt_pages/user/templateSummaryPrint_1'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'templateSummary_1',
+  //   meta: {
+  //     title: 'templateSummary_1',
+  //     noCache: true
+  //   }
+  // },
   {
     path: '/patient/patient/hospitalSummary/print',
     component: () => import('@/xt_pages/user/hospitalSummaryPrint'),
@@ -247,7 +247,7 @@ export default {
       title: 'templateSummary',
       noCache: true
     }
-  },
+  }
 
   ]
 }

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -414,7 +414,6 @@
                             :span="8"
                             v-if="isShows('钙剂量')"
                     >
-                    <el-col :span="8" v-if="isShows('钙剂量')" >
                         <el-form-item label="钙剂量(ml) : ">
                             <el-input
                                     type="number"

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -485,7 +485,7 @@
         //   scope.row.prescribing_number = 1
         // }
         if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-          scope.row.retail_price = scope.row.drug.min_price
+             scope.row.retail_price = scope.row.drug.min_price
           // if (scope.row.prescribing_number > scope.row.drug.total) {
           //   this.$message.error(scope.row.drug_name + '库存不足')
           // }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1228,7 +1228,7 @@ export default {
           return false
         } else {
           var drugs = response.data.data.drugs
-          console.log("232323322323332",this.prescriptions)
+          console.log("232323322323332",drugs)
           // for (let i = 0; i < drugs.length; i++) {
           //   drugs[i].count = 0
           //   if (drugs[i].stock_in != null) {

src/xt_pages/stock/detail/print.vue

@@ -445,26 +445,6 @@
     //       }
     //   })
     // },
-    getWarehouseOut(good_id){
-      var total = 0
-      for(let i=0;i<this.wareOutList.length;i++){
-         if(this.wareOutList[i].good_id == good_id){
-            total += this.wareOutList[i].count
-         }
-      }
-      return total
-    }
-     getPrintStockGood(){
-
-      getPrintStockGood(this.queryParams).then(response=>{
-          if(response.data.state == 1){
-            var list =  response.data.data.list
-            console.log("list23323232323232",list)
-            this.wareOutList = list
-
-          }
-      })
-    },
     getWarehouseOut(good_id){
       var total = 0
       for(let i=0;i<this.wareOutList.length;i++){
@@ -481,7 +461,6 @@
       this.goodUnit = this.$store.getters.good_unit
       this.getGoodDetailPrintList()
       this.getStockDetail()
-      this.getPrintStockGood()
     }
 
   }

src/xt_pages/stock/drugs/cancelDrugStockOrderEdit.vue

@@ -291,6 +291,7 @@
   import BreadCrumb from '../../components/bread-crumb'
   import DrugsStockDialog from './drugsStockDialog/index'
   import {postSearchDrugList} from "@/api/data"
+  import { getDataConfig } from "@/utils/data";
   export default {
     components: { DrugsStockDialog, BreadCrumb },
     name: 'cancelStockOrderEdit',
@@ -811,6 +812,7 @@
       }
     },
     created() {
+      this.unitList = getDataConfig('hemodialysis','units')
       this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit
       const order_id = this.$route.query.id

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

@@ -428,21 +428,13 @@ export default {
                order[i].total_price = order[i].count * order[i].last_price
                total_price += order[i].count * order[i].last_price
              }else{
-
+               console.log("555555555555",order[i])
                if(order[i].price > 0){
-
+                console.log("近来33232323322323")
                  if(order[i].count_unit == order[i].min_unit && order[i].max_unit!=order[i].min_unit){
                    order[i].total_price = order[i].count * order[i].price
                  }
-                 if(order[i].count_unit == order[i].max_unit && order[i].max_unit !=order[i].min_unit){
-                   if(order[i].is_sys == 0){
-                     order[i].total_price += order[i].count * order[i].price
-                   }else{
-                     order[i].total_price += order[i].count * order[i].price * order[i].min_number
-                   }
-                 }
-
-                if(order[i].count_unit == order[i].max_unit && order[i].max_unit ==order[i].min_unit){
+                 if(order[i].count_unit == order[i].max_unit){
                    if(order[i].is_sys == 0){
                      order[i].total_price += order[i].count * order[i].price
                    }else{
@@ -461,17 +453,6 @@ export default {
                     order[i].price = this.getPrice(order[i].drug_id)
                  }
 
-                if(order[i].count_unit == order[i].max_unit && order[i].max_unit!=order[i].min_unit){
-                   if(order[i].is_sys == 0){
-                     order[i].total_price += order[i].count * this.getPrice(order[i].drug_id)
-                   }else{
-                     order[i].total_price += order[i].count * this.getPrice(order[i].drug_id) * order[i].min_number
-                   }
-                   order[i].price = this.getPrice(order[i].drug_id)
-                }
-
-                 if(order[i].count_unit == order[i].max_unit && order[i].max_unit==order[i].min_unit){
-
                 if(order[i].count_unit == order[i].max_unit){
                    if(order[i].is_sys == 0){
                      order[i].total_price += order[i].count * this.getPrice(order[i].drug_id)
@@ -479,7 +460,7 @@ export default {
                      order[i].total_price += order[i].count * this.getPrice(order[i].drug_id) * order[i].min_number
                    }
                    order[i].price = this.getPrice(order[i].drug_id)
-                 }
+                }
                 total_price +=order[i].total_price
                }
 

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -1086,7 +1086,7 @@ export default {
           loading.close()
          }
       })
-    }
+    },
     changeUnit(val,index){
     // console.log("val3232323232",val)
     //  for(let i=0;i<this.recordInfo.recordData.length;i++){

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -7,8 +7,7 @@
     </div>
     <div class="app-container ">
       <div id="dialysis-print-box">
-        <div v-if="orgId!=9675 && orgId!=9671 && orgId!=10210">
-        <div v-if="orgId!=9671 && orgId!=10210 && orgId!=10188 && orgId!=10127 && orgId!=10164 && orgId!=3877">
+        <div v-if="orgId!=9671 && orgId!=9675 && orgId!=10210 && orgId!=10188 && orgId!=10127 && orgId!=10164 && orgId!=3877">
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
@@ -69,17 +68,17 @@
           </div>
           <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
             <div style="width:50px;">科室：</div><div style="width:60px;"></div>
-            <div style="width:70px;">领药人：</div><div style="width:60px;"></div>
+            <div style="width:70px;">领料人：</div><div style="width:60px;"></div>
             <div style="width:80px;">审批：</div><div style="width:100px;">肖庆娥</div>
             <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
             <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>
             <div style="width:70px;">制单人：</div><div style="width:100px;">徐立琼</div>
           </div>
         </div>
-      </div>
+      </div> 
 
 
-      <div v-if="orgId == 9671 || orgId == 10210 || orgId == 10188 || orgId == 10127 || orgId ==10164 || orgId ==3877">
+      <div v-if="orgId == 9671 || orgId == 9675 ||  orgId == 10210 || orgId == 10188 || orgId == 10127 || orgId ==10164 || orgId ==3877">
        <div class="dialysis-print-order" v-for="(it,index) in tableData" :key="index" >
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
@@ -122,7 +121,7 @@
                    {{(item.count/item.min_number * item.price).toFixed(2)}}
                 </span>
                 <span v-else> {{(item.count * item.price).toFixed(2)}}</span>
-
+               
              </td>
              <td>{{item.drug_warehouse_info.batch_number}}</td>
              <td>{{(getTime(item.product_date))}}</td>
@@ -145,7 +144,7 @@
           </div>
           <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
             <div style="width:50px;">科室：</div><div style="width:60px;"></div>
-            <div style="width:70px;">领药人：</div><div style="width:60px;"></div>
+            <div style="width:70px;">领料人：</div><div style="width:60px;"></div>
             <div style="width:80px;">审批：</div><div style="width:100px;">肖庆娥</div>
             <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
             <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>
@@ -291,7 +290,7 @@
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.list.push(response.data.data.list[i])
             }
-
+           
           }
         })
       },
@@ -394,7 +393,7 @@
              var info = response.data.data.info
             var warehousing = response.data.data.warehousing
             this.warehouseList = warehousing
-
+          
             for(let i=0;i<info.length;i++){
                info[i].child = []
               for(let j=0;j<warehousing.length;j++){
@@ -403,11 +402,11 @@
                 }
               }
             }
-
+            
             var manufacturerList = response.data.data.manufacturerList
-
+           
             this.manufactureList = manufacturerList
-
+            
             this.tableList = info
             this.tableData = response.data.data.drug_warhouse_out
             console.log("nfo32323223323223232323",this.tableData)
@@ -435,7 +434,7 @@
     created() {
       this.orgName = this.$store.getters.xt_user.org.org_name;
       const order_id = this.$route.query.id;
-      this.orgId = this.$store.getters.xt_user.org.id;
+      this.orgId = this.$store.getters.xt_user.org.id;  
       this.getDrugOutOrderDetailPrint(order_id)
     }
 
@@ -595,4 +594,3 @@
     line-height: 30px;
   }
 </style>
-

src/xt_pages/stock/stockInOrder.vue

@@ -852,7 +852,7 @@ export default {
        {id:0,name:"全部"},
        {id:1,name:"已审核"},
        {id:2,name:"未审核"},
-      ]
+      ],
       check_id: 0,
     };
 

src/xt_pages/stock/stockInOrderAdd.vue

@@ -746,6 +746,7 @@
               'stockIn': this.recordInfo.recordData
             }
             console.log("param232232323232323w",params)
+   
             postWarehouse(params, this.warehousing_time, this.type,this.storehouse_id,this.warehousing_info_id).then(response => {
               if (response.data.state == 0) {
                 this.loading = false

src/xt_pages/stock/stockOutOrder.vue

@@ -109,8 +109,6 @@
         <el-button size="small" type="primary" @click="toExport"
           >导出</el-button
         >
-        <!-- <span>&nbsp;&nbsp;</span>
-        <el-button size="small" type="primary" @click="toExport">导出</el-button>
         <span>&nbsp;&nbsp;</span>
         <label class="title"><span class="name">出库方式</span> :</label>
         <el-select size="small" v-model="way_type" filterable placeholder="请选择仓库" style="width:200px" @change="changeWay">
@@ -120,17 +118,25 @@
               :label="option.name"
               :value="option.id">
             </el-option>
-        </el-select>
-         <span>&nbsp;&nbsp;</span>
-          <label class="title"><span class="name">审核状态</span> :</label>
-          <el-select size="small" v-model="check_type" filterable placeholder="请选择仓库" style="width:200px" @change="changeCheckType">
-              <el-option
-                v-for="(option, index) in checkList"
-                :key="index"
-                :label="option.name"
-                :value="option.id">
-              </el-option>
+        </el-select> 
+
+        <div style="margin-left: 10px">
+          <span>审核状态:</span>
+          <el-select
+            v-model="check_type"
+            style="width: 140px; margin-right: 10px"
+            placeholder="请选择"
+            @change="changeCheckList"
+          >
+            <el-option
+              v-for="item in checkList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
           </el-select>
+        </div>
       </div>
 
       <el-table
@@ -183,14 +189,13 @@
           </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.is_check == 1">已审核</span>
             <span v-if="scope.row.is_check == 2">未审核</span>
           </template>
         </el-table-column>
 
-
         <el-table-column label="操作" align="center" width="300px">
           <template slot-scope="scope">
             <el-tooltip
@@ -1017,36 +1022,13 @@ export default {
         { id: 2, name: "自动出库" },
         { id: 3, name: "调拨出库" },
       ],
-      good_type_id:"",
-      tableShow:false,
-      tableList:[],
-      dialogVisibleTwo:false,
-      userList:[],
-      editdialogVisibleTwo:false,
-      editdialogVisibleThree:false,
-      order_id:"",
-      warehouse_out_time:"",
-      exportList:[],
-      is_sys:0,
-      infoList:[],
-      stockFlowList:[],
-      list:[],
-      houselist:[],
-      storehouse_id:0,
-      is_sys:0,
-      way_type:0,
-      wayList:[
-        { id:0,name:"全部"},
-        { id:1,name:"手动出库"},
-        { id:2,name:"自动出库"},
-        { id:3,name:"调拨出库"}
-      ],
       check_type:0,
       checkList:[
        {id:0,name:"全部"},
        {id:1,name:"已审核"},
        {id:2,name:"未审核"},
-      ]
+      ],
+      check_id: 0,
     };
   },
   methods: {
@@ -1061,6 +1043,7 @@ export default {
         keyword: this.keywords,
         page: this.page,
         limit: this.limit,
+        check_type:this.check_type,
       };
       getAllSecondOrderList(params).then((response) => {
         if (response.data.state == 1) {
@@ -1081,11 +1064,9 @@ export default {
         end_time: this.end_time,
         type: this.type,
         keywords: this.searchKey,
-        storehouse_id:this.storehouse_id,
-        way_type:this.way_type,
-        check_type:this.check_type,
         storehouse_id: this.storehouse_id,
         way_type: this.way_type,
+        check_type:this.check_type,
       };
       this.warehouseOutDate = [];
       getWarehouseOutList(Params).then((response) => {
@@ -1115,8 +1096,6 @@ export default {
         type: this.type,
         storehouse_id: this.storehouse_id,
         way_type: this.way_type,
-        storehouse_id:this.storehouse_id,
-        way_type:this.way_type,
         check_type:this.check_type,
       };
       this.warehouseOutDate = [];
@@ -1251,11 +1230,9 @@ export default {
           "&is_sys=" +
           row.is_sys +
           "&supply_cancel_out_id=" +
-          row.supply_cancel_out_id,
+          row.supply_cancel_out_id+
+          "&is_check="+row.is_check+"&type="+row.type,
       });
-    handleEdit: function(index, row) {
-      this.$router.push({path:'/stock/stockoutorderedit?id='+row.id+"&is_sys="+row.is_sys+"&supply_cancel_out_id="+row.supply_cancel_out_id+"&is_check="+row.is_check+"&type="+row.type})
-
     },
     handleDelete: function (index, row) {
       if (row.is_sys == 12) {
@@ -1266,6 +1243,10 @@ export default {
         this.$message.error("采购出库数据不能删除!");
         return false;
       }
+      if(row.is_check == 1){
+        this.$message.error("已审核的单据不能删除!")
+        return false
+      }
       const ids = [];
       ids.push(row.id);
       const idStr = ids.join(",");
@@ -1330,16 +1311,13 @@ export default {
       const ids = [];
       const idOne = [];
       for (let i = 0; i < this.selectedTableData.length; i++) {
-        if (this.selectedTableData[i].is_sys == 1) {
-          this.$message.error("自动出库数据不能删除!");
-          return false;
         if(this.selectedTableData[i].is_check == 1){
-          this.$message.error("已审核单据不能删除")
+          this.$message.error("已审核单据不能删除!")
           return false
         }
-        if(this.selectedTableData[i].is_sys == 1){
-          this.$message.error("自动出库数据不能删除!")
-          return false
+        if (this.selectedTableData[i].is_sys == 1) {
+          this.$message.error("自动出库数据不能删除!");
+          return false;
         }
         if (this.selectedTableData[i].is_sys == 12) {
           this.$message.error("调拨出库数据不能删除!");
@@ -1347,15 +1325,11 @@ export default {
         }
         if (this.selectedTableData[i].is_sys == 0) {
           ids.push(this.selectedTableData[i].id);
-          idOne.push(this.selectedTableData[i].supply_cancel_out_id);
+          if(this.selectedTableData[i].supply_cancel_out_id > 0){
+            idOne.push(this.selectedTableData[i].supply_cancel_out_id);
+          }
+        
         }
-         if(this.selectedTableData[i].is_sys == 0){
-           ids.push(this.selectedTableData[i].id);
-           if(this.selectedTableData[i].supply_cancel_out_id > 0){
-             idOne.push(this.selectedTableData[i].supply_cancel_out_id)
-           }
-
-         }
       }
       if (idOne.length > 0) {
         this.$message.error("采购出库数据不能删除!");
@@ -2062,25 +2036,10 @@ export default {
     changeWay() {
       this.GetWarehouseOut();
     },
-  },
-    }
-    if(storehouse_name == "全部"){
-      return ""
-    }else{
-       return storehouse_name
+    changeCheckList(){
+      this.GetWarehouseOut();
     }
-
-   },
-   changeStoreHouse(){
-     this.GetWarehouseOut()
-   },
-   changeWay(){
-     this.GetWarehouseOut()
-   },
-   changeCheckType(){
-    this.GetWarehouseOut()
-   }
-  }
+  },
 };
 </script>
 

src/xt_pages/stock/stockPrint.vue

@@ -37,34 +37,30 @@
                             </thead>
                             <tbody>
                                 <tr v-for='(item,index) in tableList' :key="index">
-                                   <td  style="text-align:center">{{getGoodType(item.good_type_id)}}</td>
-                                   <td  style="text-align:center">{{item.good_name }}</td>
-                                   <td  style="text-align:center"><span>{{item.specification_name }} / {{item.packing_unit}}</span></td>
-                                   <td  style="text-align:center">{{item.social_security_directory_code}}</td>
-                                   <td  style="text-align:center">{{item.buy_price}}</td>
-                                   <td  style="text-align:center">{{getManufacture(item.manufacturer)}}</td>
-                                   <td  style="text-align:center">
+                                   <td>{{getGoodType(item.good_type_id)}}</td>
+                                   <td>{{item.good_name }}</td>
+                                   <td><span>{{item.specification_name }} / {{item.packing_unit}}</span></td>
+                                   <td>{{item.social_security_directory_code}}</td>
+                                   <td>{{item.buy_price}}</td>
+                                   <td>{{getManufacture(item.manufacturer)}}</td>
+                                   <td>
                                       <span v-if="getWareInfo(item.xt_warehouse_info)>0">{{getWareInfo(item.xt_warehouse_info)}}{{item.packing_unit}}</span>
                                    </td>
-                                   <td v-if="end_time == ''"  style="text-align:center">
-                                      <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10290 || org_id == 10265">
                                    <td v-if="end_time == ''">
                                       <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10290 || org_id == 10265 || org_id == 10210">
                                         <span>
-                                          {{getWareInfo(item.xt_warehouse_info) - getOverFlushInfo(item.xt_warehouse_info) + getCancelSotckInfo(item.cancel_stock_info)}}
                                           {{getWareInfo(item.xt_warehouse_info) - getOverFlushInfo(item.xt_warehouse_info)}}
                                         </span>
                                       </span>
                                       <span v-else>{{getAutoCount(item.id) + getOutCount(item.id)}} </span>
                                    </td>
 
-                                   <td v-if="end_time!=''"  style="text-align:center">
-                                    {{getAutoCount(item.id) + getOutCount(item.id)}}
+                                   <td v-if="end_time!=''">
+                                    {{getAutoCount(item.id) + getOutCount(item.id)}} 
                                    </td>
-
-
-                                   <td v-if="end_time == ''"  style="text-align:center">
-                                     <span v-if="org_id == 9671 ||  org_id == 9675 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10290 || org_id == 10265 || org_id == 10210">
+                                  
+                                   <td v-if="end_time == ''">
+                                     <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10290 || org_id == 10265 || org_id == 10210">
                                         {{getOverFlushInfo(item.xt_warehouse_info)}}
                                      </span>
                                      <span v-else>
@@ -73,8 +69,6 @@
                                    </td>
                                    <td v-if="end_time!=''">
                                     {{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id)  }}
-                                   <td v-if="end_time!=''" style="text-align:center">
-                                    {{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id) + getCancelCount(item.id) }}
                                    </td>
                                 </tr>
                             </tbody>
@@ -321,6 +315,7 @@ export default {
         total += arr[i].stock_count
       }
      }
+     console.log("totla23323232",total)
      return total
    },
    getCancelSotckInfo(arr){
@@ -335,7 +330,7 @@ export default {
    },
     created(){
       this.org_id =  this.$store.getters.xt_user.org_id
-
+     
       var starttime =  this.$route.query.start_time
       this.start_time = starttime
       var endtime =  this.$route.query.end_time
@@ -376,7 +371,7 @@ export default {
       border: 1px solid;
       border-collapse: collapse;
       padding: 2px;
-
+      
 
       thead {
         tr {