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/router/modules/patient.js

@@ -139,7 +139,7 @@ export default {
     }
   },
   {
-    path:"/patients/patients/:id/inspectionInfectious",
+    path: '/patients/patients/:id/inspectionInfectious',
     component: () => import('@/xt_pages/user/inspectionInfectious'),
     hidden: true,
     is_menu: false,
@@ -148,7 +148,17 @@ export default {
       title: 'inspectionInfectious',
       noCache: true
     }
-  
+  },
+  {
+    path: '/patients/patients/:id/templateSummary',
+    component: () => import('@/xt_pages/user/templateSummary'),
+    hidden: true,
+    is_menu: false,
+    name: 'templateSummary',
+    meta: {
+      title: 'templateSummary',
+      noCache: true
+    }
   },
   {
     path: '/patients/course',
@@ -193,5 +203,6 @@ export default {
       noCache: true
     }
   }
+
   ]
 }

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/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -1283,42 +1283,44 @@
               })
               var msg = response.data.data.msg
               if(msg == 1){
-                this.$message.error("无库存,请入库")
-                return
+                var exid = response.data.data.advice.id
+                  if (response.data.data.advice.parent_id > 0) {
+                    exid = response.data.data.advice.parent_id
+                  }
+                
+                  this.currentRow.execution_state = 1
+                  this.currentRow.execution_staff =
+                    response.data.data.advice.execution_staff
+                  this.currentRow.execution_time =
+                    response.data.data.advice.execution_time
+                  var alen = this.doctor_advices.length
+
+                  for (var index in this.doctor_advices) {
+                    if (
+                      this.doctor_advices[index].id == exid ||
+                      this.doctor_advices[index].parent_id == exid
+                    ) {
+                      this.doctor_advices[index].execution_state = 1
+                      this.doctor_advices[index].execution_staff =
+                        response.data.data.advice.execution_staff
+                      this.doctor_advices[index].execution_time =
+                        response.data.data.advice.execution_time
+                      // this.doctor_advices[index].checker = response.data.data.advice.checker;
+                      break
+                    }
+                  }
+                  this.execTimeDialogVisible = false
+                  return false
               }
 
               if(msg == 2){
                 this.$message.error("库存不足,请入库")
                 return
               }
