518合并代码

src/api/data.js

@@ -10,7 +10,7 @@ export function createConfig(params) {
 }
 
 export function createChildConfig(params) {
-  console.log("parasms22222",params)
+  console.log('parasms22222', params)
   return request({
     url: '/api/createchildconfig',
     method: 'post',
@@ -138,26 +138,21 @@ export function getBaseDrugLibList(params) {
   })
 }
 
-
-
-
-export function createMedicineInsurancePercent(params,module) {
+export function createMedicineInsurancePercent(params, module) {
   return request({
-    url: '/api/medicineinsurancepercent/create?module='+module,
+    url: '/api/medicineinsurancepercent/create?module=' + module,
     method: 'post',
     data: params
   })
 }
 
-
-export function getMedicineInsurancePercent(type_id,module) {
+export function getMedicineInsurancePercent(type_id, module) {
   return request({
-    url: '/api/medicineinsurancepercent/get?type_id='+type_id+"&module="+module,
-    method: 'get',
+    url: '/api/medicineinsurancepercent/get?type_id=' + type_id + '&module=' + module,
+    method: 'get'
   })
 }
 
-
 export function createDrugUnitSafeguard(params) {
   return request({
     url: '/api/drugunitsafeguard/create',
@@ -174,8 +169,6 @@ export function deleteDurg(params) {
   })
 }
 
-
-
 export function createMZSick(params) {
   return request({
     url: '/api/mz/sick/create',
@@ -216,10 +209,6 @@ export function GetMZSick(params) {
   })
 }
 
-
-
-
-
 export function createAddition(params) {
   return request({
     url: '/api/addition/create',
@@ -260,10 +249,6 @@ export function GetAddition(params) {
   })
 }
 
-
-
-
-
 export function createDiagnose(params) {
   return request({
     url: '/api/diagnose/create',
@@ -304,28 +289,19 @@ export function GetDiagnose(params) {
   })
 }
 
-export function getAllDrugList(params){
-  
+export function getAllDrugList(params) {
   return request({
-    url:"/api/drug/getalldruglist",
-    method:"Get",
-    params:params
+    url: '/api/drug/getalldruglist',
+    method: 'Get',
+    params: params
   })
 }
 
-export function postSearchDrugList(keyword,params){
-  
+export function postSearchDrugList(keyword, storehouse_id, params) {
   return request({
-    url:"/api/drug/postsearchdruglist?keyword="+keyword,
-    method:"get",
-    params:params
+    url: '/api/drug/postsearchdruglist?keyword=' + keyword + '&storehouse_id=' + storehouse_id,
+    method: 'get',
+    params: params
   })
 }
 
-
-
-
-
-
-
-

src/api/drug/drug_stock.js

@@ -581,3 +581,10 @@ export function getDrugOutOrderPrint(params) {
     params: params
   })
 }
+
+export function GetAllConfigOne() {
+  return request({
+    url: '/api/drugstock/config/list',
+    method: 'get'
+  })
+}

src/api/stock.js

@@ -56,7 +56,6 @@ export function modifyManufacturer(params) {
   })
 }
 
-
 export function getManufacturerList(params) {
   return request({
     url: '/api/stock/manufacturer/list',
@@ -611,9 +610,9 @@ export function getWarehouseOrderInfoList(params) {
   })
 }
 
-export function postSearchGoodList(keyword, params) {
+export function postSearchGoodList(keyword, storehouse_id, params) {
   return request({
-    url: '/api/good/postsearchgoodlist?keyword=' + keyword,
+    url: '/api/good/postsearchgoodlist?keyword=' + keyword + '&storehouse_id=' + storehouse_id,
     method: 'Get',
     params: params
   })

src/xt_pages/data/components/drugs.vue

@@ -966,7 +966,6 @@
      },
 
       handleSuccessTwo({ results, header }) {
-         console.log("header22222",header)
         if (header != undefined && header.length > 0) {
 
           var isHasDrugName = header.includes('*药品名称');

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -2012,6 +2012,9 @@ export default {
        if(arr[i] == "肝素4ml"){
           strname = "肝素4ml"
         }
+       if(arr[i] == "肝素2ml"){
+          strname = "肝素2ml"
+        }
       }
       return strname
     },

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -643,7 +643,7 @@ export default {
       if (keyword != undefined) {
         key = keyword
       }
-    postSearchGoodList(key).then(response => {
+    postSearchGoodList(key,this.storehouse_id).then(response => {
         if (response.data.state == 1) {
             var list = response.data.data.list
            

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -643,7 +643,7 @@
         if (keyword != undefined) {
           key = keyword
         }
-        postSearchGoodList(key).then(response => {
+        postSearchGoodList(key,this.storehouse_id).then(response => {
           if (response.data.state == 1) {
            
              var list = response.data.data.list

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

@@ -640,7 +640,7 @@ export default {
           key = keyword
         }
         let searchArray = [];
-        postSearchDrugList(key).then(response => {
+        postSearchDrugList(key,this.storehouse_id).then(response => {
           if (response.data.state == 1) {
             searchArray = response.data.data.list;
             

src/xt_pages/stock/drugs/cancelDrugStockOrderEdit.vue

@@ -641,7 +641,7 @@
           key = keyword
         }
         let searchArray = [];
-        postSearchDrugList(key).then(response => {
+        postSearchDrugList(key,this.storehouse_id).then(response => {
           if (response.data.state == 1) {
             searchArray = response.data.data.list;
             

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -132,18 +132,18 @@
                 style="padding-top: 10px"
               >
               <div style="display:flex;">
-                <el-input
+                <!-- <el-input
                   oninput="value=value.replace(/\D|^0/g,'')"
                   placeholder="请输入入库数量"
                   type="number"
                   v-model="scope.row.warehousing_count"
                   style="width:120px"
-                ></el-input>
-                 <!-- <el-input
+                ></el-input> -->
+                 <el-input
                   placeholder="请输入入库数量"
                   v-model="scope.row.warehousing_count"
                   style="width:120px"
-                ></el-input> -->
+                ></el-input>
                  <!-- {{scope.row.max_unit}} -->
                   <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px">
                     <el-option
@@ -829,7 +829,7 @@
           key = keyword
         }
         let searchArray = [];
-        postSearchDrugList(key).then(response => {
+        postSearchDrugList(key,this.storehouse_id).then(response => {
           if (response.data.state == 1) {
             searchArray = response.data.data.list;
             

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -163,20 +163,20 @@
                 style="padding-top: 10px;"
               >
                 <div style="display:flex;">
-                  <el-input
+                  <!-- <el-input
                    :disabled="disabled"
                     oninput="value=value.replace(/\D|^0/g,'')"
                     placeholder="请输入入库数量"
                     type="number"
                     v-model="scope.row.warehousing_count"
                     style="width:80px"
-                  ></el-input>
-                   <!-- <el-input
+                  ></el-input> -->
+                   <el-input
                    :disabled="disabled"
                     placeholder="请输入入库数量"
                     v-model="scope.row.warehousing_count"
                     style="width:80px"
-                  ></el-input> -->
+                  ></el-input>
                    <!-- {{scope.row.max_unit}} -->
                    <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px"  :disabled="disabled">
                     <el-option
@@ -848,7 +848,7 @@ export default {
           key = keyword
         }
         let searchArray = [];
-        postSearchDrugList(key).then(response => {
+        postSearchDrugList(key,this.storehouse_id).then(response => {
           if (response.data.state == 1) {
              searchArray = response.data.data.list;
              var list = response.data.data.list

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -119,7 +119,7 @@
           </el-table-column>
 
 
-          <!-- <el-table-column width="150" align="center">
+          <el-table-column width="150" align="center">
             <template slot="header" slot-scope="scope">
               <span>剩余库存</span>
             </template>
@@ -138,7 +138,7 @@
                 </div>
               </el-form-item>
             </template>
-          </el-table-column> -->
+          </el-table-column>
           
           <el-table-column width="200" align="center">
             <template slot="header" slot-scope="scope">
@@ -152,6 +152,7 @@
               >
                 <div style="display:flex;">
                   <el-input
+                   @input="getSupplyCount(scope.row.count,scope.row.max_unit,scope.row.min_unit,scope.$index,scope.row.total_count,scope.row.max_unit_fisrt,scope.row.min_unit_fisrt)"
                     oninput="value=value.replace(/\D|^0/g,'')"
                     style="width:80px"
                     placeholder="请输入出库数量"
@@ -709,7 +710,7 @@ export default {
           key = keyword
         }
         let searchArray = [];
-        postSearchDrugList(key).then(response => {
+        postSearchDrugList(key,this.storehouse_id).then(response => {
           if (response.data.state == 1) {
             searchArray = response.data.data.list;
              var list = response.data.data.list

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -126,7 +126,7 @@
                   </el-form-item>
               </template>
           </el-table-column> -->
-<!--          
+         
          <el-table-column width="150" align="center">
             <template slot="header" slot-scope="scope">
               <span>剩余库存</span>
@@ -146,7 +146,7 @@
                 </div>
               </el-form-item>
             </template>
-          </el-table-column> -->
+          </el-table-column> 
            <el-table-column width="200" align="center">
             <template slot="header" slot-scope="scope">
               <span>出库数量<span style="color: red">*</span></span>
@@ -165,7 +165,7 @@
                     placeholder="请输入出库数量"
                     type="number"
                     v-model="scope.row.count"
-
+                    @input="getSupplyCount(scope.row.count,scope.row.max_unit,scope.row.min_unit,scope.$index,scope.row.total_count,scope.row.max_unit_fisrt,scope.row.min_unit_fisrt)"
                   ></el-input>
                   <el-select v-model="scope.row.count_unit" filterable placeholder="请选择单位" style="width:80px" :disabled="unitShow">
                     <el-option
@@ -340,7 +340,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
 
-  import { deleteDrugWarehouseOutInfo, editDrugWarehouseoutInfo, getDrugWarehouseOutInfo,GetAllConfig,GetAllDrugInfoByID,getDrugBatchNumber } from '@/api/drug/drug_stock'
+  import { deleteDrugWarehouseOutInfo, editDrugWarehouseoutInfo, getDrugWarehouseOutInfo,GetAllConfigOne,GetAllDrugInfoByID,getDrugBatchNumber } from '@/api/drug/drug_stock'
   import BreadCrumb from '../../components/bread-crumb'
   import DrugsStockDialog from './drugsStockDialog/index'
   import {postSearchDrugList } from "@/api/data"
@@ -469,21 +469,21 @@
           spinner: "el-icon-loading",
           background: "rgba(0, 0, 0, 0.7)"
         });
-        GetAllConfig().then(response => {
+        GetAllConfigOne().then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg);
             return false;
           } else {
             this.manufacturer = response.data.data.manufacturer;
             this.dealer = response.data.data.dealer;
-            for(let i = 0; i<  response.data.data.drugs.length;i++){
-              this.goodType.push(response.data.data.drugs[i])
-              if(response.data.data.drugs[i].drug_specs != null) {
-                for (let b = 0; b < response.data.data.drugs[i].drug_specs.length; b++) {
-                  this.goodInfo.push(response.data.data.drugs[i].drug_specs[b])
-                }
-              }
-            }
+            // for(let i = 0; i<  response.data.data.drugs.length;i++){
+            //   this.goodType.push(response.data.data.drugs[i])
+            //   if(response.data.data.drugs[i].drug_specs != null) {
+            //     for (let b = 0; b < response.data.data.drugs[i].drug_specs.length; b++) {
+            //       this.goodInfo.push(response.data.data.drugs[i].drug_specs[b])
+            //     }
+            //   }
+            // }
             this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
             this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
           }
@@ -752,11 +752,17 @@
             var manulist = response.data.data.manulist
             this.manufacturerList = manulist
             this.dealerList =  response.data.data.dealerList
+           
             for (let i = 0; i < response.data.data.list.length; i++) {
+
               response.data.data.list[i].drug_name = response.data.data.list[i].drug.drug_name,
               response.data.data.list[i].drug_type = response.data.data.list[i].drug.drug_type
               response.data.data.list[i].name = response.data.data.list[i].drug.dose + response.data.data.list[i].drug.dose_unit +"*"+response.data.data.list[i].drug.min_number+response.data.data.list[i].drug.min_unit + "/" + response.data.data.list[i].drug.max_unit
-              if(response.data.data.list[i].number == "0" || response.data.data.list[i].number == 0){
+              if(response.data.data.list[i].count%response.data.data.list[i].drug.min_number == 0){
+                 response.data.data.list[i].count = response.data.data.list[i].count/response.data.data.list[i].drug.min_number
+                 response.data.data.list[i].count_unit = response.data.data.list[i].drug.max_unit
+              }
+             if(response.data.data.list[i].number == "0" || response.data.data.list[i].number == 0){
                   response.data.data.list[i].number = ""
               }else{
                 response.data.data.list[i].number = response.data.data.list[i].number
@@ -786,6 +792,7 @@
               response.data.data.list[i].last_price = response.data.data.list[i].last_price
               this.recordInfo.recordData.push(response.data.data.list[i])
             }
+            console.log("我爱的我的2级大风32323232323",this.recordInfo.recordData)
              for(let j=0;j<this.recordInfo.recordData.length;j++){
                for(let i=0;i<manulist.length;i++){
                   if(this.recordInfo.recordData[j].manufacturer == manulist[i].id){
@@ -798,7 +805,7 @@
                  }
                }
               }
-
+            console.log("wode 23232323232322323",this.recordInfo.recordData)
             this.warehouseOut = response.data.data.info
             this.storehouse_id = response.data.data.info.storehouse_id
             this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
@@ -835,7 +842,8 @@
           key = keyword
         }
         let searchArray = [];
-        postSearchDrugList(key).then(response => {
+      
+        postSearchDrugList(key,this.storehouse_id).then(response => {
           if (response.data.state == 1) {
             searchArray = response.data.data.list;
 
@@ -995,7 +1003,7 @@
     },
     created() {
       this.drugTypeList = getDictionaryDataConfig('system','drug_type')
-      this.GetConfigInfo()
+      // this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit
       const order_id = this.$route.query.id
       this.GetOrderDetail(order_id)

src/xt_pages/stock/stockInOrderAdd.vue

@@ -110,8 +110,8 @@
             <template slot-scope="scope">
               <el-form-item :prop="'recordData.' + scope.$index + '.warehousing_count'"
                             :rules='tableRules.warehousing_count' style="padding-top: 20px">
-                <el-input placeholder="请输入入库数量" type="number" v-model="scope.row.warehousing_count"  oninput="value=value.replace(/\D|^0/g,'')"></el-input>
-                <!-- <el-input placeholder="请输入入库数量" v-model="scope.row.warehousing_count"></el-input> -->
+                <!-- <el-input placeholder="请输入入库数量" type="number" v-model="scope.row.warehousing_count"  oninput="value=value.replace(/\D|^0/g,'')"></el-input> -->
+                <el-input placeholder="请输入入库数量" v-model="scope.row.warehousing_count"></el-input>
                   {{scope.row.min_unit}}
               </el-form-item>
             
@@ -759,7 +759,7 @@
         if (keyword != undefined) {
           key = keyword
         }
-        postSearchGoodList(key).then(response => {
+        postSearchGoodList(key,this.storehouse_id).then(response => {
           if (response.data.state == 1) {
            
              var list = response.data.data.list

src/xt_pages/stock/stockInOrderEdit.vue

@@ -179,18 +179,18 @@
                 :rules="tableRules.warehousing_count"
                 style="padding-top: 20px"
               >
-                <el-input
+                <!-- <el-input
                   oninput="value=value.replace(/\D|^0/g,'')"
                   placeholder="请输入入库数量"
                   type="number"
                   v-model="scope.row.warehousing_count"
                    :disabled ="disabled"
-                ></el-input>
-                 <!-- <el-input
+                ></el-input> -->
+                 <el-input
                   placeholder="请输入入库数量"
                   v-model="scope.row.warehousing_count"
                    :disabled ="disabled"
-                ></el-input> -->
+                ></el-input>
                 {{scope.row.min_unit}}
               </el-form-item>
             </template>
@@ -795,7 +795,7 @@ export default {
         if (keyword != undefined) {
           key = keyword
         }
-        postSearchGoodList(key).then(response => {
+        postSearchGoodList(key,this.storehouse_id).then(response => {
           if (response.data.state == 1) {
           
             var list = response.data.data.list

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -127,7 +127,7 @@
             </template>
           </el-table-column>
           
-          <!-- <el-table-column  width="150" align="center">
+          <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
               <span>剩余库存</span>
             </template>
@@ -145,7 +145,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-       -->
+      
 
          <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
@@ -158,6 +158,7 @@
                 style="padding-top: 17px"
               >
                 <el-input
+                 @input="getSupplyCount(scope.row.count,scope.row.stock_count,scope.$index)"
                  oninput="value=value.replace(/\D|^0/g,'')"
                   placeholder="请输入出库数量"
                   type="number"
@@ -732,7 +733,7 @@ export default {
         key = keyword
       }
 
-      postSearchGoodList(key).then(response => {
+      postSearchGoodList(key,this.storehouse_id).then(response => {
         if (response.data.state == 1) {
             var list = response.data.data.list
           

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -161,7 +161,7 @@
             </template>
           </el-table-column>
 
-          <!-- <el-table-column  width="150" align="center">
+           <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
               <span>剩余库存</span>
             </template>
@@ -178,7 +178,7 @@
                 ></el-input>
               </el-form-item>
             </template>
-          </el-table-column> -->
+          </el-table-column> 
 
           <el-table-column width="150" align="center">
             <template slot="header" slot-scope="scope">
@@ -187,7 +187,7 @@
             <template slot-scope="scope">
               <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
                             style="padding-top: 17px">
-                <el-input type="number" v-model="scope.row.count"  :disabled="stockShow"   oninput="value=value.replace(/\D|^0/g,'')"></el-input>
+                <el-input type="number" v-model="scope.row.count"  :disabled="stockShow"   oninput="value=value.replace(/\D|^0/g,'')"  @input="getSupplyCount(scope.row.count,scope.row.stock_count,scope.$index)"></el-input>
               </el-form-item>
             </template>
           </el-table-column>
@@ -729,7 +729,7 @@
         key = keyword
       }
 
-      postSearchGoodList(key).then(response => {
+      postSearchGoodList(key,this.storehouse_id).then(response => {
         if (response.data.state == 1) {
 
             var list = response.data.data.list

src/xt_pages/stock/stockQuery.vue

@@ -148,8 +148,8 @@
        </el-table-column>
        <el-table-column label="出库数量" align="center">
          <template slot-scope="scope">
-          <span v-if="org_id == 9675 || org_id == 3907 || org_id == 9583">{{ getAutoCount(scope.row.id) + getOutCount(scope.row.id) }}</span>
-          <span v-if="org_id!=9675 && org_id!=3907 && org_id!=9583">
+          <span v-if="org_id == 3907 || org_id == 9583">{{ getAutoCount(scope.row.id) + getOutCount(scope.row.id) }}</span>
+          <span v-if="org_id!=3907 && org_id!=9583">
              <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
               <td style="border-right: none; border-inline-end: none;text-align: center">
               {{getWareInfoCount(scope.row.xt_warehouse_info,item.storehouse_id) - getWareInfoCountOne(scope.row.xt_warehouse_info,item.storehouse_id)}}&nbsp;
@@ -161,7 +161,7 @@
 
         <el-table-column label="剩余库存量" align="center">
          <template slot-scope="scope">
-           <span v-if="org_id == 9675 || org_id == 3907 || org_id == 9583">
+           <span v-if="org_id == 3907 || org_id == 9583">
              {{
               getWareInfo(scope.row.xt_warehouse_info) -
               getAutoCount(scope.row.id) -
@@ -169,7 +169,7 @@
               getCancelCount(scope.row.id)
               }}
           </span>
-          <span v-if="org_id!=9675 && org_id!=3907 && org_id!=9583">
+          <span v-if="org_id!=3907 && org_id!=9583">
              <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
               <td style="border-right: none; border-inline-end: none;text-align: center">
                {{getWareInfoCountOne(scope.row.xt_warehouse_info,item.storehouse_id)}}&nbsp;&nbsp;