Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/router/index_路由未分离前.js

@@ -604,7 +604,7 @@ export const xt_asyncRouterMap = [
         name: 'weight',
         meta: { title: 'weight', noCache: true }
       },
-   
+
       {
         path: '/patients/patient/:id/dialysisRecord',
         component: () => import('@/xt_pages/user/dialysisRecord'),
@@ -860,21 +860,24 @@ export const xt_asyncRouterMap = [
         hidden: true,
         is_menu: false,
         meta: { title: 'stockOutOrderAdd', noCache: true }
-      }, {
+      },
+      {
         path: '/stock/out/detail',
         component: () => import('@/xt_pages/stock/stockOutDetail'),
         name: 'stockOutDetail',
         hidden: true,
         is_menu: false,
         meta: { title: 'stockOutDetail', noCache: true }
-      }, {
+      },
+      {
         path: '/stock/cancel/add',
         component: () => import('@/xt_pages/stock/cancelStockOrderAdd'),
         name: 'cancelStockOrderAdd',
         hidden: true,
         is_menu: false,
         meta: { title: 'cancelStockOrderAdd', noCache: true }
-      }, {
+      },
+      {
         path: '/stock/cancel/detail',
         component: () => import('@/xt_pages/stock/cancelStockDetail'),
         name: 'cancelStockDetail',
@@ -887,8 +890,8 @@ export const xt_asyncRouterMap = [
         component: () => import('@/xt_pages/stock/index'),
         name: 'config',
         meta: { title: 'config' }
-      },
-     
+      }
+
     ]
   },
   {

src/router/modules/drugs.js

@@ -13,40 +13,40 @@ export default {
   },
   children: [
     {
-        path: '/stock/drugs/stock/query',
-        component: () => import('@/xt_pages/stock/drugs/query'),
-        name: 'drugsQuery',
-        meta: { title: 'drugsQuery', noCache: true }
+      path: '/stock/drugs/stock/query',
+      component: () => import('@/xt_pages/stock/drugs/query'),
+      name: 'drugsQuery',
+      meta: { title: 'drugsQuery', noCache: true }
     },
     {
-        path: '/stock/drugs/stock/in',
-        component: () => import('@/xt_pages/stock/drugs/drugStockInOrder'),
-        name: 'drugsStockIn',
-        meta: { title: 'drugsStockIn', noCache: true }
+      path: '/stock/drugs/stock/in',
+      component: () => import('@/xt_pages/stock/drugs/drugStockInOrder'),
+      name: 'drugsStockIn',
+      meta: { title: 'drugsStockIn', noCache: true }
     },
     {
-        path: '/stock/drugs/stock/out',
-        component: () => import('@/xt_pages/stock/drugs/drugStockOutOrder'),
-        name: 'drugsStockOut',
-        meta: { title: 'drugsStockOut', noCache: true }
+      path: '/stock/drugs/stock/out',
+      component: () => import('@/xt_pages/stock/drugs/drugStockOutOrder'),
+      name: 'drugsStockOut',
+      meta: { title: 'drugsStockOut', noCache: true }
     },
     {
-        path: '/stock/drugs/stock/return',
-        component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrder'),
-        name: 'drugsStockReturn',
-        meta: { title: 'drugsStockReturn', noCache: true }
+      path: '/stock/drugs/stock/return',
+      component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrder'),
+      name: 'drugsStockReturn',
+      meta: { title: 'drugsStockReturn', noCache: true }
     },
     {
-        path: '/stock/drugs/stock/cancel',
-        component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrder'),
-        name: 'drugsStockCancel',
-        meta: { title: 'drugsStockCancel', noCache: true }
+      path: '/stock/drugs/stock/cancel',
+      component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrder'),
+      name: 'drugsStockCancel',
+      meta: { title: 'drugsStockCancel', noCache: true }
     },
     {
-      path:'/stock/drugs/stock/detail',
-      component:()=>import('@/xt_pages/stock/drugs/drugIndex'),
-      name:'drugDetail',
-      meta:{title:'明细查询',noCache:true}
+      path: '/stock/drugs/stock/detail',
+      component: () => import('@/xt_pages/stock/drugs/drugIndex'),
+      name: 'drugDetail',
+      meta: { title: '明细查询', noCache: true }
     },
     // {
     //     path: '/stock/drugs/stock/adjustPrice',
@@ -122,7 +122,7 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'cancelDrugStockOrderAdd', noCache: true }
-    },{
+    }, {
       path: '/drugstock/cancel/detail',
       component: () => import('@/xt_pages/stock/drugs/cancelDrugStockDetail'),
       name: 'cancelDrugStockDetail',
@@ -139,31 +139,40 @@ export default {
       meta: { title: 'drugStockUserDetail', noCache: true }
     },
 
-    //编辑药品入库单
+    // 编辑药品入库单
     {
-      path:'/drugstock/in/order/edit',
-      component:()=>import('@/xt_pages/stock/drugs/drugStockInOrderEdit'),
-      name:'drugStockInOrderEdit',
-      hidden:true,
-      is_menu:false,
+      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/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 }
     },
     {
-      path:'/drugstock/in/drugbatchnumber',
-      component:()=>import('@/xt_pages/stock/drugs/drugBatchNumber'),
-      name:"drugBatchNumber",
-      hidden:true,
-      is_menu:false,
-      meta:{title:"drugBatchNumber",noCache:true}
+      path: '/stock/stockoutorderedit',
+      component: () => import('@/xt_pages/stock/stockOutOrderEdit'),
+      name: 'stockOutOrderEdit',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockOutOrderEdit', noCache: true }
     }
