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

src/lang/zh.js

@@ -355,6 +355,8 @@ export default {
     rescue_record: '抢救记录',
     manage_ment: '设备管理',
     nursing_record: '透析护理记录',
-    special_record: '特殊记录'
+    special_record: '特殊记录',
+    template_summary: '治疗小结',
+    template_plan: '个性化方案'
   }
 }

src/xt_pages/data/components/templateTable.vue

@@ -354,6 +354,7 @@ export default {
         }
 
         if (valid) {
+           
           createConfig(this.temp).then(response => {
             if (!response.data) {
               // 由于mockjs 不支持自定义状态码只能这样hack

src/xt_pages/data/druguseTemplate.vue

@@ -1817,10 +1817,11 @@
         })
       },
       handleSelect1(){
-
+       this.templateForm.drug_id =  val.id
       },
-      handleSelect(){
-
+      handleSelect(val){
+        console.log("val23232",val)
+        this.templateForm.drug_id =  val.id
       },
       submitTemplate(formName) {
 
@@ -2376,9 +2377,10 @@
           this.templateForm.week_days = this.templateForm.weekday.filter(function(s) {
             return s && s.trim()
           }).join(',')
+          this.templateForm.way = 1
         }
         console.log("编辑模板",this.templateForm)
-
+      
         // 编辑创建医嘱模版
         CreateSingleAdviceTemplate(this.templateForm).then(response => {
           if (response.data.state == 0) {

src/xt_pages/data/template.vue

@@ -45,7 +45,9 @@ export default {
         { label: this.$t("data_config.nursing_record"), key: "nursing_record" },
         { label: this.$t("data_config.special_record"), key: "special_record" },
         { label: this.$t("data_config.course_disease"), key: "course_disease" },
-        { label: this.$t("data_config.rescue_record"), key: "rescue_record" }
+        { label: this.$t("data_config.rescue_record"), key: "rescue_record" },
+        // { label: this.$t("data_config.template_summary"), key: "template_summary" },
+        // { label: this.$t("data_config.template_plan"), key: "template_plan" }
       ],
       activeName: "education",
       createdTimes: 0

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -109,6 +109,7 @@
                 style="padding-top: 17px"
               >
                 <el-input
+                  oninput="value=value.replace(/\D|^0/g,'')"
                   placeholder="请输入退库数量"
                   type="number"
                   v-model="scope.row.return_count"
@@ -128,8 +129,8 @@
                 style="padding-top: 17px"
               >
                 <el-input
-                 oninput="value=value.replace(/[^0-9.]/g,'')"
-                  placeholder="请输入退库数量"
+                 
+                  placeholder="请输入单价"
                   type="number"
                   v-model="scope.row.price"
                 ></el-input>      

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -75,13 +75,13 @@
             <template slot-scope="scope">
               <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
                             style="padding-top: 17px">
-                <el-input type="number" v-model="scope.row.count"  oninput="value=value.replace(/[^0-9.]/g,'')"></el-input>
+                <el-input type="number" v-model="scope.row.count"  oninput="value=value.replace(/\D|^0/g,'')"></el-input>
               </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>
+              <span>单价<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
               <el-form-item
@@ -90,7 +90,7 @@
                 style="padding-top: 17px"
               >
                 <el-input
-                  placeholder="请输入退库数量"
+                  placeholder="请输入单价"
                   type="number"
                   v-model="scope.row.price"
                 ></el-input>      
@@ -513,6 +513,7 @@
               'cancelStock': this.recordInfo.recordData
             }
             console.log("parasm23232",params)
+         
             editCancelStockInfo(params, this.return_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)

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

@@ -155,7 +155,7 @@
               >
               <div style="display:flex;">
                 <el-input
-                  oninput="value=value.replace(/[^0-9.]/g,'')"
+                   oninput="value=value.replace(/\D|^0/g,'')"
                   style="width:100px"
                   placeholder="请输入退库数量"
                   type="number"
@@ -691,6 +691,7 @@ export default {
         this.currentIndex = val
       },
       handleSelect(val){
+         console.log("val23232",val)
          this.getDrugBatchNumber(val.id)
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(i == this.currentIndex){
@@ -699,6 +700,7 @@ export default {
              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].price = val.last_price
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer
              this.recordInfo.recordData[i].number =  val.number
              this.recordInfo.recordData[i].max_unit = val.max_unit

src/xt_pages/stock/drugs/cancelDrugStockOrderEdit.vue

@@ -81,7 +81,7 @@
               >
               <div style="display:flex;">
                 <el-input
-                 oninput="value=value.replace(/[^0-9.]/g,'')"
+                 oninput="value=value.replace(/\D|^0/g,'')"
                   style="width:100px"
                   placeholder="请输入退库数量"
                   type="number"
@@ -668,6 +668,7 @@
              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].price = val.price
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer
              this.recordInfo.recordData[i].number =  val.number
              this.recordInfo.recordData[i].max_unit = val.max_unit

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

@@ -67,7 +67,7 @@
 
     
 
-    <div class="cell clearfix">
+    <!-- <div class="cell clearfix">
       <label class="title"><span class="name">单据类型</span> : </label>
       <el-select
         size="small"
@@ -84,8 +84,8 @@
         >
         </el-option>
       </el-select>
-    </div>
-
+    </div> -->
+<!-- 
     <div class="cell clearfix">
       <label class="title"><span class="name">其它</span> : </label>
       <el-select
@@ -103,7 +103,7 @@
         >
         </el-option>
       </el-select>
-    </div>
+    </div> -->
 
     <el-row :gutter="12" style="margin-top: 10px">
       <el-table
@@ -141,7 +141,7 @@
 
         <el-table-column label="规格型号" align="center">
           <template slot-scope="scope">
-            <span>{{scope.row.drug_spec}}</span>
+            <span>{{scope.row.dose}}{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}</span>
           </template>
         </el-table-column>
 
@@ -359,7 +359,7 @@ export default {
       getDrugCancelDetail(params).then(response=>{
          if(response.data.state == 1){
            var order =  response.data.data.order
-           console.log("退库详细",order)
+           console.log("退库详细222222222222222222",order)
            this.tableData = order
            this.tableList = order
            var total = response.data.data.total
@@ -388,10 +388,11 @@ export default {
     exportList(){
        for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1
+          this.tableList[i].unit = this.tableList[i].dose + this.tableList[i].dose_unit + "*"+this.tableList[i].min_number + this.tableList[i].min_unit+"/"+this.tableList[i].max_unit
         }
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','备注']
-       const filterVal = ['index','drug_name', 'drug_spec', 'min_unit','count','price','remark']
+       const filterVal = ['index','drug_name', 'unit', 'min_unit','count','price','remark']
        
        const data = this.formatJson(filterVal, this.tableList)
        console.log("data",data)

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

@@ -173,7 +173,7 @@
         </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
-            {{scope.row.total_price}}
+            {{scope.row.price * scope.row.count}}
           </template>
         </el-table-column>
       </el-table>

src/xt_pages/stock/drugs/drugBatchNumber.vue

@@ -66,12 +66,13 @@
         </el-table-column>
          <el-table-column prop="drug_name" label="批号" align="center">
            <template slot-scope="scope">
-              {{scope.row.number}}
+              {{scope.row.batch_number}}
            </template>
         </el-table-column>
          <el-table-column prop="drug_name" label="入库数量" align="center">
            <template slot-scope="scope">
-              {{scope.row.stock_max_number}}{{scope.row.max_unit}}{{scope.row.stock_min_number}}{{scope.row.min_unit}}
+             {{scope.row.warehousing_count}}{{scope.row.max_unit}}
+              <!-- {{scope.row.stock_max_number}}{{scope.row.max_unit}}{{scope.row.stock_min_number}}{{scope.row.min_unit}} -->
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="进货单价" align="center">

src/xt_pages/stock/drugs/drugCancelDetailPrint.vue

@@ -33,7 +33,7 @@
                 <span>{{item.drug_name}}</span>
               </td>
               <td style="line-height: 50px">
-                <span>{{item.drug_spec}}</span>
+                <span>{{item.dose}}{{item.dose_unit}}*{{item.min_number}}{{item.min_unit}}/{{item.max_unit}}</span>
               </td>
               <td style="line-height: 50px">
                 <span>{{item.min_unit}}</span>

src/xt_pages/stock/drugs/drugIndex.vue

@@ -15,9 +15,9 @@
           <el-tab-pane label="出库明细">
             <drug-out-detail></drug-out-detail>
           </el-tab-pane>
-          <!-- <el-tab-pane label="退库明细">
+          <el-tab-pane label="退库明细">
             <drug-cancel-detail></drug-cancel-detail>
-          </el-tab-pane> -->
+          </el-tab-pane>
 
         </el-tabs>
       </div>

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -170,7 +170,7 @@
       this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
       // this.getlist()
       // this.getOutList()
-      // this.getDrugCountList()
+      this.getDrugCountList()
 
       this.getDrugFlow()
     },
@@ -447,6 +447,8 @@
        if((count%min_number)!=0){
          str_min = count%min_number + min_unit
        }
+       console.log("str2323222",str)
+       console.log("str22333333",str_min)
        return str+str_min
      },
 

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -847,19 +847,18 @@ export default {
         console.log("hhh23",this.exportList)
          for(let i=0;i<this.exportList.length;i++){
            for(let j=0;j<this.drugTypeList.length;j++){
-             if(this.exportList[i].drug_type == this.drugTypeList[j].value){
+             if(this.exportList[i].drug_type == this.drugTypeList[j].id){
                this.exportList[i].drug_type = this.drugTypeList[j].name
              }
            }
          }
-       
-       
+              
         const tHeader = ['药品名称','药品类型','规格&单位', '批号','入库数量','进货价','总价','生产厂家','生产日期','有效日期','经销商','批注文号','备注']
-        const filterVal = ['drug_name', 'drug_type','unit','number','warehousing_count','price','total_price','manufacturer','product_date','expiry_date','dealer','batch_number','remark']
+        const filterVal = ['drug_name', 'drug_type','unit','batch_number','warehousing_count','price','total_price','manufacturer','product_date','expiry_date','dealer','number','remark']
          
      
         console.log("table",this.exportList)
-      
+        return
         const data = this.formatJson(filterVal, this.exportList)
         excel.export_json_to_excel({
           header: tHeader,

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -124,7 +124,7 @@
               >
               <div style="display:flex;">
                 <el-input
-                  oninput="value=value.replace(/[^0-9.]/g,'')"
+                  oninput="value=value.replace(/\D|^0/g,'')"
                   placeholder="请输入入库数量"
                   type="number"
                   v-model="scope.row.warehousing_count"
@@ -546,6 +546,7 @@
         tempObj['dose']= ''
         tempObj['dose_unit']=''
         tempObj['dealer'] = ''
+        tempObj['last_price'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (this.recordInfo.recordData.length <= 1) {
@@ -695,7 +696,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)

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -189,7 +189,7 @@
               >
                 <div style="display:flex;">
                   <el-input
-                    oninput="value=value.replace(/[^0-9.]/g,'')"
+                    oninput="value=value.replace(/\D|^0/g,'')"
                     placeholder="请输入入库数量"
                     type="number"
                     v-model="scope.row.warehousing_count"
@@ -676,7 +676,7 @@ export default {
             stockIn: this.recordInfo.recordData
           };
           console.log("params22222222222",params)
-        
+          
           EditDrugWarehouse(
             params,
             this.warehousing_time,

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -225,15 +225,16 @@
               {{scope.row.dose}} {{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
             </template>
           </el-table-column>
-          <el-table-column label="批号" align="center">
+          <!-- <el-table-column label="批号" align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.batch_number!=''">{{scope.row.batch_number}}</span> 
              <span v-if="scope.row.batch_number == '0'"></span> 
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">
-              {{getTotalCount(scope.row.drug_id)}}
+              <!-- {{getTotalCount(scope.row.drug_id)}} -->
+              {{getTotalCountOne(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}
             </template>
           </el-table-column>
           <el-table-column label="出货单价" align="center">
@@ -306,8 +307,10 @@
               <span>序号</span>
             </template>
             <template slot-scope="scope">
-              <span v-if="scope.row.is_total == 0">{{scope.$index+1}}</span>
-              <span v-if="scope.row.is_total == 1">{{'合计'}}</span>
+              <!-- <span v-if="scope.row.is_total == 0">{{scope.$index+1}}</span>
+              <span v-if="scope.row.is_total == 1">{{'合计'}}</span> -->
+              {{scope.$index+1}}
+            
             </template>
           </el-table-column>
 
@@ -316,8 +319,9 @@
               <span>使用人</span>
             </template>
             <template slot-scope="scope">
-              <span v-if="scope.row.is_total == 0">{{scope.row.user.name}}</span>
-              <span  v-if="scope.row.is_total == 1"></span>
+              <!-- <span v-if="scope.row.is_total == 0">{{scope.row.user.name}}</span>
+              <span  v-if="scope.row.is_total == 1"></span> -->
+              {{scope.row.user.name}}
             </template>
           </el-table-column>
           <el-table-column min-width="35" align="center">
@@ -326,7 +330,7 @@
             </template>
             <template slot-scope="scope">
               <span >{{scope.row.count}}{{scope.row.count_unit}}</span>
-              <span  v-if="scope.row.is_total == 1">{{scope.row.total}}</span>
+              <!-- <span  v-if="scope.row.is_total == 1">{{scope.row.total}}</span> -->
             </template>
           </el-table-column>
 
@@ -335,7 +339,7 @@
               <span>使用时间</span>
             </template>
             <template slot-scope="scope">
-              <span  v-if="scope.row.is_total == 0">{{scope.row.ctime | parseTime('{y}-{m}-{d} {h}:{i}')}} </span>
+              <span>{{scope.row.ctime | parseTime('{y}-{m}-{d} {h}:{i}')}} </span>
             </template>
           </el-table-column>
 
@@ -345,10 +349,10 @@
               <span>批次号</span>
             </template>
             <template slot-scope="scope">
-              <span>{{getDrugBatchNumber(scope.row.id)}}</span>
+              <span>{{getDrugBatchNumber(scope.row.drug_id)}}</span>
             </template>
           </el-table-column>
-
+          
         </el-table>
       </span>
       <span slot="footer" class="dialog-footer">
@@ -520,7 +524,8 @@ export default {
       drugOutList:[],
       outList:[],
       userListOne:[],
-      exportList:[]
+      exportList:[],
+      batchNumberList:[]
     };
   },
   methods: {
@@ -947,13 +952,14 @@ export default {
           this.tableShow = true
           this.tableList = []
           var list =  response.data.data.list
+          console.log("list2323232",list)
           var outList = response.data.data.outList
-          for(let i=0;i<outList.length;i++){
-              //如果都是最大单位,把最数量转为最小数量
-             if(outList[i].count_unit == outList[i].max_unit){
-                outList[i].count = outList[i].min_number * outList[i].count 
-             }
-          }
+          // for(let i=0;i<outList.length;i++){
+          //     //如果都是最大单位,把最数量转为最小数量
+          //    if(outList[i].count_unit == outList[i].max_unit){
+          //       outList[i].count = outList[i].min_number * outList[i].count 
+          //    }
+          // }
           this.outList = outList
          console.log("outList222",outList)
          this.manufacturerList = response.data.data.manufacturerList
@@ -972,66 +978,32 @@ export default {
      })
    },
    toDetail(val){
-     console.log("val",val)
+     this.userList = []
+     this.userListOne = []
      var params = {
        warehouse_out_id:val.warehouse_out_id,
        drug_id:val.drug_id,
        record_time:val.sys_record_time,
      }
-     this.userList = []
      getAutoDrugDetail(params).then(response=>{
        if(response.data.state == 1){
-        console.log("list23232323232",response.data.data.list)
-      
-        var total = 0
-        for (let i = 0; i < response.data.data.list.length; i++) {
-          var obj = response.data.data.list[i]
-          obj['is_total'] = 0
-          this.userList.push(obj)
-          var str = 0
-          var max_unit = ""
-          var min_unit = ""
-          var number = 0
-          var min_str = 0
-         for(let i=0;i<response.data.data.list.length;i++){
-             min_str = response.data.data.list[0].drug.min_str
-             max_unit = response.data.data.list[0].drug.max_unit
-             min_unit = response.data.data.list[0].drug.min_unit
-             number = response.data.data.list[0].drug.min_number
-           if(response.data.data.list[i].count_unit == response.data.data.list[i].drug.max_unit){
-              response.data.data.list[i].count = response.data.data.list[i].count * response.data.data.list[i].drug.min_number
-           }
-         }
-         var total_count = 0
-         for(let i=0;i<response.data.data.list.length;i++){
-            total_count += response.data.data.list[i].count 
-         }
-         console.log("总规格2323232",total_count,number)
-         
-        if(parseInt(total_count)!=0){
-          str = parseInt(total_count/number)
-         }
-        if(parseInt(total_count)!=0){
-          min_str =  parseInt(total_count)%number
-        }
         
-        total = str + max_unit + min_str + min_unit
-        console.log("h2hh2h323",str,min_str)
- 
-        }
-        this.userList.push({
-          is_total: 1,
-          total: total,
-        })
+        this.userList = response.data.data.list
+        
         if(val.is_sys == 1){
+        
           this.drugDialogVisible = true
         }
         if(val.is_sys == 0){
+         
           this.drugDialogVisibleTwo = true
         }
          var userListOne = response.data.data.outList
          console.log("手动出库2232332",userListOne)
          this.userListOne = userListOne
+         var  batchNumber = response.data.data.batchNumber
+         console.log("出库详情",batchNumber)
+         this.batchNumberList = batchNumber
        }
      })
    },
@@ -1108,6 +1080,58 @@ export default {
          }
          return str + min_str
       },
+      getTotalCountOne(id,min_number,max_unit,min_unit){
+       
+        for(let i=0;i<this.outList.length;i++){
+          if(this.outList[i].count_unit == this.outList[i].max_unit){
+            this.outList[i].total_count = this.outList[i].count * this.outList[i].min_number
+          }
+
+         if(this.outList[i].count_unit == this.outList[i].min_unit){
+            this.outList[i].total_count = this.outList[i].count
+          }
+       
+        }
+        console.log("我的",this.outList)
+          let dataInfo = {};
+          this.outList.forEach((item, index) => {
+            let { drug_id } = item;
+            if (!dataInfo[drug_id]) {
+              dataInfo[drug_id] = {
+                drug_id,
+                child: [],
+                total:0,
+              };
+            }
+          });
+        let list = Object.values(dataInfo);
+        console.log("drug_id22222",list)
+        for(let i=0;i<list.length;i++){
+          for(let j=0;j<this.outList.length;j++){
+            if(list[i].drug_id == this.outList[j].drug_id){
+              list[i].child.push(this.outList[j])
+            }
+          }
+        }
+       var total = 0
+       for(let i=0;i<list.length;i++){
+        for(let j=0;j<list[i].child.length;j++){
+           if(id == list[i].child[j].drug_id){
+             total+= list[i].child[j].total_count
+           }
+        }
+       }
+      
+      var str = ""
+      var min_str = ""
+      
+      str = parseInt(total/min_number)+ max_unit
+      min_str =  total%min_number + min_unit
+
+     return str + min_str
+      
+       
+     },
       getAllPrice(drug_id,price,min_price){
          var strprice = 0
          var minstrprice = 0
@@ -1131,22 +1155,28 @@ export default {
          return  total_price
       },
 
-      getDrugBatchNumber(id){
+      // getDrugBatchNumber(id){
         
-        var arr= []
-        var batchNumber =[]
+      //   var arr= []
+      //   var batchNumber =[]
         
-        for(let i=0;i<this.userList.length;i++){
-           if(id == this.userList[i].id){
-            arr.push(this.userList[i].drugwarehouseoutinfo)
-           }
-        }
-        if(batchNumber.length > 0 ){
-         for(let j=0;j<arr.length;j++){
-           batchNumber.push(arr[j].batch_number)
+      //   for(let i=0;i<this.userList.length;i++){
+      //      if(id == this.userList[i].id){
+      //        for(let j=0;j<this.userList[i].drugwarehouseoutinfo.length;j++){
+      //           batchNumber.push(this.userList[i].drugwarehouseoutinfo[j].batch_number)
+      //        }
+      //      }
+      //   }
+      //   return batchNumber.join(",")
+      // },
+      getDrugBatchNumber(drugid){
+        var arr = []
+        for(let i=0;i<this.batchNumberList.length;i++){
+          if(drugid == this.batchNumberList[i].drug_id){
+            arr.push(this.batchNumberList[i].batch_number)
           }
         }
-        return batchNumber.join(",")
+        return arr.join(",")
       },
     
       getExportOutOrderDrugList(){

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -149,7 +149,7 @@
               >
                 <div style="display:flex;">
                   <el-input
-                    oninput="value=value.replace(/[^0-9.]/g,'')"
+                     oninput="value=value.replace(/\D|^0/g,'')"
                     style="width:80px"
                     placeholder="请输入出库数量"
                     type="number"

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -90,11 +90,19 @@
               </template>
                 <template slot-scope="scope">
                   <el-form-item style="padding-top: 20px">
-                    <el-input
+                    <!-- <el-input
                      :disabled="drug_show"
                       placeholder="请输入批号"
                       v-model="scope.row.batch_number"
-                    ></el-input>
+                    ></el-input> -->
+                    <el-select v-model="scope.row.batch_number" filterable placeholder="请选择">
+                      <el-option
+                        v-for="(item,index) in numberList"
+                        :key="index"
+                        :label="item.batch_number"
+                        :value="item.batch_number">
+                      </el-option>
+                    </el-select>
                   </el-form-item>
               </template>
           </el-table-column>
@@ -110,7 +118,7 @@
               >
                 <div style="display:flex;">
                   <el-input
-                   oninput="value=value.replace(/[^0-9.]/g,'')"
+                   oninput="value=value.replace(/\D|^0/g,'')"
                    style="width:100px"
                    :disabled="drug_show"
                     placeholder="请输入出库数量"
@@ -258,7 +266,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
 
-  import { deleteDrugWarehouseOutInfo, editDrugWarehouseoutInfo, getDrugSalesReturnConfig, getDrugWarehouseOutInfo,GetAllConfig,GetAllDrugInfoByID } from '@/api/drug/drug_stock'
+  import { deleteDrugWarehouseOutInfo, editDrugWarehouseoutInfo, getDrugSalesReturnConfig, getDrugWarehouseOutInfo,GetAllConfig,GetAllDrugInfoByID,getDrugBatchNumber } from '@/api/drug/drug_stock'
   import BreadCrumb from '../../components/bread-crumb'
   import DrugsStockDialog from './drugsStockDialog/index'
   import {postSearchDrugList } from "@/api/data"
@@ -330,7 +338,8 @@
         manufacturerList:[],
         drug_show:false,
         unitList:[],
-        unitShow:true
+        unitShow:true,
+        numberList:[]
       }
     },
     methods: {
@@ -434,12 +443,14 @@
         tempObj['id'] = 0
         tempObj['drug_id'] = 0
         tempObj['retail_price'] = ''
-
         tempObj['count'] = ''
         tempObj['price'] = ''
         tempObj['remark'] = ''
         tempObj['batch_number'] = ''
         tempObj['number'] = ''
+        tempObj['count_unit'] = ""
+        tempObj['dealer'] = 0
+        tempObj['manufacturer'] = 0
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if(this.drug_show == true){
@@ -470,12 +481,23 @@
           }).catch(() => {
           })
         }
-      }, getTime(val, temp) {
-        if (val != 0) {
-          return uParseTime(val, temp)
-        } else {
-          return ''
-        }
+      }, 
+      // getTime(val, temp) {
+      //   if (val != 0) {
+      //     return uParseTime(val, temp)
+      //   } else {
+      //     return ''
+      //   }
+      // },
+     getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
       },
       showDialog(index, row) {
         this.currentIndex = index;
@@ -557,13 +579,34 @@
               'stockOut': this.recordInfo.recordData
             }
             console.log("params----",params)
+           
             editDrugWarehouseoutInfo(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)
                 return false
               } else {
-                this.$message.success('保存成功')
-                this.$router.back(-1)
+                var msg = response.data.data.msg
+                var drug_name =  response.data.data.drug_name
+                console.log("drug_name",drug_name)
+                var dose = response.data.data.dose
+                console.log("dose",dose)
+                var dose_unit = response.data.data.dose_unit
+                console.log("dose_unit",dose_unit)
+                var min_number = response.data.data.min_number
+                console.log("min_number",min_number)
+                var min_unit =  response.data.data.min_unit
+                console.log("min_unit",min_unit)
+                var max_unit =  response.data.data.max_unit
+                console.log("max_unit",max_unit)
+                var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
+                console.log("str22222222",str)
+              if(msg == 1){
+                this.$message.error(str + "库存不足,请入库")
+              }else{
+                this.$message.success("出库成功");
+                this.recordInfo.recordData = [];
+                this.$router.back(-1);
+              }
               }
             })
           } else {
@@ -693,6 +736,7 @@
         this.currentIndex = val
       },
       handleSelect(val){
+         this.getDrugBatchNumber(val.id)
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(i == this.currentIndex){
              this.recordInfo.recordData[i].drug_id  = val.id
@@ -704,7 +748,6 @@
              this.recordInfo.recordData[i].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)
@@ -715,6 +758,18 @@
      getDataConfig(module, filed_name){
        return getDataConfig(module, filed_name)
      },
+     getDrugBatchNumber(id){
+          var params = {
+            id:id
+          }
+        getDrugBatchNumber(params).then(response=>{
+           if(response.data.state == 1){
+             var list = response.data.data.list
+             console.log("list2222",list)
+             this.numberList = list
+           }
+        })
+      }
     },
     created() {
       this.drugTypeList = getDictionaryDataConfig('system','drug_type') 

src/xt_pages/stock/stockFlow.vue

@@ -87,12 +87,12 @@
            </template>
         </el-table-column>
      
-       <el-table-column label="是否退库" align="center">
+       <!-- <el-table-column label="是否退库" align="center">
          <template slot-scope="scope">
            <span v-if="scope.row.is_edit == 2">是</span>
            <span v-if="scope.row.is_edit ==1">否</span>   
          </template>
-       </el-table-column>
+       </el-table-column> -->
 
        <el-table-column label="批次" align="center">
          <template slot-scope="scope">

src/xt_pages/stock/stockInOrderAdd.vue

@@ -101,7 +101,7 @@
             <template slot-scope="scope">
               <el-form-item :prop="'recordData.' + scope.$index + '.warehousing_count'"
                             :rules='tableRules.warehousing_count' style="padding-top: 20px">
-                <el-input placeholder="请输入入库数量" type="number" v-model="scope.row.warehousing_count"  oninput="value=value.replace(/[^0-9.]/g,'')"></el-input>
+                <el-input placeholder="请输入入库数量" type="number" v-model="scope.row.warehousing_count"  oninput="value=value.replace(/\D|^0/g,'')"></el-input>
                   {{scope.row.min_unit}}
               </el-form-item>
             
@@ -167,7 +167,7 @@
             </template>
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px">
-                <el-input placeholder="请输入批号" v-model="scope.row.license_number" ></el-input>
+                <el-input placeholder="请输入批准文号" v-model="scope.row.license_number" ></el-input>
               </el-form-item>
             </template>
           </el-table-column>

src/xt_pages/stock/stockInOrderEdit.vue

@@ -198,7 +198,7 @@
                 style="padding-top: 20px"
               >
                 <el-input
-                  oninput="value=value.replace(/[^0-9.]/g,'')"
+                  oninput="value=value.replace(/\D|^0/g,'')"
                   placeholder="请输入入库数量"
                   type="number"
                   v-model="scope.row.warehousing_count"
@@ -272,7 +272,7 @@
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px">
                 <el-input
-                  placeholder="请输入批号"
+                  placeholder="请输入批准文号"
                   v-model="scope.row.license_number"
                   
                 ></el-input>
@@ -525,7 +525,6 @@ export default {
       tempObj["remark"] = "";
       tempObj["dealer"] = "";
       tempObj["manufacturer"] = "";
-      tempObj["number"] = ""
       tempObj["license_number"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
@@ -672,7 +671,7 @@ export default {
             stockIn: this.recordInfo.recordData
           };
           console.log("params2222",params)
-       
+        
           EditWarehouse(
             params,
             this.warehousing_time,
@@ -831,8 +830,6 @@ export default {
               this.numberList.push(val.xt_warehouse_info[j])
             }
             this.recordInfo.recordData[i].number = val.xt_warehouse_info[0].number
-          }else{
-            this.recordInfo.recordData[i].number = ""
           }
         }
      

src/xt_pages/stock/stockOutOrder.vue

@@ -419,7 +419,8 @@
               <span>批次号</span>
             </template>
             <template slot-scope="scope">
-               {{scope.row.number}}
+               <!-- {{scope.row.number}} -->
+               {{getBatchNumber(scope.row.patient_id,scope.row.good_id)}}
             </template>
           </el-table-column>
           <el-table-column min-width="35" align="center">
@@ -633,7 +634,8 @@
               <span>批次号</span>
             </template>
             <template slot-scope="scope">
-              <span v-if="scope.row.is_total == 0">{{getNumber(scope.row.id)}}</span>
+              <!-- <span v-if="scope.row.is_total == 0">{{getNumber(scope.row.id)}}</span> -->
+               <span v-if="scope.row.is_total ==0">{{getBatchNumber(scope.row.patient_id,scope.row.good_id)}}</span>
             </template>
           </el-table-column>
 <!-- 
@@ -806,7 +808,8 @@ export default {
       warehouse_out_time:"",
       exportList:[],
       is_sys:0,
-      infoList:[]
+      infoList:[],
+      stockFlowList:[]
     };
   },
   methods: {
@@ -1533,6 +1536,9 @@ export default {
               var info = response.data.data.info
               this.infoList = info
               console.log("info列表22222222",info)
+              var stockflowlist = response.data.data.stockFlowList
+              console.log("stockflowlist",stockflowlist)
+              this.stockFlowList = stockflowlist
               for (let i = 0; i < arrList.length; i++) {
                 var obj = arrList[i]
                 obj['is_total'] = 0
@@ -1657,6 +1663,15 @@ export default {
     formatJson(filterVal, jsonData) {
     return jsonData.map(v => filterVal.map(j => v[j]));
    },
+   getBatchNumber(patient_id,good_id){
+     var arr = []
+     for(let i=0;i<this.stockFlowList.length;i++){
+        if(patient_id == this.stockFlowList[i].patient_id && good_id == this.stockFlowList[i].good_id){
+           arr.push(this.stockFlowList[i].number)
+        }
+     }
+     return arr.join(',')
+   }
   }
 };
 </script>

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -146,6 +146,7 @@
                 style="padding-top: 17px"
               >
                 <el-input
+                 oninput="value=value.replace(/\D|^0/g,'')"
                   placeholder="请输入出库数量"
                   type="number"
                   v-model="scope.row.count"

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -139,7 +139,7 @@
             <template slot-scope="scope">
               <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
                             style="padding-top: 17px">
-                <el-input type="number" v-model="scope.row.count"  :disabled="stockShow"></el-input>
+                <el-input type="number" v-model="scope.row.count"  :disabled="stockShow"   oninput="value=value.replace(/\D|^0/g,'')"></el-input>
               </el-form-item>
             </template>
           </el-table-column>

src/xt_pages/upload/fast/FastProvince.vue

@@ -143,6 +143,7 @@
             <el-tab-pane label="抢救记录">
               <rescue-record :doctor_advices='doctor_advices' :patient='patient' :prescription='prescription'></rescue-record>
             </el-tab-pane>
+             
           </el-tabs>
         </div>
       </div>
@@ -160,7 +161,7 @@
   import dialysisParams from "../fast/dialysisParams"
   import dialysisSummary from "../fast/dialysisSummary"
   import rescueRecord from "../fast/rescueRecord"
-
+  
   import {
   getDialysisRecordInitData,
   getDialysisSchedules,
@@ -175,7 +176,8 @@ import { parseTime } from "@/utils";
       treatInfo,
       dialysisParams,
       dialysisSummary,
-      rescueRecord
+      rescueRecord,
+     
     },
     data() {
       return {

src/xt_pages/user/components/PatientDetail.vue

@@ -955,6 +955,7 @@
               <div class="proj">
                 <span class="proj_title">日期：</span>
                 <!-- {{ getTime(patientPrint.created_time) }} -->
+                {{printDate}}
               </div>
               <div class="proj"><span class="proj_title">医生签名：</span></div>
             </div>
@@ -1134,7 +1135,7 @@ export default {
       patientID: 0,
       patientPrint: {},
       print_time: "",
-
+      printDate:"",
       rules: {
         contagions: [{ type: "array", required: false, trigger: "change" }],
         avatar: [{ required: true, message: "请上传头像", trigger: "blur" }],
@@ -1203,6 +1204,11 @@ export default {
     this.getZones();
     var ptime = Math.round(new Date().getTime() / 1000);
     // this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}');
+
+    var data = new Date();
+    var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+    var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
+    this.printDate = data.getFullYear() + "-" + month + "-" + date;
   },
   methods: {
     getTime(val) {