-              var exid = response.data.data.advice.id
-              if (response.data.data.advice.parent_id > 0) {
-                exid = response.data.data.advice.parent_id
-              }
-             
-              this.currentRow.execution_state = 1
-              this.currentRow.execution_staff =
-                response.data.data.advice.execution_staff
-              this.currentRow.execution_time =
-                response.data.data.advice.execution_time
-              var alen = this.doctor_advices.length
-
-              for (var index in this.doctor_advices) {
-                if (
-                  this.doctor_advices[index].id == exid ||
-                  this.doctor_advices[index].parent_id == exid
-                ) {
-                  this.doctor_advices[index].execution_state = 1
-                  this.doctor_advices[index].execution_staff =
-                    response.data.data.advice.execution_staff
-                  this.doctor_advices[index].execution_time =
-                    response.data.data.advice.execution_time
-                  // this.doctor_advices[index].checker = response.data.data.advice.checker;
-                  break
-                }
+              if(msg == 3){
+                this.$message.error("无库存,请入库")
               }
-              this.execTimeDialogVisible = false
-              return false
+              
             }
           })
           .catch(() => {

src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue

@@ -1465,7 +1465,7 @@ export default {
           this.afterdialysis = afterdialysis
           // eslint-disable-next-line no-unused-vars
           var doctoradvce = response.data.data.doctorAdvice
-          var doctorAdevieInfo = response.data.data.doctorAdevieInfo
+          var doctorAdevieInfo = JSON.parse(JSON.stringify(response.data.data.advices))
           this.newTableAdvice = response.data.data.doctorAdevieInfo
           console.log('哈哈哈哈哈哈哈哈哈', this.newTableAdvice)
           var tableAdvice = doctorAdevieInfo

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -487,6 +487,7 @@
                     </tr>
                     <tr>
                       <td width="60">时间</td>
+                      <td width="50">体温<br />°C</td>
                       <td width="60">血压<br />(mmHg)</td>
                       <td width="50">脉搏<br />(次/分)</td>
                       <td width="50">呼吸<br />(次/分)</td>
@@ -517,6 +518,7 @@
 
                     <tr v-for="(monitor, monindex) in monitors" :key="monindex">
                       <td>{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
+                      <td>{{ monitor.temperature ? monitor.temperature : "" }}</td>
                       <td>
                         {{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure + "/" : "" }}
                         {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyFive.vue

@@ -72,14 +72,15 @@
                 L
               </span>
               ）
-              <label-box :isChecked="prescription.mode_id > 2 ? true : false" showValue="其他："></label-box>
+              <label-box :isChecked="prescription.mode_id == 9 ? true : false" showValue="HFHD+HP"></label-box>&nbsp;
+              <label-box :isChecked="prescription.mode_id > 2 && prescription.mode_id != 9 ? true : false" showValue="其他："></label-box>
               <span v-if="prescription.mode_id == 3">{{ prescription.mode_id == 3 ? "HD+HP" : "" }}</span>
               <span v-if="prescription.mode_id == 4">{{ prescription.mode_id == 4 ? "HP" : "" }}</span>
               <span v-if="prescription.mode_id == 5">{{ prescription.mode_id == 5 ? "HF" : "" }}</span>
               <span v-if="prescription.mode_id == 6">{{ prescription.mode_id == 6 ? "SCUF" : "" }}</span>
               <span v-if="prescription.mode_id == 7">{{ prescription.mode_id == 7 ? "IUF" : "" }}</span>
               <span v-if="prescription.mode_id == 8">{{ prescription.mode_id == 8 ? "HFHD" : "" }}</span>
-              <span v-if="prescription.mode_id == 9">{{ prescription.mode_id == 9 ? "HFHD+HP" : "" }}</span>
+              <!-- <span v-if="prescription.mode_id == 9">{{ prescription.mode_id == 9 ? "HFHD+HP" : "" }}</span> -->
               <span v-if="prescription.mode_id == 10">{{ prescription.mode_id == 10 ? "PHF" : "" }}</span>
               <span v-if="prescription.mode_id == 11">{{ prescription.mode_id == 11 ? "HFR" : "" }}</span>
               <span v-if="prescription.mode_id == 12">{{ prescription.mode_id == 12 ? "HDF+HP" : "" }}</span>
@@ -681,6 +682,7 @@
             <td colspan="2" style="width:110px;height:40px">医生签名</td>
 
             <td colspan="2" style="width:108px;height:40px">执行</td>
+            <td colspan="2" style="width:108px;height:40px">核对</td>
             <td colspan="3" style="width:130px;height:40px">执行时间</td>
             <!-- <td style="width:60px;height:60px">
               <p style="height:20px;line-height:20px">核对</p>
@@ -726,6 +728,12 @@
               </span>
               <img style="height:30px;" :src="setAdminUserES(advice.execution_staff)" alt srcset v-else />
             </td>
+            <td colspan="2" style="height:40px">
+              <span v-if="setAdminUserES(advice.checker) == ''">
+                {{ getAdminUser(advice.checker) }}
+              </span>
+              <img style="height:30px;" :src="setAdminUserES(advice.checker)" alt srcset v-else />
+            </td>
             <td colspan="3" style="width:130px;">
               {{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}
             </td>
@@ -830,7 +838,7 @@
             <td width="100" style="border:none;padding-left:5px;">
               透析器凝血:
             </td>
-            <td width="100" style="text-align:left;border:none;">
+            <td style="text-align:left;border:none;">
               <div>
                 <span style="width:100px;display:inline-block;border:none;">
                   {{ afterdialysis.cruor ? afterdialysis.cruor : "" }}
@@ -839,7 +847,7 @@
             </td>
             <!-- <td width="10" style="border:none;"></td> -->
 
-            <td width="70" style="border:none;padding-left:5px;">内瘘:</td>
+            <!-- <td width="70" style="border:none;padding-left:5px;">内瘘:</td>
             <td width="200" style="text-align:left;border:none;line-height: 30px;">
               <div>
                 <span style="width:200px;display:inline-block">
@@ -854,7 +862,7 @@
                   {{ afterdialysis.catheter ? afterdialysis.catheter : "" }}
                 </span>
               </div>
-            </td>
+            </td> -->
           </tr>
         </tbody>
       </table>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -506,6 +506,13 @@
                   </tr>
                 </tbody>
               </table>
+              <table class="table-box">
+                <tbody>
+                  <tr>
+                    <td style="text-align:left;padding-left:5px;">备注:{{ predialysis.remark ? predialysis.remark : '' }}</td>
+                  </tr>
+                </tbody>
+              </table>
             </td>
           </tr>
         </tbody>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2713,7 +2713,7 @@
                 if (obj.type == 3) {
                   obj.single_dose = 1
                 }
-
+                console.log('项目obj',temp2)
                 this.prescriptions[i].project.push(obj)
               }
               this.curStatus = 2

src/xt_pages/stock/cancelStockOrder.vue

@@ -30,38 +30,39 @@
           @click="search"
           >搜索</el-button
         >
+        <div style="margin-left:10px;">
+          <label class="title"><span class="name">退库时间</span> : </label>
+          <el-date-picker
+            size="small"
+            v-model="start_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="startTimeChange"
+          ></el-date-picker>
+          <span class="cellLine"> - </span>
+          <el-date-picker
+            size="small"
+            v-model="end_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="endTimeChange"
+          ></el-date-picker>
+        </div>
       </div>
 
-      <div class="cell clearfix">
-        <label class="title"><span class="name">退库时间</span> : </label>
-        <el-date-picker
-          size="small"
-          v-model="start_time"
-          prefix-icon="el-icon-date"
-          :editable="false"
-          style="width: 196px;"
-          type="date"
-          placeholder="选择日期时间"
-          align="right"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          @change="startTimeChange"
-        ></el-date-picker>
-        <span class="cellLine"> - </span>
-        <el-date-picker
-          size="small"
-          v-model="end_time"
-          prefix-icon="el-icon-date"
-          :editable="false"
-          style="width: 196px;"
-          type="date"
-          placeholder="选择日期时间"
-          align="right"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          @change="endTimeChange"
-        ></el-date-picker>
-      </div>
+      
 
       <div class="filter-container" style="margin-top: 10px">
         <el-checkbox
@@ -640,7 +641,7 @@ export default {
       const tHeader = ['耗材名称',  '规格&单位','退库数量','退库单价','批次','品名/注册证号(备案凭证号)','生产厂家','生产日期','有效期','退库原因']
       const filterVal = ['good_name', 'unit','count','price','number','register_account','manufacturer','product_date','expiry_date','remark']
       console.log("table",this.exportList)
-      
+     
       const data = this.formatJson(filterVal, this.exportList)
       excel.export_json_to_excel({
         header: tHeader,

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -62,7 +62,7 @@
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         >
        
-          <el-table-column align="center" width="230">
+          <el-table-column align="center" width="230" fixed="left">
              <template slot="header" slot-scope="scope">
               <span>耗材名称</span>
             </template>
@@ -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>      
@@ -156,7 +157,7 @@
                     v-for="(item,index) in numberList"
                     :key="index"
                     :label="item.number"
-                    :value="item.number">
+                    :value="item.id">
                   </el-option>
               </el-select>
               </el-form-item>
@@ -313,7 +314,11 @@ export default {
       tableRules: {
         return_count: [
           { required: true, message: "数量不能为空", trigge: "blur" }
-        ]
+        
+        ],
+        // price: [
+        //   { required: true, message: "单价不能为空", trigge: "blur" }
+        // ]
       },
       ruleForm: {
         manufacturer: [
@@ -339,7 +344,9 @@ export default {
       dealer: [],
       goodType: [],
       goodInfo:[],
-      numberList:[]
+      numberList:[],
+      dealerList:[],
+      manufacturerList:[]
     };
   },
   methods: {
@@ -431,6 +438,7 @@ export default {
       tempObj["remark"] = ""
       tempObj["price"] = ""
       tempObj["total"] = ""
+      tempObj["warehouse_info_id"] =  0
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -538,12 +546,27 @@ export default {
             this.$message.success("请添加退库商品");
             return;
           }
+          console.log("hhhhh2h332",this.recordInfo.recordData)
+          for(let i=0;i<this.recordInfo.recordData.length;i++){
+            if(this.recordInfo.recordData[i].good_id == 0){
+               this.$message.error("耗材规格不能为空")
+               return
+            }
+
+            for(let j=0;j<this.numberList.length;j++){
+              if(this.recordInfo.recordData[i].number == this.numberList[j].id){
+                this.recordInfo.recordData[i].number = this.numberList[j].number
+                this.recordInfo.recordData[i].warehouse_info_id = this.numberList[j].id
+              }
+            }
+            
+          }
 
           const params = {
             cancelStock: this.recordInfo.recordData
           };
           console.log("params",params)
- 
+         
           postCancelStock(
             params,
             this.return_time,
@@ -562,6 +585,9 @@ export default {
              }
              if(msg == 2){
                this.$message.error("退库数量大于出库数量")
+             }
+              if(msg == 4){
+               this.$message.error("该批次退库数量大于入库数量")
              }
              if(msg == 3){
                this.$notify({
@@ -692,6 +718,7 @@ export default {
     tempObj["remark"] = ""
     tempObj["price"] = ""
     tempObj["total"] = ""
+    tempObj["warehouse_info_id"] = 0
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

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>      
@@ -112,12 +112,12 @@
                 :prop="'recordData.' + scope.$index + '.return_count'"
                 style="padding-top: 17px"
               >
-               <el-select v-model="scope.row.number" filterable placeholder="请选择">
+               <el-select v-model="scope.row.number" filterable placeholder="请选择" >
                   <el-option
                     v-for="(item,index) in numberList"
                     :key="index"
                     :label="item.number"
-                    :value="item.number">
+                    :value="item.id">
                   </el-option>
               </el-select>
               </el-form-item>
@@ -277,7 +277,10 @@
         tableRules: {
           count: [
             { required: true, message: '数量不能为空', trigge: 'blur' }
-          ]
+          ],
+          // price: [
+          //   { required: true, message: '单价不能为空', trigge: 'blur' }
+          // ]
 
         },
         ruleForm: {
@@ -311,7 +314,8 @@
         goodList:[],
         manufacturerList:[],
         dealerList:[],
-        numberList:[]
+        numberList:[],
+        numberShow:true
       }
     },
     methods: {
@@ -395,6 +399,7 @@
         tempObj["register_account"] = ""
         tempObj["remark"] = ""
         tempObj["price"] = ""
+        tempObj["warehouse_info_id"] = 0
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (row.id == 0) {
@@ -509,18 +514,50 @@
               array[i].price = array[i].price.toString()
             }
 
+            for(let i=0;i<this.recordInfo.recordData.length;i++){
+               if(this.recordInfo.recordData[i].good_id == 0){
+                  this.$message.error("耗材规格不能为空")
+                  return
+               }
+             for(let j=0;j<this.numberList.length;j++){
+                if(this.recordInfo.recordData[i].number == this.numberList[j].id){
+                  this.recordInfo.recordData[i].number = this.numberList[j].number
+                  this.recordInfo.recordData[i].warehouse_info_id = this.numberList[j].id
+                }
+             }
+            }
+
             const params = {
               '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)
                 return false
               } else {
-                this.$message.success('退库成功')
-
-                this.$router.back(-1)
+                var msg =  response.data.data.msg
+                if (msg == 1){
+                    this.$message.error("该耗材无出库记录")
+                    return
+                }
+                if(msg == 2){
+                  this.$message.error("退库数量大于出库数量")
+                }
+                  if(msg == 4){
+                  this.$message.error("该批次退库数量大于入库数量")
+                }
+                if(msg == 3){
+                  this.$notify({
+                    title: "成功",
+                    message: "退库成功",
+                    type: "success",
+                    duration: 2000
+                  });
+                  this.recordInfo.recordData = [];
+                  this.$router.back(-1);
+                }        
               }
             })
           } else {

src/xt_pages/stock/cancelStockOrderPrint.vue

@@ -17,48 +17,48 @@
           <table class="print-table" border="1">
             <tbody>
             <tr>
-              <td style="line-height: 50px" width="230">耗材名称</td>
-              <td style="line-height: 50px" width="260">品名/注册证号(备案凭证号)</td>
-              <td style="line-height: 50px" width="230">规格型号</td>
-              <td style="line-height: 50px" width="200">生产厂商</td>
-              <td style="line-height: 50px" width="180">批号(序列号)</td>
-              <td style="line-height:50px" width="200">生产日期</td>
-              <td style="line-height: 50px" width="200">有效期</td>
-              <td style="line-height: 50px" width="200">退库数量</td>
-              <td style="line-height: 50px" width="80">单价</td>
-              <td style="line-height: 50px" width="80">总金额</td>
+              <td width="230">耗材名称</td>
+              <td width="260">品名/注册证号(备案凭证号)</td>
+              <td width="230">规格型号</td>
+              <td width="200">生产厂商</td>
+              <td width="180">批号(序列号)</td>
+              <td width="200">生产日期</td>
+              <td width="200">有效期</td>
+              <td width="200">退库数量</td>
+              <td width="80">单价</td>
+              <td width="80">总金额</td>
             </tr>
 
             <tr v-for="(item,i) in it.XtCancelStockInfo" :key="i">
-              <td style="line-height: 50px">
+              <td>
                 <span>{{item.GoodInfo.good_name}}</span>
               </td>
-             <td style="line-height: 50px">
+             <td>
                 <span>{{item.register_account}}</span>
               </td>
-              <td style="line-height: 50px">
+              <td>
                   <span>{{item.GoodInfo.specification_name}}/{{item.GoodInfo.packing_unit}}</span>
               </td>
-              <td style="line-height: 50px">
+              <td>
                   {{item.manufacturer}}
               </td>
-              <td style="line-height: 50px">
+              <td>
                 <span>{{item.number}}</span>
               </td>
-              <td style="line-height:50px">
+              <td>
                   {{(getTime(item.product_date))}}
               </td>
              <td>{{(getTime(item.expiry_date))}}</td>
-             <td  style="line-height:50px">
+             <td>
                {{item.count}}
              </td>
-              <td  style="line-height:50px">
+              <td>
                {{item.price}}
              </td>
              <td> {{(item.count * item.price).toFixed(2)}}</td>
             </tr>
              <tr>
-               <td style="line-height:50px">合计</td>
+               <td>合计</td>
                <td colspan="8"></td>
                <td>{{getAllPrince(it.id).toFixed(2)}}</td>
              </tr>
@@ -74,12 +74,10 @@
             <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
           </div>
           <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
-            <div style="width:50px;">科室：</div><div style="width:60px;"></div>
-            <div style="width:70px;">领料人：</div><div style="width:60px;"></div>
             <div style="width:80px;">审批：</div><div style="width:100px;">肖庆娥</div>
             <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
             <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>
-            <div style="width:70px;">制单人：</div><div style="width:100px;">徐立琼</div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;">肖庆娥</div>
           </div>
         </div>
 
@@ -384,7 +382,7 @@
     width: 100%;
     text-align: center;
     border-collapse: collapse;
-    line-height: 40px;
+    line-height: 20px;
     font-size: 14px;
   }
 

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -31,38 +31,39 @@
         @click="search"
         >搜索</el-button
       >
+      <div style="margin-left:10px;">
+        <label class="title"><span class="name">日期查询</span> : </label>
+        <el-date-picker
+          size="small"
+          v-model="start_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="startTimeChange"
+        ></el-date-picker>
+        <span class="cellLine"> - </span>
+        <el-date-picker
+          size="small"
+          v-model="end_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="endTimeChange"
+        ></el-date-picker>
+      </div>
     </div>
 
-    <div class="cell clearfix">
-      <label class="title"><span class="name">日期查询</span> : </label>
-      <el-date-picker
-        size="small"
-        v-model="start_time"
-        prefix-icon="el-icon-date"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-        @change="startTimeChange"
-      ></el-date-picker>
-      <span class="cellLine"> - </span>
-      <el-date-picker
-        size="small"
-        v-model="end_time"
-        prefix-icon="el-icon-date"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-        @change="endTimeChange"
-      ></el-date-picker>
-    </div>
+    
 
     <!-- <div class="cell clearfix">
       <label class="title"><span class="name">单据类型</span> : </label>

src/xt_pages/stock/detail/stockInDetail.vue

@@ -33,38 +33,39 @@
         @click="search"
         >搜索</el-button
       >
+      <div style="margin-left:10px;">
+        <label class="title"><span class="name">日期查询</span> : </label>
+        <el-date-picker
+          size="small"
+          v-model="start_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="startTimeChange"
+        ></el-date-picker>
+        <span class="cellLine"> - </span>
+        <el-date-picker
+          size="small"
+          v-model="end_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="endTimeChange"
+        ></el-date-picker>
+      </div>
     </div>
 
-    <div class="cell clearfix">
-      <label class="title"><span class="name">日期查询</span> : </label>
-      <el-date-picker
-        size="small"
-        v-model="start_time"
-        prefix-icon="el-icon-date"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-        @change="startTimeChange"
-      ></el-date-picker>
-      <span class="cellLine"> - </span>
-      <el-date-picker
-        size="small"
-        v-model="end_time"
-        prefix-icon="el-icon-date"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-        @change="endTimeChange"
-      ></el-date-picker>
-    </div>
+    
 
     <!-- <div class="cell clearfix">
       <label class="title"><span class="name">单据类型</span> : </label>

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -31,38 +31,39 @@
         @click="search"
         >搜索</el-button
       >
+      <div style="margin-left:10px;">
+        <label class="title"><span class="name">日期查询</span> : </label>
+        <el-date-picker
+          size="small"
+          v-model="start_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="startTimeChange"
+        ></el-date-picker>
+        <span class="cellLine"> - </span>
+        <el-date-picker
+          size="small"
+          v-model="end_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="endTimeChange"
+        ></el-date-picker>
+      </div>
     </div>
 
-    <div class="cell clearfix">
-      <label class="title"><span class="name">日期查询</span> : </label>
-      <el-date-picker
-        size="small"
-        v-model="start_time"
-        prefix-icon="el-icon-date"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-        @change="startTimeChange"
-      ></el-date-picker>
-      <span class="cellLine"> - </span>
-      <el-date-picker
-        size="small"
-        v-model="end_time"
-        prefix-icon="el-icon-date"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-        @change="endTimeChange"
-      ></el-date-picker>
-    </div>
+    
 
     <!-- <div class="cell clearfix">
       <label class="title"><span class="name">单据类型</span> : </label>

src/xt_pages/stock/drugs/cancelDrugStockOrder.vue

@@ -30,38 +30,39 @@
           @click="search"
           >搜索</el-button
         >
+        <div style="margin-left:10px;">
+          <label class="title"><span class="name">退库时间</span> : </label>
+          <el-date-picker
+            size="small"
+            v-model="start_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="startTimeChange"
+          ></el-date-picker>
+          <span class="cellLine"> - </span>
+          <el-date-picker
+            size="small"
+            v-model="end_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="endTimeChange"
+          ></el-date-picker>
+        </div>
       </div>
 
-      <div class="cell clearfix">
-        <label class="title"><span class="name">退库时间</span> : </label>
-        <el-date-picker
-          size="small"
-          v-model="start_time"
-          prefix-icon="el-icon-date"
-          :editable="false"
-          style="width: 196px;"
-          type="date"
-          placeholder="选择日期时间"
-          align="right"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          @change="startTimeChange"
-        ></el-date-picker>
-        <span class="cellLine"> - </span>
-        <el-date-picker
-          size="small"
-          v-model="end_time"
-          prefix-icon="el-icon-date"
-          :editable="false"
-          style="width: 196px;"
-          type="date"
-          placeholder="选择日期时间"
-          align="right"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          @change="endTimeChange"
-        ></el-date-picker>
-      </div>
+      
 
       <div class="filter-container" style="margin-top: 10px">
         <el-checkbox
@@ -75,180 +76,179 @@
         <el-button size="small"  type="primary" @click="toExport">导出</el-button>
       </div>
 
-      <el-row :gutter="12" style="margin-top: 10px">
-        <el-table
-          :data="cancelStockDate"
-          :class="signAndWeighBoxPatients"
-          border
-          highlight-current-row
-          ref="multipleTable"
-          @current-change="handleCurrentChangeOne"
-          @selection-change="select"
-          :row-style="{ color: '#303133' }"
-          :header-cell-style="{
-            backgroundColor: 'rgb(245, 247, 250)',
-            color: '#606266'
-          }"
-        >
-          <el-table-column type="selection" width="55"> </el-table-column>
+      <el-table
+        :data="cancelStockDate"
+        :class="signAndWeighBoxPatients"
+        border
+        highlight-current-row
+        ref="multipleTable"
+        @current-change="handleCurrentChangeOne"
+        @selection-change="select"
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+      >
+        <el-table-column type="selection" width="55"> </el-table-column>
 
-          <el-table-column label="单据日期" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.return_time | parseTime("{y}-{m}-{d}") }}
-            </template>
-          </el-table-column>
+        <el-table-column label="单据日期" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.return_time | parseTime("{y}-{m}-{d}") }}
+          </template>
+        </el-table-column>
 
-          <el-table-column label="单据编号" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.order_number }}
-            </template>
-          </el-table-column>
+        <el-table-column label="单据编号" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.order_number }}
+          </template>
+        </el-table-column>
 
-          <el-table-column label="制单人" align="center">
-            <template slot-scope="scope">
-              {{ getXuserName(scope.row.creater) }}
-            </template>
-          </el-table-column>
+        <el-table-column label="制单人" align="center">
+          <template slot-scope="scope">
+            {{ getXuserName(scope.row.creater) }}
+          </template>
+        </el-table-column>
 
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scope">
-              <el-tooltip
-                class="item"
-                effect="dark"
-                content="编辑"
-                placement="top"
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="编辑"
+              placement="top"
+            >
+              <el-button
+                size="mini"
+                type="primary"
+                icon="el-icon-edit-outline"
+                @click="handleEdit(scope.$index, scope.row)"
               >
-                <el-button
-                  size="mini"
-                  type="primary"
-                  icon="el-icon-edit-outline"
-                  @click="handleEdit(scope.$index, scope.row)"
-                >
-                </el-button>
-              </el-tooltip>
-              <el-tooltip
-                class="item"
-                effect="dark"
-                content="删除"
-                placement="top"
+              </el-button>
+            </el-tooltip>
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="删除"
+              placement="top"
+            >
+              <el-button
+                size="mini"
+                type="danger"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.$index, scope.row)"
               >
-                <el-button
-                  size="mini"
-                  type="danger"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.$index, scope.row)"
-                >
-                </el-button>
-              </el-tooltip>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :page-sizes="[10, 50, 100]"
-          :page-size="10"
-          background
-          style="margin-top:20px;float: right"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total"
-        >
-        </el-pagination>
-      </el-row>
-    </div>
+              </el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
 
-    <div v-show ="showTable" style="margin-top:10px">
-       <el-table
-          :data="tableList"
-          :class="signAndWeighBoxPatients"
-          border
-          highlight-current-row
-          ref="multipleTableOne"
-          @current-change="handleCurrentChangeOne"
-          @selection-change="select"
-          :row-style="{ color: '#303133' }"
-          :header-cell-style="{
-            backgroundColor: 'rgb(245, 247, 250)',
-            color: '#606266'
-          }"
-        >
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;float: right;margin-bottom:10px;"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+      <div v-show ="showTable">
+        <el-table
+            :data="tableList"
+            :class="signAndWeighBoxPatients"
+            border
+            highlight-current-row
+            ref="multipleTableOne"
+            @current-change="handleCurrentChangeOne"
+            @selection-change="select"
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
+          >
 