+
   ]
 }

src/xt_pages/data/components/addDrugs.vue

@@ -14,12 +14,12 @@
                             <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.drug_alias" 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
@@ -31,11 +31,11 @@
                             </el-select>
                         </el-form-item>
                         <div style="width:100%;">
-                          <div><span style="color:red;">*</span>单位&规格: <span style="color:#999">例如：0.75 g * 60 粒 / 盒</span></div>
+                          <div><span style="width:120px;text-align:right;display:inline-block"><span style="color:red;">*</span>单位&规格：</span><span style="color:#999">例如：0.75 g * 60 粒 / 盒</span></div>
                         </div>
-                        <div style="width:100%;display:flex;align-items:center;">
+                        <div style="width:100%;display:flex;align-items:center;margin-left:120px;">
                             <el-form-item prop="dose" class="noMargin">
-                              <el-input v-model="form.dose" type="number" style="width:100px" placeholder="剂量" :disabled="dosageShow"></el-input>  
+                              <el-input v-model="form.dose" type="number" style="width:100px;margin-right:5px;" 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">
@@ -45,11 +45,11 @@
                                   :label="item.name"
                                   :value="item.name">
                                 </el-option>
-                            </el-select>
-                          </el-form-item>
-                            *
+                              </el-select>
+                            </el-form-item>
+                            <span style="margin-bottom:20px;font-size:20px;">*</span>
                             <el-form-item prop="min_number" class="noMargin">
-                              <el-input v-model="form.min_number" style="width:100px" type="number" placeholder="拆零"> </el-input>
+                              <el-input v-model="form.min_number" style="width:100px;margin-right:5px;" :disabled="dosageShow" 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">
@@ -60,8 +60,8 @@
                                   :value="item.name">
                                 </el-option>
                               </el-select>
-                          </el-form-item>
-                          /
+                            </el-form-item>
+                          <span style="margin-bottom:20px;font-size:20px;">/</span>
                           <el-form-item prop="max_unit" class="noMargin">
                             <el-select v-model="form.max_unit" style="width:160px;" placeholder="包装单位">
                               <el-option
@@ -73,8 +73,8 @@
                             </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
@@ -106,7 +106,7 @@
                             </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>
@@ -155,7 +155,7 @@
                                 </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>
@@ -196,7 +196,7 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                      
+
 
 
                         <el-form-item label="限制性用药 : ">
@@ -228,7 +228,7 @@
                                       maxlength="30"></el-input>
                         </el-form-item>
                         <el-form-item label="生产厂商 : " prop="manufacturer">
-                           
+
                             <el-select v-model="form.manufacturer" style="width:160px;" filterable placeholder="请选择">
                                 <el-option
                                         v-for="(item,index) in manufacturerList"
@@ -295,13 +295,14 @@
                         </el-form-item>
 
                         <el-form-item label="社保目录编码">
-                            <el-input v-model="form.social_security_directory_code" style="width:180px"></el-input>
+                            <el-input v-model="form.social_security_directory_code" style="width:160px"></el-input>
                         </el-form-item>
 
 
 
                         <el-form-item label="备案日期:">
                             <el-date-picker
+                                    style="width:160px"
                                     value-format="yyyy-MM-dd"
                                     v-model="form.record_date"
                                     type="date"
@@ -310,9 +311,9 @@
                         </el-form-item>
 
                         <el-form-item label="药品备注:">
-                            <el-input v-model="form.drug_remark" style="width:180px"></el-input>
+                            <el-input v-model="form.drug_remark" style="width:160px"></el-input>
                         </el-form-item>
-                      
+
                         <el-form-item label="经销商: " style="width:100%">
 
                             <el-select v-model="form.dealer" style="width:100%;" filterable placeholder="请选择">
@@ -348,7 +349,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="label">
                         <el-select v-model="form.label" style="width:160px;" placeholder="请选择">
                             <el-option
@@ -539,8 +540,9 @@
           drug_name: [{ required: true, message: '请填写药品名称', trigger: 'blur' }],
           drug_alias: [{ required: true, message: '请选择药品类别', trigger: 'change' }],
           // drug_spec: [{ required: true, message: '请填写药品规格', trigger: 'blur' }],
