数据

src/api/advice.js

@@ -52,7 +52,7 @@ export function ExecDoctorAdvice(patient, id, time, mode,origin) {
     mode: mode,
     origin:origin,
   };
-  console.log("paras------",params)
+ 
   return request({
     url: "/api/patients/advice/exec",
     method: "Post",

src/api/data.js

@@ -304,7 +304,23 @@ export function GetDiagnose(params) {
   })
 }
 
+export function getAllDrugList(params){
+  
+  return request({
+    url:"/api/drug/getalldruglist",
+    method:"Get",
+    params:params
+  })
+}
 
+export function postSearchDrugList(keyword,params){
+  
+  return request({
+    url:"/api/drug/postsearchdruglist?keyword="+keyword,
+    method:"get",
+    params:params
+  })
+}
 
 
 

src/api/drug/drug_stock.js

@@ -438,6 +438,23 @@ export function getDrugWarehouseOrderInfo(params){
 }
 
 
+export function getDrugStockList(params){
+  
+  return request({
+    url:"/api/drugstock/drugstocklist",
+    method:"get",
+    params:params
+  })
+}
+
 
+export function getDrugStockFlow(params){
+  
+  return request({
+    url:"/api/drugstock/getdrugstockflow",
+    method:"Get",
+    params:params
+  })
+}
 
 

src/api/stock.js

@@ -618,4 +618,13 @@ export function getWarehouseOrderInfoList(params){
       method:"get",
       params:params
    })
-} 
+} 
+
+export function postSearchGoodList(keyword,params){
+  
+  return request({
+    url:"/api/good/postsearchgoodlist?keyword="+keyword,
+    method:"Get",
+    params:params
+  })
+}

src/router/modules/drugs.js

@@ -79,7 +79,8 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'drugStockInOrderAdd', noCache: true }
-    },{
+    },
+    {
       path: '/drugstock/in/detail',
       component: () => import('@/xt_pages/stock/drugs/drugStockInDetail'),
       name: 'drugStockInDetail',
@@ -128,7 +129,8 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'cancelDrugStockDetail', noCache: true }
-    },{
+    },
+    {
       path: '/drugstock/user/detail',
       component: () => import('@/xt_pages/stock/drugs/drugStockUserDetail'),
       name: 'drugStockUserDetail',
@@ -136,5 +138,32 @@ export default {
       is_menu: false,
       meta: { title: 'drugStockUserDetail', noCache: true }
     },
+
+    //编辑药品入库单
+    {
+      path:'/drugstock/in/order/edit',
+      component:()=>import('@/xt_pages/stock/drugs/drugStockInOrderEdit'),
+      name:'drugStockInOrderEdit',
+      hidden:true,
+      is_menu:false,
+      meta: { title: 'drugStockInOrderEdit', noCache: true }
+    },
+
+    {
+      path:'/drugstock/in/drugstockflow',
+      component:()=>import('@/xt_pages/stock/drugs/drugStockFlow'),
+      name:"drugStockFlow",
+      hidden:true,
+      is_menu:false,
+      meta:{title:"drugStockFlow",noCache:true}
+    },
+    {
+      path:'/drugstock/in/drugbatchnumber',
+      component:()=>import('@/xt_pages/stock/drugs/drugBatchNumber'),
+      name:"drugBatchNumber",
+      hidden:true,
+      is_menu:false,
+      meta:{title:"drugBatchNumber",noCache:true}
+    }
   ]
 }

src/xt_pages/data/components/addConsumable.vue

@@ -48,9 +48,53 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="规格型号 : " prop="name" style="width:100%">
+                        <!-- <el-form-item label="规格型号 : " prop="name" style="width:100%">
                             <el-input v-model="form.specification_name" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
+                        </el-form-item> -->
+                       <div style="width:100%;">
+                          <div><span style="color:red;">*</span>单位&规格: <span style="color:#999">例如：0.75 g * 60 粒 / 盒</span></div>
+                        </div>
+                       <div style="width:100%;display:flex;align-items:center;">
+                            <el-form-item prop="dosage" class="noMargin">
+                              <el-input v-model="form.dosage" type="number" style="width:100px" placeholder="剂量" :disabled="dosageShow"></el-input>  
+                            </el-form-item>
+                            <el-form-item prop="max_unit" class="noMargin">
+                              <el-select v-model="form.max_unit" style="width:160px;" placeholder="剂量单位" @change="changeMaxUnit">
+                                <el-option
+                                  v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                                  :key="index"
+                                  :label="item.name"
+                                  :value="item.name">
+                                </el-option>
+                            </el-select>
+                          </el-form-item>
+                            *
+                            <el-form-item prop="min_number" class="noMargin">
+                              <el-input v-model="form.min_number" style="width:100px" type="number" placeholder="拆零"> </el-input>
+                            </el-form-item>
+                            <el-form-item prop="min_unit" class="noMargin">
+                              <el-select v-model="form.min_unit" style="width:160px;"  placeholder="拆零单位"  @change="changeMinUnit">
+                                <el-option
+                                  v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                                  :key="index"
+                                  :label="item.name"
+                                  :value="item.name">
+                                </el-option>
+                              </el-select>
+                          </el-form-item>
+                          /
+                          <el-form-item prop="packing_unit" class="noMargin">
+                            <el-select v-model="form.packing_unit" style="width:160px;" placeholder="包装单位">
+                              <el-option
+                                v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.name">
+                              </el-option>
+                            </el-select>
+                          </el-form-item>
+                        </div>
+                       
                         <el-form-item label="生产厂商 : " prop="name" style="width:100%">
                             <el-select v-model="form.manufacturer" style="width:100%" placeholder="请选择">
                                 <el-option

src/xt_pages/data/components/addDrugs.vue

@@ -9,31 +9,17 @@
         <el-tabs v-model="activeName">
             <el-tab-pane label="基础数据" name="first">
                 <div>
-                    <el-form :model="form" :rules="rules" ref="form" label-width="120px"
-                             style="display: flex;flex-wrap: wrap;justify-content: space-between;">
+                    <el-form :model="form" :rules="rules" ref="form" label-width="120px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
                         <el-form-item label="药品名称 : " prop="drug_name">
                             <el-input v-model="form.drug_name" style="width:160px;" placeholder=""
                                       maxlength="30"></el-input>
                         </el-form-item>
-                        <el-form-item label="拼音 : ">
-                            <el-input v-model="form.pinyin" style="width:160px;" placeholder=""
-                                      maxlength="30"></el-input>
-                        </el-form-item>
-                        <el-form-item label="五笔 : ">
-                            <el-input v-model="form.wubi" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item>
+                      
                         <el-form-item label="药品别名 : ">
                             <el-input v-model="form.drug_alias" style="width:160px;" placeholder=""
                                       maxlength="30"></el-input>
                         </el-form-item>
-                        <el-form-item label="别名拼音 : " prop="drug_alias_pinyin">
-                            <el-input v-model="form.drug_alias_pinyin" style="width:160px;" placeholder=""
-                                      maxlength="30"></el-input>
-                        </el-form-item>
-                        <el-form-item label="别名五笔 : " prop="drug_alias_wubi">
-                            <el-input v-model="form.drug_alias_wubi" style="width:160px;" placeholder=""
-                                      maxlength="30"></el-input>
-                        </el-form-item>
+                        
                         <el-form-item label="药品类别 : " prop="drug_category">
                             <el-select v-model="form.drug_category" style="width:160px;" placeholder="请选择">
                                 <el-option
@@ -44,10 +30,51 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="药品规格 : " prop="drug_spec">
-                            <el-input v-model="form.drug_spec" style="width:160px;" placeholder=""
-                                      maxlength="30"></el-input>
-                        </el-form-item>
+                        <div style="width:100%;">
+                          <div><span style="color:red;">*</span>单位&规格: <span style="color:#999">例如：0.75 g * 60 粒 / 盒</span></div>
+                        </div>
+                        <div style="width:100%;display:flex;align-items:center;">
+                            <el-form-item prop="dose" class="noMargin">
+                              <el-input v-model="form.dose" type="number" style="width:100px" placeholder="剂量" :disabled="dosageShow"></el-input>  
+                            </el-form-item>
+                            <el-form-item prop="dose_unit" class="noMargin">
+                              <el-select v-model="form.dose_unit" style="width:160px;" placeholder="剂量单位" @change="changeMaxUnit">
+                                <el-option
+                                  v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                                  :key="index"
+                                  :label="item.name"
+                                  :value="item.name">
+                                </el-option>
+                            </el-select>
+                          </el-form-item>
+                            *
+                            <el-form-item prop="min_number" class="noMargin">
+                              <el-input v-model="form.min_number" style="width:100px" type="number" placeholder="拆零"> </el-input>
+                            </el-form-item>
+                            <el-form-item prop="min_unit" class="noMargin">
+                              <el-select v-model="form.min_unit" style="width:160px;"  placeholder="拆零单位"  @change="changeMinUnit">
+                                <el-option
+                                  v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                                  :key="index"
+                                  :label="item.name"
+                                  :value="item.name">
+                                </el-option>
+                              </el-select>
+                          </el-form-item>
+                          /
+                          <el-form-item prop="max_unit" class="noMargin">
+                            <el-select v-model="form.max_unit" style="width:160px;" placeholder="包装单位">
+                              <el-option
+                                v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.name">
+                              </el-option>
+                            </el-select>
+                          </el-form-item>
+                        </div>
+                       
+                        
                         <el-form-item label="药品类型 : " prop="drug_type">
                             <el-select v-model="form.drug_type" style="width:160px;" placeholder="请选择">
                                 <el-option
@@ -58,7 +85,49 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="库存警戒:" prop="drug_stock_limit">
+
+                      <el-form-item label="默认给药途径:" prop="delivery_way">
+                        <el-select v-model="form.delivery_way" style="width:160px;" placeholder="请选择">
+                            <el-option
+                                    v-for="(item, index) in deliveryWayOptions"
+                                    :key="index"
+                                    :label="item.name"
+                                    :value="item.name">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="默认执行频率:" prop="execution_frequency">
+                        <el-select v-model="form.execution_frequency" style="width:160px;" placeholder="请选择">
+                            <el-option
+                                    v-for="(item,index) in executionFrequencyOptions"
+                                    :key="index"
+                                    :label="item.name"
+                                    :value="item.name">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                  
+                    <el-form-item label="默认单次用量 : " prop="drug_dose">
+                         <el-input v-model="form.drug_dose" style="width:70px;margin-right:5px;" placeholder=""
+                                      maxlength="30"></el-input>
+                          <el-select v-model="form.drug_dose_unit" style="width:80px;" placeholder="单次用量单位">
+                                <el-option
+                                        v-for="(item,index) in unitList"
+                                        :key="index"
+                                        :label="item.name"
+                                        :value="item.id">
+                                </el-option>
+                           </el-select>
+                     </el-form-item>
+                    <el-form-item label="默认开药数量:" prop="prescribing_number">
+                        <el-input v-model="form.prescribing_number" style="width:160px;" placeholder=""
+                                  maxlength="30"></el-input>
+                    </el-form-item>
+                    <el-form-item label="默认开药天数:" prop="prescribing_number">
+                        <el-input v-model="form.drug_day" style="width:160px;" placeholder=""
+                                  maxlength="30"></el-input>
+                    </el-form-item>
+                       <el-form-item label="库存警戒:" prop="drug_stock_limit">
                             <el-input v-model="form.drug_stock_limit" style="width:160px;" placeholder=""
                                       maxlength="30"></el-input>
                         </el-form-item>
@@ -86,35 +155,20 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="最大单位 : " prop="max_unit">
-                            <el-select v-model="form.max_unit" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                        v-for="item,index in getDataConfig('hemodialysis','units')"
-                                        :key="index"
-                                        :label="item.name"
-                                        :value="item.name">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="最小单位 : " prop="min_unit">
-                            <el-select v-model="form.min_unit" style="width:160px;" placeholder="请选择">
-                                <el-option
-                                        v-for="item,index in getDataConfig('hemodialysis','units')"
-                                        :key="index"
-                                        :label="item.name"
-                                        :value="item.name">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
+                       
                         <el-form-item label="单位换算 : ">
                             <el-input v-model="form.unit_matrixing" style="width:160px;" placeholder=""
                                       maxlength="30"></el-input>
                         </el-form-item>
-                        <el-form-item label="零售价(元) : " prop="retail_price">
-                            <el-input v-model="form.retail_price" style="width:160px;" placeholder=""
+                        <el-form-item label="拆零零售价(元) : " prop="min_price">
+                            <el-input v-model="form.min_price" style="width:160px;" placeholder=""
+                                      maxlength="30"></el-input>
+                        </el-form-item>
+                        <el-form-item label="包装零售价(元) : " prop="retail_price">
+                          <el-input v-model="form.retail_price" style="width:160px;" placeholder=""
                                       maxlength="30"></el-input>
                         </el-form-item>
-                        <el-form-item label="上次进价(元) : " prop="last_price">
+                        <el-form-item label="进货价(元) : " prop="last_price">
                             <el-input v-model="form.last_price" style="width:160px;" placeholder=""
                                       maxlength="30"></el-input>
                         </el-form-item>
@@ -142,24 +196,13 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="剂量 : " prop="drug_dose">
-                            <el-input v-model="form.drug_dose" style="width:70px;margin-right:5px;" placeholder=""
-                                      maxlength="30"></el-input>
-                            <el-select v-model="form.drug_dose_unit" style="width:80px;" placeholder="请选择">
-                                <el-option
-                                        v-for="item,index in getDataConfig('hemodialysis','units')"
-                                        :key="index"
-                                        :label="item.name"
-                                        :value="item.id">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
+                      
 
 
                         <el-form-item label="限制性用药 : ">
                             <el-select v-model="form.lmt_used_flag" style="width:160px;" placeholder="请选择">
                                 <el-option
-                                        v-for="item,index in lmt_used_flags"
+                                        v-for="(item,index) in lmt_used_flags"
                                         :key="index"
                                         :label="item.name"
                                         :value="item.id">
@@ -171,7 +214,7 @@
                         <el-form-item label="审批标志 : ">
                             <el-select v-model="form.hosp_appr_flag" style="width:160px;" placeholder="请选择">
                                 <el-option
-                                        v-for="item,index in hosp_appr_flags"
+                                        v-for="(item,index) in hosp_appr_flags"
                                         :key="index"
                                         :label="item.name"
                                         :value="item.id">
@@ -185,15 +228,7 @@
                                       maxlength="30"></el-input>
                         </el-form-item>
                         <el-form-item label="生产厂商 : " prop="manufacturer">
-                            <!-- <el-select v-model="form.manufacturer" style="width:160px;" placeholder="请选择">
-                              <el-option
-                                v-for="item,index in manufacturers"
-                                :key="index"
-                                :label="item.manufacturer_name"
-                                :value="item.id">
-                              </el-option>
-                            </el-select> -->
-
+                           
                             <el-select v-model="form.manufacturer" style="width:160px;" filterable placeholder="请选择">
                                 <el-option
                                         v-for="(item,index) in manufacturerList"
@@ -230,7 +265,7 @@
                         <el-form-item label="是否特病目录:" prop="is_special_diseases">
                             <el-select v-model="form.is_special_diseases" style="width:160px;" placeholder="请选择">
                                 <el-option
-                                        v-for="item,index in options"
+                                        v-for="(item,index) in options"
                                         :key="index"
                                         :label="item.label"
                                         :value="item.value">
@@ -240,7 +275,7 @@
                         <el-form-item label="是否备案 : " prop="is_record">
                             <el-select v-model="form.is_record" style="width:160px;" placeholder="请选择">
                                 <el-option
-                                        v-for="item,index in options"
+                                        v-for="(item,index) in options"
                                         :key="index"
                                         :label="item.label"
                                         :value="item.value">
@@ -251,7 +286,7 @@
                         <el-form-item label="处方药标志">
                             <el-select v-model="form.prescription_mark" style="width:160px;" placeholder="请选择">
                                 <el-option
-                                        v-for="item,index in options"
+                                        v-for="(item,index) in options"
                                         :key="index"
                                         :label="item.label"
                                         :value="item.value">
@@ -263,6 +298,8 @@
                             <el-input v-model="form.social_security_directory_code" style="width:180px"></el-input>
                         </el-form-item>
 
+
+
                         <el-form-item label="备案日期:">
                             <el-date-picker
                                     value-format="yyyy-MM-dd"
@@ -275,10 +312,7 @@
                         <el-form-item label="药品备注:">
                             <el-input v-model="form.drug_remark" style="width:180px"></el-input>
                         </el-form-item>
-                        <!-- <el-form-item label="代理商 : " prop="agent">
-                          <el-input v-model="form.agent" style="width:160px;" placeholder="" maxlength="30"></el-input>
-                        </el-form-item> -->
-
+                      
                         <el-form-item label="经销商: " style="width:100%">
 
                             <el-select v-model="form.dealer" style="width:100%;" filterable placeholder="请选择">
@@ -314,38 +348,11 @@
             <el-tab-pane label="扩展数据" name="second">
                 <el-form :model="form" label-width="120px"
                          style="display: flex;flex-wrap: wrap;justify-content: space-between;">