-          <el-table-column label="药品名称" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.BaseDrugLib.drug_name}}
-            </template>
-          </el-table-column>
+            <el-table-column label="药品名称" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.BaseDrugLib.drug_name}}
+              </template>
+            </el-table-column>
+            
+          <el-table-column label="规格&单位" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.BaseDrugLib.dose}}{{scope.row.BaseDrugLib.dose_unit}} * {{scope.row.BaseDrugLib.min_number}}{{scope.row.BaseDrugLib.min_unit}} /{{scope.row.BaseDrugLib.max_unit}}
+              </template>
+            </el-table-column>
           
-         <el-table-column label="规格&单位" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.BaseDrugLib.dose}}{{scope.row.BaseDrugLib.dose_unit}} * {{scope.row.BaseDrugLib.min_number}}{{scope.row.BaseDrugLib.min_unit}} /{{scope.row.BaseDrugLib.max_unit}}
-            </template>
-          </el-table-column>
-         
-          <el-table-column label="退库数量" align="center">
-            <template slot-scope="scope">
-               {{ scope.row.count}}
-            </template>
-          </el-table-column>
+            <el-table-column label="退库数量" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.count}}
+              </template>
+            </el-table-column>
 
-          <el-table-column label="退库单位" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.max_unit}}
-            </template>
-          </el-table-column>
+            <el-table-column label="退库单位" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.max_unit}}
+              </template>
+            </el-table-column>
 