-          dosage:[{required:true,message:'请输入药品剂量',trigger:'blur'}],
-          max_unit: [{ required: true, message: '请填写剂量单位', trigger: 'change' }],
+          dose:[{required:true,message:'请输入剂量',trigger:'blur'}],
+          dose_unit:[{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'}],
@@ -550,7 +552,7 @@
           drug_origin_place: [{ required: true, message: '请填写产地', trigger: 'blur' }],
           drug_dosage_form: [{ required: true, message: '请填写药品剂型', trigger: 'blur' }],
           medical_insurance_level: [{ 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' }],
@@ -565,7 +567,7 @@
           drug_remark: [{ required: true, message: '请填写药品备注' }],
           lmt_used_flag:[{ required: true, message: '请选择是否限制用药' }],
           hosp_appr_flag:[{ required: true, message: '请选择审批标志' }],
-      
+
         },
         page: 1,
         limit: 500,
@@ -598,7 +600,7 @@
         type: Number,
         default: 1
       },
-     
+
 
     },
     methods: {
@@ -609,7 +611,7 @@
         this.$refs[formName].validate((valid) => {
           console.log(valid)
           if (valid) {
-            console.log(1111,this.getValue())
+            // console.log(1111,this.getValue())
             this.$emit('dialog-comfirm', this.getValue())
           }
         })
@@ -639,7 +641,7 @@
         this.form.intro = ''
       },
       show(id, obj) {
-        
+
         this.unitList = []
         var arr =  getDataConfig('hemodialysis','units')
         for(let i=0;i<arr.length;i++){
@@ -652,6 +654,7 @@
               this.unitList.push(arr[i])
             }
         }
+        console.log('this.unitList',this.unitList)
         this.getInitializtion()
         this.getlist()
         this.GetAllConfig()
@@ -660,11 +663,11 @@
         }else{
           obj.drug_classify = parseInt(obj.drug_classify)
         }
-       
+
         if(obj.dealer == 0){
            obj.dealer = ""
         }
-        
+
         this.visible = true
         if (id == 0) {
           this.formTitle = '新增'
@@ -716,7 +719,12 @@
         this.form.prescription_mark = ''
         this.form.record_date = ''
         this.form.drug_remark = ''
-
+        this.form.dose = ''
+        this.form.dose_unit = ""
+        this.form.min_number= ""
+        this.form.min_unit = ""
+        this.form.max_unit = ""
+        this.form.min_price = ""
         this.visible = false
       },
       getValue: function() {
@@ -790,7 +798,7 @@
 
         getManufacturerList(params).then(response => {
           var manufacturerList = response.data.data.manufacturer
-         
+
           this.manufacturerList = manufacturerList
         })
       },
@@ -809,28 +817,28 @@
         getInitializtion().then(response=>{
            if(response.data.state ==1){
              var drugCategoryList =  response.data.data.drugCategoryList
-            
+
              this.drugCategoryList = drugCategoryList
              var drugTypeList = response.data.data.drugTypeList
-             
+
               this.drugTypeList = drugTypeList
              var drugDosageFormList =  response.data.data.drugDosageFormList
-            
+
              this.drugDosageFormList = drugDosageFormList
              var medicalInsuranceLevelList =  response.data.data.medicalInsuranceLevelList
-           
+
              this.medicalInsuranceLevelList = medicalInsuranceLevelList
              var drugControlList = response.data.data.drugControlList
-             
+
              this.drugControlList = drugControlList
              var drugClassifyList = response.data.data.drugClassifyList
-           
+
              this.drugClassifyList = drugClassifyList
              var statisticsCategoryList =  response.data.data.statisticsCategoryList
-            
+
              this.statisticsCategoryList = statisticsCategoryList
              var pharmacologyCategoryList = response.data.data.pharmacologyCategoryList
-           
+
              this.pharmacologyCategoryList = pharmacologyCategoryList
            }
         })
@@ -838,39 +846,83 @@
       changeMaxUnit(val){
         if(val == this.form.min_unit){
           this.form.dose = 1
+          this.form.min_number = this.form.dose
           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++){
+          this.dosageShow = false
+        }
+        var arr =  getDataConfig('hemodialysis','units')
+        this.unitList = []
+        for(let i=0;i<arr.length;i++){
+
+          if(this.form.min_unit == arr[i].name){
+            this.unitList.push(arr[i])
+          }
           if(val == arr[i].name){
-             this.unitList.push(arr[i])
+            this.unitList.push(arr[i])
           }
-       }
-               
+          let idArr = []
+          this.unitList.map(item => {
+            idArr.push(item.id)
+          })
+          if(idArr.indexOf(this.form.drug_dose_unit) == -1){
+            if(this.form.drug_dose_unit == arr[i].id){
+              this.unitList.push(arr[i])
+            }
+          }
+
+        }
+        let ojb = {};
+        this.unitList = this.unitList.reduce(function(prevArr, currentItem) {
+            //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
+            ojb[currentItem.name] ? '' : ojb[currentItem.name] = true && prevArr.push(currentItem);
+            return prevArr
+        }, [])
+
       },
       changeMinUnit(val){
         if(val == this.form.max_unit){
           this.form.dose = 1
+          this.form.min_number = this.form.dose
           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')
+
+        // if(this.form.dosage == "" || this.form.max_unit == ""){
+        //    this.form.min_number = 1
+        // }
+        var arr = getDataConfig('hemodialysis','units')
+        this.unitList = []
         for(let i=0;i<arr.length;i++){
             if(val == arr[i].name){
               this.unitList.push(arr[i])
             }
+            if(this.form.max_unit == arr[i].name){
+              this.unitList.push(arr[i])
+            }
+            if(this.form.drug_dose_unit == arr[i].id){
+              this.unitList.push(arr[i])
+            }
+            let idArr = []
+            this.unitList.map(item => {
+              idArr.push(item.id)
+            })
+            if(idArr.indexOf(this.form.drug_dose_unit) == -1){
+              if(this.form.drug_dose_unit == arr[i].id){
+                this.unitList.push(arr[i])
+              }
+            }
         }
-       
+        let ojb = {};
+        this.unitList = this.unitList.reduce(function(prevArr, currentItem) {
+          //利用对象的键名无法重复的特点，mch_id是唯一区别的属性值
+          ojb[currentItem.name] ? '' : ojb[currentItem.name] = true && prevArr.push(currentItem);
+          return prevArr
+        }, [])
+
       }
     }, watch: {
       visible(val) {
@@ -883,9 +935,9 @@
        //获取所有经销商
       this.GetAllConfig()
       this.getlist()
-      
-      
-     
+
+
+
     }
   }
 </script>