-                    <el-form-item label="默认给药途径:" prop="delivery_way">
-                        <el-select v-model="form.delivery_way" style="width:160px;" placeholder="请选择">
-                            <el-option
-                                    v-for="item, index in deliveryWayOptions"
-                                    :key="index"
-                                    :label="item.name"
-                                    :value="item.name">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="默认执行频率:" prop="execution_frequency">
-                        <el-select v-model="form.execution_frequency" style="width:160px;" placeholder="请选择">
-                            <el-option
-                                    v-for="item,index in executionFrequencyOptions"
-                                    :key="index"
-                                    :label="item.name"
-                                    :value="item.name">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="默认单次用量:" prop="single_dose">
-                        <el-input v-model="form.single_dose" style="width:160px;" placeholder=""
-                                  maxlength="30"></el-input>
-                    </el-form-item>
-                    <el-form-item label="默认开药数量:" prop="prescribing_number">
-                        <el-input v-model="form.prescribing_number" style="width:160px;" placeholder=""
-                                  maxlength="30"></el-input>
-                    </el-form-item>
+           
                     <el-form-item label="标签:" prop="label">
                         <el-select v-model="form.label" style="width:160px;" placeholder="请选择">
                             <el-option
-                                    v-for="item,index in sign"
+                                    v-for="(item,index) in sign"
                                     :key="index"
                                     :label="item.name"
                                     :value="item.id">
@@ -358,7 +365,7 @@
                     <el-form-item label="是否常用医嘱:" prop="is_use_doctor_advice">
                         <el-select v-model="form.is_use_doctor_advice" style="width:160px;" placeholder="请选择">
                             <el-option
-                                    v-for="item,index in options"
+                                    v-for="(item,index) in options"
                                     :key="index"
                                     :label="item.label"
                                     :value="item.value">
@@ -368,7 +375,7 @@
                     <el-form-item label="是否默认:" prop="is_default">
                         <el-select v-model="form.is_default" style="width:160px;" placeholder="请选择">
                             <el-option
-                                    v-for="item,index in options"
+                                    v-for="(item,index) in options"
                                     :key="index"
                                     :label="item.label"
                                     :value="item.value">
@@ -520,23 +527,34 @@
           prescription_mark: '',//处方药标志
           social_security_directory_code: '',//社保目录编码
           record_date: '',//备案日期
-          drug_remark: ''//药品备注
+          drug_remark: '',//药品备注
+          drug_day:"",//默认开药天数
+          min_number:"",//拆零数量
+          min_price:"",//拆零零售价
+          dose_unit:"",//剂量
+          dose:"",//剂量单位
         },
 
         rules: {
           drug_name: [{ required: true, message: '请填写药品名称', trigger: 'blur' }],
           drug_alias: [{ required: true, message: '请选择药品类别', trigger: 'change' }],
-          drug_spec: [{ required: true, message: '请填写药品规格', trigger: 'blur' }],
+          // drug_spec: [{ required: true, message: '请填写药品规格', trigger: 'blur' }],
+          dosage:[{required:true,message:'请输入药品剂量',trigger:'blur'}],
+          max_unit: [{ required: true, message: '请填写剂量单位', trigger: 'change' }],
+          min_unit: [{ required: true, message: '请填写拆零单位', trigger: 'change' }],
+          unval:[{required:true,message:"请填写拆零",trigger:'change'}],
+          min_number:[{required:true,message:"请填写拆零",trigger:'change'}],
+          packing_unit: [{ required: true, message: '请填写包装单位', trigger: 'change' }],
           drug_type: [{ required: true, message: '请填写药品类型', trigger: 'blur' }],
           drug_stock_limit: [{ required: true, message: '请填写库存警戒', trigger: 'blur' }],
           drug_origin_place: [{ required: true, message: '请填写产地', trigger: 'blur' }],
           drug_dosage_form: [{ required: true, message: '请填写药品剂型', trigger: 'blur' }],
           medical_insurance_level: [{ required: true, message: '请选择医保等级', trigger: 'change' }],
-          max_unit: [{ required: true, message: '请填写最大单位', trigger: 'change' }],
-          min_unit: [{ required: true, message: '请填写最小单位', trigger: 'change' }],
+         
           unit_matrixing: [{ required: true, message: '请填写单位换算', trigger: 'blur' }],
-          retail_price: [{ required: true, message: '请填写零售价', trigger: 'blur' }],
-          last_price: [{ required: true, message: '请填写上次进价', trigger: 'blur' }],
+          retail_price: [{ required: true, message: '请填写拆零零售价', trigger: 'blur' }],
+          last_price: [{ required: true, message: '请填写进货价', trigger: 'blur' }],
+          packing_price:[{required:true,message:'请填写包装零售价',trigger:'blur'}],
           drug_classify: [{ required: true, message: '请选择药物分类', trigger: 'change' }],
           drug_dose: [{ required: true, message: '请填写剂量', trigger: 'blur' }],
           manufacturer: [{ required: true, message: '请选择生产产商', trigger: 'change' }],
@@ -547,7 +565,7 @@
           drug_remark: [{ required: true, message: '请填写药品备注' }],
           lmt_used_flag:[{ required: true, message: '请选择是否限制用药' }],
           hosp_appr_flag:[{ required: true, message: '请选择审批标志' }],
-
+      
         },
         page: 1,
         limit: 500,
@@ -560,7 +578,9 @@
         drugControlList:[],
         drugClassifyList:[],
         statisticsCategoryList:[],
-        pharmacologyCategoryList:[]
+        pharmacologyCategoryList:[],
+        dosageShow:false,
+        unitList:[]
       }
     },
     props: {
@@ -619,11 +639,28 @@
         this.form.intro = ''
       },
       show(id, obj) {
-        console.log("obj333333333",obj)
+        
+        this.unitList = []
+        var arr =  getDataConfig('hemodialysis','units')
+        for(let i=0;i<arr.length;i++){
+            if(obj.max_unit == arr[i].name){
+              this.unitList.push(arr[i])
+            }
+        }
+        for(let i=0;i<arr.length;i++){
+            if(obj.min_unit == arr[i].name){
+              this.unitList.push(arr[i])
+            }
+        }
         this.getInitializtion()
         this.getlist()
         this.GetAllConfig()
-        obj.drug_classify = parseInt(obj.drug_classify)
+        if(obj.drug_classify == 0){
+           obj.drug_classify = ""
+        }else{
+          obj.drug_classify = parseInt(obj.drug_classify)
+        }
+       
         if(obj.dealer == 0){
            obj.dealer = ""
         }
@@ -735,10 +772,14 @@
         form['social_security_directory_code'] = this.form.social_security_directory_code
         form['record_date'] = this.form.record_date
         form['drug_remark'] = this.form.drug_remark
-
         form['hosp_appr_flag'] = this.form.hosp_appr_flag
         form['lmt_used_flag'] = this.form.lmt_used_flag
-       
+
+        form['min_number'] = this.form.min_number
+        form["drug_day"] = this.form.drug_day
+        form['dose'] = this.form.dose,
+        form['dose_unit'] = this.form.dose_unit
+        form['min_price'] = this.form.min_price
         return form
       },
       getlist() {
@@ -768,31 +809,68 @@
         getInitializtion().then(response=>{
            if(response.data.state ==1){
              var drugCategoryList =  response.data.data.drugCategoryList
-             console.log("药品类别",drugCategoryList) 
+            
              this.drugCategoryList = drugCategoryList
              var drugTypeList = response.data.data.drugTypeList
-              console.log("药物分类",drugTypeList)
+             
               this.drugTypeList = drugTypeList
              var drugDosageFormList =  response.data.data.drugDosageFormList
-             console.log("药品剂型",drugDosageFormList) 
+            
              this.drugDosageFormList = drugDosageFormList
              var medicalInsuranceLevelList =  response.data.data.medicalInsuranceLevelList
-             console.log("医保等级",medicalInsuranceLevelList)
+           
              this.medicalInsuranceLevelList = medicalInsuranceLevelList
              var drugControlList = response.data.data.drugControlList
-             console.log("开药控制",drugControlList)
+             
              this.drugControlList = drugControlList
              var drugClassifyList = response.data.data.drugClassifyList
-             console.log("药物分类",drugClassifyList)
+           
              this.drugClassifyList = drugClassifyList
              var statisticsCategoryList =  response.data.data.statisticsCategoryList
-             console.log("统计分类",statisticsCategoryList)
+            
              this.statisticsCategoryList = statisticsCategoryList
              var pharmacologyCategoryList = response.data.data.pharmacologyCategoryList
-             console.log("药理分类",pharmacologyCategoryList)
+           
              this.pharmacologyCategoryList = pharmacologyCategoryList
            }
         })
+      },
+      changeMaxUnit(val){
+        if(val == this.form.min_unit){
+          this.form.dose = 1
+          this.dosageShow = true
+        }
+        if(val !=this.form.min_unit){
+          this.dosageShow = false 
+        } 
+       var arr =  getDataConfig('hemodialysis','units')
+      
+       for(let i=0;i<arr.length;i++){
+          if(val == arr[i].name){
+             this.unitList.push(arr[i])
+          }
+       }
+               
+      },
+      changeMinUnit(val){
+        if(val == this.form.max_unit){
+          this.form.dose = 1
+          this.dosageShow = true
+        }
+        if(val != this.form.max_unit){
+          this.dosageShow = false
+        }
+        
+        if(this.form.dosage == "" || this.form.max_unit == ""){
+           this.form.min_number = 1
+        } 
+        var arr =  getDataConfig('hemodialysis','units')
+        for(let i=0;i<arr.length;i++){
+            if(val == arr[i].name){
+              this.unitList.push(arr[i])
+            }
+        }
+       
       }
     }, watch: {
       visible(val) {
@@ -815,9 +893,14 @@
 <style lang="scss">
     .addDrugsDialog {
 
-    .el-dialog__body {
-        padding-top: 0px;
-    }
+      .el-dialog__body {
+          padding-top: 0px;
+      }
+      .noMargin{
+        .el-form-item__content{
+          margin-left: 0 !important;
+        }
+      }
 
     }
 </style>

src/xt_pages/data/components/consumables.vue

@@ -10,8 +10,8 @@
         <label class="title"><span class="name">是否启用</span> : </label>
         <el-select v-model="is_use" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeUser">
           <el-option
-            v-for="item in options"
-            :key="item.value"
+            v-for="(item,z) in options"
+            :key="z"
             :label="item.label"
             :value="item.value">
           </el-option>
@@ -19,8 +19,8 @@
         <label class="title"><span class="name">生产厂商</span> : </label>
         <el-select v-model="manufacturer" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeManufacture">
           <el-option
-            v-for="item in manufacturers"
-            :key="item.id"
+            v-for="(item,y) in manufacturers"
+            :key="y"
             :label="item.manufacturer_name"
             :value="item.id">
           </el-option>
@@ -28,34 +28,13 @@
         <span style="color: #909399;font-size:14px;">备案 : &nbsp;</span>
         <el-select v-model="is_record" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeRecord">
           <el-option
-            v-for="item in optionOne"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-        <!-- <label class="title"><span class="name">是否收费</span> : </label>
-        <el-select v-model="is_charge" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeCharge">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
+            v-for="(item,index) in optionOne"
+            :key="index"
             :label="item.label"
             :value="item.value">
           </el-option>
         </el-select>
-        <span style="color: #909399;font-size:14px;">耗材种类 : &nbsp;</span>
-        <el-select v-model="good_kind" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeKind">
-          <el-option
-            label="全部"
-            value="0">
-          </el-option>
-          <el-option
-            v-for="item,index in  getDictionaryDataConfig('system','good_kind')"
-            :key="index"
-            :label="item.name"
-            :value="item.id">
-          </el-option>
-        </el-select> -->
+       
       </div>
       <div>
         <el-button type="primary" @click="openForm()">新增</el-button>
@@ -206,7 +185,7 @@
       width="40%"
     >
 
-      <div v-for="(item,index) in logs" :key="index">
+      <div v-for="(item,i) in logs" :key="i">
         <span> {{ item.export_time | parseTime('{y}-{m}-{d} {h}:{i}:{s}')}}</span>
         <br/>
         <br/>
@@ -327,7 +306,12 @@
               good_number:'',
               social_security_directory_code:"",
               special_medical:"",
-              production_type:""
+              production_type:"",
+              min_number:"",
+              packing_unit:"",
+              packing_price:'',
+              default_count_unit:"",
+              min_unit:"",
             },
             isVisibility: false,
 
@@ -706,7 +690,11 @@
             }else{
               this.goodInfo.goodInfoDialog.formValue.special_medical = response.data.data.goodInfo.special_medical.toString()
             }
-
+            this.goodInfo.goodInfoDialog.formValue.min_unit = response.data.data.goodInfo.min_unit
+            this.goodInfo.goodInfoDialog.formValue.min_number = response.data.data.goodInfo.min_number
+            this.goodInfo.goodInfoDialog.formValue.packing_unit = response.data.data.goodInfo.packing_unit
+            this.goodInfo.goodInfoDialog.formValue.packing_price = response.data.data.goodInfo.packing_price
+            this.goodInfo.goodInfoDialog.formValue.default_count_unit = response.data.data.goodInfo.default_count_unit
             this.$refs.addConsumable.show(row.id, this.goodInfo.goodInfoDialog.formValue)
           }
         })
@@ -791,16 +779,12 @@
         })
       },
       goodInfoDialogComfirm: function(val) {
-
+        console.log("val22222",val)
         if (val.isCreated == 2) {
           //修改
           val['id'] = this.goodInfo.editGoodId;
           val['good_code'] = this.goodInfo.good_code;
 
-
-
-
-
           modifyGoodInfo(val).then(response => {
             if (response.data.state == 0) {
               // this.$message.error(response.data.msg)

src/xt_pages/data/components/drugs.vue

@@ -7,15 +7,7 @@
         <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search"
                    @click="searchAction">搜索
         </el-button>
-        <!-- <label class="title"><span class="name">是否启用</span> : </label>
-        <el-select v-model="is_use" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeUser">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select> -->
+      
        <label class="title"><span class="name">生产厂商</span> : </label>
         <el-select v-model="manufacturer" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeManufacture">
           <el-option
@@ -34,15 +26,7 @@
             :value="item.value">
           </el-option>
         </el-select>
-        <!-- <span style="color: #909399;font-size:14px;">是否注射类别 : &nbsp;</span>
-        <el-select v-model="is_inject" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeInject">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select> -->
+   
 
         <span style="color: #909399;font-size:14px;">备案 : &nbsp;</span>
         <el-select v-model="is_record" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeRecord">
@@ -56,8 +40,7 @@
       </div>
       <div>
         <el-button type="primary" @click="openForm(0)">新增</el-button>
-        <!-- <el-button type="primary" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028" >批量备案</el-button>
-        <el-button type="primary" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord()">批量备案</el-button> -->
+       
       </div>
 
     </div>
@@ -98,9 +81,10 @@
           <div>{{scope.row.drug_name}}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="date" label="规格" width="60" align="center">
+      <el-table-column prop="date" label="单位&规格" width="120" align="center">
         <template slot-scope="scope">
-          <div>{{scope.row.drug_spec}}</div>
+          <!-- <div>{{scope.row.drug_spec}}</div> -->
+          <div>{{scope.row.dose}}{{scope.row.dose_unit}}&nbsp;* &nbsp;{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}</div>
         </template>
       </el-table-column>
       <el-table-column prop="date" label="最大单位" width="60" align="center">
@@ -329,6 +313,9 @@
           drug_code: '',
           hosp_appr_flag:'',
           lmt_used_flag:'',
+          dose_unit:'',
+          min_price:'',
+          drug_day:"",//默认开药天数
         },
         tempFormValue: {
           drug_name: '',//药品名称
@@ -381,7 +368,11 @@
           prescription_mark:'',
           hosp_appr_flag:'',
           lmt_used_flag:'',
-
+          dosage:'', //剂量
+          unval:'',//拆零
+          packing_unit:"",//包装单位
+          packing_price:"",//包装零售价
+          drug_day:"",//默认开药天数
         },
 
         current_id: 0,
@@ -500,6 +491,10 @@
         if (val.id > 0) {
           //修改
           val['id'] = this.current_id;
+          console.log("9999999999999999999",val.min_number)
+          val.min_number =  parseInt(val.min_number)
+          console.log("min_22222222",val)
+         
           editBaseDrugLib(val,untit).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
@@ -512,8 +507,8 @@
           })
         } else if (val.id == 0) {
           //新增
-
-
+          console.log("val2222222",val)
+        
           createBaseDrugLib(val).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
@@ -567,7 +562,7 @@
               this.$message.error(response.data.msg);
               return false
             } else {
-
+              console.log("药品详情",response.data.data.drug)
               for (let key in response.data.data.drug) {
                 this.formValue[key] = response.data.data.drug[key]
               }
@@ -680,6 +675,11 @@
               if(this.formValue.hosp_appr_flag == 0){
                 this.formValue.hosp_appr_flag = ""
               }
+              if(this.formValue.drug_classify == 0){
+                 this.formValue.drug_classify = ""
+              }
+
+
 
               this.$refs.addDrugs.show(id, this.formValue)
 
@@ -734,10 +734,10 @@
           } else {
             this.total = response.data.data.total;
             this.list = [];
-
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.list.push(response.data.data.list[i])
             }
+            console.log("数据库字典",this.list)
           }
         })
       },