-          <el-table-column label="退库单价" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.price}}
-            </template> 
-          </el-table-column>
+            <el-table-column label="退库单价" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.price}}
+              </template> 
+            </el-table-column>
 
-           <el-table-column label="批次" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.batch_number}}
-            </template>
-          </el-table-column>
+            <el-table-column label="批次" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.batch_number}}
+              </template>
+            </el-table-column>
 
-          <el-table-column label="品名/注册证号(备案凭证号)" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.register_account}}
-            </template>
-          </el-table-column>
+            <el-table-column label="品名/注册证号(备案凭证号)" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.register_account}}
+              </template>
+            </el-table-column>
 
-          <el-table-column label="生产厂家" align="center">
-            <template slot-scope="scope">
-              {{scope.row.manufacturer}}
-            </template>
-          </el-table-column>
+            <el-table-column label="生产厂家" align="center">
+              <template slot-scope="scope">
+                {{scope.row.manufacturer}}
+              </template>
+            </el-table-column>
 
-          <el-table-column label="生产日期" align="center">
-            <template slot-scope="scope">
-               {{scope.row.product_date}}
-            </template>
-          </el-table-column>
+            <el-table-column label="生产日期" align="center">
+              <template slot-scope="scope">
+                {{scope.row.product_date}}
+              </template>
+            </el-table-column>
 
-         <el-table-column label="有效日期" align="center">
-            <template slot-scope="scope">
-              {{scope.row.expiry_date}}
-            </template>
-          </el-table-column>
-         
-          <el-table-column label="经销商" align="center">
-            <template slot-scope="scope">
-              {{scope.row.dealer}}
-            </template>
-          </el-table-column>
-         
-          <el-table-column label="退库原因" align="center">
-            <template slot-scope="scope">
-              {{scope.row.remark}}
-            </template>
-          </el-table-column>
+          <el-table-column label="有效日期" align="center">
+              <template slot-scope="scope">
+                {{scope.row.expiry_date}}
+              </template>
+            </el-table-column>
+          
+            <el-table-column label="经销商" align="center">
+              <template slot-scope="scope">
+                {{scope.row.dealer}}
+              </template>
+            </el-table-column>
+          
+            <el-table-column label="退库原因" align="center">
+              <template slot-scope="scope">
+                {{scope.row.remark}}
+              </template>
+            </el-table-column>
 
-        
-        </el-table>
+          
+          </el-table>
+      </div>
     </div>
+
+    
   </div>
 </template>
 

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

@@ -102,7 +102,7 @@
           max-height="450"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         >
-          <el-table-column align="center" width="200">
+          <el-table-column align="center" width="200" fixed="left">
             <template slot="header" slot-scope="scope">
               <span>药品名称<span style="color: red">*</span></span>
             </template>
@@ -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"
@@ -499,6 +499,7 @@ export default {
       tempObj["product_date"] = ""
       tempObj["expiry_date"] = ""
       tempObj["batch_number"] = ""
+      tempObj["max_unit"] = ""
       tempObj["batch_number_id"] = 0
       this.recordInfo.recordData.push(tempObj);
     },
@@ -598,10 +599,12 @@ export default {
             return;
           }
           for(let i=0;i<this.recordInfo.recordData.length;i++){
+            this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
              for(let j=0;j<this.numberList.length;j++){
                 if(this.recordInfo.recordData[i].batch_number == this.numberList[j].id){
                    this.recordInfo.recordData[i].batch_number = this.numberList[j].batch_number
                    this.recordInfo.recordData[i].batch_number_id = this.numberList[j].id
+                 
                 }
              }
           }