src/xt_pages/dialysis/details/NavIgation.vue

@@ -90,6 +90,7 @@
       :schedual="temp_schedual"
       :stockType="stockType"
       :lastAssessment="lastAssessment"
+      :mode_id="mode_id"
     ></dialysis-prescription-dialog>
 
     <double-check-dialog
@@ -209,12 +210,16 @@ export default {
 
   data() {
     return {
-      temp_schedual: {}
+      temp_schedual: {},
+      mode_id:1
     };
   },
   mounted() {},
 
   props: {
+    mode_id:{
+      type:Number
+    },
     longAdvices: {
       // 临时医嘱
       type: Array,

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

@@ -1308,13 +1308,16 @@
                 type: 'success',
                 duration: 2000
               })
+              var msg = response.data.data.msg
+              if(msg == "ok"){
+                 this.$message.error("请入库,库存不足")
+              }
+            
               var exid = response.data.data.advice.id
               if (response.data.data.advice.parent_id > 0) {
                 exid = response.data.data.advice.parent_id
               }
-              // if (this.currentRow.parent_id > 0) {
-              //     exid = this.currentRow.parent_id;
-              // }
+             
               this.currentRow.execution_state = 1
               this.currentRow.execution_staff =
                 response.data.data.advice.execution_staff

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

@@ -804,6 +804,9 @@
     name: 'dialysisPrescriptionDialog',
     components: { MsgTip,multiSelectBox },
     props: {
+      mode_id:{
+        type:Number
+      },
       schedual: {
         type: Object
       },
@@ -1815,7 +1818,8 @@
 
         // 入口
         var pre = pre
-        this.dialysisPrescription.mode_id = this.$route.query.mode_id
+        this.dialysisPrescription.mode_id = this.$route.query.mode_id ? this.$route.query.mode_id : this.mode_id
+        console.log('this.dialysisPrescription.mode_id',this.dialysisPrescription.mode_id)
         if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || this.schedual.mode_id == 2 || this.schedual.mode_id == 5 || this.schedual.mode_id == 12) {
           this.zhiShow = true
           this.huShow = true

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -15,7 +15,7 @@
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id == 40 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
           <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38)" width="50px"> 超滤率 <br />(ml/h) </th>
           <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

@@ -880,7 +880,8 @@
         <td>&nbsp;{{monitor.dialysate_temperature}}</td>
         <td>&nbsp;{{monitor.replacement_rate}}</td> -->
           <td>
-            &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
+            <template v-if="(dialysisOrder && monitor.operate_time == dialysisOrder.start_time)">【开始透析】</template>
+            {{ monitor.end }}&nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
           </td>
           <td>
             <span v-if="setAdminUserES(monitor.monitoring_nurse) == ''">
@@ -2096,12 +2097,29 @@ export default {
             if (this.org_template_info.org_id == 9535) {
               this.isShowZero = true
             }
+            var tempmonitorflag = true;
+            for (let index = 0; index < this.monitors.length; index++) {
+              const monitor = this.monitors[index]
+              this.monitors[index].end = ''
+              if (Object.keys(monitor).length > 0 && index > 1) {
+                if (this.dialysisOrder && monitor.operate_time == this.dialysisOrder.end_time) {
+                  this.monitors[index].end = '【结束透析】'
+                  tempmonitorflag = false
+                }
+                if (tempmonitorflag && index == this.monitors.length - 1) {
+                  this.monitors[index].end = '【结束透析】'
+                }
+              }
+            }
             if (this.monitors.length < 6) {
               var nl = 6 - this.monitors.length
               for (let index = 0; index < nl; index++) {
                 this.monitors.push([])
               }
             }
+
+            
+            console.log('this.monitors',this.monitors)
             this.jilurow = this.monitors.length + 1
 
             this.advice_jilurow = this.advices.length + 1

src/xt_pages/outpatientCharges/components/monthPrescriptionTable.vue

@@ -44,23 +44,25 @@
 
       <el-table-column align="center" prop="day" width="50" label="天数">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.day" placeholder="" readonly></el-input>
-          <div>{{'天'}}</div>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.day" placeholder="" readonly></el-input>
+            <span>{{'天'}}</span>
+          </div>
         </template>
       </el-table-column>
 
       <el-table-column align="center" prop="prescribing_number" width="80" label="总量">
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
-            <el-input v-model="scope.row.prescribing_number" style="width:60%" placeholder="" readonly></el-input>
-            <div> {{scope.row.prescribing_number_unit}}</div>
+            <el-input v-model="scope.row.prescribing_number" style="width:60%" placeholder="" readonly></el-input>{{scope.row.prescribing_number_unit}}
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="retail_price" width="60" label="单价">
+      <el-table-column align="center" prop="retail_price" width="70" label="单价">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
-          <div>{{'元'}}</div>
+          <div style="display:flex;align-items:center;">
+          <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>{{'元'}}
+          </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="remark" width="50" label="备注">
@@ -105,8 +107,10 @@
       </el-table-column>
       <el-table-column align="center" prop="number_days" width="50" label="天数">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>
-          <div>{{'天'}}</div>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>
+            <div>{{'天'}}</div>
+          </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="total" width="70" label="总量">
@@ -117,10 +121,12 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="单价">
+      <el-table-column align="center" prop="name" width="70" label="单价">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
-          <div>{{'元'}}</div>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
+            <div>{{'元'}}</div>
+          </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="备注">

src/xt_pages/outpatientDoctorStation/components/dialysisIndex.vue

@@ -61,6 +61,7 @@
           :his_is_open="his_is_open"
           :lastAssessment="lastAssessment"
           :stockType="stockType"
+          :mode_id="mode_id"
         >
         </nav-igation>
 
@@ -309,7 +310,8 @@ export default {
       queueConfig:{},
       stockType:[],
       preparestock:[],
-      dialysisShow:false
+      dialysisShow:false,
+      mode_id:1
     }
   },
   created() {
@@ -326,6 +328,8 @@ export default {
         schedules.map(item => {
           if(item.patient_id == this.patient_id){
             arr.push(item.patient_id)
+            console.log('item',item)
+            this.mode_id = item.mode_id
           }
         })
         if(arr.length > 0){
@@ -362,6 +366,7 @@ export default {
                   schedules.map(item => {
                     if(item.patient_id == this.patient_id){
                       arr.push(item.patient_id)
+                      this.mode_id = item.mode_id
                     }
                   })
                   if(arr.length > 0){

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

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

src/xt_pages/outpatientDoctorStation/components/prescriptionTemplateTable.vue

@@ -7,11 +7,15 @@
                 <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span></template>
             </el-table-column>
 
-            <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
+            <el-table-column align="center" prop="single_dose" width="120" label="单次用量">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
-                        <el-input v-model="scope.row.single_dose" @input="getSingleDose(scope)" style="width:65%;"></el-input>
-                        <div>{{scope.row.single_dose_unit}}</div>
+                        <el-input v-model="scope.row.single_dose" @input="getSingleDose(scope)" style="width:50%;"></el-input>
+                        <!-- <div>{{scope.row.single_dose_unit}}</div> -->
+                        <el-select v-model="scope.row.single_dose_unit" placeholder="请选择" style="width:50%;" @change="getAllChange(scope)">
+                          <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
+                          <el-option :label="scope.row.drug.dose_unit" :value="scope.row.drug.dose_unit"></el-option>
+                        </el-select>
                     </div>
                 </template>
             </el-table-column>
@@ -29,7 +33,7 @@
             </el-table-column>
             <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
                 <template slot-scope="scope">
-                    <el-select v-model="scope.row.execution_frequency" placehold er="请选择">
+                    <el-select v-model="scope.row.execution_frequency" placehold er="请选择" @change="getAllChange(scope)">
                         <el-option
                                 v-for="item,index in efs"
                                 :key="index"
@@ -44,16 +48,20 @@
             <el-table-column align="center" prop="day" width="70" label="天数">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
-                        <el-input v-model="scope.row.day" @input="getDay(scope)" placeholder=""></el-input>{{'天'}}
+                        <el-input v-model="scope.row.day" @input="getAllChange(scope)" placeholder=""></el-input>{{'天'}}
                     </div>
                 </template>
             </el-table-column>
 
-            <el-table-column align="center" prop="prescribing_number" width="80" label="总量">
+            <el-table-column align="center" prop="prescribing_number" width="120" label="总量">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
-                        <el-input v-model="scope.row.prescribing_number" style="width:60%" placeholder=""></el-input>
-                        <div> {{scope.row.prescribing_number_unit}}</div>
+                        <el-input v-model="scope.row.prescribing_number" style="width:50%" @input="changePrescribingNumber(scope)" placeholder=""></el-input>
+                        <!-- <div> {{scope.row.prescribing_number_unit}}</div> -->
+                        <el-select v-model="scope.row.prescribing_number_unit" placeholder="请选择" style="width:50%;" @change="getAllChange(scope)">
+                          <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
+                          <el-option :label="scope.row.drug.max_unit" :value="scope.row.drug.max_unit"></el-option>
+                        </el-select>
                     </div>
                 </template>
             </el-table-column>
@@ -89,8 +97,10 @@
             </el-table-column>
             <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
                 <template slot-scope="scope">
+                  <div style="display:flex;align-items:center;">
                     <el-input v-model="scope.row.single_dose" @input="getProjectSingleDose(scope)" placeholder=""></el-input>
                     <div>{{scope.row.unit}}</div>
+                  </div>
 
                 </template>
             </el-table-column>
@@ -127,10 +137,12 @@
                     </div>
                 </template>
             </el-table-column>
-            <el-table-column align="center" prop="name" width="50" label="单价">
+            <el-table-column align="center" prop="name" width="70" label="单价">
                 <template slot-scope="scope">
-                    <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
-                    <div>{{'元'}}</div>
+                    <div style="display:flex;align-items:center;">
+                      <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
+                      <div>{{'元'}}</div>
+                    </div>
 
                 </template>
             </el-table-column>
@@ -375,6 +387,51 @@
           .catch(() => {});
 
       },
+      getAllChange(scope){
+        if(scope.row.drug.min_unit == scope.row.single_dose_unit){
+          if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+            console.log(1)
+            scope.row.prescribing_number = scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day
+          }else{
+            console.log(12)
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency)) * scope.row.day / scope.row.drug.min_number) 
+          }
+        }else{
+          if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+            console.log(123)
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose) 
+          }else{
+            console.log(1234)
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose / scope.row.drug.min_number)
+          }
+        }
+        if(scope.row.prescribing_number == 0){
+          scope.row.prescribing_number = 1
+        }
+        if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+          // scope.row.retail_price = scope.row.drug.min_price * scope.row.prescribing_number
+          if(scope.row.prescribing_number > scope.row.drug.total){
+            this.$message.error(scope.row.drug_name + '库存不足')
+          }
+        }else{
+          if((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total){
+            this.$message.error(scope.row.drug_name + '库存不足')
+          }
+          // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
+        }
+        
+      },
+      changePrescribingNumber(scope){
+        if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+          if(parseInt(scope.row.prescribing_number) > scope.row.drug.total){
+            this.$message.error(scope.row.drug_name + '库存不足')
+          }
+        }else{
+          if((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total){
+            this.$message.error(scope.row.drug_name + '库存不足')
+          }
+        }
+      },
       getSingleDose(scope){
         this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
       },

