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

src/api/patient.js

@@ -501,12 +501,12 @@ export function getInspectionItemList(params) {
   })
 }
 
-export function saveCreation(params) {
-  console.log('中国龚3223呃3额', params)
+export function saveCreation(data) {
+  console.log('中国龚3223呃3额', data)
   return request({
     url: '/api/patient/savecreationinspection',
-    method: 'get',
-    params: params
+    method: 'post',
+    data: data
   })
 }
 
@@ -534,11 +534,11 @@ export function getTemplateSummaryPrintDetail(params) {
   })
 }
 
-export function UpdateTemplateSummary(params) {
+export function UpdateTemplateSummary(data) {
   return request({
     url: '/api/patient/updatetemplatesummary',
-    method: 'get',
-    params: params
+    method: 'post',
+    data: data
   })
 }
 

src/api/stock.js

@@ -835,9 +835,9 @@ export function updateStockPrice(params) {
   })
 }
 
-export function deleteStockPrice(id, params) {
+export function deleteStockPrice(params) {
   return request({
-    url: '/api/stock/deletestockprice?id=' + id,
+    url: '/api/stock/deletestockprice',
     method: 'Get',
     params: params
   })

src/utils/tools.js

@@ -153,7 +153,7 @@ export function uParseTime(time, cFormat) {
 }
 
 export function calculateAnticoagulantZL(type, shouji, shichang, weichi) {
- 
+  console.log('t', type)
   var t = 0.5
   if (type == 1) {
     t = 0.5
@@ -168,34 +168,30 @@ export function calculateAnticoagulantZL(type, shouji, shichang, weichi) {
   if (isNaN(shouji) || isNaN(shichang) || isNaN(weichi)) {
     return 0
   }
- console.log((shouji + (shichang - t) * weichi).toFixed(1))
+  console.log((shouji + (shichang - t) * weichi).toFixed(1))
   return (shouji + (shichang - t) * weichi).toFixed(1)
 }
 
-
-
-
-
-export function formatDate (date, format) {
+export function formatDate(date, format) {
   if (/(y+)/.test(format)) {
-      format= format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+    format = format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
   }
-  let o = {
-      'M+': date.getMonth() + 1,
-      'd+': date.getDate(),
-      'h+': date.getHours(),
-      'm+': date.getMinutes(),
-      's+': date.getSeconds()
-  };
-  for (let k in o) {
-      if (new RegExp(`(${k})`).test(format)) {
-          let str = o[k] + '';
-          format= format.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str));
-      }
+  const o = {
+    'M+': date.getMonth() + 1,
+    'd+': date.getDate(),
+    'h+': date.getHours(),
+    'm+': date.getMinutes(),
+    's+': date.getSeconds()
   }
-  return format;
-};
+  for (const k in o) {
+    if (new RegExp(`(${k})`).test(format)) {
+      const str = o[k] + ''
+      format = format.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str))
+    }
+  }
+  return format
+}
 
-function padLeftZero (str) {
-  return ('00' + str).substr(str.length);
-};
+function padLeftZero(str) {
+  return ('00' + str).substr(str.length)
+}

src/xt_pages/data/components/addInspection.vue

@@ -49,9 +49,9 @@
                     <el-select v-model="form.project_detail" filterable placeholder="请选择" @change="changeProject">
                         <el-option
                                 v-for="item in projectList"
-                                :key="item.id"
+                                :key="item.new_id"
                                 :label="item.project_name"
-                                :value="item.id">
+                                :value="item.new_id">
                         </el-option>
                     </el-select>
                 </el-form-item>
@@ -257,7 +257,8 @@
                 project_name: projectList[i].project_name,
                 unit: projectList[i].unit,
                 price: projectList[i].price,
-                type: 2
+                type: 2,
+                new_id: Math.floor((Math.random() + Math.floor(Math.random() * 9 + 1)) * Math.pow(10, 10 - 1))
               }
               this.projectList.push(obj)
 
@@ -271,7 +272,9 @@
                 project_name: goodInfos[i].good_name,
                 unit: goodInfos[i].good_unit,
                 price: goodInfos[i].retail_price,
-                type: 3
+                type: 3,
+                new_id: Math.floor((Math.random() + Math.floor(Math.random() * 9 + 1)) * Math.pow(10, 10 - 1))
+
               }
               this.projectList.push(obj)
             }