@@ -691,6 +694,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 +703,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
@@ -754,6 +759,7 @@ export default {
     tempObj["expiry_date"] = ""
     tempObj["batch_number"] = ""
     tempObj["batch_number_id"] = 0
+    tempObj["max_unit"] = ""
     this.unitList =  getDataConfig('hemodialysis','units')
     console.log("单位",this.unitList)
     this.recordInfo.recordData.push(tempObj);

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

@@ -33,40 +33,41 @@
         @click="search"
         >搜索</el-button
       >
+      <div style="margin-left:10px;">
+        <label class="title"><span class="name">日期查询</span> : </label>
+        <el-date-picker
+          size="small"
+          v-model="start_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="startTimeChange"
+        ></el-date-picker>
+        <span class="cellLine"> - </span>
+        <el-date-picker
+          size="small"
+          v-model="end_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="endTimeChange"
+        ></el-date-picker>
+      </div>
     </div>
 
-    <div class="cell clearfix">
-      <label class="title"><span class="name">日期查询</span> : </label>
-      <el-date-picker
-        size="small"
-        v-model="start_time"
-        prefix-icon="el-icon-date"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-        @change="startTimeChange"
-      ></el-date-picker>
-      <span class="cellLine"> - </span>
-      <el-date-picker
-        size="small"
-        v-model="end_time"
-        prefix-icon="el-icon-date"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-        @change="endTimeChange"
-      ></el-date-picker>
-    </div>
+    
 
-    <div class="cell clearfix">
+    <!-- <div class="cell clearfix">
       <label class="title"><span class="name">单据类型</span> : </label>
       <el-select
         size="small"
@@ -83,8 +84,8 @@
         >
         </el-option>
       </el-select>
-    </div>
-
+    </div> -->
+<!-- 
     <div class="cell clearfix">
       <label class="title"><span class="name">其它</span> : </label>
       <el-select
@@ -102,7 +103,7 @@
         >
         </el-option>
       </el-select>
-    </div>
+    </div> -->
 
     <el-row :gutter="12" style="margin-top: 10px">
       <el-table
@@ -140,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>
 
@@ -358,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
@@ -387,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/drugInOrder.vue

@@ -33,38 +33,39 @@
         @click="search"
         >搜索</el-button
       >
+      <div style="margin-left:10px;">
+        <label class="title"><span class="name">日期查询</span> : </label>
+        <el-date-picker
+          size="small"
+          v-model="start_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="startTimeChange"
+        ></el-date-picker>
+        <span class="cellLine"> - </span>
+        <el-date-picker
+          size="small"
+          v-model="end_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="endTimeChange"
+        ></el-date-picker>
+      </div>
     </div>
 
-    <div class="cell clearfix">
-      <label class="title"><span class="name">日期查询</span> : </label>
-      <el-date-picker
-        size="small"
-        v-model="start_time"
-        prefix-icon="el-icon-date"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-        @change="startTimeChange"
-      ></el-date-picker>
-      <span class="cellLine"> - </span>
-      <el-date-picker
-        size="small"
-        v-model="end_time"
-        prefix-icon="el-icon-date"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-        @change="endTimeChange"
-      ></el-date-picker>
-    </div>
+    
 
     <!-- <div class="cell clearfix">
       <label class="title"><span class="name">单据类型</span> : </label>

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

@@ -31,38 +31,39 @@
         @click="search"
         >搜索</el-button
       >
+      <div style="margin-left:10px;">
+        <label class="title"><span class="name">日期查询</span> : </label>
+        <el-date-picker
+          size="small"
+          v-model="start_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="startTimeChange"
+        ></el-date-picker>
+        <span class="cellLine"> - </span>
+        <el-date-picker
+          size="small"
+          v-model="end_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 196px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          @change="endTimeChange"
+        ></el-date-picker>
+      </div>
     </div>
 
-    <div class="cell clearfix">
-      <label class="title"><span class="name">日期查询</span> : </label>
-      <el-date-picker
-        size="small"
-        v-model="start_time"
-        prefix-icon="el-icon-date"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-        @change="startTimeChange"
-      ></el-date-picker>
-      <span class="cellLine"> - </span>
-      <el-date-picker
-        size="small"
-        v-model="end_time"
-        prefix-icon="el-icon-date"
-        :editable="false"
-        style="width: 196px;"
-        type="date"
-        placeholder="选择日期时间"
-        align="right"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-        @change="endTimeChange"
-      ></el-date-picker>
-    </div>
+    
 
     <!-- <div class="cell clearfix">
       <label class="title"><span class="name">单据类型</span> : </label>
@@ -172,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

@@ -30,38 +30,39 @@
           @click="search"
           >搜索</el-button
         >
+        <div style="margin-left:10px;">
+          <label class="title"><span class="name">入库时间</span> : </label>
+          <el-date-picker
+            size="small"
+            v-model="start_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="startTimeChange"
+          ></el-date-picker>
+          <span class="cellLine"> - </span>
+          <el-date-picker
+            size="small"
+            v-model="end_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="endTimeChange"
+          ></el-date-picker>
+        </div>
       </div>
 
-      <div class="cell clearfix">
-        <label class="title"><span class="name">入库时间</span> : </label>
-        <el-date-picker
-          size="small"
-          v-model="start_time"
-          prefix-icon="el-icon-date"
-          :editable="false"
-          style="width: 196px;"
-          type="date"
-          placeholder="选择日期时间"
-          align="right"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          @change="startTimeChange"
-        ></el-date-picker>
-        <span class="cellLine"> - </span>
-        <el-date-picker
-          size="small"
-          v-model="end_time"
-          prefix-icon="el-icon-date"
-          :editable="false"
-          style="width: 196px;"
-          type="date"
-          placeholder="选择日期时间"
-          align="right"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          @change="endTimeChange"
-        ></el-date-picker>
-      </div>
+      
 
       <div class="cell clearfix">
         <el-checkbox
@@ -832,12 +833,18 @@ export default {
            if(this.exportList[i].manufacturer == this.manufacturerList[j].id){
              this.exportList[i].manufacturer = this.manufacturerList[j].manufacturer_name
            }
+           if(this.exportList[i].manufacturer == 0){
+              this.exportList[i].manufacturer = ""
+           } 
          }
 
          for(let z=0;z<this.dealerList.length;z++){
            if(this.exportList[i].dealer == this.dealerList[z].id){
               this.exportList[i].dealer = this.dealerList[z].dealer_name
            }
+           if(this.exportList[i].dealer == 0){
+             this.exportList[i].dealer = ""
+           }
          }
       }
       
@@ -846,19 +853,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)
-      
+        
         const data = this.formatJson(filterVal, this.exportList)
         excel.export_json_to_excel({
           header: tHeader,

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -43,7 +43,7 @@
           max-height="450"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         >
-          <el-table-column align="center" width="200">
+          <el-table-column align="center" width="200" fixed="left">
             <template slot="header" slot-scope="scope">
               <span>药品名称<span style="color: red">*</span></span>
             </template>
@@ -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"
@@ -657,7 +657,7 @@ export default {
              }
 
              this.recordInfo.recordData[i].last_price = this.recordInfo.recordData[i].last_price.toString()
-            //  this.recordInfo.recordData[i].manufacturer = this.recordInfo.recordData[i].drug.manufacturer
+             this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].last_price.toString()
             
             for(let j=0;j<this.manufacturerList.length;j++){
               if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
@@ -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

@@ -28,38 +28,39 @@
           @click="search"
           >搜索</el-button
         >
+        <div style="margin-left:10px;">
+          <label class="title"><span class="name">出库时间</span> : </label>
+          <el-date-picker
+            size="small"
+            v-model="start_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="startTimeChange"
+          ></el-date-picker>
+          <span class="cellLine"> - </span>
+          <el-date-picker
+            size="small"
+            v-model="end_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="endTimeChange"
+          ></el-date-picker>
+        </div>
       </div>
 
-      <div class="cell clearfix">
-        <label class="title"><span class="name">出库时间</span> : </label>
-        <el-date-picker
-          size="small"
-          v-model="start_time"
-          prefix-icon="el-icon-date"
-          :editable="false"
-          style="width: 196px;"
-          type="date"
-          placeholder="选择日期时间"
-          align="right"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          @change="startTimeChange"
-        ></el-date-picker>
-        <span class="cellLine"> - </span>
-        <el-date-picker
-          size="small"
-          v-model="end_time"
-          prefix-icon="el-icon-date"
-          :editable="false"
-          style="width: 196px;"
-          type="date"
-          placeholder="选择日期时间"
-          align="right"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          @change="endTimeChange"
-        ></el-date-picker>
-      </div>
+      
 
       <div class="cell clearfix">
         <el-checkbox
@@ -224,15 +225,16 @@
               {{scope.row.dose}}&nbsp;{{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">
@@ -305,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>
 
@@ -315,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">
@@ -325,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>
 
@@ -334,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>
 
@@ -344,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">
@@ -519,7 +524,8 @@ export default {
       drugOutList:[],
       outList:[],
       userListOne:[],
-      exportList:[]
+      exportList:[],
+      batchNumberList:[]
     };
   },
   methods: {
@@ -946,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
@@ -971,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
        }
      })
    },
@@ -1107,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
@@ -1130,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

@@ -61,7 +61,7 @@
           max-height="450"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         >
-          <el-table-column align="center" width="200">
+          <el-table-column align="center" width="200" fixed="left">
             <template slot="header" slot-scope="scope">
               <span>药品名称<span style="color: red">*</span></span>
             </template>