src/xt_pages/outpatientDoctorStation/prescriptionTemplate.vue

@@ -94,7 +94,8 @@
         page: 1,
         limit: 10,
         patient_id: 0,
-        total:0
+        total:0,
+        patient_name:''
       }
     },
     methods: {
@@ -132,7 +133,7 @@
         })
       },
       jumpDetail(row) {
-        this.$router.push('/outpatientDoctorStation/prescriptionTemplatedetail?id=' + row.id + '&patient_id=' + this.patient_id)
+        this.$router.push('/outpatientDoctorStation/prescriptionTemplatedetail?id=' + row.id + '&patient_id=' + this.patient_id + '&patient_name=' + this.patient_name)
       },
       getMode(id) {
         let name = ''
@@ -170,6 +171,7 @@
         this.page = 1
         this.limit = 10
         this.patient_id = val.id
+        this.patient_name = val.name
         let params = {
           patient_id: val.id,
           page: this.page,

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1,13 +1,13 @@
 <template>
     <div class="main-contain new-main-contain">
 
-        <div style="height: calc(100% - 58px);display: flex;flex-direction: column;margin-top: 56px;">
-            <div class="position">
-                <bread-crumb :crumbs='crumbs'></bread-crumb>
-                <el-button type="primary" @click="save">保存</el-button>
-
+        <div style="height: calc(100% - 0px);display: flex;flex-direction: column;">
+            <div style="display:flex;justify-content: space-between;align-items:center;margin-bottom:10px;padding:0 10px;color:#606266;">
+              <div>姓名：{{ $route.query.patient_name }}</div>
+              <el-button size="small" @click="save" type="primary">保存</el-button>
             </div>
-            <div class="mainCenter" v-loading="loading">
+
+            <div class="mainCenter" style="padding:0 10px;" v-loading="loading">
                 <div class="centerLeft">
                     <el-form :model="tempForm" ref="tempForm" label-width="80px"
                              style="display: flex;flex-wrap: wrap;justify-content: space-between;">
@@ -1322,8 +1322,8 @@
                   prescribing_number: temp[b].prescribing_number,
                   single_dose_unit: temp[b].min_unit,
                   prescribing_number_unit: temp[b].max_unit,
-                  medical_insurance_number: temp[b].medical_insurance_number
-
+                  medical_insurance_number: temp[b].medical_insurance_number,
+                  drug: temp[b]
                 }
 
                 if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -3,7 +3,7 @@
   <div id='prescriptionPrint'>
     <div v-for="(item,index) in advicePrint" :key="index">
       <div id='prescription-print'  v-for='(i,pageIndex) in item.pageArr.length' :key="pageIndex" class="prescription-print" style="page-break-after: always;">
-          <img src="../../../assets/img/bailinTop.jpg" alt="">
+          <img src="../../../assets/img/bailinTop.jpg" style="width:100%" alt="">
           <div class="printTitle">处方笺</div>
           <div style="display:flex;">
             <div style="width:33%;display:flex;">费别：<span class="under_line"></span></div>
@@ -66,7 +66,7 @@
           </div>
           <div>*处方当日有效，特殊情况可适当延长，一般不超过3天</div>
           <div>*药品属于特殊商品，非质量问题不允许退换</div>
-          <img src="../../../assets/img/bailinBottom.jpg" alt="">
+          <img src="../../../assets/img/bailinBottom.jpg" style="width:100%" alt="">
           <!-- <div class="doctorBox">
               <p>医师：{{item.doctor?item.doctor:""}}</p>
               <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>

src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue

@@ -2,7 +2,7 @@
    <div id='prescriptionPrint'>
     <div id='prescription-print' class="prescription-print" v-for="(item,index) in advicePrint" :key="index">
 
-        <img src="../../../assets/img/bailinTop.jpg" alt="">
+        <img src="../../../assets/img/bailinTop.jpg" style="width:100%" alt="">
         <div class="printTitle">治疗单</div>
         <div style="display:flex;">
             <div style="width:33%;display:flex;">费别：<span class="under_line">深圳医保1档</span></div>
@@ -89,7 +89,7 @@
           <div style="display:flex;">
             打印时间：<span style="border-bottom:1px solid #000;">{{getTime(new Date())?getTime(new Date()):""}}</span>
           </div>
-          <img src="../../../assets/img/bailinBottom.jpg" alt="">
+          <img src="../../../assets/img/bailinBottom.jpg" style="width:100%" alt="">
           <div style="page-break-after:always"></div>
      </div>
 

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -15,12 +15,12 @@
             <el-form-item label="耗材名称 : " prop="good_name" style="width:100%">
               <el-input v-model="form.good_name" placeholder="" maxlength="30"></el-input>
             </el-form-item>
-            <el-form-item label="拼音 : " prop="pinyin" style="width:50%">
+            <!-- <el-form-item label="拼音 : " prop="pinyin" style="width:50%">
               <el-input v-model="form.pinyin" placeholder="" maxlength="30"></el-input>
             </el-form-item>
             <el-form-item label="五笔 : " prop="wubi" style="width:50%">
               <el-input v-model="form.wubi" placeholder="" maxlength="30"></el-input>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="耗材种类 : " prop="good_kind">
               <el-select v-model="form.good_kind" style="width:160px;" placeholder="请选择">
                 <el-option
@@ -53,17 +53,17 @@
             </el-form-item>
            
            <div style="width:100%;">
-              <div><span style="color:red;">*</span>单位&规格: <span style="color:#999">例如：0.75 g * 60 粒 / 盒</span></div>
+              <div><span style="color:red;">*</span>单位&规格: <span style="color:#999">例如：FX80 * 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-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')"
@@ -72,8 +72,8 @@
                       :value="item.name">
                     </el-option>
                   </el-select>
-              </el-form-item>
-              /
+              </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
@@ -511,7 +511,7 @@
               packing_unit:"",
               packing_price:'',
               default_count_unit:"",
-            
+              min_unit:"",
             }
           this.good_status = []
           for (let key in tempform) {

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -28,7 +28,7 @@
                         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 class="titleOne">当前进货价合计:</div> -->
       </div>
      
       <!-- <div class="cell clearfix">
@@ -80,7 +80,7 @@
                     v-model="scope.row.drug_name"
                     :fetch-suggestions="querySearchAsync"
                     :trigger-on-focus="false"
-                    placeholder="请输入病人名字"
+                    placeholder="请输入药品名称"
                     @select="handleSelect"
                     @input="changeDrugName(scope.$index)"
                     style="width:160px;"
@@ -528,7 +528,7 @@
         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
+              name = this.recordInfo.recordData[i].dose + this.recordInfo.recordData[i].dose_unit + "*" + this.recordInfo.recordData[i].min_number + this.recordInfo.recordData[i].min_unit + "/"+this.recordInfo.recordData[i].max_unit
            }
         }
         return name