@@ -309,7 +312,7 @@
       addProjectList() {
         console.log(this.projectList)
         for (let i = 0; i < this.projectList.length; i++) {
-          if (this.form.project_detail == this.projectList[i].id) {
+          if (this.form.project_detail == this.projectList[i].new_id) {
             this.projectList[i].number = this.form.number
             this.projectList[i].number = this.projectList[i].number.toString()
             this.tableData.push(this.projectList[i])

src/xt_pages/data/components/editInspection.vue

@@ -50,7 +50,7 @@
                                 v-for="item,index in projectList"
                                 :key="index"
                                 :label="item.project_name"
-                                :value="item.id">
+                                :value="item.new_id">
                         </el-option>
                     </el-select>
 
@@ -209,7 +209,9 @@
                 unit: projectList[i].unit,
                 price: projectList[i].price,
                 type: 2,
-                m_id: 0
+                m_id: 0,
+                new_id: Math.floor((Math.random() + Math.floor(Math.random() * 9 + 1)) * Math.pow(10, 10 - 1))
+
               }
               this.projectList.push(obj)
 
@@ -224,7 +226,9 @@
                 unit: goodInfos[i].good_unit,
                 price: goodInfos[i].retail_price,
                 type: 3,
-                m_id: 0
+                m_id: 0,
+                new_id: Math.floor((Math.random() + Math.floor(Math.random() * 9 + 1)) * Math.pow(10, 10 - 1))
+
 
               }
               this.projectList.push(obj)
@@ -336,7 +340,7 @@
       },
       addProjectList() {
         for (let i = 0; i < this.projectList.length; i++) {
-          if (this.form.project_detail == this.projectList[i].id) {
+          if (this.form.project_detail == this.projectList[i].new_id) {
             this.projectList[i].number = this.form.number
             this.projectList[i].number = this.projectList[i].number.toString()
             this.tableData.push(this.projectList[i])

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

@@ -2118,7 +2118,7 @@
         this.isVisibility = false
       },
       changeThisAnticoagulant: function(val) {
-
+        console.log("val",val)
         var thismode = val
         if (isNaN(thismode) || thismode <= 0) {
           return false
@@ -2145,6 +2145,16 @@
           this.anticoagulant.weichi_unit = 'ml'
           this.anticoagulant.zongliang_unit = 'ml'
         }
+
+        console.log('首季9999', this.dialysisPrescription.anticoagulant_zongliang)
+        console.log("收集",this.dialysisPrescription.anticoagulant_shouji)
+        console.log("weichi",this.dialysisPrescription.anticoagulant_weichi)
+        if(this.$store.getters.xt_user.template_info.template_id == 41 && this.dialysisPrescription.anticoagulant == 2){
+          this.dialysisPrescription.anticoagulant_zongliang = ""
+          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) +  parseInt(this.dialysisPrescription.anticoagulant_weichi)
+        }
+
+
       },
       handleCommit: function() {
         if (this.dialysisPrescription.anticoagulant == '低分子肝素') {
@@ -3445,7 +3455,7 @@
         if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
-
+        
       },
       'dialysisPrescription.anticoagulant_shouji': function() {
         let dialysis_duration_minute = 0
@@ -3477,6 +3487,11 @@
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
 
+      if(this.$store.getters.xt_user.template_info.template_id == 41 && this.dialysisPrescription.anticoagulant == 2){
+          this.dialysisPrescription.anticoagulant_zongliang = ""
+          this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) +  parseInt(this.dialysisPrescription.anticoagulant_weichi)
+       }
+
       },
       'dialysisPrescription.anticoagulant_weichi': function() {
         let dialysis_duration_minute = 0
@@ -3502,8 +3517,13 @@
         if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
-        console.log('首季', this.dialysisPrescription.anticoagulant_zongliang)
-
+        console.log('首季9999', this.dialysisPrescription.anticoagulant_zongliang)
+        console.log("收集",this.dialysisPrescription.anticoagulant_shouji)
+        console.log("weichi",this.dialysisPrescription.anticoagulant_weichi)
+        if(this.$store.getters.xt_user.template_info.template_id == 41 && this.dialysisPrescription.anticoagulant == 2){
+         this.dialysisPrescription.anticoagulant_zongliang = ""
+         this.dialysisPrescription.anticoagulant_zongliang = parseInt(this.dialysisPrescription.anticoagulant_shouji) +  parseInt(this.dialysisPrescription.anticoagulant_weichi)
+       }
       },
       'prescription.id': {
         immediate: true,

src/xt_pages/management/components/UserForm.vue

@@ -1041,7 +1041,8 @@ export default {
         { id: 1, name: "0.22%季铵盐" },
         { id: 2, name: "500mg/l含氯消毒剂" },
         { id: 3, name: "1000mg/l含氯消毒剂" },
-        { id: 4, name: "1500mg/l含氯消毒剂" }
+        { id: 4, name: "1500mg/l含氯消毒剂" },
+        { id: 5, name: "消毒湿巾" }
       ],
       // 夜路消毒方式
       sterilizeType: [
@@ -1292,6 +1293,9 @@ export default {
             if (information[index].disinfectant_type === 4) {
               information[index].disinfectant_type = "1500mg/l含氯消毒剂";
             }
+            if (information[index].disinfectant_type === 5) {
+               information[index].disinfectant_type = "消毒湿巾";
+            }
 
             if (information[index].disinfection === 1) {
               information[index].disinfection = "已消毒";
@@ -1817,6 +1821,9 @@ export default {
             if (information[index].disinfectant_type === 4) {
               information[index].disinfectant_type = "1500mg/l含氯消毒剂";
             }
+            if (information[index].disinfectant_type === 5) {
+              information[index].disinfectant_type = "消毒湿巾";
+            }
 
             if (information[index].disinfection === 0) {
               information[index].disinfection = "";
@@ -2103,6 +2110,9 @@ export default {
             if (information[index].disinfectant_type === 4) {
               information[index].disinfectant_type = "1500mg/l含氯消毒剂";
             }
+           if (information[index].disinfectant_type === 5) {
+              information[index].disinfectant_type = "消毒湿巾";
+            }
 
             if (information[index].disinfection === 0) {
               information[index].disinfection = "";

src/xt_pages/management/home.vue

@@ -981,7 +981,7 @@
                                      </el-form-item>
                                     </el-col>
                                     <el-col :span="8">
-                                       <el-form-item label="患者:" required prop ="patient_name">
+                                       <el-form-item label="患者:">
                                            <el-autocomplete
                                                style="width:150px"
                                                popper-class="my-autocomplete"

src/xt_pages/stock/drugs/drugDamaged.vue

@@ -160,7 +160,7 @@
                 <el-input v-model="form.count"></el-input>
             </el-form-item>
             <el-form-item label="库存">
-                <el-input v-model="form.total"></el-input>
+                <el-input v-model="form.total" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="产地">
                 <el-input v-model="form.drug_origin_place"></el-input>

src/xt_pages/stock/drugs/drugModifyPrice.vue

@@ -102,7 +102,7 @@
         </div>
     </div>
     <el-dialog
-        title="库房调价"
+        title="药品调价"
         :visible.sync="dialogVisible"
         width="1200px">
         <el-form :model="form" class="modifyDialog" label-width="120px">
@@ -142,22 +142,22 @@
             </el-form-item>
         </el-form>
         <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-            <el-table-column prop="date" label="单据编号" width="100">
+            <el-table-column prop="date" label="单据编号" width="100" align="center">
                <template slot-scope="scope">
                  {{scope.row.warehousing_order}}
                 </template>  
             </el-table-column>
-            <el-table-column prop="date"label="药品名称" width="100">
+            <el-table-column prop="date"label="药品名称" width="100" align="center">
               <template slot-scope="scope">
                  {{scope.row.drug_name}}
                 </template>  
             </el-table-column>
-            <el-table-column prop="name"label="规格" width="100">
+            <el-table-column prop="name"label="规格" width="100" align="center">
               <template slot-scope="scope">
-                  {{scope.row.dose}}{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
+                 {{scope.row.specification_name}}
               </template>
             </el-table-column>
-            <el-table-column prop="name" label="单位" width="100">
+            <el-table-column prop="name" label="单位" width="100" align="center">
               <template slot-scope="scope">
               {{scope.row.warehousing_unit}}
               </template>
@@ -167,37 +167,37 @@
               {{scope.row.count}}
               </template>
             </el-table-column> -->
-            <el-table-column prop="name" label="原进货价" width="100">
+            <el-table-column prop="name" label="原进货价" width="100" align="center">
                 <template slot-scope="scope">
                 {{scope.row.retail_price}}
                 </template>
             </el-table-column>
-            <el-table-column prop="name" label="原零售价" width="100">
+            <el-table-column prop="name" label="原零售价" width="100" align="center">
                  <template slot-scope="scope">
                   {{scope.row.retail_price}}
                 </template>
             </el-table-column>
-            <el-table-column  prop="name" label="新零售价" width="100">
+            <el-table-column  prop="name" label="新零售价" width="100" align="center">
                 <template slot-scope="scope">
                   {{scope.row.new_price}}
                 </template>  
             </el-table-column>
-            <el-table-column prop="name" label="生产厂商" width="100">
+            <el-table-column prop="name" label="生产厂商" width="100" align="center">
                 <template slot-scope="scope">
                   {{scope.row.manufacturer}}
                 </template>   
             </el-table-column>
-            <el-table-column prop="name" label="批准文号" width="100">
+            <el-table-column prop="name" label="批准文号" width="100" align="center">
                  <template slot-scope="scope">
                   {{scope.row.number}}
                 </template>    
             </el-table-column>
-            <el-table-column prop="name" label="供应商" width="100">
+            <el-table-column prop="name" label="供应商" width="100" align="center">
                 <template slot-scope="scope">
                   {{scope.row.manufacturer}}
                 </template>    
             </el-table-column>
-            <el-table-column prop="name" label="备注"  width="100">
+            <el-table-column prop="name" label="备注"  width="100" align="center">
                <template slot-scope="scope">
                   {{scope.row.remark}}
                 </template>      
@@ -471,6 +471,7 @@ export default {
             dealer:this.form.dealer,
             last_price:this.form.last_price,
             start_time:this.getTime(new Date()),
+            specification_name:this.form.specification_name,
             } 
           this.tableData.push(obj)     
         },
@@ -525,10 +526,11 @@ export default {
             this.form.dealer = val.dealer
             this.form.manufacturer = val.manufacturer
             this.form.remark = val.remark
-            this.form.warehousing_unit = val.warehouseing_unit  
+            this.form.warehousing_unit = val.max_unit  
             this.form.total = val.total
             this.form.batch_number = val.batch_number
             this.form.last_price = val.last_price
+            this.form.specification_name =  val.dose + val.dose_unit +"*"+val.min_number+val.min_unit+"/"+val.max_unit
         },
         getTime(val) {
          if(val < 0){
@@ -545,7 +547,7 @@ export default {
            this.tableData[i].retail_price = this.tableData[i].retail_price.toString()
            this.tableData[i].last_price = this.tableData[i].last_price.toString()
            this.tableData[i].new_price = this.tableData[i].new_price.toString()
-           this.tableData[i].count =  parseInt(this.tableData[i].count)
+          //  this.tableData[i].count =  parseInt(this.tableData[i].count)
            if(this.tableData[i].dealer == 0){
              this.tableData[i].dealer = ""
            }

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -352,7 +352,7 @@
         var count = 0
         for(let i=0;i<this.warehouseList.length;i++){
           if(id == this.warehouseList[i].warehousing_id){
-             count +=this.warehouseList[i].warehousing_count * this.warehouseList[i].last_price
+             count +=this.warehouseList[i].warehousing_count * this.warehouseList[i].price
           }
         }
         return count

src/xt_pages/stock/drugs/inventory.vue

@@ -993,7 +993,7 @@ export default {
              warehouse_info_id:this.form.warehouse_info_id,
              total:this.total.toString(),
              remark:this.remark,
-             prof_count:parseInt(this.prof_count),
+             proof_count:parseInt(this.form.proof_count),
            }
           console.log("params",params)
          SaveDrugProofInventory(params).then(response=>{

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -25,7 +25,7 @@
                 style="width: 200px;margin-left:10px;"
                 class="filter-item"
                 v-model.trim="searchKey"
-                placeholder=""
+               placeholder="请输入单据编号或操作人姓名"
                 />
                 <el-button
                 size="small"

src/xt_pages/stock/stockDamaged.vue

@@ -108,7 +108,7 @@
         <el-form :model="form" class="modifyDialog" label-width="120px">
           
             <el-form-item label="耗材ID">
-                <el-input v-model="form.good_id"></el-input>
+                <el-input v-model="form.good_id" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="耗材名称">
                   <el-autocomplete
@@ -129,7 +129,7 @@
                  </el-autocomplete>
             </el-form-item>
             <el-form-item label="规格">
-                <el-input v-model="form.specification_name"></el-input>
+                <el-input v-model="form.specification_name" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="批号">
                  <el-select v-model="form.number" filterable placeholder="请选择">
@@ -142,28 +142,31 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="单位">
-                <el-input v-model="form.warehousing_unit"></el-input>
+                <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="进货价">
-                <el-input v-model="form.buy_price"></el-input>
+                <el-input v-model="form.buy_price" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="零售价">
-                <el-input v-model="form.packing_price"></el-input>
+                <el-input v-model="form.packing_price" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="报损数量">
                 <el-input v-model="form.count"></el-input>
             </el-form-item>
             <el-form-item label="库存">
-                <el-input v-model="form.total"></el-input>
+                <el-input v-model="form.total" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="产地">
                 <el-input v-model="form.good_origin_place"></el-input>
             </el-form-item>
             <el-form-item label="批准文号">
-                <el-input v-model="form.license_number"></el-input>
+                <el-input v-model="form.license_number" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="生产厂商">
-                <el-input v-model="form.manufacturer"></el-input>
+                <el-input v-model="form.manufacturer" :disabled="true"></el-input>
+            </el-form-item>
+           <el-form-item label="供应商">
+                <el-input v-model="form.dealer" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="备注">
                 <div style="display:flex;">
@@ -309,7 +312,23 @@
                     </template>
                     </el-autocomplete>
                 </el-form-item>
-               <el-form-item label="报损数量：">
+               <el-form-item label="规格：">
+                 <el-input v-model="form.specification_name" style="width:200px"></el-input>
+               </el-form-item>
+               <el-form-item label="批号">
+                 <el-select v-model="form.number" filterable placeholder="请选择">
+                  <el-option
+                    v-for="(item,index) in numberList"
+                    :key="index"
+                    :label="item.number"
+                    :value="item.number">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="单位">
+                 <el-input v-model="form.warehousing_unit"></el-input>
+              </el-form-item>
+                <el-form-item label="报损数量：">
                  <el-input v-model="form.count" style="width:200px"></el-input>
                </el-form-item>
              </el-col> 
@@ -512,6 +531,11 @@ export default {
           this.form.product_date = val.product_date
       },
       addStock(){
+
+        if(this.form.count == ""){
+          this.$message.error("请输入报损数量")
+          return 
+        }
         var obj = {
           good_id:this.form.good_id,
           good_name:this.form.good_name,
@@ -674,12 +698,20 @@ export default {
        this.tableData.splice(index,1)
      },
      toEdit(row){
+      console.log("row",row)
       this.form.good_name = row.good_name
-      this.form.packing_unit = row.packing_unit
+      this.form.warehousing_unit = row.warehousing_unit
       this.form.packing_price = row.packing_price
       this.form.count = row.count
       this.form.remark = row.remark
       this.form.id = row.id
+      this.form.specification_name = row.specification_name
+      this.form.dealer = row.dealer
+      this.form.manufacturer = row.manufacturer
+      this.form.good_origin_place = row.good_origin_place
+      this.form.total = row.total
+      this.form.number = row.number
+      this.form.license_number = row.license_number
       this.editPriceDialogVisible = true  
      },
      upatePrice(){
@@ -689,6 +721,13 @@ export default {
             this.tableData[i].packing_price = this.form.packing_price
             this.tableData[i].count = this.form.count
             this.tableData[i].remark = this.form.remark
+            this.tableData[i].good_name = this.form.specification_name
+            this.tableData[i].warehousing_unit  = this.form.warehousing_unit
+            this.tableData[i].total = this.form.total
+            this.tableData[i].number = this.form.number
+            this.tableData[i].license_number = this.form.license_number
+            this.tableData[i].manufacturer = this.form.manufacturer
+            this.tableData[i].good_origin_place = this.form.good_origin_place
          }
        }
        this.editPriceDialogVisible = false

src/xt_pages/stock/stockModifyPrice.vue

@@ -26,14 +26,16 @@
             v-model="start_time"
             type="date"
             style="margin-left:5px;width:140px;"
-            placeholder="选择日期">
+            placeholder="选择日期"
+            @change="changeStartTime">
             </el-date-picker>
             <el-date-picker
             size="small"
             v-model="end_time"
             type="date"
             style="margin-left:5px;width:140px;"
-            placeholder="选择日期">
+            placeholder="选择日期"
+            @change="changeEndTime">
             </el-date-picker>
         </div>
         <div>
@@ -168,15 +170,21 @@
                   </template>
                  </el-autocomplete>
             </el-form-item>
+            <el-form-item label="规格">
+                <el-input v-model="form.specification_name" :disabled="true"></el-input>
+            </el-form-item>
             <el-form-item label="原价格">
-                <el-input v-model="form.packing_price"></el-input>
+                <el-input v-model="form.packing_price" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="现价格">
                 <el-input v-model="form.new_price"></el-input>
             </el-form-item>
-            <!-- <el-form-item label="调价数量">
-                <el-input v-model="form.count" type="number"></el-input>
-            </el-form-item> -->
+            <el-form-item label="生产商">
+                <el-input v-model="form.manufacturer" :disabled="true"></el-input>
+            </el-form-item>
+            <el-form-item label="供应商">
+                <el-input v-model="form.dealer" :disabled="true"></el-input>
+            </el-form-item>
             <el-form-item label="备注" style="width:66%;">
                 <div style="display:flex;">
                     <el-input v-model="form.remark"></el-input>
@@ -205,11 +213,6 @@
                {{scope.row.warehousing_unit}}
                </template>
             </el-table-column>
-            <!-- <el-table-column prop="name" label="调价数量" width="100" align="center">
-              <template slot-scope="scope">
-                {{scope.row.count}}
-              </template> 
-            </el-table-column> -->
             <el-table-column prop="name" label="原进货价" width="100" align="center">
                <template slot-scope="scope">
                 {{scope.row.buy_price}}
@@ -288,26 +291,26 @@
                     </template>
                     </el-autocomplete>
                 </el-form-item>
+               <el-form-item label="规格">
+                 <el-input v-model="form.specification_name" style="width:200px" :disabled="true"></el-input>
+               </el-form-item>
+               <el-form-item label="生产厂商">
+                 <el-input v-model="form.manufacturer" style="width:200px" :disabled="true"></el-input>
+               </el-form-item>
+              <el-form-item label="供应商">
+                 <el-input v-model="form.dealer" style="width:200px" :disabled="true"></el-input>
+               </el-form-item>
                <el-form-item label="原价格：">
-                 <el-input v-model="form.packing_price" style="width:200px"></el-input>
+                 <el-input v-model="form.packing_price" style="width:200px" :disabled="true"></el-input>
                </el-form-item>
                <el-form-item label="现价格：">
                     <el-input v-model="form.new_price" style="width:200px"></el-input>
                 </el-form-item>
+               <el-form-item label="备注:">
+                    <el-input v-model="form.remark" style="width:200px"></el-input>
+                </el-form-item>
              </el-col> 
             </el-row>
-            <!-- <el-row>
-             <el-col>
-               <el-form-item label="调价数量：">
-                    <el-input v-model="form.count"  style="width:200px"></el-input>
-                </el-form-item>
-                <el-form-item label="备注：">
-                    <div style="display:flex;">
-                        <el-input v-model="form.remark"  style="width:200px"></el-input>
-                    </div>
-                </el-form-item>
-              </el-col>  
-            </el-row> -->
           </el-form>
         </span>
         <span slot="footer" class="dialog-footer">
@@ -379,7 +382,6 @@
                         placeholder="请输入耗材名称"
                         @select="handleSelect"
                         @input="changeGoodName(scope.$index)"
-                        :disabled="true"
                         style="width:160px;"
                     >
                         <i class="el-icon-search el-input__icon" slot="suffix"></i>
@@ -388,12 +390,21 @@
                     </template>
                     </el-autocomplete>
                 </el-form-item>
+               <el-form-item label="规格：">
+                 <el-input v-model="form.specification_name" style="width:200px" :disabled="true"></el-input>
+               </el-form-item>
                <el-form-item label="原价格：">
-                 <el-input v-model="form.packing_price" style="width:200px"></el-input>
+                 <el-input v-model="form.packing_price" style="width:200px" :disabled="true"></el-input>
                </el-form-item>
                <el-form-item label="现价格：">
                     <el-input v-model="form.new_price" style="width:200px"></el-input>
                 </el-form-item>
+               <el-form-item label="生产商">
+                 <el-input v-model="form.manufacturer" style="width:200px" :disabled="true"></el-input>
+               </el-form-item>
+              <el-form-item label="供应商">
+                 <el-input v-model="form.dealer" style="width:200px" :disabled="true"></el-input>
+               </el-form-item>
                 <el-form-item label="备注：">
                     <el-input v-model="form.remark" style="width:200px"></el-input>
                 </el-form-item>
@@ -534,11 +545,12 @@ export default {
           }else{
             this.form.dealer = val.dealer
           }
-          if(this.form.manufacturer == 0){
-            this.form.manufacturer = ""
-          }else{
-            this.form.manufacturer = val.manufacturer
-          }
+          // if(this.form.manufacturer == 0){
+          //   this.form.manufacturer = ""
+          // }else{
+          //   this.form.manufacturer = val.manufacturer
+          // }
+          this.form.manufacturer = val.manufacturer
           this.form.specification_name = val.specification_name
           this.form.remark = val.remark
           this.form.buy_price = val.buy_price
@@ -546,6 +558,10 @@ export default {
          
       },
       addPrice(){
+        if(this.form.new_price == ""){
+           this.$message.error("请输入现价格")
+           return
+        }
         var obj = {
          id:this.form.id,
          good_name:this.form.good_name,
@@ -601,9 +617,16 @@ export default {
       this.form.count = row.count
       this.form.remark = row.remark
       this.form.id = row.id
+      this.form.specification_name = row.specification_name
+      this.form.manufacturer = row.manufacturer
+      this.form.dealer = row.dealer
       this.editPriceDialogVisible = true  
      },
      upatePrice(){
+       if(this.form.new_price == ""){
+          this.$message.error("请输入现价格")
+          return false
+       }
        for(let i=0;i<this.tableData.length;i++){
          if(this.form.id == this.tableData[i].id){
             this.tableData[i].good_name = this.form.good_name
@@ -769,21 +792,30 @@ export default {
            }else{
              this.form.new_price = info.new_price
            }
-          
+           this.form.specification_name = info.specification_name
            this.form.packing_price = info.packing_price
            this.form.remark = info.remark
+           this.form.manufacturer = info.manufacturer
+           this.form.dealer = info.dealer
            this.modifyDialogVisible = true
          }
        })
      },
      updateStockPrice(){
+         if(this.form.new_price == ""){
+           this.$message.error("请输入现价格")
+           return
+         }
          var params = {
+
            new_price:this.form.new_price.toString(),
            id:this.id,
            packing_price:this.form.packing_price.toString(),
            remark:this.form.remark,
            good_id:this.form.good_id,
            good_name:this.form.good_name,
+           manufacturer:this.form.manufacturer,
+           dealer:this.form.dealer,
          }
          console.log("params",params)
        updateStockPrice(params).then(response=>{
@@ -808,6 +840,7 @@ export default {
           let params = {
             id:id,
           }
+          console.log("id23232322332233223",id)
           deleteStockPrice(params).then(response => {
             if (response.data.state == 1) {
               var msg = response.data.data.msg
@@ -818,6 +851,14 @@ export default {
         }).catch(() => {
           this.loading = false
         });
+     },
+     changeStartTime(val){
+       this.start_time = this.getTime(val)
+       this.getAllStockPrice()
+     },
+     changeEndTime(val){
+       this.end_time = this.getTime(val)
+       this.getAllStockPrice()
      }
     },
     created(){

src/xt_pages/user/courseOfDisease.vue

@@ -330,6 +330,7 @@
 
       createAction: function() {
         this.new_content = this.$refs.editor.content
+        console.log("hhhhh2h3h232323232",this.new_content)
         if (this.new_content.length == 0) {
           this.$message.error('请填写病程内容')
           return

src/xt_pages/user/dialysisSolution.vue

@@ -1063,6 +1063,12 @@ export default {
         this.addPlan.dialysis_duration,
         this.addPlan.anticoagulant_weichi
       )
+
+      if(this.$store.getters.xt_user.template_info.template_id == 41 && this.addPlan.anticoagulant == 2 ){
+         this.addPlan.anticoagulant_zongliang = ""
+         this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) + parseInt(this.addPlan.anticoagulant_weichi)
+      }
+      
     },
     'addPlan.anticoagulant_weichi': function() {
       this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(
@@ -1071,6 +1077,11 @@ export default {
         this.addPlan.dialysis_duration,
         this.addPlan.anticoagulant_weichi
       )
+
+      if(this.$store.getters.xt_user.template_info.template_id == 41 && this.addPlan.anticoagulant == 2 ){
+         this.addPlan.anticoagulant_zongliang = ""
+         this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) + parseInt(this.addPlan.anticoagulant_weichi)
+      }
     }
   },
 
@@ -1917,6 +1928,11 @@ export default {
         return false
       }
       this.anticoagulant = this.anticoagulantsConfit[thismode]
+
+      if(this.$store.getters.xt_user.template_info.template_id == 41 && this.addPlan.anticoagulant == 2 ){
+         this.addPlan.anticoagulant_zongliang = ""
+         this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) + parseInt(this.addPlan.anticoagulant_weichi)
+      }
     },
 
     addPlanModeChange() {

src/xt_pages/user/templateSummary.vue

@@ -60,7 +60,7 @@
             <el-col :span="14">
               <div class="record_content_panel">
                 <div style="background-color:rgb(245, 247, 250)" class="title">阶段小结内容</div>
-                <div style="padding:10px;border-bottom:1px solid #DCDFE6;"><span v-if="editObj.record_time!=''">阶段小结时间:{{getTime(editObj.record_time)}}</span></div>
+                <div style="padding:10px;border-bottom:1px solid #DCDFE6;">阶段小结时间:<span v-if="editObj.record_time!=''">{{getTime(editObj.record_time)}}</span></div>
                 <!-- <div style="padding: 10px 10px 0;">阶段小结概要:</div>
                 <div style="padding:10px;border-bottom:1px solid #DCDFE6;">
                   <span style="margin-right:10px;line-height:30px;">干体重(kg):{{editObj.dry_weight}}</span>
@@ -87,7 +87,7 @@
                   <span style="margin-right:10px;line-height:30px;">透后血压（mmHg):{{editObj.after_pressure}}</span>
                 </div> -->
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">阶段小结总结:
-                   {{editObj.template_summary_content}}
+                   <span v-html="editObj.template_summary_content"></span>
                  </div>
                 <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">阶段小结化验结果:
                   <div>
@@ -109,7 +109,10 @@
                   </div>
                 </div>
 
-                <div style="padding:10px;line-height:20px;">阶段小结个体化透析方案:{{editObj.template_plan_content}}</div>
+                <div style="padding:10px;line-height:20px;">阶段小结个体化透析方案:
+                  <!-- {{editObj.template_plan_content}} -->
+                  <span v-html="editObj.template_plan_content"></span>
+                </div>
               </div>
             </el-col>
           </el-row>
@@ -303,7 +306,14 @@
                         :value="item.value">
                         </el-option>
                      </el-select>
-                     <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_summary_content"></el-input>
+                     <keep-alive>
+                        <editor ref="edit_neditor"
+                                id="edit_editor1"
+                                style="width: 800px"
+                                v-bind:r_content="form.template_summary_content">
+                        </editor>
+                    </keep-alive>
+                     <!-- <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_summary_content"></el-input> -->
                   </el-row>
                   <el-row>
                     <label class="title"><span class="name">阶段小结个体化透析方案</span> : </label>
@@ -315,7 +325,14 @@
                         :value="item.value">
                         </el-option>
                      </el-select>
-                     <el-input style="margin:10px 0;" type="textarea"  autosize v-model="form.template_plan_content"></el-input>
+                     <keep-alive>
+                        <editor ref="edit_neditorOne"
+                                id="edit_editor"
+                                style="width: 800px"
+                                v-bind:r_content="form.template_plan_content">
+                        </editor>
+                    </keep-alive>
+                     <!-- <el-input style="margin:10px 0;" type="textarea"  autosize v-model="form.template_plan_content"></el-input> -->
                   </el-row>
                   <el-row>
                     <label class="title"><span class="name">阶段小结化验结果</span> : </label>
@@ -561,7 +578,14 @@
                         :value="item.value">
                         </el-option>
                      </el-select>
-                     <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_summary_content"></el-input>
+                      <keep-alive>
+                        <editor ref="editor"
+                                id="edit_editor1"
+                                style="width: 800px"
+                                v-bind:r_content="form.template_summary_content">
+                        </editor>
+                    </keep-alive>
+                     <!-- <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_summary_content"></el-input> -->
                   </el-row>
                   <el-row>
                     <label class="title"><span class="name">阶段小结个体化透析方案</span> : </label>
@@ -573,7 +597,14 @@
                         :value="item.value">
                         </el-option>
                      </el-select>
-                     <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_plan_content"></el-input>
+                      <keep-alive>
+                        <editor ref="editorOne"
+                                id="edit_editor"
+                                style="width: 800px"
+                                v-bind:r_content="form.template_plan_content">
+                        </editor>
+                    </keep-alive>
+                     <!-- <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_plan_content"></el-input> -->
                   </el-row>
                   <el-row>
                     <label class="title"><span class="name">阶段小结化验结果</span> : </label>
@@ -850,7 +881,6 @@
           template_summary_id:"",
           template_summary_content:"",
           template_plan_id:"",
-          template_summary_content:"",
           template_inspection_id:0,
           template_inspection_content:"",
           admin_user_id:this.$store.getters.xt_user.user.id,
@@ -960,7 +990,8 @@
     },
     methods: {
       getTime(val) {
-         if(val == ""){
+         console.log("val2322332322323223",val)
+         if(val == "" || val == undefined){
           return ""
          }else {
           return uParseTime(val, '{y}-{m}-{d}')
@@ -1042,7 +1073,7 @@
           start_time:this.start_date,
           end_time:this.end_date,
         }
-        console.log("世纪时间",params)
+        // console.log("世纪时间",params)
         console.log(moment(moment(2020 + '-01-01').toDate()).quarter(2).format("YYYY-MM-DD"))
         getInitDataList(params).then(response=>{
           if(response.data.state == 1){
@@ -1253,10 +1284,19 @@
         if(this.form.befor_pressure == ""){
           this.form.befor_pressure = 0
         }
+        if(this.form.template_plan_id == ""){
+          this.form.template_plan_id = 0
+        }
+        if(this.form.template_summary_id == ""){
+          this.form.template_summary_id = 0
+        }
         var year = this.form.start_year+"-"+"01"+"-"+"01"
         console.log("年",year)
         var month = this.form.start_year+"-"+this.form.start_month+"-"+"01"
-        console.log("月",month)
+        console.log("月",this.$refs)
+        console.log("hhhhhh",this.$refs.edit_neditor.content)
+        console.log("ooooo",this.$refs.edit_neditorOne.content)
+
          var params = {
             title:this.form.title,
             dry_weight:this.form.dry_weight.toString(),
@@ -1276,14 +1316,15 @@
             befor_weight:this.form.befor_weight.toString(),
             after_weight:this.form.after_weight.toString(),
             befor_pressure:this.form.befor_pressure,
-            template_summary_content:this.form.template_summary_content,
-            template_plan_content:this.form.template_plan_content,
+            // template_plan_content:this.form.template_plan_content,
+            template_plan_content:this.$refs.edit_neditor.content,
             // template_inspection_content:JSON.stringify(this.form.template_inspection_content),
             admin_user_id:this.form.admin_user_id,
             record_time:this.form.record_time,
             after_pressure:this.form.after_pressure,
             template_summary_id:this.form.template_summary_id,
-            template_summary_content:this.form.template_summary_content,
+            // template_summary_content:this.form.template_summary_content,
+            template_summary_content:this.$refs.edit_neditorOne.content,
             template_plan_id:this.form.template_plan_id,
             template_inspection_id:this.form.template_inspection_id,
             patient_id:parseInt(this.patient_id),
@@ -1292,6 +1333,7 @@
             start_year:year,
             start_month:month,
             radio:this.form.radio,
+
          }
           console.log("parawm232323223",params)
 
@@ -1342,7 +1384,10 @@
               var list = response.data.data.list
               this.inspectionList = list
               this.$refs.inspection_table.setCurrentRow(this.inspectionList[0])
-              this.getCurrentRecordDetail(this.inspectionList[0].id)
+              if (list.length > 0) {
+               this.getCurrentRecordDetail(this.inspectionList[0].id)
+              }
+
            }
         })
       },
@@ -1454,6 +1499,7 @@
                this.form.minute = list.minute
                this.form.natrium =list.natrium
                this.form.perfusion_apparatus= list.perfusion_apparatus
+               this.form.other_count = list.other_count
                this.form.record_time = this.getTimeTwo(list.record_time)
                console.log("时间232233232",list.record_time)
                if(list.template_inspection_id == 0){
@@ -1504,6 +1550,18 @@
        }
       },
       editCreation(){
+        if(this.form.template_summary_id == ""){
+           this.form.template_summary_id = 0
+        }
+        if(this.form.template_inspection_id == ""){
+           this.form.template_inspection_id = 0
+        }
+        if(this.form.template_plan_id == ""){
+           this.form.template_plan_id = 0
+        }
+        if(this.dialysis_count == ""){
+            this.dialysis_count = 0
+        }
         var params = {
             id:this.form.id,
             title:this.form.title,
@@ -1524,8 +1582,10 @@
             befor_weight:this.form.befor_weight.toString(),
             after_weight:this.form.after_weight.toString(),
             befor_pressure:this.form.befor_pressure,
-            template_summary_content:this.form.template_summary_content,
-            template_plan_content:this.form.template_plan_content,
+            // template_summary_content:this.form.template_summary_content,
+            // template_plan_content:this.form.template_plan_content,
+            template_plan_content:this.$refs.editor.content,
+            template_summary_content:this.$refs.editorOne.content,
             admin_user_id:this.form.admin_user_id,
             record_time:this.form.record_time,
             after_pressure:this.form.after_pressure,
@@ -1714,6 +1774,12 @@
         console.log("val2323323223",val)
         if(val == "2021-02"){
           this.startYear = val+"-" + "28"
+        }else if(val == "2021-08"){
+          this.startYear = val+"-" + "31"
+        }else if(val == "2021-10"){
+          this.startYear = val+"-" + "31"
+        }else if(val == "2021-12"){
+          this.startYear = val+"-" + "31"
         }else{
           this.startYear = val+"-" + "30"
         }

src/xt_pages/user/templateSummaryPrint.vue

@@ -47,7 +47,10 @@
         </div>
       </div> -->
       <div style="padding:20px 0;border-bottom:1px solid #000;min-height:200px;">
-        <span style="font-weight:bold;">阶段小结总结:</span><div style="line-height:24px;">{{patientList.template_summary_content}}</div>  
+        <span style="font-weight:bold;">阶段小结总结:</span><div style="line-height:24px;">
+          <!-- {{patientList.template_summary_content}} -->
+          <div v-html="patientList.template_summary_content"></div>
+        </div>  
       </div>
      <div style="padding:20px 0;border-bottom:1px solid #000;min-height:250px;">
         <span style="font-weight:bold;">阶段小结化验结果:</span>
@@ -71,7 +74,8 @@
       </div>
       <div style="padding:20px 0;border-bottom:1px solid #000;min-height:200px;">
         <span style="font-weight:bold;">阶段小结个性化方案:</span>
-        <div style="line-height:24px;">{{patientList.template_plan_content}}</div>
+        <!-- <div style="line-height:24px;">{{patientList.template_plan_content}}</div> -->
+         <div v-html="patientList.template_plan_content"></div>
       </div>
      <div style="margin-top:10px;">
        <span>记录医生:{{getPatientList(patientList.admin_user_id)}}</span>