@@ -928,40 +928,48 @@
      },
 
       handleSuccessTwo({ results, header }) {
-
+         console.log("header22222",header)
         if (header != undefined && header.length > 0) {
 
           var isHasDrugName = header.includes('*药品名称');
-
-          var isHasDrugSpec = header.includes('*药品规格');
-
+          console.log("isHasDrugName",isHasDrugName)
+          var isHasUnval = header.includes('*拆零');
+          console.log("isHasUnval",isHasUnval)
+          var isHasMinUnit= header.includes('*拆零单位');
+           console.log("isHasMinUnit",isHasMinUnit)
+          var isHasDosage =  header.includes('*剂量')
+          console.log("isHasDosage",isHasDosage)
+        
+          var isHasMaxUnit= header.includes('*剂量单位');
+          console.log("isHasMaxUnit",isHasMaxUnit)
+          var isHasPackingUnit = header.includes('*包装单位')
+          console.log("isHasPackingUnit",isHasPackingUnit)
           var isHasDrugType =  header.includes('*药品类型');
-
+          console.log("isHasDrugType",isHasDrugType)
           var isHasDrugStockLimit =  header.includes('*库存警戒');
-
+          console.log("isHasDrugStockLimit",isHasDrugStockLimit)
           var isHasDrugOriginPlace= header.includes('*产地');
-
+          console.log("isHasDrugOriginPlace",isHasDrugOriginPlace)
           var isHasDrugDosageForm = header.includes('*药品剂型');
-
-          var isHasMaxUnit= header.includes('*最大单位');
-
-          var isHasMinUnit= header.includes('*最小单位');
-
+          console.log("isHasDrugDosageForm",isHasDrugDosageForm)
+      
           var isHasUnitMatrixing= header.includes("*单位换算");
-
-          var isHasRetailPrice = header.includes('*单零售价');
-
-          var isHasLastPrice = header.includes('*上次进价');
-
+          console.log("isHasUnitMatrixing",isHasUnitMatrixing)
+          var isHasRetailPrice = header.includes('*拆零零售价');
+          console.log("isHasRetailPrice",isHasRetailPrice)
+          var isHasLastPrice = header.includes('*进货价');
+          var isHasPackingPrice= header.includes('*包装零售价');
+         console.log("isHasLastPrice",isHasLastPrice)
           var isHasDrugClassifye = header.includes('*药物分类');
-
+         console.log("isHasDrugClassifye",isHasDrugClassifye)
          var isHasManufacturer = header.includes('*生产厂商');
-
-         var isHasDrugDose = header.includes('*剂量');
-
-         var isDrugDoseUnit = header.includes('*剂量单位');
-
-          if (!(isHasDrugName  && isHasDrugSpec && isHasDrugType && isHasDrugStockLimit && isHasDrugOriginPlace && isHasDrugDosageForm && isHasMaxUnit &&  isHasMinUnit && isHasUnitMatrixing &&  isHasRetailPrice && isHasLastPrice && isHasDrugClassifye && isHasManufacturer && isHasDrugDose && isDrugDoseUnit)) {
+         console.log("isHasManufacturer",isHasManufacturer)
+         var isHasDrugDose = header.includes('*默认单次用量');
+        console.log("isHasDrugDose",isHasDrugDose)
+         var isDrugDoseUnit = header.includes('*默认单次用量单位');
+         console.log("isDrugDoseUnit",isDrugDoseUnit)
+          if (!(isHasDrugName  && isHasUnval && isHasDrugType && isHasDrugStockLimit && isHasDrugOriginPlace && isHasDrugDosageForm && isHasMaxUnit &&  isHasMinUnit && isHasUnitMatrixing &&  isHasRetailPrice && isHasLastPrice && isHasPackingPrice && isHasDrugClassifye && isHasManufacturer && isHasDrugDose && isDrugDoseUnit && isHasDosage && isHasPackingUnit)) {
+            console.log("分区222222222222222222222222222222")
             this.dialogVisible = true;
             return
           }
@@ -984,22 +992,74 @@
            }
 
 
-           if (results[i]['药品别名'] === undefined) {
-                obj['drug_alias'] = ''
+          if (results[i]['*拆零'] === undefined) {
+                obj['min_number'] = ''
               } else {
-           if (key == '药品别名') {
-               obj['drug_alias'] = results[i][key].replace(/\s/g,"")
+           if (key == '*拆零') {
+               obj['min_number'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['*拆零单位'] === undefined) {
+                obj['min_unit'] = ''
+              } else {
+           if (key == '*拆零单位') {
+               obj['min_unit'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+
+            if (results[i]['*剂量'] === undefined) {
+                obj['dosage'] = ''
+              } else {
+            if (key == '*剂量') {
+                obj['dosage'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['*剂量单位'] === undefined) {
+                obj['max_unit'] = ''
+              } else {
+           if (key == '*剂量单位') {
+               obj['max_unit'] = results[i][key].replace(/\s/g,"")
               }
            }
+          
+            if (results[i]['*包装单位'] === undefined) {
+                obj['packing_unit'] = ''
+              } else {
+           if (key == '*包装单位') {
+               obj['packing_unit'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
 
-            if (results[i]['*药品规格'] === undefined) {
-                obj['drug_spec'] = ''
+          if (results[i]['默认给药途径'] === undefined) {
+                obj['delivery_way'] = ''
               } else {
-           if (key == '*药品规格') {
-               obj['drug_spec'] = results[i][key].replace(/\s/g,"")
+           if (key == '默认给药途径') {
+               obj['delivery_way'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+          
+           if (results[i]['默认执行频率'] === undefined) {
+                obj['execution_frequency'] = ''
+              } else {
+           if (key == '默认执行频率') {
+               obj['execution_frequency'] = results[i][key].replace(/\s/g,"")
               }
            }
 
+          if (results[i]['默认开药天数'] === undefined) {
+                obj['drug_day'] = ''
+              } else {
+           if (key == '默认开药天数') {
+               obj['drug_day'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+          
+
+
             if (results[i]['*药品类型'] === undefined) {
                 obj['drug_type'] = ''
               } else {
@@ -1017,6 +1077,7 @@
               }
            }
 
+
            if (results[i]['*产地'] === undefined) {
                 obj['drug_origin_place'] = ''
               } else {
@@ -1042,22 +1103,8 @@
               }
            }
 
-           if (results[i]['*最大单位'] === undefined) {
-                obj['max_unit'] = ''
-              } else {
-           if (key == '*最大单位') {
-               obj['max_unit'] = results[i][key].replace(/\s/g,"")
-              }
-           }
-
-           if (results[i]['*最小单位'] === undefined) {
-                obj['min_unit'] = ''
-              } else {
-           if (key == '*最小单位') {
-               obj['min_unit'] = results[i][key].replace(/\s/g,"")
-              }
-           }
 
+          
 
             if (results[i]['*单位换算'] === undefined) {
                 obj['unit_matrixing'] = ''
@@ -1067,23 +1114,36 @@
               }
            }
 
-            if (results[i]['*单零售价'] === undefined) {
+
+
+
+          if (results[i]['*拆零零售价'] === undefined) {
                 obj['retail_price'] = ''
               } else {
-           if (key == '*单零售价') {
+           if (key == '*拆零零售价') {
                obj['retail_price'] = results[i][key].replace(/\s/g,"")
               }
            }
 
+          
+          if (results[i]['*包装零售价'] === undefined) {
+                obj['packing_price'] = ''
+              } else {
+           if (key == '*包装零售价') {
+               obj['packing_price'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
 
-         if (results[i]['*上次进价'] === undefined) {
+         if (results[i]['*进货价'] === undefined) {
                 obj['last_price'] = ''
               } else {
-           if (key == '*上次进价') {
+           if (key == '*进货价') {
                obj['last_price'] = results[i][key].replace(/\s/g,"")
               }
            }
 
+
             if (results[i]['*药物分类'] === undefined) {
                 obj['drug_classify'] = ''
               } else {
@@ -1093,64 +1153,63 @@
            }
 
 
-            if (results[i]['*生产厂商'] === undefined) {
-                obj['manufacturer'] = ''
-              } else {
-           if (key == '*生产厂商') {
-               obj['manufacturer'] = results[i][key].replace(/\s/g,"")
-              }
-           }
 
-            if (results[i]['经销商'] === undefined) {
-                obj['dealer'] = ''
+          
+
+           if (results[i]['*默认单次用量'] === undefined) {
+                obj['drug_dose'] = ''
               } else {
-            if (key == '经销商') {
-                obj['dealer'] = results[i][key].replace(/\s/g,"")
+           if (key == '*默认单次用量') {
+               obj['drug_dose'] = results[i][key].replace(/\s/g,"")
               }
            }
 
-           if (results[i]['拼音'] === undefined) {
-                obj['pinyin'] = ''
+
+           if (results[i]['*默认单次用量单位'] === undefined) {
+                obj['drug_dose_unit'] = ''
               } else {
-            if (key == '拼音') {
-                obj['pinyin'] = results[i][key].replace(/\s/g,"")
+           if (key == '*默认单次用量单位') {
+               obj['drug_dose_unit'] = results[i][key].replace(/\s/g,"")
               }
            }
 
-           if (results[i]['五笔'] === undefined) {
-                obj['wubi'] = ''
+           if (results[i]['*生产厂商'] === undefined) {
+                obj['manufacturer'] = ''
               } else {
-            if (key == '五笔') {
-                obj['wubi'] = results[i][key].replace(/\s/g,"")
+           if (key == '*生产厂商') {
+               obj['manufacturer'] = results[i][key].replace(/\s/g,"")
               }
            }
 
 
 
-            if (results[i]['别名拼音'] === undefined) {
-                obj['drug_alias_pinyin'] = ''
+            if (results[i]['经销商'] === undefined) {
+                obj['dealer'] = ''
               } else {
-            if (key == '别名拼音') {
-                obj['drug_alias_pinyin'] = results[i][key].replace(/\s/g,"")
+            if (key == '经销商') {
+                obj['dealer'] = results[i][key].replace(/\s/g,"")
               }
            }
-
-            if (results[i]['别名拼音'] === undefined) {
-                obj['drug_alias_pinyin'] = ''
+          
+           if (results[i]['限制性用药'] === undefined) {
+                obj['lmt_used_flag'] = ''
               } else {
-            if (key == '别名拼音') {
-                obj['drug_alias_pinyin'] = results[i][key].replace(/\s/g,"")
+            if (key == '限制性用药') {
+                obj['lmt_used_flag'] = results[i][key].replace(/\s/g,"")
               }
            }
+           
+
 
-            if (results[i]['别名五笔'] === undefined) {
-                obj['drug_alias_wubi'] = ''
+           if (results[i]['药品别名'] === undefined) {
+                obj['drug_alias'] = ''
               } else {
-            if (key == '别名五笔') {
-                obj['drug_alias_wubi'] = results[i][key].replace(/\s/g,"")
+           if (key == '药品别名') {
+               obj['drug_alias'] = results[i][key].replace(/\s/g,"")
               }
            }
 
+          
              if (results[i]['药品类别'] === undefined) {
                 obj['drug_category'] = ''
               } else {
@@ -1159,6 +1218,8 @@
               }
            }
 
+
+
            if (results[i]['开药控制'] === undefined) {
                 obj['drug_control'] = ''
               } else {
@@ -1175,13 +1236,7 @@
               }
            }
 
-          if (results[i]['审批标志'] === undefined) {
-                obj['hosp_appr_flag'] = ''
-              } else {
-            if (key == '审批标志') {
-                obj['hosp_appr_flag'] = results[i][key].replace(/\s/g,"")
-              }
-           }
+         
 
             if (results[i]['审批标志'] === undefined) {
                 obj['hosp_appr_flag'] = ''
@@ -1207,6 +1262,7 @@
               }
            }
 
+
            if (results[i]['统计分类'] === undefined) {
                 obj['statistics_category'] = ''
               } else {
@@ -1287,32 +1343,7 @@
                 obj['limit_remark'] = results[i][key].replace(/\s/g,"")
               }
            }
-
-          if (results[i]['*剂量'] === undefined) {
-                obj['drug_dose'] = ''
-              } else {
-            if (key == '*剂量') {
-                obj['drug_dose'] = results[i][key].replace(/\s/g,"")
-              }
-           }
-
-           if (results[i]['*剂量单位'] === undefined) {
-                obj['drug_dose_unit'] = ''
-              } else {
-            if (key == '*剂量单位') {
-                obj['drug_dose_unit'] = results[i][key].replace(/\s/g,"")
-              }
-           }
-
-           if (results[i]['限制性用药'] === undefined) {
-                obj['lmt_used_flag'] = ''
-              } else {
-            if (key == '限制性用药') {
-                obj['lmt_used_flag'] = results[i][key].replace(/\s/g,"")
-              }
-           }
-
-
+           
          }
          var newArr = [];
          tableData.push(obj);
@@ -1384,7 +1415,8 @@
        let params = {
           'drugs':tableData
         };
-
+        console.log("params222222222",params)
+        
         postDrugInformation(params).then(response=>{
            if(response.data.state == 1){
              var msg =  response.data.data.msg;

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -51,9 +51,41 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="规格型号 : " prop="specification_name" style="width:100%">
-              <el-input v-model="form.specification_name" placeholder="" maxlength="30"></el-input>
-            </el-form-item>
+           
+           <div style="width:100%;">
+              <div><span style="color:red;">*</span>单位&规格: <span style="color:#999">例如：0.75 g * 60 粒 / 盒</span></div>
+          </div>
+          <div style="width:100%;display:flex;align-items:center;">
+               <el-form-item label="规格型号 : " prop="specification_name" style="width:200px">
+                 <el-input v-model="form.specification_name" placeholder="" maxlength="30"></el-input>
+               </el-form-item>
+          
+                <el-form-item prop="min_number" class="noMargin">
+                  <el-input v-model="form.min_number" :disabled="showMinNumber" style="width:100px" type="number" placeholder="拆零"> </el-input>
+                </el-form-item>
+                <el-form-item prop="min_unit" class="noMargin">
+                  <el-select v-model="form.min_unit" style="width:160px;"  placeholder="拆零单位"  @change="changeMinUnit">
+                    <el-option
+                      v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                      :key="index"
+                      :label="item.name"
+                      :value="item.name">
+                    </el-option>
+                  </el-select>
+              </el-form-item>
+              /
+              <el-form-item prop="packing_unit" class="noMargin">
+                <el-select v-model="form.packing_unit" style="width:160px;" placeholder="包装单位" @change="changePackingUnit">
+                  <el-option
+                    v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                    :key="index"
+                    :label="item.name"
+                    :value="item.name">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </div>
+                       
             <el-form-item label="生产厂商 : " prop="manufacturer" style="width:100%">
              
                <el-select v-model="form.manufacturer" style="width:100%;" filterable placeholder="请选择">
@@ -65,7 +97,7 @@
                   </el-option>
              </el-select>
             </el-form-item>
-            <el-form-item label="单位 : " prop="good_unit">
+            <!-- <el-form-item label="单位 : " prop="good_unit">
               <el-select v-model="form.good_unit" style="width:160px;" placeholder="请选择">
                 <el-option
                   v-for="item,index in form.goodUnit"
@@ -73,20 +105,29 @@
                   :label="item.name"
                   :value="item.id">
                 </el-option>
-               <!-- <el-option
-                  v-for="item,index in getDataConfig('hemodialysis','units')"
-                  :key="index"
-                  :label="item.name"
-                  :value="item.name">
-               </el-option> -->
               </el-select>
+            </el-form-item> -->
+            <el-form-item label="包装零售价 : " prop="retail_price">
+              <el-input v-model="form.packing_price" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
-            <el-form-item label="零价 : " prop="retail_price">
+            <el-form-item label="拆零零售价 : " prop="retail_price">
               <el-input v-model="form.retail_price" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
-            <el-form-item label="最新进价 : " prop="buy_price">
+         
+            <el-form-item label="进货价 : " prop="buy_price">
               <el-input v-model="form.buy_price" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
+            <el-form-item label="默认单次用量:" prop="name">
+              <el-input v-model="form.default_count" style="width:80px;" placeholder="" maxlength="30"></el-input>
+                <el-select v-model="form.default_count_unit" style="width:80px;" placeholder="单次用量单位" @change="changeDefaultCountUnit">
+                  <el-option
+                    v-for="(item,index) in unitList"
+                    :key="index"
+                    :label="item.name"
+                    :value="item.name">
+                  </el-option>
+                </el-select>
+             </el-form-item>
             <el-form-item label="库存警戒 : " prop="stock_warn_count">
               <el-input v-model="form.stock_warn_count" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
@@ -184,9 +225,7 @@
       <el-tab-pane label="扩展数据" name="second">
         <el-form :model="form" label-width="120px"
                  style="display: flex;flex-wrap: wrap;justify-content: space-between;">
-          <el-form-item label="默认使用数量:" prop="name">
-            <el-input v-model="form.default_count" style="width:160px;" placeholder="" maxlength="30"></el-input>
-          </el-form-item>
+         
           <el-form-item label="标签:" prop="sign">
             <el-select v-model="form.sign" style="width:160px;" placeholder="请选择">
               <el-option
@@ -339,6 +378,11 @@
           social_security_directory_code:"",
           production_type:"",
           special_medical:"",
+          min_number:"",
+          packing_unit:"",
+          packing_price:'',
+          default_count_unit:"",
+          min_unit:"",
         },
 
         rules: {
@@ -376,7 +420,9 @@
         dealer:[],
         goodKindList:[],
         medicalInsuranceLevelList:[],
-        statisticsCategoryList:[]
+        statisticsCategoryList:[],
+        unitList:[],
+        showMinNumber:false,
       }
     },
     props: {
@@ -403,6 +449,24 @@
         return getDataConfig(module, filed_name)
       },
       show(id,form) {
+        console.log("form",form)
+
+        if(form!=undefined){
+          this.unitList = []
+          var arr =  getDataConfig('hemodialysis','units')
+          for(let i=0;i<arr.length;i++){
+            if(form.min_unit == arr[i].name){
+              this.unitList.push(arr[i])
+            }
+          }
+          for(let j=0;j<arr.length;j++){
+          if(form.packing_unit == arr[j].name){
+              this.unitList.push(arr[j])
+            }
+          } 
+          console.log("列表222",this.unitList)
+        }
+       
         this.visible = true
         this.good_status =[]
         this.getlist()
@@ -442,7 +506,12 @@
               is_statistics_work: '',
               sort: '',
               is_doctor_use: '',
-              good_number: ''
+              good_number: '',
+              min_number:"",
+              packing_unit:"",
+              packing_price:'',
+              default_count_unit:"",
+            
             }
           this.good_status = []
           for (let key in tempform) {
@@ -525,6 +594,11 @@
         form['social_security_directory_code'] = this.form.social_security_directory_code
         form['production_type'] = this.form.production_type
         form['special_medical'] = this.form.special_medical
+        form['min_unit'] = this.form.min_unit
+        form['min_number'] = this.form.min_number
+        form["packing_unit"]= this.form.packing_unit
+        form["packing_price"] = this.form.packing_price
+        form["default_count_unit"] = this.form.default_count_unit
         return form
       }, changeSelected: function(val) {
         console.log(val)
@@ -567,6 +641,40 @@
 
          }
        })
+      },
+      changeMinUnit(val){
+        if(this.form.packing_unit == val){
+          this.form.min_number = 1
+          this.showMinNumber = true
+        }else{
+          this.showMinNumber = false
+        }
+        var arr =  getDataConfig('hemodialysis','units')
+        for(let i=0;i<arr.length;i++){
+          if(val == arr[i].name){
+           this.unitList.push(arr[i])
+          }
+        }
+        
+      },
+      changePackingUnit(val){
+        if(this.form.min_unit == val){
+           this.form.min_number = 1
+           this.showMinNumber = true
+        }else{
+          this.showMinNumber = false
+         }
+        var arr =  getDataConfig('hemodialysis','units')
+        for(let i=0;i<arr.length;i++){
+          if(val == arr[i].name){
+           this.unitList.push(arr[i])
+          }
+        }
+      },
+     changeDefaultCountUnit(val){
+       console.log("val2222",val)
+       this.form.default_count_unit = ''
+        this.form.default_count_unit = val
       }
     },
     watch: {
@@ -589,6 +697,10 @@
 
 </script>
 
-<style scoped>
-
+<style lang="scss">
+   .noMargin{
+    .el-form-item__content{
+        margin-left: 0 !important;
+      }
+    }
 </style>

src/xt_pages/stock/config/goodInfo.vue

@@ -210,7 +210,10 @@
               sort:'',
               is_use_doctor_advice:'',
               good_number:'',
-
+              min_number:"",
+              packing_unit:"",
+              packing_price:'',
+              default_count_unit:""
             },
 
             isVisibility: false
@@ -223,6 +226,7 @@
         this.getList()
       },
       handleGoodInfoEdit: function(index, row) {
+       
         this.getAllDealer()
         this.getAllManufacturer()
         this.getAllGoodType()
@@ -232,12 +236,14 @@
         let params = {
           id: row.id
         }
+
         GetGoodInfo(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             return false
           } else {
-            console.log(response.data.data.goodInfo)
+             
+            console.log("详情",response.data.data.goodInfo)
 
             if (response.data.data.goodInfo.good_unit <= 0) {
               this.goodInfo.goodInfoDialog.formValue.good_unit = ''
@@ -422,9 +428,12 @@
 
 
 
-            this.goodInfo.goodInfoDialog.formValue.good_number =
-              response.data.data.goodInfo.agent
+            this.goodInfo.goodInfoDialog.formValue.good_number = response.data.data.goodInfo.agent
 
+            this.goodInfo.goodInfoDialog.formValue.min_number = response.data.data.goodInfo.min_number
+            this.goodInfo.goodInfoDialog.formValue.packing_unit = response.data.data.goodInfo.packing_unit
+            this.goodInfo.goodInfoDialog.formValue.packing_price = response.data.data.goodInfo.packing_price
+            this.goodInfo.goodInfoDialog.formValue.default_count_unit = response.data.data.goodInfo.default_count_unit
 
 
             this.$refs.dialog.show()
@@ -482,10 +491,13 @@
               response.data.data.goodInfo.stock_warn_count
             this.goodInfo.goodInfoDialog.formValue.is_reuse = response.data.data.goodInfo.is_reuse.toString()
 
-            this.goodInfo.goodInfoDialog.formValue.remark =
-              response.data.data.goodInfo.remark
+            this.goodInfo.goodInfoDialog.formValue.remark = response.data.data.goodInfo.remark
             this.goodInfo.goodInfoDialog.isCreated = 3
             this.goodInfo.goodInfoDialog.isVisibility = true
+            this.goodInfo.goodInfoDialog.formValue.min_number = response.data.data.min_number
+            this.goodInfo.goodInfoDialog.formValue.packing_unit = response.data.data.packing_unit
+            this.goodInfo.goodInfoDialog.formValue.packing_price= response.data.data.packing_price
+            this.goodInfo.goodInfoDialog.formValue.default_count_unit = response.data.data.default_count_unit
           }
         })
       },
@@ -628,6 +640,8 @@
         this.goodInfo.goodInfoDialog.formValue.expiry_date_warn_day_count = ''
         this.goodInfo.goodInfoDialog.formValue.stock_warn_count = ''
         this.goodInfo.goodInfoDialog.formValue.is_reuse = '2'
+
+      
       },
       getAllDealer: function() {
         this.goodInfo.goodInfoDialog.formValue.dealers = []

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -90,6 +90,7 @@
           backgroundColor: 'rgb(245, 247, 250)',
           color: '#606266'
         }"
+       @current-change="handleCurrentChangeOne"
       >
         <el-table-column align="center" type="selection" width="55">
         </el-table-column>
@@ -112,7 +113,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="厂家" align="center">
+        <!-- <el-table-column label="厂家" align="center">
           <template slot-scope="scope">
             {{scope.row.manufacturers ? scope.row.manufacturers.manufacturer_name:''}}
           </template>
@@ -122,12 +123,12 @@
           <template slot-scope="scope">
             {{scope.row.dealers ? scope.row.dealers.dealer_name:''}}
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column label="操作" align="center" width="240">
           <template slot-scope="scope">
 
-             <el-tooltip
+             <!-- <el-tooltip
               class="item"
               effect="dark"
               content="详情"
@@ -140,7 +141,7 @@
                 @click="handleSearch(scope.row.id)"
               >
               </el-button>
-            </el-tooltip>
+            </el-tooltip> -->
             
             <el-tooltip
               class="item"
@@ -282,6 +283,119 @@
         <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
       </span>
     </el-dialog>
+
+    
+
+
+      <el-table
+        v-show="showOne"
+        :data="WarehouseInfo.warehouseInfoDate"
+        :class="signAndWeighBoxPatients"
+        style="width: 100%"
+        border
+        highlight-current-row
+        v-loading="Warehouse.loading"
+        ref="multipleTable"
+        @selection-change="select"
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+      >
+        <el-table-column align="center" type="selection" width="55">
+        </el-table-column>
+
+        <el-table-column label="药品名称" align="center">
+          <template slot-scope="scope">
+             {{scope.row.drug.drug_name}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="药品类型" align="center">
+          <template slot-scope="scope">
+              {{getDrugType(scope.row.drug.drug_type)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="规格&单位" align="center">
+          <template slot-scope="scope">
+             {{scope.row.drug.dosage}}&nbsp;{{scope.row.drug.max_unit}}*{{scope.row.drug.unval}}{{scope.row.drug.min_unit}}/{{scope.row.drug.packing_unit}}
+          </template>
+        </el-table-column>
+       
+        <el-table-column label="批号" align="center">
+          <template slot-scope="scope">
+           {{scope.row.number}}
+          </template>
+        </el-table-column>
+        
+        <el-table-column label="入库数量" align="center">
+          <template slot-scope="scope">
+             {{scope.row.warehousing_count}}
+          </template>
+        </el-table-column>
+
+       <el-table-column label="进货价" align="center">
+          <template slot-scope="scope">
+            {{scope.row.price}}
+          </template>
+        </el-table-column>
+
+      
+       <el-table-column label="总价" align="center">
+          <template slot-scope="scope">
+             {{scope.row.total_price}}
+          </template>
+        </el-table-column>
+      
+
+       <el-table-column label="生产厂家" align="center">
+          <template slot-scope="scope">
+             {{getManufacturer(scope.row.drug.manufacturer)}}
+          </template>
+        </el-table-column>
+
+
+       <el-table-column label="生产日期" align="center">
+          <template slot-scope="scope">
+             {{getTime(scope.row.product_date)}}
+          </template>
+        </el-table-column>
+       
+
+       <el-table-column label="有效日期" align="center">
+          <template slot-scope="scope">
+             {{getTime(scope.row.expiry_date)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="批准文号" align="center">
+          <template slot-scope="scope">
+             {{scope.row.number}}
+          </template>
+        </el-table-column>
+
+
+        <el-table-column label="备注" align="center">
+          <template slot-scope="scope">
+            {{scope.row.remark}}
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;float: right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+
   </div>
 </template>
 
@@ -295,12 +409,15 @@ import {
   getDrugWarehouseList,
  
 } from "@/api/drug/drug_stock";
+import {getAllDrugList}from "@/api/data"
+ import {getDictionaryDataConfig } from "@/utils/data";
 import BreadCrumb from "../../components/bread-crumb";
 
 export default {
   name: "drugStockInOrder",
   components: { BreadCrumb },
   created() {
+    this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
     var nowMonth = nowDate.getMonth() + 1;
@@ -321,23 +438,8 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-    
-    // var date1 = new Date();
-    // var date2 = new Date(date1);
-
-    // //-30为30天前，+30可以获得30天后的日期
-    // date2.setDate(date1.getDate() - 30);
 
-    // //30天前（月份判断是否小于10，小于10的前面+0）
-    // var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
-      
-    // //当前日期
-    // var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
-
-    //  this.start_time = agoDay
-    //  console.log("333333332222",this.start_time)
     this.GetWarehouse();
-    // this.GetConfigInfo();
     this.fetchAllAdminUsers();
    
   },
@@ -373,7 +475,10 @@ export default {
       },
       
       startTime: "",
-      dialogVisible:false
+      dialogVisible:false,
+      showOne:false,
+      drugTypeList:[],
+      manufacturerList:[]
     };
   },
   methods: {
@@ -545,12 +650,18 @@ export default {
       return Math.round(parseFloat(val) * 100) / 100;
     },
 
-    handleEdit: function(index, row) {
-      this.$router.push({
-        name: "drugStockInDetail",
-        query: { id: row.id, type: this.type }
-      });
+    // handleEdit: function(index, row) {
+    //   this.$router.push({
+    //     name: "drugStockInDetail",
+    //     query: { id: row.id, type: this.type }
+    //   });
     
+    // },
+    handleEdit:function(index,row){
+       this.$router.push({
+         name:"drugStockInOrderEdit",
+         query:{id:row.id,type:this.type}
+       })
     },
     handleSearch(id){
        this.WarehouseInfo.warehouseInfoDate=[]
@@ -561,18 +672,20 @@ export default {
       const params = {
         id: order_id
       };
+   
       getDrugWarehouseInfoList(params).then(response => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
           return false;
         } else {
           for (let i = 0; i < response.data.data.info.length; i++) {
+            this.showOne = true
             this.WarehouseInfo.warehouseInfoDate = []
-            this.WarehouseInfo.warehouseInfoDate.push(
-              response.data.data.info[i]
-            );
+            this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i]);
+            console.log("列表详情",this.WarehouseInfo.warehouseInfoDate)
           }
           this.WarehouseInfo.warehouse = response.data.data.warehousing;
+          this.getAllDrugList()
         }
       });
     },
@@ -667,7 +780,49 @@ export default {
         })
         .catch(() => {});
     },
-   
+    handleCurrentChangeOne(val){
+      this.GetOrderDetail(val.id)
+      
+    },
+    getTime(val) {
+       if(val < 0){
+           return ""
+       }
+       if(val == ""){
+          return ""
+        }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+        }
+     },
+     getDrugType(id){
+       var name = ""
+       for(let i=0;i<this.drugTypeList.length;i++){
+          if(id == this.drugTypeList[i].id){
+            name = this.drugTypeList[i].name
+          }
+       }
+       return name
+     },
+     getAllDrugList(){
+       getAllDrugList().then(response=>{
+          if(response.data.state == 1){
+            var manufacturerList = response.data.data.manufacturerList
+            this.manufacturerList = manufacturerList
+          }
+       })
+     },
+     getManufacturer(id){
+        var name = ""
+        for(let i=0;i<this.manufacturerList.length;i++){
+           if(id == this.manufacturerList[i].id){
+               name = this.manufacturerList[i].manufacturer_name
+           }
+        }
+        return name
+     },
+     getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+      },
   }
 };
 </script>

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -12,10 +12,7 @@
     </div>
     <div class="app-container">
 
-      <!--<stock-in-dialog ref="dialog" :propForm="propForm"-->
-                       <!--:visibility="isVisibility"-->
-                       <!--v-on:dialog-comfirm="comfirm"-->
-                       <!--v-on:dialog-cancle="cancle"></stock-in-dialog>-->
+    
       <drugs-stock-dialog
         ref="dialog"
         :propForm="propForm"
@@ -30,9 +27,11 @@
         <el-date-picker size="small" v-model="warehousing_time" prefix-icon="el-icon-date" :editable="false"
                         style="width: 196px;" type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd"></el-date-picker>
+         <div class="titleOne">制单人:{{this.$store.getters.xt_user.user.user_name}}</div>
+         <div class="titleOne">当前进货价合计:</div>
       </div>
-
-      <div class="cell clearfix">
+     
+      <!-- <div class="cell clearfix">
         <label class="title"><span class="name">经销商</span> : </label>
         <el-select size="small" v-model="form.dealer" filterable placeholder="请选择经销商" @change="changeDealer">
           <el-option
@@ -42,9 +41,9 @@
             :value="option.id">
           </el-option>
         </el-select>
-      </div>
+      </div> -->
 
-      <div class="cell clearfix">
+      <!-- <div class="cell clearfix">
         <label class="title"><span class="name">厂商</span> : </label>
 
         <el-select size="small" v-model="form.manufacturer" filterable placeholder="请选择厂商"
@@ -56,7 +55,7 @@
             :value="option.id">
           </el-option>
         </el-select>
-      </div>
+      </div> -->
 
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table
@@ -75,131 +74,132 @@
 
             <template slot-scope="scope">
               <el-form-item style="padding-top: 15px">
-                <el-input
-                  placeholder="请输入药品名称"
-                  v-model="scope.row.drug_id"
-                  :value="typeName(scope.row.drug_id)"
-                  @focus="showDialog(scope.$index, scope.row)"
-                ></el-input>
+                  <el-autocomplete
+                    class="checkSearch"
+                    popper-class="my-autocomplete"
+                    v-model="scope.row.drug_name"
+                    :fetch-suggestions="querySearchAsync"
+                    :trigger-on-focus="false"
+                    placeholder="请输入病人名字"
+                    @select="handleSelect"
+                    @input="changeDrugName(scope.$index)"
+                    style="width:160px;"
+                  >
+                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                  <template slot-scope="{ item }">
+                    <div class="name">{{ item.drug_name }}</div>
+                  </template>
+                 </el-autocomplete>
               </el-form-item>
             </template>
+          </el-table-column>
+           <el-table-column align="center" width="200">
+            <template slot="header" slot-scope="scope">
+              <span>药品类型</span>
+            </template>
+             <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.drug_type" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in drugTypeList"
+                  :key="index"
+                  :label="option.name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>
           </el-table-column>
           <el-table-column align="center" width="200">
             <template slot="header" slot-scope="scope">
-              <span>规格名称<span style="color: red">*</span></span>
+              <span>规格&单位</span>
             </template>
             <template slot-scope="scope">
               <el-form-item style="padding-top: 15px">
                 <el-input
-                  placeholder="请输入规格名称"
-                  v-model="scope.row.drug_id"
-                  :value="specificationName(scope.row.drug_id)"
-                  @focus="showDialog(scope.$index, scope.row)"
+                  :disabled="true"
+                  placeholder="请输入规格&单位"
+                  v-model="scope.row.name"
                 ></el-input>
               </el-form-item>
             </template>
           </el-table-column>
-
-          <el-table-column align="center" width="150">
+         <el-table-column align="center" width="200">
+          <template slot="header" slot-scope="scope" >
+                <span>批号</span>
+            </template>
+              <template slot-scope="scope">
+                <el-form-item style="padding-top: 15px">
+                  <el-input
+                    placeholder="请输入批号"
+                    v-model="scope.row.lot_number"
+                  ></el-input>
+                </el-form-item>
+              </template>
+         </el-table-column>
+
+         <el-table-column align="center" width="180">
             <template slot="header" slot-scope="scope">
-              <span>进价<span style="color: red">*</span></span>
+              <span>入库数量<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-              <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
               <el-form-item
-                :prop="'recordData.' + scope.$index + '.price'"
-                :rules="tableRules.price"
+                :prop="'recordData.' + scope.$index + '.warehousing_count'"
+                :rules="tableRules.warehousing_count"
                 style="padding-top: 17px"
               >
                 <el-input
-                  placeholder="请输入单价"
+                  placeholder="请输入入库数量"
                   type="number"
-                  v-model="scope.row.price"
+                  v-model="scope.row.warehousing_count"
+                  style="width:100px"
                 ></el-input>
+                {{scope.row.max_unit}}
               </el-form-item>
             </template>
           </el-table-column>
-
-
-           <el-table-column align="center" width="180">
-            <template slot="header" slot-scope="scope">
-              <span>单位<span style="color: red">*</span></span>
-            </template>
-            <template slot-scope="scope">
-             
-              <el-form-item
-                :prop="'recordData.' + scope.$index + '.min_unit'"
-                :rules="tableRules.min_unit"
-                style="padding-top: 17px"
-              >
-               <el-select v-model="scope.row.min_unit" style="width:160px;" placeholder="请选择">
-                <el-option
-                  v-for="(item,index) in getDataConfig('hemodialysis','units')"
-                  :key="index"
-                  :label="item.name"
-                  :value="item.name">
-                </el-option>
-              </el-select>
-              </el-form-item>
-            </template>
-          </el-table-column>
-
-
-          <el-table-column align="center" width="180">
+       
+          <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope">
-              <span>入库数量<span style="color: red">*</span></span>
+              <span>进货单价(元)<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-              <!--{{scope.row.warehousing_count}}-->
-              <!--<el-input type="number" v-model="scope.row.warehousing_count"   @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
-
               <el-form-item
-                :prop="'recordData.' + scope.$index + '.warehousing_count'"
-                :rules="tableRules.warehousing_count"
+                :prop="'recordData.' + scope.$index + '.price'"
+                :rules="tableRules.last_price"
                 style="padding-top: 17px"
               >
                 <el-input
-                  placeholder="请输入入库数量"
+                  style="width:100px"
+                  placeholder="请输入单价"
                   type="number"
-                  v-model="scope.row.warehousing_count"
+                  v-model="scope.row.last_price"
                 ></el-input>
+               
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="进价总价" align="center" width="150">
-            <template slot-scope="scope">
-              {{ calculate(scope.row.price * scope.row.warehousing_count) }}
-            </template>
-          </el-table-column>
 
-          <el-table-column label="零售价" align="center" width="150">
+          <el-table-column label="总价(元)" align="center" width="150">
             <template slot-scope="scope">
-              {{ scope.row.retail_price }}
+              {{ calculate(scope.row.last_price * scope.row.warehousing_count) }} 
             </template>
           </el-table-column>
 
-          <el-table-column label="零价总价" align="center" width="150">
+          <el-table-column label="生产厂家" width="250" align="center">
             <template slot-scope="scope">
-              {{ calculate(scope.row.retail_price * scope.row.warehousing_count) }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" width="150">
-            <template slot="header" slot-scope="scope">
-              <span>批号</span>
-            </template>
-            <template slot-scope="scope">
-              <el-form-item>
-                <el-input
-                  placeholder="请输入批号"
-                  v-model="scope.row.number"
-                ></el-input>
-              </el-form-item>
+               <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in manufacturerList"
+                  :key="index"
+                  :label="option.manufacturer_name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
             </template>
           </el-table-column>
+ 
 
           <el-table-column label="生产日期" width="250" align="center">
             <template slot-scope="scope">
-              <!--{{scope.row.product_date | parseTime("{y}-{m}-{d}")}}-->
               <el-date-picker
                 prefix-icon="el-icon-date"
                 style="width: 145px"
@@ -213,7 +213,6 @@
           </el-table-column>
           <el-table-column label="有效日期" width="250" align="center">
             <template slot-scope="scope">
-              <!--{{ scope.row.expiry_date | parseTime("{y}-{m}-{d}")}}-->
               <el-date-picker
                 prefix-icon="el-icon-date"
                 style="width: 145px"
@@ -225,6 +224,18 @@
               ></el-date-picker>
             </template>
           </el-table-column>
+        
+        <el-table-column align="center" width="150" label="批准文号">
+            <template slot-scope="scope">
+              <el-form-item>
+                <el-input
+                  placeholder="请输入批准文号"
+                  v-model="scope.row.batch_number"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+       
           <el-table-column label="备注" width="150" align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.remark"></el-input>
@@ -279,7 +290,6 @@
 
 <script>
   import { uParseTime } from '@/utils/tools'
-
   import {
     GetAllConfig,
     GetAllDrugInfoByID,
@@ -287,7 +297,8 @@
   } from "@/api/drug/drug_stock";
   import BreadCrumb from '../../components/bread-crumb'
   import DrugsStockDialog from './drugsStockDialog/index'
-  import {getDataConfig } from "@/utils/data";
+  import {getDataConfig, getDictionaryDataConfig } from "@/utils/data";
+  import {getAllDrugList,postSearchDrugList } from "@/api/data"
   export default {
     components: { DrugsStockDialog, BreadCrumb },
     name: 'stockIn',
@@ -392,7 +403,13 @@
         manufacturer: [],
         dealer: [],
         goodType: [],
-        goodInfo:[]
+        goodInfo:[],
+        drugList:[],
+        manufacturerList:[],
+        showOne:true,
+        showTwo:false,
+        drugTypeList:[],
+        totalPrice:0,
       }
     },
     methods: {
@@ -421,7 +438,6 @@
         this.isVisibility = true
       }, 
       comfirm: function(val) {
-        console.log("Val2222222",val)
         this.$refs.dialog.hide()
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {
@@ -498,7 +514,8 @@
           }
         }
         return name;
-      }, specificationName: function(drug_id) {
+      },
+       specificationName: function(drug_id) {
         let name = "";
         for (let i = 0; i < this.goodInfo.length; i++) {
           if (this.goodInfo[i].id == drug_id) {
@@ -506,9 +523,19 @@
           }
         }
         return name;
+      },
+      getDrugName:function(drug_id){
+        let name = ""
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+           if(drug_id == this.recordInfo.recordData[i].id){
+              name = this.recordInfo.recordData[i].dosage + this.recordInfo.recordData[i].max_unit + "*" + this.recordInfo.recordData[i].min_number + this.recordInfo.recordData[i].min_unit + "/"+this.recordInfo.recordData[i].packing_unit
+           }
+        }
+        return name
       },
        handleEdit: function(index, row) {
         const tempObj = {}
+        tempObj['drug_name'] = ''
         tempObj['drug_id'] = 0
         tempObj['number'] = ''
         tempObj['product_date'] = ''
@@ -520,6 +547,8 @@
         tempObj['dealer'] = ''
         tempObj['manufacturer'] = ''
         tempObj['min_unit'] = ''
+        tempObj["drug_type"] = ''
+        tempObj['batch_number'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (this.recordInfo.recordData.length <= 1) {
@@ -534,19 +563,7 @@
         }
         return Math.round(parseFloat(val) * 100) / 100
       },
-      // GetWarehouseInfoByOrdeNumber: function() {
-      //   const params = {
-      //     'warehousing_order': sessionStorage.getItem('warehousing_orders')
-      //   }
-      //   this.recordInfo.recordData = []
-      //   getWarehouseInfoByOrdeNumber(params).then(response => {
-      //     if (response.data.state != 0) {
-      //       for (let i = 0; i < response.data.data.info.length; i++) {
-      //         this.recordInfo.recordData.push(response.data.data.info[i])
-      //       }
-      //     }
-      //   })
-      // },
+     
       getTime(val, temp) {
         if (val != 0) {
           return uParseTime(val, temp)
@@ -642,8 +659,9 @@
       submit() {
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
+            
             const array = this.recordInfo.recordData
-            console.log(array)
+          
             for (let i = 0; i < array.length; i++) {
 
               if (array[i].drug_id == 0) {
@@ -656,10 +674,13 @@
               this.$message.success('请添加入库商品')
               return
             }
-
+            for(let i=0;i<this.recordInfo.recordData.length;i++){
+               this.recordInfo.recordData[i].last_price = this.recordInfo.recordData[i].last_price.toString()
+            }
             const params = {
               'stockIn': this.recordInfo.recordData
             }
+            console.log("params2222222",params)
             postDrugWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -686,9 +707,90 @@
       getDataConfig(module, filed_name){
         return getDataConfig(module, filed_name)
       },
+     
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+      },
+
+  // 改版后的JS
+      getlist(){
+        getAllDrugList().then(response=>{
+           if(response.data.state == 1){
+             var list = response.data.data.list
+             this.drugList = list
+             var manufacturerList = response.data.data.manufacturerList
+             this.manufacturerList = manufacturerList
+             for(let i=0;i<this.drugList.length;i++){
+                for(let j=0;j<this.manufacturerList.length;j++){
+                  if(this.drugList[i].manufacturer == this.manufacturerList[j].id){
+                     this.drugList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+                  }
+                }
+             }
+           }
+        })
+      },
+
+      changeDrugName(val){
+        console.log("val22222",val)
+        this.showOne = false
+        this.showTwo = true
+      },
+      querySearchAsync(keyword, cb) {
+        let key = '';
+        if (keyword != undefined) {
+          key = keyword
+        }
+        let searchArray = [];
+        postSearchDrugList(key).then(response => {
+          if (response.data.state == 1) {
+            searchArray = response.data.data.list;
+            
+             var list = response.data.data.list
+             console.log("猎豹22222222222",list)
+
+             this.drugList = list
+             var manufacturerList = response.data.data.manufacturerList
+             this.manufacturerList = manufacturerList
+             for(let i=0;i<this.drugList.length;i++){
+             
+                for(let j=0;j<this.manufacturerList.length;j++){
+                  if(this.drugList[i].manufacturer == this.manufacturerList[j].id){
+                     this.drugList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+                  }
+                }
+             }
+           
+             cb(this.drugList)
+          } else {
+            cb([])
+          }
+        })
+      },
+      changeDrugName(val){
+        this.currentIndex = val
+      },
+      handleSelect(val){
+         for(let i=0;i<this.recordInfo.recordData.length;i++){
+           if(i == this.currentIndex){
+             this.recordInfo.recordData[i].drug_id  = val.id
+             this.recordInfo.recordData[i].drug_name = val.drug_name
+             this.recordInfo.recordData[i].drug_type = val.drug_type
+             this.recordInfo.recordData[i].name  = val.dose +val.dose_unit+"*"+val.min_number+ val.min_unit+"/"+val.max_unit
+             this.recordInfo.recordData[i].last_price = val.last_price
+             this.recordInfo.recordData[i].manufacturer =  val.manufacturer
+             this.recordInfo.recordData[i].batch_number = val.number
+             this.recordInfo.recordData[i].max_unit = val.max_unit
+           }
+        }
+        console.log("333333",this.recordInfo.recordData)
+      }
+     
     }
     ,
     created() {
+      this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
+     
       var nowDate = new Date()
       var nowYear = nowDate.getFullYear()
       var nowMonth = nowDate.getMonth() + 1
@@ -700,20 +802,33 @@
         '-' +
         (nowDay < 10 ? '0' + nowDay : nowDay)
       const tempObj = {}
+
       tempObj['drug_id'] = 0
-      tempObj['number'] = ''
+      tempObj['drug_name'] = ''
+      tempObj['dosage'] = ''
+      tempObj['max_unit'] = ''
+      tempObj['min_unit'] = '',
+      tempObj['packing_unit'] = '',
+      tempObj['lot_number'] = ''
       tempObj['product_date'] = ''
       tempObj['expiry_date'] = ''
       tempObj['warehousing_count'] = ''
       tempObj['retail_price'] = ''
-      tempObj['price'] = ''
+      tempObj['last_price'] = ''
       tempObj['remark'] = ''
       tempObj['dealer'] = ''
       tempObj['manufacturer'] = ''
-      tempObj['min_unit'] = ''
+      tempObj['batch_number'] = ''
+      tempObj['drug_type'] = ''
+      tempObj['batch_number'] = ''
+      
       this.recordInfo.recordData.push(tempObj)
+      
       this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit
+      
+     
+    
     }
 
   }
@@ -743,6 +858,15 @@
     margin-bottom: 15px;
   }
 
+  .titleOne {
+    width: 120px;
+    display: inline-block;
+    font-weight: normal;
+    color: #909399;
+    padding: 6px 0;
+    margin-left:20px;
+}
+
 </style>
 
 <style>

src/xt_pages/stock/drugs/drugStockInOrderDetail.vue

@@ -37,7 +37,7 @@
 
       <div class="cell clearfix" style="margin-top: 10px">
         <el-button size="small" icon="el-icon-edit" @click="editRecord"
-          >编辑</el-button
+          >编辑222</el-button
         >
         <el-button size="small" icon="el-icon-delete" @click="deleteRecord"
           >删除</el-button

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -58,7 +58,7 @@
         </el-date-picker>
       </div>
 
-      <div class="cell clearfix">
+      <!-- <div class="cell clearfix">
         <label class="title"><span class="name">经销商</span> : </label>
         <el-select
           size="small"
@@ -93,8 +93,11 @@
           >
           </el-option>
         </el-select>
-      </div>
+      </div> -->
+
 
+
+   <!-- 编辑入库单详情 -->
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table
           id="oictable"
@@ -112,59 +115,73 @@
 
             <template slot-scope="scope">
               <el-form-item style="padding-top: 15px">
-                <el-input
-                  placeholder="请输入药品名称"
-                  v-model="scope.row.drug_id"
-                  :value="typeName(scope.row.drug_id)"
-                  @focus="showDialog(scope.$index, scope.row)"
-                ></el-input>
+                 <el-autocomplete
+                    class="checkSearch"
+                    popper-class="my-autocomplete"
+                    v-model="scope.row.drug_name"
+                    :fetch-suggestions="querySearchAsync"
+                    :trigger-on-focus="false"
+                    placeholder="请输入病人名字"
+                    @select="handleSelect"
+                    @input="changeDrugName(scope.$index)"
+                    style="width:160px;"
+                  >
+                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                  <template slot-scope="{ item }">
+                    <div class="name">{{ item.drug_name }}</div>
+                  </template>
+                 </el-autocomplete>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="200">
+         <el-table-column align="center" width="200">
             <template slot="header" slot-scope="scope">
-              <span>规格名称<span style="color: red">*</span></span>
+              <span>药品类型</span>
             </template>
-            <template slot-scope="scope">
-              <el-form-item style="padding-top: 15px">
-                <el-input
-                  placeholder="请输入规格名称"
-                  v-model="scope.row.drug_id"
-                  :value="specificationName(scope.row.drug_id)"
-                  @focus="showDialog(scope.$index, scope.row)"
-                ></el-input>
-              </el-form-item>
+             <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.drug_type" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in drugTypeList"
+                  :key="index"
+                  :label="option.name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
             </template>
           </el-table-column>
-
-          <el-table-column align="center" width="150">
+          <el-table-column align="center" width="200">
             <template slot="header" slot-scope="scope">
-              <span>进价<span style="color: red">*</span></span>
+              <span>规格&单位</span>
             </template>
             <template slot-scope="scope">
-              <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
-              <el-form-item
-                :prop="'recordData.' + scope.$index + '.price'"
-                :rules="tableRules.price"
-                style="padding-top: 17px"
-              >
+              <el-form-item style="padding-top: 15px">
                 <el-input
-                  placeholder="请输入单价"
-                  type="number"
-                  v-model="scope.row.price"
+                  :disabled="true"
+                  placeholder="请输入规格&单位"
+                  v-model="scope.row.name"
                 ></el-input>
               </el-form-item>
             </template>
           </el-table-column>
-
-          <el-table-column align="center" width="180">
+          <el-table-column align="center" width="200">
+            <template slot="header" slot-scope="scope" >
+              <span>批号</span>
+              </template>
+                <template slot-scope="scope">
+                  <el-form-item style="padding-top: 15px">
+                    <el-input
+                      placeholder="请输入批号"
+                      v-model="scope.row.lot_number"
+                    ></el-input>
+                  </el-form-item>
+                </template>
+          </el-table-column>
+                   
+         <el-table-column align="center" width="180">
             <template slot="header" slot-scope="scope">
               <span>入库数量<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-              <!--{{scope.row.warehousing_count}}-->
-              <!--<el-input type="number" v-model="scope.row.warehousing_count"   @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
-
               <el-form-item
                 :prop="'recordData.' + scope.$index + '.warehousing_count'"
                 :rules="tableRules.warehousing_count"
@@ -174,44 +191,54 @@
                   placeholder="请输入入库数量"
                   type="number"
                   v-model="scope.row.warehousing_count"
+                  style="width:100px"
                 ></el-input>
+                {{scope.row.max_unit}}
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="进价总价" align="center" width="150">
-            <template slot-scope="scope">
-              {{ calculate(scope.row.price * scope.row.warehousing_count) }}
-            </template>
-          </el-table-column>
-
-          <el-table-column label="零价" align="center" width="150">
-            <template slot-scope="scope">
-              {{ scope.row.retail_price }}
-            </template>
+          <el-table-column>
+            <template slot="header" slot-scope="scope">
+                <span>进货单价(元)<span style="color: red">*</span></span>
+              </template>
+              <template slot-scope="scope">
+                <el-form-item
+                  :prop="'recordData.' + scope.$index + '.price'"
+                  :rules="tableRules.last_price"
+                  style="padding-top: 17px"
+                >
+                  <el-input
+                    style="width:100px"
+                    placeholder="请输入单价"
+                    type="number"
+                    v-model="scope.row.last_price"
+                  ></el-input>
+                
+                </el-form-item>
+              </template>
           </el-table-column>
 
-          <el-table-column label="零价总价" align="center" width="150">
+          <el-table-column label="总价(元)" align="center" width="150">
             <template slot-scope="scope">
-              {{ calculate(scope.row.retail_price * scope.row.warehousing_count) }}
+              {{ calculate(scope.row.last_price * scope.row.warehousing_count) }} 
             </template>
           </el-table-column>
-          <el-table-column align="center" width="150">
-            <template slot="header" slot-scope="scope">
-              <span>批号</span>
-            </template>
+         
+          <el-table-column label="生产厂家" width="250" align="center">
             <template slot-scope="scope">
-              <el-form-item>
-                <el-input
-                  placeholder="请输入批号"
-                  v-model="scope.row.number"
-                ></el-input>
-              </el-form-item>
+               <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in manufacturerList"
+                  :key="index"
+                  :label="option.manufacturer_name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
             </template>
           </el-table-column>
 
           <el-table-column label="生产日期" width="250" align="center">
             <template slot-scope="scope">
-              <!--{{scope.row.product_date | parseTime("{y}-{m}-{d}")}}-->
               <el-date-picker
                 prefix-icon="el-icon-date"
                 style="width: 145px"
@@ -223,9 +250,10 @@
               ></el-date-picker>
             </template>
           </el-table-column>
-          <el-table-column label="有效日期" width="250" align="center">
+
+
+         <el-table-column label="有效日期" width="250" align="center">
             <template slot-scope="scope">
-              <!--{{ scope.row.expiry_date | parseTime("{y}-{m}-{d}")}}-->
               <el-date-picker
                 prefix-icon="el-icon-date"
                 style="width: 145px"
@@ -237,6 +265,7 @@
               ></el-date-picker>
             </template>
           </el-table-column>
+ 
           <el-table-column label="备注" width="150" align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.remark"></el-input>
@@ -301,7 +330,8 @@ import {
 } from "@/api/drug/drug_stock";
 import BreadCrumb from "../../components/bread-crumb";
 import DrugsStockDialog from './drugsStockDialog/index'
-
+import {postSearchDrugList} from "@/api/data"
+import {getDataConfig, getDictionaryDataConfig } from "@/utils/data";
 export default {
   components: { DrugsStockDialog, BreadCrumb },
   name: "stockIn",
@@ -369,12 +399,14 @@ export default {
       dealer: [],
       goodType: [],
       goodInfo:[],
+      drugList:[],
+      manufacturerList:[],
     };
   },
   methods: {
     comfirm: function(val) {
       this.$refs.dialog.hide();
-      console.log(val)
+   
       if (val.selectedGoodInfo.length > 0) {
         for (let i = val.selectedGoodInfo.length - 1; i >= 0 ; i--) {
           if (i == 0) {
@@ -409,7 +441,7 @@ export default {
         }
       }
 
-      console.log( this.recordInfo.recordData)
+      // console.log( this.recordInfo.recordData)
 
       this.currentIndex = -1;
     },
@@ -458,7 +490,7 @@ export default {
       return name;
     },
     specificationName: function(drug_id) {
-      console.log(this.goodInfo)
+ 
       let name = "";
       for (let i = 0; i < this.goodInfo.length; i++) {
         if (this.goodInfo[i].id == drug_id) {
@@ -480,8 +512,8 @@ export default {
       tempObj["dealer"] = "";
       tempObj["manufacturer"] = "";
       tempObj['retail_price'] = ""
-
-
+      tempObj['drug_name'] = ""
+      tempObj['manufacturer'] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -580,6 +612,7 @@ export default {
       this.$refs["tableForm"].validate(valid => {
         if (valid) {
           const array = this.recordInfo.recordData;
+        
           for (let i = 0; i < array.length; i++) {
             if (array[i].drug_id == 0) {
               this.$message.error("药品名称或者药品规格名称不能为空");
@@ -594,12 +627,15 @@ export default {
              if(this.recordInfo.recordData[i].manufacturer == ""){
                this.recordInfo.recordData[i].manufacturer = 0
              }
+
+             this.recordInfo.recordData[i].last_price = this.recordInfo.recordData[i].drug.last_price.toString()
+             this.recordInfo.recordData[i].manufacturer = this.recordInfo.recordData[i].drug.manufacturer
             
           }
           const params = {
             stockIn: this.recordInfo.recordData
           };
-          console.log("params",params)
+          console.log("params22222222222",params)
          
           EditDrugWarehouse(
             params,
@@ -632,6 +668,9 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
+       
+          var manufacturerList = response.data.data.manufacturerList
+          console.log("000000000000",response.data.data.info)
           for (let i = 0; i < response.data.data.info.length; i++) {
             response.data.data.info[i].product_date = this.getTime(
               response.data.data.info[i].product_date,
@@ -641,22 +680,38 @@ export default {
               response.data.data.info[i].expiry_date,
               "{y}-{m}-{d}"
             );
-            response.data.data.info[i].price = response.data.data.info[
-              i
-            ].price.toString();
+            response.data.data.info[i].price = response.data.data.info[i].price.toString();
+
+            response.data.data.info[i].retail_price = response.data.data.info[i].retail_price.toString();
+
+            response.data.data.info[i].warehousing_count = response.data.data.info[i].warehousing_count.toString();
+             
+            response.data.data.info[i].name = response.data.data.info[i].drug.dose + response.data.data.info[i].drug.dose_unit+"*"+response.data.data.info[i].drug.min_number+ response.data.data.info[i].drug.min_unit+"/"+response.data.data.info[i].drug.max_unit
+
+            response.data.data.info[i].lot_number = response.data.data.info[i].number
 
-            response.data.data.info[i].retail_price = response.data.data.info[
-              i
-              ].retail_price.toString();
+            response.data.data.info[i].drug_name = response.data.data.info[i].drug.drug_name
 
-            response.data.data.info[
-              i
-            ].warehousing_count = response.data.data.info[
-              i
-            ].warehousing_count.toString();
+            response.data.data.info[i].last_price = response.data.data.info[i].drug.last_price
+
+            response.data.data.info[i].max_unit = response.data.data.info[i].drug.max_unit
+            
+            response.data.data.info[i].drug_type = response.data.data.info[i].drug.drug_type
 
+           if(response.data.data.info[i].manufacturer == 0){
+               response.data.data.info[i].manufacturer = ""
+            }
+          
             this.recordInfo.recordData.push(response.data.data.info[i]);
+           
+            for(let j=0;j<manufacturerList.length;j++){
+              if(response.data.data.info[i].manufacturer == manufacturerList[j].id){
+                 response.data.data.info[i].manufacturer = manufacturerList[j].manufacturer_name
+               }
+            }
           }
+          console.log("列表详情",this.recordInfo.recordData)
+
 
           this.warehouse = response.data.data.warehousing;
           this.form.manufacturer = this.warehouse.manufacturer;
@@ -667,28 +722,65 @@ export default {
             "{y}-{m}-{d}"
           );
 
-          if (this.recordInfo.recordData.length == 0) {
-            const tempObj = {};
-            tempObj["id"] = 0;
-            tempObj["drug_id"] = 0;
-            tempObj["number"] = "";
-            tempObj["product_date"] = "";
-            tempObj["expiry_date"] = "";
-            tempObj["warehousing_count"] = "";
-            tempObj["price"] = "";
-            tempObj["remark"] = "";
-            tempObj["dealer"] = "";
-            tempObj["manufacturer"] = "";
-            tempObj['retail_price'] = ""
-
-            this.recordInfo.recordData.push(tempObj);
-          }
+        
         }
       });
-    }
+    },
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+      },
+
+      querySearchAsync(keyword, cb) {
+        let key = '';
+        if (keyword != undefined) {
+          key = keyword
+        }
+        let searchArray = [];
+        postSearchDrugList(key).then(response => {
+          if (response.data.state == 1) {
+             searchArray = response.data.data.list;
+             var list = response.data.data.list
+         
+             this.drugList = list
+             var manufacturerList = response.data.data.manufacturerList
+             this.manufacturerList = manufacturerList
+             for(let i=0;i<this.drugList.length;i++){
+               
+                for(let j=0;j<this.manufacturerList.length;j++){
+                  if(this.drugList[i].manufacturer == this.manufacturerList[j].id){
+                     this.drugList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+
+                  }
+                }
+             }
+             cb(this.drugList)
+          } else {
+            cb([])
+          }
+        })
+      },
+      changeDrugName(val){
+        this.currentIndex = val
+      },
+      handleSelect(val){
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+           if(i == this.currentIndex){
+             this.recordInfo.recordData[i].lot_number = ""
+             this.recordInfo.recordData[i].drug_name = val.drug_name
+             this.recordInfo.recordData[i].drug_type = val.drug_type
+             this.recordInfo.recordData[i].name  = val.dose +val.dose_unit+"*"+val.min_number+ val.min_unit+"/"+val.max_unit
+             this.recordInfo.recordData[i].last_price = val.last_price
+             this.recordInfo.recordData[i].manufacturer =  val.manufacturer
+             this.recordInfo.recordData[i].batch_number = val.number
+             this.recordInfo.recordData[i].max_unit = val.max_unit
+           }
+        }
+      },
+    
 
   },
   created() {
+    this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;
     const order_id = this.$route.query.id;

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -607,6 +607,7 @@ export default {
             this.$message.error(response.data.msg)
             return false
           } else {
+          
             this.warehousingOutInfo.warehousingOutData=[]
             for (let i = 0; i < response.data.data.list.length; i++) {
 
@@ -727,6 +728,7 @@ export default {
           } else {
             this.userList=[]
             var total = 0
+            console.log("888888888888",response.data.data.list)
             for (let i = 0; i < response.data.data.list.length; i++) {
               var obj = response.data.data.list[i]
               obj['is_total'] = 0
@@ -739,7 +741,7 @@ export default {
               total: total,
             })
 
-            console.log(this.userList)
+            
           }
         })
       },

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -111,72 +111,111 @@
 
             <template slot-scope="scope">
               <el-form-item style="padding-top: 15px">
-                <el-input
-                  placeholder="请输入药品名称"
-                  v-model="scope.row.drug_id"
-                  :value="typeName(scope.row.drug_id)"
-                  @focus="showDialog(scope.$index, scope.row)"
-                ></el-input>
+                <el-autocomplete
+                    class="checkSearch"
+                    popper-class="my-autocomplete"
+                    v-model="scope.row.drug_name"
+                    :fetch-suggestions="querySearchAsync"
+                    :trigger-on-focus="false"
+                    placeholder="请输入病人名字"
+                    @select="handleSelect"
+                    style="width:160px;"
+                  >
+                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                  <template slot-scope="{ item }">
+                    <div class="name">{{ item.drug_name }}</div>
+                  </template>
+                 </el-autocomplete>
               </el-form-item>
             </template>
           </el-table-column>
           <el-table-column align="center" width="200">
             <template slot="header" slot-scope="scope">
-              <span>规格名称<span style="color: red">*</span></span>
+              <span>药品类型</span>
+            </template>
+             <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.drug_type" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in drugTypeList"
+                  :key="index"
+                  :label="option.name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" width="200">
+            <template slot="header" slot-scope="scope">
+              <span>规格&单位<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
               <el-form-item style="padding-top: 15px">
                 <el-input
-                  placeholder="请输入规格名称"
-                  v-model="scope.row.drug_id"
-                  :value="specificationName(scope.row.drug_id)"
-                  @focus="showDialog(scope.$index, scope.row)"
+                  :disabled="true"
+                  placeholder="请输入规格&单位"
+                  v-model="scope.row.name"
                 ></el-input>
               </el-form-item>
             </template>
           </el-table-column>
-
-          <el-table-column width="100" align="center">
+          <el-table-column align="center" width="200">
+            <template slot="header" slot-scope="scope" >
+                  <span>批号</span>
+              </template>
+                <template slot-scope="scope">
+                  <el-form-item style="padding-top: 15px">
+                    <el-input
+                      placeholder="请输入批号"
+                      v-model="scope.row.batch_number"
+                    ></el-input>
+                  </el-form-item>
+              </template>
+          </el-table-column>
+          <el-table-column width="180" align="center">
             <template slot="header" slot-scope="scope">
-              <span>出库价<span style="color: red">*</span></span>
+              <span>出库数量<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-            
               <el-form-item
-                :prop="'recordData.' + scope.$index + '.price'"
-                :rules="tableRules.price"
+                :prop="'recordData.' + scope.$index + '.count'"
+                :rules="tableRules.count"
                 style="padding-top: 17px"
               >
                 <el-input
-                  placeholder="请输入进价"
+                  placeholder="请输入出库数量"
                   type="number"
-                  v-model="scope.row.price"
+                  v-model="scope.row.count"
+                  style="width:100px"
                 ></el-input>
+                {{scope.row.packing_unit}}
               </el-form-item>
+              
             </template>
           </el-table-column>
-
           <el-table-column width="100" align="center">
             <template slot="header" slot-scope="scope">
-              <span>出库数量<span style="color: red">*</span></span>
+              <span>出货价<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
+            
               <el-form-item
-                :prop="'recordData.' + scope.$index + '.count'"
-                :rules="tableRules.count"
+                :prop="'recordData.' + scope.$index + '.last_price'"
+                :rules="tableRules.last_price"
                 style="padding-top: 17px"
               >
                 <el-input
-                  placeholder="请输入出库数量"
+                  placeholder="请输入出货价"
                   type="number"
-                  v-model="scope.row.count"
+                  v-model="scope.row.last_price"
                 ></el-input>
               </el-form-item>
             </template>
           </el-table-column>
+
+        
          
           
-          <el-table-column width="80" align="center">
+          <!-- <el-table-column width="80" align="center">
             <template slot="header" slot-scope="scope">
               <span>单位<span style="color: red">*</span></span>
             </template>
@@ -191,18 +230,18 @@
               </el-select>
             </template>
           </el-table-column>
-         
+          -->
 
           
 
-          <el-table-column label="进价总价" width="100" align="center">
+          <el-table-column label="总价" width="100" align="center">
             <template slot-scope="scope">
-              {{ calculate(scope.row.price * scope.row.count) }}
+              {{ calculate(scope.row.last_price * scope.row.count) }}
             </template>
           </el-table-column>
 
 
-          <el-table-column label="零售价" align="center" width="150">
+          <!-- <el-table-column label="零售价" align="center" width="150">
             <template slot-scope="scope">
               {{ scope.row.retail_price }}
             </template>
@@ -212,8 +251,59 @@
             <template slot-scope="scope">
               {{ calculate(scope.row.retail_price * scope.row.count) }}
             </template>
+          </el-table-column> -->
+          
+             <el-table-column label="生产厂家" width="250" align="center">
+            <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in manufacturerList"
+                  :key="index"
+                  :label="option.manufacturer_name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>
           </el-table-column>
+ 
 
+          <el-table-column label="生产日期" width="250" align="center">
+            <template slot-scope="scope">
+              <el-date-picker
+                prefix-icon="el-icon-date"
+                style="width: 145px"
+                v-model="scope.row.product_date"
+                type="date"
+                placeholder="选择日期时间"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+            </template>
+          </el-table-column>
+          <el-table-column label="有效日期" width="250" align="center">
+            <template slot-scope="scope">
+              <el-date-picker
+                prefix-icon="el-icon-date"
+                style="width: 145px"
+                v-model="scope.row.expiry_date"
+                type="date"
+                placeholder="选择日期时间"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+            </template>
+          </el-table-column>
+        
+        <el-table-column align="center" width="150" label="批准文号">
+            <template slot-scope="scope">
+              <el-form-item>
+                <el-input
+                  placeholder="请输入批准文号"
+                  v-model="scope.row.number"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
 
           <el-table-column label="备注" width="80" align="center">
             <template slot-scope="scope">
@@ -265,7 +355,8 @@ import {  postDrugWarehouseOut,GetAllConfig,GetAllDrugInfoByID } from "@/api/dru
 
 import BreadCrumb from "../../components/bread-crumb";
 import DrugsStockDialog from './drugsStockDialog/index'
-import { getDataConfig } from "@/utils/data";
+import { getDataConfig,getDictionaryDataConfig } from "@/utils/data";
+import {postSearchDrugList} from "@/api/data"
 export default {
   components: { DrugsStockDialog,   BreadCrumb },
   name: "salesReturnOrderAdd",
@@ -317,7 +408,13 @@ export default {
       manufacturer: [],
       dealer: [],
       goodType: [],
-      goodInfo:[]
+      goodInfo:[],
+      drugList:[],
+      manufacturerList:[],
+      showOne:true,
+      showTwo:false,
+      drugTypeList:[],
+      totalPrice:0,
     };
   },
   methods: {
@@ -546,11 +643,14 @@ export default {
             this.$message.success("请添加出库商品");
             return;
           }
-
+          for(let i=0;i<this.recordInfo.recordData.length;i++){
+            this.recordInfo.recordData[i].last_price = this.recordInfo.recordData[i].last_price.toString()
+          }
           const params = {
             stockOut: this.recordInfo.recordData
           };
-
+          console.log("params222222",params)
+      
           postDrugWarehouseOut(
             params,
             this.warehouse_out_time,
@@ -584,8 +684,97 @@ export default {
     getDataConfig(module, filed_name){
      return getDataConfig(module, filed_name)
     },
+    querySearchAsync(keyword, cb) {
+        let key = '';
+        if (keyword != undefined) {
+          key = keyword
+        }
+        let searchArray = [];
+        postSearchDrugList(key).then(response => {
+          if (response.data.state == 1) {
+            searchArray = response.data.data.list;
+            
+             var list = response.data.data.list
+             this.drugList = list
+             var manufacturerList = response.data.data.manufacturerList
+             this.manufacturerList = manufacturerList
+             for(let i=0;i<this.drugList.length;i++){
+                for(let j=0;j<this.manufacturerList.length;j++){
+                  if(this.drugList[i].manufacturer == this.manufacturerList[j].id){
+                     this.drugList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+                  }
+                }
+             }
+             cb(this.drugList)
+          } else {
+            cb([])
+          }
+        })
+      },
+      handleSelect(val){
+         if(this.recordInfo.recordData.length == 1){
+            this.recordInfo.recordData[0].drug_id = val.id
+            this.recordInfo.recordData[0].drug_name = val.drug_name
+            this.recordInfo.recordData[0].drug_type = val.drug_type
+            this.recordInfo.recordData[0].dosage = val.dosage
+            this.recordInfo.recordData[0].max_unit = val.max_unit
+            this.recordInfo.recordData[0].unval = val.unval
+            this.recordInfo.recordData[0].min_unit = val.min_unit
+            this.recordInfo.recordData[0].packing_unit = val.packing_unit
+            this.recordInfo.recordData[0].number = val.number
+            this.recordInfo.recordData[0].last_price = val.last_price
+            this.recordInfo.recordData[0].manufacturer = val.manufacturer
+         for(let i=0;i<this.recordInfo.recordData.length;i++){       
+           this.recordInfo.recordData[i].name = this.recordInfo.recordData[i].dosage + this.recordInfo.recordData[i].max_unit + "*" + this.recordInfo.recordData[i].unval + this.recordInfo.recordData[i].min_unit + "/"+this.recordInfo.recordData[i].packing_unit
+           this.totalPrice += this.recordInfo.recordData[i].last_price * this.recordInfo.recordData[i].warehousing_count
+           for(let j=0;j<this.drugTypeList.length;j++){
+               if(this.recordInfo.recordData[i].drug_type == this.drugTypeList[j].id){
+                  this.recordInfo.recordData[i].drug_type = this.drugTypeList[j].name
+               } 
+           }
+         }
+         }else{
+            var arr = []
+            for(let i=0;i<this.recordInfo.recordData.length;i++){ 
+              if(this.recordInfo.recordData[i].drug_id> 0){
+                 arr.push(this.recordInfo.recordData[i])
+              }
+            } 
+            this.recordInfo.recordData = arr
+            const tempObj = {}
+            tempObj['drug_name'] = val.drug_name
+            tempObj['drug_id'] = val.id
+            tempObj['number'] = ''
+            tempObj['product_date'] = ''
+            tempObj['expiry_date'] = ''
+            tempObj['warehousing_count'] = ''
+            tempObj['retail_price'] = ''
+            tempObj['price'] = ''
+            tempObj['remark'] = ''
+            tempObj['dealer'] = ''
+            tempObj['manufacturer'] = ''
+            tempObj['min_unit'] = ''
+            tempObj['batch_number'] = ''
+            tempObj['drug_type'] = ''
+            this.recordInfo.recordData.push(tempObj) 
+         }
+
+        for(let i=0;i<this.recordInfo.recordData.length;i++){       
+          this.recordInfo.recordData[i].name = this.recordInfo.recordData[i].dosage + this.recordInfo.recordData[i].max_unit + "*" + this.recordInfo.recordData[i].unval + this.recordInfo.recordData[i].min_unit + "/"+this.recordInfo.recordData[i].packing_unit
+          this.totalPrice += this.recordInfo.recordData[i].last_price * this.recordInfo.recordData[i].warehousing_count
+          for(let j=0;j<this.drugTypeList.length;j++){
+             if(this.recordInfo.recordData[i].drug_type == this.drugTypeList[j].id){
+                this.recordInfo.recordData[i].drug_type = this.drugTypeList[j].name
+              } 
+           }
+        }
+      },
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+      },
   },
   created() {
+    this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
     var nowMonth = nowDate.getMonth() + 1;
@@ -598,11 +787,18 @@ export default {
       (nowDay < 10 ? "0" + nowDay : nowDay);
     const tempObj = {};
     tempObj["drug_id"] = 0;
+    tempObj['dosage'] = ''
+    tempObj['max_unit'] = ''
+    tempObj['unval'] = ''
+    tempObj['min_unit'] = '',
+    tempObj['packing_unit'] = '',
     tempObj["return_count"] = 0;
     tempObj["price"] = "";
     tempObj["remark"] = "";
     tempObj["min_unit"] = "";
-
+    tempObj['manufacturer'] = ''
+    tempObj['batch_number'] = ''
+    tempObj['drug_type'] = ''
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/drugs/query.vue

@@ -82,91 +82,85 @@
           >搜索
           </el-button>
       </div>
-
-
-      <el-table
-        :row-style="{ color: '#303133' }"
-        :header-cell-style="{
-          backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266'
-        }"
-        :data="WarehouseInfo.warehouseInfoDate"
-        :class="signAndWeighBoxPatients"
+      
+       <el-table
+        :data="tableList"
         border
-        v-loading="WarehouseInfo.loading"
-        :span-method="merge"
-
-      >
-        <el-table-column label="药品名称" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.drug_name }}
-          </template>
+        style="width: 100%">
+        <el-table-column prop="date" label="药品编号" width="180">
+           <template  slot-scope="scope">
+              
+           </template>
         </el-table-column>
-        <el-table-column label="规格名称" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.drug_spec }}</span>
-          </template>
+        <el-table-column prop="drug_type" label="药品类型" width="180">
+           <template slot-scope="scope">
+             {{getDrugType(scope.row.drug_type)}}
+           </template>
         </el-table-column>
-        <el-table-column label="入库数量" align="center">
-          <template slot-scope="scope">
-            <span
-              @click="showStockInDetailDialog(scope.row.drug_id)"
-            >{{ stockInCount(scope.row) }}</span
-            >
-          </template>
+        <el-table-column prop="drug_name" label="药品名称">
+           <template slot-scope="scope">
+             {{scope.row.drug_name}}
+           </template>
         </el-table-column>
-         <el-table-column label="单价" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.last_price}}</span
-            >
-          </template>
+        <el-table-column prop="drug_name" label="规格&&单位">
+           <template slot-scope="scope">
+             {{scope.row.dosage + scope.row.max_unit +"*"+scope.row.min_number+scope.row.min_unit+"/"+scope.row.packing_unit}}
+           </template>
         </el-table-column>
-        <el-table-column label="入库退货" align="center">
-          <template slot-scope="scope">
-            <span
-              @click="showSaleReturnDetailDialog(scope.row)"
-            >{{ salesReturnCount(scope.row) }}</span
-            >
-          </template>
+         <el-table-column prop="drug_name" label="进货单价">
+           <template slot-scope="scope">
+             {{scope.row.last_price}}
+           </template>
         </el-table-column>
-        <el-table-column label="实际入库" align="center">
-          <template slot-scope="scope">
-            {{ stockInCount(scope.row) - salesReturnCount(scope.row) }}
-          </template>
+         <el-table-column prop="drug_name" label="厂家">
+           <template slot-scope="scope">
+             {{getManufacturerList(scope.row.manufacturer)}}
+           </template>
         </el-table-column>
-        <el-table-column label="出库数量" align="center">
-          <template slot-scope="scope">
-            <span
-              @click="showStockOutDetailDialog(scope.row.drug_id)"
-            >{{ stockOutCount(scope.row) }}</span
-            >
-          </template>
+        <el-table-column prop="drug_name" label="剩余库存量">
+           <template slot-scope="scope">
+            <span v-if="scope.row.stock_max_number!=''">
+              {{scope.row.stock_max_number}}{{scope.row.packing_unit}}
+              <span v-if="scope.row.stock_min_number!=''">
+                {{scope.row.stock_min_number}}{{scope.row.min_unit}}
+              </span>
+            </span> 
+           </template>
         </el-table-column>
-        <el-table-column label="出库退库" align="center">
+        <el-table-column prop="drug_name" label="操作">
           <template slot-scope="scope">
-            <span
-              @click="showCancelStockDetailDialog(scope.row)"
-            >{{ cancelStockCount(scope.row) }}</span
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="库存流水"
+              placement="top"
             >
+              <el-button
+                size="small"
+                type="warning"
+                icon="el-icon-edit-outline"
+                @click="handleDetail(scope.row.drug_id)"
+              >
+              </el-button>
+            </el-tooltip>
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="批次"
+              placement="top"
+            >
+              <el-button
+                size="small"
+                type="primary"
+                icon="el-icon-edit-outline"
+                @click="handleBatch(scope.row.drug_id)"
+              >
+              </el-button>
+            </el-tooltip>
           </template>
         </el-table-column>
-        <el-table-column label="实际出库" align="center">
-          <template slot-scope="scope">
-            {{ stockOutCount(scope.row) - cancelStockCount(scope.row) }}
-          </template>
-        </el-table-column>
-
-        <el-table-column label="剩余库存" align="center">
-          <template slot-scope="scope">
-            <span>{{
-              stockInCount(scope.row) -
-                salesReturnCount(scope.row) -
-                stockOutCount(scope.row) +
-                cancelStockCount(scope.row)
-            }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
+       </el-table>
+       
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -191,17 +185,18 @@
 <script>
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getAllDrugStockQueryList } from '@/api/drug/drug_stock'
+  import { getAllDrugStockQueryList,getDrugStockList } from '@/api/drug/drug_stock'
   import SettingDialog from './settingDialog/index'
   import { getDictionaryDataConfig } from "@/utils/data";
   export default {
     name: 'stockIn',
     created() {
-      this.GetAllDrugStockQueryList()
-
+      //  this.GetAllDrugStockQueryList()
       var drugCategory = getDictionaryDataConfig('system','drug_category')
       this.drugCategory.push(...drugCategory)
-      console.log("透析记录",this.drugCategory)
+      this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
+  
+      this.getlist()
     },
     components: {
       SettingDialog,
@@ -233,7 +228,10 @@
         drug_category:0,
         drugCategory:[
           {id:0,name:"全部"}
-        ]
+        ],
+        drugTypeList:[],
+        tableList:[],
+        manufacturerList:[]
       }
     },
     methods: {
@@ -293,7 +291,6 @@
           start_time:this.start_time,
           end_time:this.end_time,
         }
-        console.log("parasm22222",Params)
         this.WarehouseInfo.loading = true
         this.WarehouseInfo.warehouseInfoDate = []
         getAllDrugStockQueryList(Params).then(response => {
@@ -309,7 +306,7 @@
               this.WarehouseInfo.warehouseInfoDate.push(response.data.data.list[i])
               arr.push(response.data.data.list[i])
             }
-            console.log("数据源头",arr)
+           
             for(let i=0;i<arr.length;i++){
                arr[i].stockInCount =  this.stockInCount(arr[i])
                arr[i].salesReturnCount = this.salesReturnCount(arr[i])
@@ -319,7 +316,7 @@
                arr[i].reactOutCount = (this.stockOutCount(arr[i]) - this.cancelStockCount(arr[i]))?(this.stockOutCount(arr[i]) - this.cancelStockCount(arr[i])):0
                arr[i].overplusCount = (this.stockInCount(arr[i])-this.salesReturnCount(arr[i])-this.stockOutCount(arr[i])+this.cancelStockCount(arr[i]))?this.stockInCount(arr[i])-this.salesReturnCount(arr[i])-this.stockOutCount(arr[i])+this.cancelStockCount(arr[i]):0
             }
-             console.log("arr222222222",arr)
+          
              this.tableData = arr
             this.handleSpanTempArr()
           }
@@ -457,6 +454,57 @@
           name: "drugQueryPrint",
           query: {drug_category:this.drug_category,keyword:this.keywords,start_time:this.start_time,end_time:this.end_time,page:this.page,limit:this.limit}
         });
+      },
+ 
+  //获取库存
+      getlist(){
+        const params = {
+          page: this.page,
+          limit: this.limit,
+          keyword: this.keywords,
+          drug_category:this.drug_category,
+          start_time:this.start_time,
+          end_time:this.end_time,
+        }
+       
+        getDrugStockList(params).then(response=>{
+          if(response.data.state == 1){
+             var list = response.data.data.list
+           
+             this.tableList = list
+             var total = response.data.data.total
+             this.total = total
+             this.manufacturerList = response.data.data.manufacturerList
+           
+           }
+        })
+      },
+      getDrugType(id){
+       
+        var name = ""
+        for(let i=0;i<this.drugTypeList.length;i++){
+           if(this.drugTypeList[i].id == id){
+
+             name = this.drugTypeList[i].name
+           }
+        }
+     
+        return name
+      },
+      getManufacturerList(id){
+        var name = ""
+        for(let i=0;i<this.manufacturerList.length;i++){
+          if(id == this.manufacturerList[i].id){
+             name = this.manufacturerList[i].manufacturer_name
+          }
+        }
+        return name
+      },
+      handleDetail(id){
+        this.$router.push({path:'/drugstock/in/drugstockflow?drug_id='+id})
+      },
+      handleBatch(id){
+        this.$router.push({path:'/drugstock/in/drugbatchnumber?drug_id'+id})
       }
     }
   }

src/xt_pages/stock/stockInOrderAdd.vue

@@ -58,7 +58,29 @@
                   style="width: 100%"
                   max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
         >
-      
+          <el-table-column align="center" width="200">
+             <template slot="header" slot-scope="scope">
+              <span>耗材名称</span>
+            </template>
+            <template slot-scope="scope">
+                <el-autocomplete
+                    class="checkSearch"
+                    popper-class="my-autocomplete"
+                    v-model="scope.row.good_name"
+                    :fetch-suggestions="querySearchAsync"
+                    :trigger-on-focus="false"
+                    placeholder="请输入病人名字"
+                    @select="handleSelect"
+                    @input="changeGoodName(scope.$index)"
+                    style="width:160px;"
+                  >
+                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                  <template slot-scope="{ item }">
+                    <div class="name">{{ item.good_name }}</div>
+                  </template>
+                 </el-autocomplete>
+            </template>
+          </el-table-column>
           <el-table-column align="center" width="200">
             
             <template slot="header" slot-scope="scope">
@@ -67,77 +89,42 @@
      
             <template slot-scope="scope">
               <el-form-item style="padding-top: 15px;margin-left: 10px;margin-right: 10px">
-                <el-input placeholder="请输入耗材类型" v-model="scope.row.good_type_id"
-                          :value="typeName(scope.row.good_type_id)"
-                          @focus="showDialog(scope.$index, scope.row)"></el-input>
+                <el-input placeholder="请输入耗材类型" v-model="scope.row.good_type_id" :value="typeName(scope.row.good_type_id)"></el-input>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="200">
-             <template slot="header" slot-scope="scope">
-              <span>耗材名称</span>
-            </template>
-            <template slot-scope="scope">
-               <el-input v-model="scope.row.good_name" :disabled="true"></el-input>
-            </template>
-          </el-table-column>
           <el-table-column align="center" width="200">
             
             <template slot="header" slot-scope="scope">
-              <span>规格名称<span style="color: red">*</span></span>
+              <span>规格&单位<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
 
               <el-form-item style="padding-top: 15px">
-                <el-input placeholder="请输入规格名称" v-model="scope.row.good_id"
-                          :value="specificationName(scope.row.good_id)"
-                          @focus="showDialog(scope.$index, scope.row)"></el-input>
+                <el-input placeholder="请输入规格名称" v-model="scope.row.name"></el-input>
               </el-form-item>
 
             </template>
           </el-table-column>
-          <el-table-column align="center" width="200">
-             <template slot="header" slot-scope="scope">
-              <span>单位<span style="color: red">*</span></span>
-            </template>
-            <template slot-scope="scope">
-              <el-form-item style="padding-top:15px">
-              <el-select v-model="scope.row.good_unit" style="width:160px;" placeholder="请选择">
-                 <el-option
-                   v-for="(item,index) in propForm.goodUnit"
-                   :key="index"
-                   :label="item.name"
-                   :value="item.id">
-                </el-option>
-              </el-select>
- 
-              </el-form-item>
-            </template>
-          </el-table-column>
-
+        
           <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope">
-              <span>进货价<span style="color: red">*</span></span>
+              <span>批号</span>
             </template>
             <template slot-scope="scope">
-              <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
-              <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price'
-                            style="padding-top: 17px">
-                <el-input placeholder="请输入单价" type="number" v-model="scope.row.price"></el-input>
+              <el-form-item style="padding-top: 17px">
+                <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input>
               </el-form-item>
 
-
             </template>
           </el-table-column>
 
+
           <el-table-column align="center" width="180">
             <template slot="header" slot-scope="scope">
               <span>入库数量<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-              <!--{{scope.row.warehousing_count}}-->
-              <!--<el-input type="number" v-model="scope.row.warehousing_count"   @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
-
               <el-form-item :prop="'recordData.' + scope.$index + '.warehousing_count'"
                             :rules='tableRules.warehousing_count' style="padding-top: 17px">
                 <el-input placeholder="请输入入库数量" type="number" v-model="scope.row.warehousing_count"></el-input>
@@ -145,41 +132,60 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="总价" align="center" width="150">
-            <template slot-scope="scope">
-              {{calculate(scope.row.price*scope.row.warehousing_count)}}
-            </template>
-          </el-table-column>
-
           <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope">
-              <span>批号</span>
+              <span>进货单价<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-              <el-form-item style="padding-top: 17px">
-                <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input>
+            
+              <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price'
+                            style="padding-top: 17px">
+                <el-input placeholder="请输入单价" type="number" v-model="scope.row.price"></el-input>
               </el-form-item>
 
+
+            </template>
+          </el-table-column>
+
+          <el-table-column label="总价" align="center" width="150">
+            <template slot-scope="scope">
+              {{calculate(scope.row.price*scope.row.warehousing_count)}}
             </template>
           </el-table-column>
+          
+          <el-table-column label="生产厂家" align="center" width="150">
+             <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in manufacturerList"
+                  :key="index"
+                  :label="option.manufacturer_name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
+        
           <el-table-column label="生产日期" align="center" width="250">
             <template slot-scope="scope">
-              <!--{{scope.row.product_date | parseTime("{y}-{m}-{d}")}}-->
               <el-date-picker prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.product_date"
                               type="date" placeholder="选择日期时间" format="yyyy-MM-dd"
-                              value-format="yyyy-MM-dd"></el-date-picker>
+                              value-format="yyyy-MM-dd">
+              </el-date-picker>
 
             </template>
           </el-table-column>
           <el-table-column label="有效日期" align="center" width="250">
             <template slot-scope="scope">
-              <!--{{ scope.row.expiry_date | parseTime("{y}-{m}-{d}")}}-->
               <el-date-picker prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.expiry_date"
                               type="date" placeholder="选择日期时间" format="yyyy-MM-dd"
-                              value-format="yyyy-MM-dd"></el-date-picker>
+                              value-format="yyyy-MM-dd">
+              </el-date-picker>
 
             </template>
           </el-table-column>
+         
+
           <el-table-column label="备注" align="center" width="150">
             <template slot-scope="scope">
               <el-input placeholder="请输入备注" v-model="scope.row.remark"></el-input>
@@ -231,7 +237,8 @@
     GetAllGoodType,
     getWarehouseInfoByOrdeNumber,
     modifyWarehouseInfo,
-    postWarehouse
+    postWarehouse,
+    postSearchGoodList
   } from '@/api/stock'
   import BreadCrumb from '../components/bread-crumb'
 
@@ -340,7 +347,9 @@
 
         manufacturer: [],
         dealer: [],
-        goodType: []
+        goodType: [],
+        manufacturerList:[],
+        goodList:[]
       }
     },
     methods: {
@@ -487,6 +496,8 @@
         tempObj['dealer'] = ''
         tempObj['manufacturer'] = ''
         tempObj['good_unit'] = ''
+        tempObj['specification_name'] = ''
+        tempObj['name'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (this.recordInfo.recordData.length <= 1) {
@@ -628,10 +639,7 @@
                 this.$message.error('商品类型不能为空')
                 return
               }
-              if (array[i].good_id == 0) {
-                this.$message.error('规格名称不能为空')
-                return
-              }
+              array[i].price = array[i].price.toString()
             }
 
             if(this.recordInfo.recordData.length <= 0){
@@ -666,6 +674,53 @@
       getDataConfig(module, filed_name){
          return getDataConfig(module, filed_name)
        },
+      querySearchAsync(keyword, cb) {
+        let key = '';
+        if (keyword != undefined) {
+          key = keyword
+        }
+        console.log("keyrowrd",key)
+        postSearchGoodList(key).then(response => {
+          if (response.data.state == 1) {
+           
+             var list = response.data.data.list
+             this.goodList = list
+             var manufacturerList = response.data.data.manufacturerList
+             this.manufacturerList = manufacturerList
+             for(let i=0;i<this.goodList.length;i++){
+                for(let j=0;j<this.manufacturerList.length;j++){
+                  if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
+                     this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+                  }
+                }
+             }
+           
+             cb(this.goodList)
+          } else {
+            cb([])
+          }
+        })
+      },
+      changeGoodName(val){
+        this.currentIndex = val
+      },
+      handleSelect(val){
+        console.log("val",val)
+         for(let i=0;i<this.recordInfo.recordData.length;i++){
+           if(this.currentIndex == i){
+              this.recordInfo.recordData[i].good_type_id = val.id
+              this.recordInfo.recordData[i].good_name = val.good_name
+              this.recordInfo.recordData[i].good_type_id = val.good_type_id
+              this.recordInfo.recordData[i].name = val.specification_name + "*" + val.min_number+val.min_unit +"/"+val.packing_unit
+              this.recordInfo.recordData[i].number =  val.number
+              this.recordInfo.recordData[i].manufacturer = val.manufacturer
+              this.recordInfo.recordData[i].remark = val.remark
+              this.recordInfo.recordData[i].price = val.buy_price
+              this.recordInfo.recordData[i].specification_name = val.specification_name
+              this.recordInfo.recordData[i].good_id = val.id
+           }
+         }
+      }
     }
     ,
     created() {
@@ -691,6 +746,9 @@
       tempObj['dealer'] = ''
       tempObj['manufacturer'] = ''
       tempObj['good_unit'] = ''
+      tempObj['good_name'] = ''
+      tempObj['specification_name'] = ''
+      tempObj['name'] = ''
       this.recordInfo.recordData.push(tempObj)
       this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -25,13 +25,7 @@
     </div>
 
     <div class="app-container">
-    <!---->
-      <!--<stock-in-dialog-->
-        <!--ref="dialog" :propForm="propForm"-->
-        <!--:visibility="isVisibility"-->
-        <!--v-on:dialog-comfirm="comfirm"-->
-        <!--v-on:dialog-cancle="cancle"-->
-      <!--&gt;</stock-in-dialog>-->
+    
 
       <stock-in-dialog
         ref="dialog" :propForm="propForm"
@@ -107,119 +101,161 @@
           max-height="450"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         >
-          <el-table-column min-width="35" align="center">
+         <el-table-column width="150" align="center">
             <template slot="header" slot-scope="scope">
-              <span>耗材类型</span>
+              <span>耗材名称</span>
             </template>
 
             <template slot-scope="scope">
-              <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id == 0" style="color:#c5c8cf">请输入类型</span>-->
-              <!--<span @click="showDialog(scope.$index, scope.row)" v-if="scope.row.good_type_id != 0">{{typeName(scope.row.good_type_id)}}</span>-->
-
               <el-form-item style="padding-top: 15px">
-                <el-input
-                  placeholder="请输入商品类型"
-                  v-model="scope.row.good_type_id"
-                  :value="typeName(scope.row.good_type_id)"
-                  @focus="showDialog(scope.$index, scope.row)"
-                ></el-input>
+                <el-autocomplete
+                    class="checkSearch"
+                    popper-class="my-autocomplete"
+                    v-model="scope.row.good_name"
+                    :fetch-suggestions="querySearchAsync"
+                    :trigger-on-focus="false"
+                    placeholder="请输入病人名字"
+                    @select="handleSelect"
+                    @input="changeGoodName(scope.$index)"
+                    style="width:150px;"
+                  >
+                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                  <template slot-scope="{ item }">
+                    <div class="name">{{ item.good_name }}</div>
+                  </template>
+                 </el-autocomplete>
               </el-form-item>
             </template>
           </el-table-column>
-           <el-table-column min-width="35" align="center">
+          <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
-              <span>耗材名称</span>
+              <span>耗材类型</span>
             </template>
 
             <template slot-scope="scope">
+             
+
               <el-form-item style="padding-top: 15px">
                 <el-input
-                  placeholder=""
-                  v-model="scope.row.good_id"
-                  :value="typeNameOne(scope.row.good_id)"
-                  :disabled="true"
+                  placeholder="请输入商品类型"
+                  v-model="scope.row.good_type_id"
+                  :value="typeName(scope.row.good_type_id)"
+                  @focus="showDialog(scope.$index, scope.row)"
                 ></el-input>
               </el-form-item>
             </template>
           </el-table-column>
+      
           
-          <el-table-column min-width="35" align="center">
+          <el-table-column width="150" align="center">
             <template slot="header" slot-scope="scope">
-              <span>规格名称<span style="color: red">*</span></span>
+              <span>规格&&单位<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
               <el-form-item style="padding-top: 15px">
-                <el-input
-                  placeholder="请输入规格名称"
-                  v-model="scope.row.good_id"
-                  :value="specificationName(scope.row.good_id)"
-                  @focus="showDialog(scope.$index, scope.row)"
-                ></el-input>
+                <el-input v-model="scope.row.name"></el-input>
               </el-form-item>
             </template>
           </el-table-column>
           
-          <el-table-column min-width="35" align="center">
+          <el-table-column  width="150" align="center">
              <template slot="header" slot-scope="scope">
-              <span>单位<span style="color: red">*</span></span>
+              <span>批号<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-              <el-select v-model="scope.row.good_unit" style="width:160px;" placeholder="请选择">
-                 <el-option
-                   v-for="(item,index) in propForm.goodUnit"
-                   :key="index"
-                   :label="item.name"
-                   :value="item.id">
-                </el-option>
-              </el-select>
+               <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input>
             </template>
           </el-table-column>
 
-          <el-table-column min-width="23" align="center">
+         <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
-              <span>出货价<span style="color: red">*</span></span>
+              <span>出库数量<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-              <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
               <el-form-item
-                :prop="'recordData.' + scope.$index + '.price'"
-                :rules="tableRules.price"
+                :prop="'recordData.' + scope.$index + '.count'"
+                :rules="tableRules.count"
                 style="padding-top: 17px"
               >
                 <el-input
-                  placeholder="请输入单价"
+                  placeholder="请输入出库数量"
                   type="number"
-                  v-model="scope.row.price"
+                  v-model="scope.row.count"
                 ></el-input>
               </el-form-item>
             </template>
           </el-table-column>
 
-          <el-table-column min-width="23" align="center">
+          <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
-              <span>出库数量<span style="color: red">*</span></span>
+              <span>出货单价<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
               <el-form-item
-                :prop="'recordData.' + scope.$index + '.count'"
-                :rules="tableRules.count"
+                :prop="'recordData.' + scope.$index + '.price'"
+                :rules="tableRules.price"
                 style="padding-top: 17px"
               >
                 <el-input
-                  placeholder="请输入出库数量"
+                  placeholder="请输入单价"
                   type="number"
-                  v-model="scope.row.count"
+                  v-model="scope.row.price"
                 ></el-input>
               </el-form-item>
             </template>
           </el-table-column>
 
-          <el-table-column label="总价" min-width="20" align="center">
+
+
+          <el-table-column label="总价"  width="150" align="center">
             <template slot-scope="scope">
               {{ calculate(scope.row.price * scope.row.count) }}
             </template>
           </el-table-column>
-          <el-table-column label="备注" min-width="20" align="center">
+
+          <el-table-column label="生产厂商"  width="150" align="center">
+            <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in manufacturerList"
+                  :key="index"
+                  :label="option.manufacturer_name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>   
+          </el-table-column>
+
+         <!-- <el-table-column label="生产日期"  width="150" align="center">
+           <template slot-scope="scope">
+              <el-date-picker
+                prefix-icon="el-icon-date"
+                style="width: 145px"
+                v-model="scope.row.product_date"
+                type="date"
+                placeholder="选择日期时间"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+            </template>
+         </el-table-column>
+
+          <el-table-column label="有效期"  width="150" align="center">
+            <template slot-scope="scope">
+              <el-date-picker
+                prefix-icon="el-icon-date"
+                style="width: 145px"
+                v-model="scope.row.expiry_date"
+                type="date"
+                placeholder="选择日期时间"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+            </template>
+          </el-table-column> -->
+
+
+          <el-table-column label="备注"  width="150" align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.remark"></el-input>
             </template>
@@ -265,7 +301,7 @@
 
 <script>
 import { uParseTime } from "@/utils/tools";
-import { getSalesReturnConfig, postWarehouseOut,GetAllConfig,GetAllGoodInfoByID } from "@/api/stock";
+import { getSalesReturnConfig, postWarehouseOut,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList } from "@/api/stock";
 
 import BreadCrumb from "../components/bread-crumb";
 import StockInDialog from './Dialog/stockInDialog'
@@ -320,7 +356,9 @@ export default {
       manufacturer: [],
       dealer: [],
       goodType: [],
-      goodInfo:[]
+      goodInfo:[],
+      goodList:[],
+      manufacturerList:[]
     };
   },
   methods: {
@@ -352,36 +390,7 @@ export default {
 
       this.currentIndex = -1
 
-      // this.$refs.dialog.hide();
-      // this.propForm.goodType = [];
-      // if (val.selectedGoodInfo.length > 0) {
-      //   for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {
-      //     if (i == 0) {
-      //       this.recordInfo.recordData[this.currentIndex].good_type_id =
-      //         val.selectedGoodInfo[i].good_type_id;
-      //       this.recordInfo.recordData[this.currentIndex].good_id =
-      //         val.selectedGoodInfo[i].id;
-      //       this.recordInfo.recordData[
-      //         this.currentIndex
-      //       ].price = val.selectedGoodInfo[i].buy_price.toString();
-      //     } else {
-      //       console.log(val.selectedGoodInfo[i].buy_price.toString());
-      //       const tempForm = {};
-      //       tempForm["good_type_id"] = val.selectedGoodInfo[i].good_type_id;
-      //       tempForm["good_id"] = val.selectedGoodInfo[i].id;
-      //       tempForm["count"] = "";
-      //       tempForm["price"] = val.selectedGoodInfo[i].buy_price.toString();
-      //       tempForm["remark"] = "";
-      //       this.recordInfo.recordData.splice(
-      //         this.currentIndex + 1,
-      //         0,
-      //         tempForm
-      //       );
-      //     }
-      //   }
-      // }
-      //
-      // this.currentIndex = -1;
+    
     },
     cancle: function() {
       this.$refs.dialog.hide();
@@ -404,22 +413,6 @@ export default {
           return false;
         } else {
           loading.close();
-          // var warehouseInfoList = response.data.data.warehouseInfoList;
-          // this.warehouseInfoList = response.data.data.warehouseInfoList;
-          // for (let i = 0; i < warehouseInfoList.length; i++) {
-          //   if (warehouseInfoList[i].info.manufacturers.id > 0) {
-          //     this.manufacturer.push(warehouseInfoList[i].info.manufacturers);
-          //   }
-          //   if (warehouseInfoList[i].info.dealers.id > 0) {
-          //     this.dealer.push(warehouseInfoList[i].info.dealers);
-          //   }
-          // }
-          //
-          // for (let i = 0; i < this.warehouseInfoList.length; i++) {
-          //   this.goodType.push(this.warehouseInfoList[i].info.type);
-          // }
-
-
           this.manufacturer = response.data.data.manufacturer
           this.dealer = response.data.data.dealer
           this.goodType = response.data.data.goodType
@@ -429,29 +422,6 @@ export default {
           this.manufacturer.splice(0, 0, { id: -1, manufacturer_name: '其他' })
           this.dealer.splice(0, 0, { id: -1, dealer_name: '其他' })
 
-
-
-          // const obj = {};
-          // const obj2 = {};
-          // const obj3 = {};
-          // // 去重复
-          // this.manufacturer = this.manufacturer.reduce((cur, next) => {
-          //   obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
-          //   return cur;
-          // }, []);
-          // // 去重复
-          // this.dealer = this.dealer.reduce((cur, next) => {
-          //   obj2[next.id] ? "" : (obj2[next.id] = true && cur.push(next));
-          //   return cur;
-          // }, []);
-          //
-          // this.goodType = this.goodType.reduce((cur, next) => {
-          //   obj3[next.id] ? "" : (obj3[next.id] = true && cur.push(next));
-          //   return cur;
-          // }, []);
-          //
-          // this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
-          // this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
         }
       });
     },
@@ -490,6 +460,8 @@ export default {
       tempObj["price"] = "";
       tempObj["remark"] = "";
       tempObj["good_unit"] = "";
+      tempObj["number"] = ""
+      tempObj["specification_name"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -607,8 +579,8 @@ export default {
           const params = {
             stockOut: this.recordInfo.recordData
           };
-          console.log(this.form.dealer);
-
+          console.log(this.recordInfo.recordData);
+          return
           postWarehouseOut(
             params,
             this.warehouse_out_time,
@@ -635,7 +607,54 @@ export default {
     },
     changeDealer(val) {
       this.propForm.dealer = val;
-    }
+    },
+    querySearchAsync(keyword, cb) {
+      let key = '';
+      if (keyword != undefined) {
+        key = keyword
+      }
+      console.log("keyrowrd",key)
+      postSearchGoodList(key).then(response => {
+        if (response.data.state == 1) {
+          
+            var list = response.data.data.list
+            this.goodList = list
+            var manufacturerList = response.data.data.manufacturerList
+            this.manufacturerList = manufacturerList
+            for(let i=0;i<this.goodList.length;i++){
+              for(let j=0;j<this.manufacturerList.length;j++){
+                if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
+                    this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+                }
+              }
+            }
+          
+            cb(this.goodList)
+        } else {
+          cb([])
+        }
+      })
+    },
+    changeGoodName(val){
+      this.currentIndex = val
+    },
+    handleSelect(val){
+      console.log("val",val)
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+          if(this.currentIndex == i){
+            this.recordInfo.recordData[i].good_type_id = val.id
+            this.recordInfo.recordData[i].good_name = val.good_name
+            this.recordInfo.recordData[i].good_type_id = val.good_type_id
+            this.recordInfo.recordData[i].name = val.specification_name + "*" + val.min_number+val.min_unit +"/"+val.packing_unit
+            // this.recordInfo.recordData[i].number =  val.number
+            this.recordInfo.recordData[i].manufacturer = val.manufacturer
+            this.recordInfo.recordData[i].remark = val.remark
+            this.recordInfo.recordData[i].price = val.buy_price
+            this.recordInfo.recordData[i].specification_name = val.specification_name
+            this.recordInfo.recordData[i].good_id = val.id
+          }
+        }
+      }
   },
   created() {
     var nowDate = new Date();
@@ -655,6 +674,8 @@ export default {
     tempObj["price"] = "";
     tempObj["remark"] = "";
     tempObj["good_unit"] = ""
+    tempObj["number"] = ""
+    tempObj["specification_name"] = ""
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;