@@ -549,6 +549,8 @@
         tempObj['min_unit'] = ''
         tempObj["drug_type"] = ''
         tempObj['batch_number'] = ''
+        tempObj['dose']= ''
+        tempObj['dose_unit']=''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (this.recordInfo.recordData.length <= 1) {
@@ -594,7 +596,7 @@
 
             } else {
               loading.close()
-               console.log("3333333",response.data.data.drugs)
+             
               if (response.data.data.drugs.length <= 0) {
                 this.$message.error('该厂商或经销商没有药品信息')
                 return
@@ -681,6 +683,7 @@
               '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)
@@ -732,7 +735,6 @@
       },
 
       changeDrugName(val){
-        console.log("val22222",val)
         this.showOne = false
         this.showTwo = true
       },
@@ -781,6 +783,7 @@
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer
              this.recordInfo.recordData[i].batch_number = val.number
              this.recordInfo.recordData[i].max_unit = val.max_unit
+             this.recordInfo.recordData[i].min_unit = val.min_unit
            }
         }
         console.log("333333",this.recordInfo.recordData)
@@ -808,7 +811,6 @@
       tempObj['dosage'] = ''
       tempObj['max_unit'] = ''
       tempObj['min_unit'] = '',
-      tempObj['packing_unit'] = '',
       tempObj['lot_number'] = ''
       tempObj['product_date'] = ''
       tempObj['expiry_date'] = ''

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -121,7 +121,7 @@
                     v-model="scope.row.drug_name"
                     :fetch-suggestions="querySearchAsync"
                     :trigger-on-focus="false"