@@ -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/drugs/query.vue

@@ -121,11 +121,11 @@
              {{getCount(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="退库数量" align="center">
+        <!-- <el-table-column prop="drug_name" label="退库数量" align="center">
            <template slot-scope="scope">
              {{getCancelCount(scope.row.drug_id)}}{{scope.row.max_unit}}
            </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
              <span v-if="getCountTwo(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)!=''">{{getCountTwo(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}</span>

src/xt_pages/stock/stockBatchNumber.vue

@@ -7,7 +7,7 @@
       <div class="cell clearfix">
         耗材名称:{{this.$route.query.good_name}} &nbsp;
         <!-- 库存: {{getInCount(this.$route.query.id)- getOutCount(this.$route.query.id) - getAutoCount(this.$route.query.id) + getCancelCount(this.$route.query.id)}}{{this.$route.query.packing_unit}}&nbsp; -->
-         {{getStockCount(this.$route.query.id)}}
+        库存: {{getStockCount(this.$route.query.id)}}
         规格:{{this.$route.query.specification_name}} &nbsp;
         厂家:{{this.$route.query.manufacturer}} 
       </div>

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/stockInOrder.vue

@@ -31,38 +31,39 @@
           @click="search"
           >搜索</el-button
         >
+        <div style="margin-left:10px;">
+          <label class="title"><span class="name">入库时间</span> : </label>
+          <el-date-picker
+            size="small"
+            v-model="start_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="startTimeChange"
+          ></el-date-picker>
+          <span class="cellLine"> - </span>
+          <el-date-picker
+            size="small"
+            v-model="end_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="endTimeChange"
+          ></el-date-picker>
+        </div>
       </div>
 
-      <div class="cell clearfix">
-        <label class="title"><span class="name">入库时间</span> : </label>
-        <el-date-picker
-          size="small"
-          v-model="start_time"
-          prefix-icon="el-icon-date"
-          :editable="false"
-          style="width: 196px;"
-          type="date"
-          placeholder="选择日期时间"
-          align="right"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          @change="startTimeChange"
-        ></el-date-picker>
-        <span class="cellLine"> - </span>
-        <el-date-picker
-          size="small"
-          v-model="end_time"
-          prefix-icon="el-icon-date"
-          :editable="false"
-          style="width: 196px;"
-          type="date"
-          placeholder="选择日期时间"
-          align="right"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          @change="endTimeChange"
-        ></el-date-picker>
-      </div>
+      
 
       <div class="cell clearfix">
         <el-checkbox

src/xt_pages/stock/stockInOrderAdd.vue

@@ -32,7 +32,7 @@
                   style="width: 100%"
                   max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
         >
-          <el-table-column align="center" width="200">
+          <el-table-column align="center" width="200" fixed="left">
              <template slot="header" slot-scope="scope">
               <span>耗材名称</span>
             </template>
@@ -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

@@ -29,38 +29,39 @@
           @click="search"
           >搜索</el-button
         >
+        <div style="margin-left:10px;">
+          <label class="title"><span class="name">出库时间</span> : </label>
+          <el-date-picker
+            size="small"
+            v-model="start_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="startTimeChange"
+          ></el-date-picker>
+          <span class="cellLine"> - </span>
+          <el-date-picker
+            size="small"
+            v-model="end_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="endTimeChange"
+          ></el-date-picker>
+        </div>
       </div>
 
-      <div class="cell clearfix">
-        <label class="title"><span class="name">出库时间</span> : </label>
-        <el-date-picker
-          size="small"
-          v-model="start_time"
-          prefix-icon="el-icon-date"
-          :editable="false"
-          style="width: 196px;"
-          type="date"
-          placeholder="选择日期时间"
-          align="right"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          @change="startTimeChange"
-        ></el-date-picker>
-        <span class="cellLine"> - </span>
-        <el-date-picker
-          size="small"
-          v-model="end_time"
-          prefix-icon="el-icon-date"
-          :editable="false"
-          style="width: 196px;"
-          type="date"
-          placeholder="选择日期时间"
-          align="right"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          @change="endTimeChange"
-        ></el-date-picker>
-      </div>
+      
 
       <div class="cell clearfix">
         <el-checkbox
@@ -418,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">
@@ -632,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>
 <!-- 
@@ -805,7 +808,8 @@ export default {
       warehouse_out_time:"",
       exportList:[],
       is_sys:0,
-      infoList:[]
+      infoList:[],
+      stockFlowList:[]
     };
   },
   methods: {
@@ -1532,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
@@ -1656,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

@@ -62,7 +62,7 @@
           max-height="450"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         >
-         <el-table-column width="200" align="center">
+         <el-table-column width="200" align="center" fixed="left">
             <template slot="header" slot-scope="scope">
               <span>耗材名称</span>
             </template>
@@ -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"
@@ -792,4 +793,7 @@ export default {
 .el-autocomplete-suggestion{
   width: 400px !important;
 }
+::-webkit-scrollbar{
+  height: 20px;
+}
 </style>

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/stock/stockQuery.vue

@@ -114,13 +114,13 @@
          </template>
        </el-table-column>
 
-       <el-table-column label="退库数量" align="center">
+       <!-- <el-table-column label="退库数量" align="center">
          <template slot-scope="scope">
            <span>{{getCancelCount(scope.row.good_id)}}{{scope.row.packing_unit}}</span>
 
          </template>
        </el-table-column>
-      
+       -->
        <el-table-column label="剩余库存量" align="center">
          <template slot-scope="scope">
            <!-- {{getInCount(scope.row.good_id)- getOutCount(scope.row.good_id) - getAutoCount(scope.row.good_id) + getCancelCount(scope.row.good_id)}} {{scope.row.packing_unit}} -->

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) {

src/xt_pages/user/components/PatientSidebar.vue

@@ -102,6 +102,10 @@ export default {
               name: '1-2',
               label: '病程管理'
             },
+            // {
+            //   name: '1-9',
+            //   label: '阶段小结'
+            // },
             {
               name: '1-3',
               label: '检验检查'
@@ -183,7 +187,8 @@ export default {
         this.$router.push({path:'/patients/patient/'+this.id+'/vascularAccess'})
       }else if (name == '1-8'){
         this.$router.push({path:'/patients/patients/'+this.id+'/inspectionInfectious'})
-
+      }else if (name == '1-9'){
+        this.$router.push({path:'/patients/patients/'+6092+'/templateSummary'})
       }
     },
     changePatient(value) {
@@ -328,6 +333,8 @@ export default {
         this.$router.push({
           path: '/patients/patient/' + this.id + '/proeducation'
         })
+      }else if (patientKey == '1-9'){
+        this.$router.push({path:'/patients/patients/'+this.id+'/templateSummary'})
       }
     
      }else{

src/xt_pages/user/templateSummary.vue

@@ -0,0 +1,666 @@
+<template>
+  <div class="patient-container">
+    <patient-sidebar :id="patient_id" defaultActive="1-9"></patient-sidebar>
+    <div v-loading="loading">
+      <div class="patient-app-container advice-container app-container">
+
+        <div>
+                    <span style="margin-left: 10px;float:right;">
+                        <el-button type="primary" icon="el-icon-circle-plus-outline" size="small"
+                                   @click="show_dialog = true">新增</el-button>
+
+                        <el-button type="primary" icon="el-icon-edit-outline" size="small"
+                                   @click="showEdit">修改</el-button>
+                      <el-button type="primary" icon="el-icon-printer" size="small"
+                                 @click="print">打印</el-button>
+                        <el-button size="small" v-show="selectingRows.length > 0" type="danger"
+                                   @click="deleteAction">删除</el-button>
+                    </span>
+        </div>
+        <!--<div></div>-->
+        <div class="cell clearfix">
+          <label class="title"><span class="name">日期查询</span> : </label>
+          <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                          type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+          <span class="">-</span>
+          <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                          type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+        </div>
+        <div class="record">
+          <el-row :gutter="15">
+            <el-col :span="10">
+              <el-table :header-cell-style="{
+                  backgroundColor: 'rgb(245, 247, 250)',
+                  color: '#606266'
+                }"
+                :row-style="{ color: '#303133' }" ref="record_table" :data="records"
+                        border highlight-current-row @current-change="didChangeCurrentRecord"
+                        @selection-change="didSelectionChange"
+                        :row-class-name="tableRow"
+                        @row-click="onRowClick"
+              >
+                <el-table-column type="selection" width="40" align="center"></el-table-column>
+                <el-table-column label="阶段小结名称" align="center">
+                  <template slot-scope="scope">
+                    {{ scope.row.title}}
+                  </template>
+                </el-table-column>
+                <el-table-column label="记录时间" align="center">
+                  <template slot-scope="scope">
+                    {{ recordTime(scope.row.record_time) }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="记录医生" align="center">
+                  <template slot-scope="scope">
+                    {{ doctorName(scope.row.recorder) }}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-col>
+            <el-col :span="14">
+              <div class="record_content_panel">
+                <div style="background-color:rgb(245, 247, 250)" class="title">病程内容</div>
+                <div class="content">
+                  <span v-if="current_select_record" v-html="current_select_record.content">{{current_select_record.content }}</span>
+                  <span v-else></span>
+                </div>
+              </div>
+            </el-col>
+          </el-row>
+        </div>
+      </div>
+     
+      <el-dialog title="新增阶段小结" width="80%" top="5vh" :visible.sync="show_dialog">
+        <div>
+          <div class="new_record_form">
+            <div class="cell clearfix">
+              <label class="title"><span class="name">阶段小结时间</span> : </label>
+              <el-form>
+                 <el-row :gutter="24">
+                  <el-col :span="8">
+                    <el-form-item>
+                        <el-date-picker
+                            v-model="value"
+                            type="year"
+                            placeholder="选择年">
+                        </el-date-picker>
+                    </el-form-item> 
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item>
+                      <el-radio-group v-model="radio">
+                        <el-radio :label="1" >月份</el-radio>
+                        <el-radio :label="2" >季度</el-radio>
+                     </el-radio-group>
+                    </el-form-item> 
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item>
+                      <el-date-picker
+                        v-model="value"
+                        type="month"
+                        placeholder="选择月">
+                      </el-date-picker>
+                    </el-form-item> 
+                  </el-col>
+                   
+                 </el-row>  
+                
+              </el-form>
+            </div>
+
+            <div class="cell clearfix" style="margin-top: 10px">
+              <label class="title"><span class="name">阶段小结摘要</span> : </label>
+              <el-form>
+                  <el-row :gutter="24">
+                    <el-col :span="8">
+                     <el-form-item label="干体重">
+                      <el-input></el-input>
+                     </el-form-item>  
+                    </el-col>
+                    <el-col :span="8">
+                     <el-form-item label="共透析(次)">
+                      <el-input></el-input>
+                     </el-form-item>  
+                    </el-col>
+                    <el-col :span="8">
+                     <el-form-item label="HD(次)">
+                      <el-input></el-input>
+                     </el-form-item>  
+                    </el-col>
+                  </el-row>
+                  <el-row :gutter="24">
+                    <el-col :span="8">
+                     <el-form-item label="HDF(次)">
+                      <el-input></el-input>
+                     </el-form-item>  
+                    </el-col>
+                    <el-col :span="8">
+                     <el-form-item label="HP(次)">
+                      <el-input></el-input>
+                     </el-form-item>  
+                    </el-col>
+                    <el-col :span="8">
+                     <el-form-item label="其他(次)">
+                      <el-input></el-input>
+                     </el-form-item>  
+                    </el-col>
+                  </el-row>
+                   <el-row :gutter="24">
+                    <el-col :span="8">
+                     <el-form-item label="透析器">
+                      <el-input></el-input>
+                     </el-form-item>  
+                    </el-col>
+                    <el-col :span="8">
+                     <el-form-item label="抗凝剂">
+                      <el-input></el-input>
+                     </el-form-item>  
+                    </el-col>
+                  </el-row>
+                   <div>透析液</div>
+                   <el-row :gutter="24">
+                    <el-col :span="8">
+                     <el-form-item label="钾">
+                      <el-input></el-input>
+                     </el-form-item>  
+                    </el-col>
+                    <el-col :span="8">
+                     <el-form-item label="钙">
+                      <el-input></el-input>
+                     </el-form-item>  
+                    </el-col>
+                    <el-col :span="8">
+                     <el-form-item label="钠">
+                      <el-input></el-input>
+                     </el-form-item>  
+                    </el-col>
+                  </el-row>
+                   <div>透析时长</div>
+                   <el-row :gutter="24">
+                    <el-col :span="8">
+                     <el-form-item label="时">
+                      <el-input></el-input>
+                     </el-form-item>  
+                    </el-col>
+                    <el-col :span="8">
+                     <el-form-item label="分">
+                      <el-input></el-input>
+                     </el-form-item>  
+                    </el-col>
+                  </el-row>
+                  <el-row :gutter="24">
+                    <el-col :span="8">
+                     <el-form-item label="透前体重(kg)">
+                      <el-input></el-input>
+                     </el-form-item>  
+                    </el-col>
+                    <el-col :span="8">
+                     <el-form-item label="透后体重(kg)">
+                      <el-input></el-input>
+                     </el-form-item>  
+                    </el-col>
+                  </el-row>
+                   <el-row :gutter="24">
+                    <el-col :span="8">
+                     <el-form-item label="透前血压(mmHg)">
+                      <el-input></el-input>
+                     </el-form-item>  
+                    </el-col>
+                    <el-col :span="8">
+                     <el-form-item label="透后血压(mmHg)">
+                      <el-input></el-input>
+                     </el-form-item>  
+                    </el-col>
+                  </el-row>
+                 
+                  <el-row>
+                    <label class="title"><span class="name">阶段小结总结</span> : </label>
+                     <el-select v-model="value" placeholder="请选择">
+                        <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                     </el-select>
+                     <el-input tyep="text"></el-input>
+                  </el-row>
+                  <el-row>
+                    <label class="title"><span class="name">阶段小结个体化透析方案</span> : </label>
+                     <el-select v-model="value" placeholder="请选择">
+                        <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                     </el-select>
+                     <el-input tyep="text"></el-input>
+                  </el-row>
+                  <el-row>
+                    <label class="title"><span class="name">阶段小结化验结果</span> : </label>
+                     <el-select v-model="value" placeholder="请选择">
+                        <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                     </el-select>
+                     <el-input tyep="text"></el-input>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="8">
+                      <el-form-item label="记录医生">
+                        <el-select v-model="value" placeholder="请选择">
+                            <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            </el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                      <el-form-item label="记录时间">
+                         <el-date-picker
+                            v-model="value1"
+                            type="datetime"
+                            placeholder="选择日期时间">
+                        </el-date-picker>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+              </el-form>
+            </div>
+
+
+          
+            <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
+              <el-button @click="show_dialog = false">取消</el-button>
+              <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary"
+                         @click="createAction" :loading="uploading_new_record">保存
+              </el-button>
+            </div>
+          </div>
+        </div>
+      </el-dialog>
+
+
+      <el-dialog title="修改病程记录" width="50%" top="5vh" :visible.sync="show_edit_dialog">
+        <div>
+          <div class="new_record_form">
+            <div class="cell clearfix">
+              <label class="title"><span class="name">病程日期</span> : </label>
+              <el-date-picker v-model="edit_course_of_disease_time" prefix-icon="el-icon-date" :editable="false"
+                              style="width: 200px;"
+                              type="datetime"
+                              placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm"
+                              value-format="yyyy-MM-dd HH:mm"></el-date-picker>
+
+              <label class="title"><span class="name">日常病程</span> : </label>
+              <el-select v-model="select_template" placeholder="可选择病程模板" @change="didEditSelectTemplate">
+                <el-option v-for="(option, index) in templates" :key="index" :label="option.title"
+                           :value="option.content"></el-option>
+              </el-select>
+            </div>
+
+
+            <div class="cell clearfix" style="margin-top: 10px">
+              <label class="title"><span class="name">病程标题</span> : </label>
+              <el-input v-model="edit_title" style="width: 420px"></el-input>
+            </div>
+
+            <div class="textarea_panel">
+              <!--<el-input v-model="edit_new_content" type="textarea" rows="6" resize="none"></el-input>-->
+              <keep-alive>
+                <editor ref="edit_neditor"
+                        id="edit_editor"
+                        style="width: 600px"
+                        v-bind:r_content="edit_new_content">
+                </editor>
+              </keep-alive>
+            </div>
+
+            <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
+              <el-button @click="show_edit_dialog = false">取消</el-button>
+              <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary"
+                         @click="modifyAction" :loading="uploading_new_record">保存
+              </el-button>
+            </div>
+          </div>
+        </div>
+      </el-dialog>
+    </div>
+  </div>
+
+  <!-- </div> -->
+</template>
+
+<script>
+  import PatientSidebar from './components/PatientSidebar'
+  import Editor from '@/components/Editor'
+
+  import {
+    createCourseOfDiseaseRecord,
+    deleteCourseOfDiseaseRecords,
+    getCourseOfDiseaseRecords,
+    modifyCourseOfDiseaseRecord,
+    GetCoursePrintData
+  } from '@/api/patient'
+  import { parseTime } from '@/utils'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+
+  export default {
+    name: 'templateSummary',
+    components: {
+      PatientSidebar,
+      BreadCrumb,
+      Editor
+    },
+    data() {
+      return {
+        loading: false,
+        title: '',
+        patient_id: 0,
+        date: [],
+        start_time: '',
+        end_time: '',
+        course_of_disease_time: '',
+        records: [],
+        doctors: [],
+        current_select_record: null,
+        show_dialog: false,
+        show_edit_dialog: false,
+        uploading_new_record: false,
+        templates: this.$store.getters.configlist.course_disease,
+        select_template: '',
+        new_content: '',
+        edit_new_content: '',
+        edit_course_of_disease_time: '',
+        selectingRows: [],
+        table_current_index: -1,
+        edit_current_id: 0,
+        edit_title: '',
+        radio:1,
+        value:''
+      }
+    },
+    created() {
+    //   this.patient_id = parseInt(this.$route.query.id)
+    //   if (isNaN(this.patient_id) || this.patient_id <= 0) {
+    //     this.$notify.error({
+    //       title: '错误',
+    //       message: '无效的id'
+    //     })
+    //     this.$router.push('/patients/patients')
+    //     return
+    //   }
+      var now = new Date()
+      this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
+
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
+      this.end_time =
+        nowYear +
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+      nowDate.setMonth(nowDate.getMonth() - 1)
+      nowYear = nowDate.getFullYear()
+      nowMonth = nowDate.getMonth() + 1
+      nowDay = nowDate.getDate()
+      this.start_time =
+        nowYear +
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+
+      this.requestCourseRecords()
+
+    },
+    methods: {
+      requestCourseRecords: function() {
+        this.loading = true
+        getCourseOfDiseaseRecords(this.patient_id, this.start_time, this.end_time).then(rs => {
+          this.loading = false
+          var resp = rs.data
+          if (resp.state == 1) {
+            this.current_select_record = null
+            this.records = resp.data.records
+            this.doctors = resp.data.doctors
+
+          } else {
+            this.$message.error(resp.msg)
+          }
+        }).catch(error => {
+          this.loading = false
+          this.$message.error(error)
+        })
+      },
+
+      didChangeCurrentRecord: function(record) {
+        this.current_select_record = record
+      },
+      recordTime: function(timestamp) {
+        var time = new Date(timestamp * 1000)
+        return parseTime(time, '{y}-{m}-{d} {h}:{m}')
+      },
+      doctorName: function(doctor_id) {
+        for (let index = 0; index < this.doctors.length; index++) {
+          const doctor = this.doctors[index]
+          if (doctor.id == doctor_id) {
+            return doctor.name
+          }
+        }
+        return ''
+      },
+      modifyAction: function() {
+
+        this.edit_new_content = this.$refs.edit_neditor.content
+        if (this.edit_new_content.length == 0) {
+          this.$message.error('请填写病程内容')
+          return
+        }
+        this.uploading_new_record = true
+        modifyCourseOfDiseaseRecord(this.patient_id, this.edit_new_content, this.edit_course_of_disease_time, this.edit_current_id, this.edit_title).then(rs => {
+          this.uploading_new_record = false
+          var resp = rs.data
+          if (resp.state == 1) {
+            this.records[this.table_current_index].content = resp.data.record.content
+            this.records[this.table_current_index].record_time = resp.data.record.record_time
+            this.records[this.table_current_index].recorder = resp.data.record.recorder
+            this.records[this.table_current_index].title = resp.data.record.title
+
+            this.show_edit_dialog = false
+            this.edit_new_content = ''
+            this.table_current_index = -1
+
+          } else {
+            this.table_current_index = -1
+            this.$message.error(resp.msg)
+          }
+
+        }).catch(error => {
+          this.table_current_index = -1
+          this.uploading_new_record = false
+          this.$message.error(error)
+        })
+
+      },
+
+      createAction: function() {
+        this.new_content = this.$refs.editor.content
+        if (this.new_content.length == 0) {
+          this.$message.error('请填写病程内容')
+          return
+        }
+        this.uploading_new_record = true
+        
+        createCourseOfDiseaseRecord(this.patient_id, this.new_content, this.course_of_disease_time, this.title).then(rs => {
+          this.uploading_new_record = false
+          var resp = rs.data
+          if (resp.state == 1) {
+            this.records.unshift(resp.data.record)
+            // this.$refs.record_table.setCurrentRow()
+            // this.$refs.record_table.setCurrentRow(this.records[0])
+            // this.current_select_record = this.records[0]
+            this.show_dialog = false
+            this.new_content = ''
+            this.title = ''
+
+          } else {
+            this.$message.error(resp.msg)
+          }
+
+        }).catch(error => {
+          this.uploading_new_record = false
+          this.$message.error(error)
+        })
+      },
+      didSelectTemplate: function(templateContent) {
+        this.new_content = this.new_content.length > 0 ? (this.new_content + templateContent) : templateContent
+
+      }, didEditSelectTemplate: function(templateContent) {
+        this.edit_new_content = this.edit_new_content.length > 0 ? (this.edit_new_content + templateContent) : templateContent
+      },
+
+      didSelectionChange: function(selectRows) {
+        this.selectingRows = selectRows
+      },
+      deleteAction: function() {
+        if (this.selectingRows.length == 0) {
+          return
+        }
+        var ids = []
+        for (let index = 0; index < this.selectingRows.length; index++) {
+          const row = this.selectingRows[index]
+          ids.push(row.id)
+        }
+        var ids_str = ids.join(',')
+        this.loading = true
+        deleteCourseOfDiseaseRecords(this.patient_id, ids_str).then(rs => {
+          var resp = rs.data
+          if (resp.state == 1) {
+            for (let id_index = 0; id_index < ids.length; id_index++) {
+              for (let record_index = 0; record_index < this.records.length; record_index++) {
+                if (ids[id_index] == this.records[record_index].id) {
+                  this.records.splice(record_index, 1)
+                  break
+                }
+              }
+            }
+            this.selectingRows = []
+            this.$message.success('已删除')
+
+          } else {
+            this.$message.error(resp.msg)
+          }
+          this.loading = false
+        }).catch(err => {
+          this.loading = false
+          this.$message.error(err)
+        })
+      }, startTimeChange(val) {
+        this.requestCourseRecords()
+      }, endTimeChange(val) {
+        this.requestCourseRecords()
+      }, showEdit() {
+        if (this.table_current_index == -1) {
+          this.$message.error('请选择要修改的病程内容')
+          return
+        }
+        this.show_edit_dialog = true
+        this.edit_course_of_disease_time = this.recordTime(this.records[this.table_current_index].record_time)
+        this.edit_new_content = this.records[this.table_current_index].content
+        this.edit_current_id = this.records[this.table_current_index].id
+        this.edit_title = this.records[this.table_current_index].title
+        this.$refs.record_table.setCurrentRow(null)
+
+      }, tableRow({ row, rowIndex }) {
+        // 把每一行的索引放进row
+        row.index = rowIndex
+      }, onRowClick(row, event, column) {
+        this.table_current_index = row.index
+      },print(){
+        if (this.table_current_index == -1) {
+          this.$message.error('请选择要打印的病程')
+          return
+        }
+        this.$router.push({ path: "/course/print?id="+this.records[this.table_current_index].id});
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .container {
+    margin-left: 180px;
+    padding: 20px;
+    background: #fff;
+    min-height: calc(100vh - 173px);
+    margin-bottom: 15px;
+
+  .record {
+    padding-top: 20px;
+  }
+
+  }
+  .record_content_panel {
+    border-width: 1px;
+    border-style: solid;
+    border-color: #ebeef5;
+    min-height: 200px;
+
+  .title {
+    font-size: 14px;
+    font-weight: 500;
+    color: #909399;
+    line-height: 44px;
+    height: 44px;
+    text-align: center;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+    border-bottom-color: #ebeef5;
+  }
+
+  .content {
+    padding: 12px 15px;
+    font-size: 15px;
+    color: gray;
+    line-height: 22px;
+  }
+
+  }
+
+  .new_record_form {
+
+  /*/ / padding: 10 px, 25 px;*/
+
+  .textarea_panel {
+    margin-top: 10px;
+  }
+
+  }
+</style>
+<style>
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+</style>