-                    placeholder="请输入病人名字"
+                    placeholder="请输入药品名称"
                     @select="handleSelect"
                     @input="changeDrugName(scope.$index)"
                     style="width:160px;"
@@ -636,7 +636,7 @@ export default {
             stockIn: this.recordInfo.recordData
           };
           console.log("params22222222222",params)
-         
+        
           EditDrugWarehouse(
             params,
             this.warehousing_time,
@@ -765,6 +765,7 @@ export default {
       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].lot_number = ""
              this.recordInfo.recordData[i].drug_name = val.drug_name
              this.recordInfo.recordData[i].drug_type = val.drug_type
@@ -773,6 +774,7 @@ export default {
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer
              this.recordInfo.recordData[i].batch_number = val.number
              this.recordInfo.recordData[i].max_unit = val.max_unit
+             this.recordInfo.recordData[i].min_unit = val.min_unit
            }
         }
       },

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -117,7 +117,7 @@
                     v-model="scope.row.drug_name"
                     :fetch-suggestions="querySearchAsync"
                     :trigger-on-focus="false"
-                    placeholder="请输入病人名字"
+                    placeholder="请输入药品名称"
                     @select="handleSelect"
                     style="width:160px;"
                   >

src/xt_pages/stock/stockInOrderAdd.vue

@@ -69,7 +69,7 @@
                     v-model="scope.row.good_name"
                     :fetch-suggestions="querySearchAsync"
                     :trigger-on-focus="false"
-                    placeholder="请输入病人名字"
+                    placeholder="请输入耗材名称"
                     @select="handleSelect"
                     @input="changeGoodName(scope.$index)"
                     style="width:160px;"

src/xt_pages/stock/stockOutOrder.vue

@@ -552,22 +552,6 @@ export default {
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
 
-
-      
-    // 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.start_time =
       nowYear +
       "-" +
@@ -815,11 +799,12 @@ export default {
       }
     },
     handleEdit: function(index, row) {
-      
-      this.$router.push({
-        name: "stockOutDetail",
-        query: { id: row.id, type: this.type,warehouse_out_time:row.warehouse_out_time }
-      });
+      // this.$router.push({
+      //   name: "stockOutDetail",
+      //   query: { id: row.id, type: this.type,warehouse_out_time:row.warehouse_out_time }
+      // });
+      this.$router.push({path:'/stock/stockoutorderedit?id='+row.id})
+       
     },
     handleDelete: function(index, row) {
       const ids = [];

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -114,7 +114,7 @@
                     v-model="scope.row.good_name"
                     :fetch-suggestions="querySearchAsync"
                     :trigger-on-focus="false"
-                    placeholder="请输入病人名字"
+                    placeholder="请输入耗材名称"
                     @select="handleSelect"
                     @input="changeGoodName(scope.$index)"
                     style="width:150px;"
@@ -140,7 +140,6 @@
                   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>
@@ -654,9 +653,9 @@ export default {
             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();

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -13,13 +13,7 @@
 
     <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"
@@ -69,22 +63,61 @@
                   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>
+              </template>
+
+              <template slot-scope="scope">
+                <el-form-item style="padding-top: 15px">
+                  <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 width="150" align="center">
             <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.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 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>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 15px">
+                <el-input v-model="scope.row.name"></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <!-- <el-table-column min-width="35" align="center">
             <template slot="header" slot-scope="scope">
               <span>规格名称<span style="color: red">*</span></span>
             </template>
@@ -97,7 +130,7 @@
               </el-form-item>
 
             </template>
-          </el-table-column>
+          </el-table-column> -->
 
 
           <el-table-column min-width="23" align="center">
@@ -171,13 +204,13 @@
 <script>
   import { uParseTime } from '@/utils/tools'
 
-  import { deleteWarehouseOutInfo, editWarehouseoutInfo, getSalesReturnConfig, getWarehouseOutInfo,GetAllConfig,GetAllGoodInfoByID } from '@/api/stock'
+  import { deleteWarehouseOutInfo, editWarehouseoutInfo, getSalesReturnConfig, getWarehouseOutInfo,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList } from '@/api/stock'
   import BreadCrumb from '../components/bread-crumb'
   import StockInDialog from './Dialog/stockInDialog'
 
   export default {
     components: { StockInDialog, BreadCrumb},
-    name: 'salesReturnEdit',
+    name: 'stockOutOrderEdit',
 
     data() {
       return {
@@ -443,6 +476,8 @@
             const params = {
               'stockOut': this.recordInfo.recordData
             }
+            console.log("9999999",stockOut)
+            return
             editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -465,9 +500,12 @@
             this.$message.error(response.data.msg)
             return false
           } else {
+            console.log("详情",response.data.data.list)
             for (let i = 0; i < response.data.data.list.length; i++) {
               response.data.data.list[i].price = response.data.data.list[i].price.toString()
               response.data.data.list[i].count = response.data.data.list[i].count.toString()
+              response.data.data.list[i].good_name = response.data.data.list[i].GoodInfo.good_name
+              response.data.data.list[i].name = response.data.data.list[i].GoodInfo.good_name + "*" + response.data.data.list[i].GoodInfo.specification_name
               this.recordInfo.recordData.push(response.data.data.list[i])
             }
             this.warehouseOut = response.data.data.info
@@ -497,7 +535,54 @@
         this.propForm.manufacturer = val
       }, 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() {
       this.GetConfigInfo()