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

src/api/stock.js

@@ -1169,4 +1169,13 @@ export function getGoodWarehosueInPrintList(params){
     method:"get",
     params:params,
   })
+}
+
+export function changeGoodWarehouseInfo(data){
+  
+  return request({
+    url:"/api/patient/changegoodwarehouseinfo",
+    method:"post",
+    data:data,
+  })
 }

src/xt_pages/data/components/addDrugs.vue

@@ -342,6 +342,10 @@
                           </el-option>
                         </el-select>
                       </el-form-item>
+
+                      <el-form-item label="拆零次数:" prop="is_special_diseases">
+                        <el-input v-model="form.split_of_number" style="width:160px"></el-input>
+                      </el-form-item>
                         <el-form-item label="是否备案 : " prop="is_record">
                             <el-select v-model="form.is_record" style="width:160px;" placeholder="请选择">
                                 <el-option
@@ -697,7 +701,8 @@
           is_self_drug:"2",
           is_zero_flag:"",
           scan_code:"",
-          drug_identification_code:""
+          drug_identification_code:"",
+          split_of_number:""
         },
 
         rules: {
@@ -1044,7 +1049,7 @@
         form['is_zero_flag'] = parseInt(this.form.is_zero_flag)
         form["scan_code"] = this.form.scan_code
         form["drug_identification_code"] = this.form.drug_identification_code
-
+        form["split_of_number"] = parseInt(this.form.split_of_number)
 
         return form
       },

src/xt_pages/data/components/consumables.vue

@@ -355,7 +355,7 @@
               bby01:"",
               is_show:"",
               is_zero_flag:"",
-
+              split_of_number:"",
             },
             isVisibility: false,
           }
@@ -787,6 +787,9 @@
               this.goodInfo.goodInfoDialog.formValue.is_zero_flag =  response.data.data.goodInfo.is_zero_flag.toString()
             }
 
+            console.log("hahhhhhhhhhhhhhh",response.data.data.goodInfo.split_of_number)
+            this.goodInfo.goodInfoDialog.formValue.split_of_number = response.data.data.goodInfo.split_of_number
+
 
             this.$refs.addConsumable.show(row.id, this.goodInfo.goodInfoDialog.formValue)
 
@@ -874,11 +877,17 @@
         })
       },
       goodInfoDialogComfirm: function(val) {
-
+        console.log("VAL----------------",val)
         if (val.isCreated == 2) {
           //修改
           val['id'] = this.goodInfo.editGoodId;
           val['good_code'] = this.goodInfo.good_code;
+          if(val.is_zero_flag == 1){
+            if(val.split_of_number ==""){
+                this.$message.error("拆零次数不能为空!")
+                return
+            }
+          }
 
           modifyGoodInfo(val).then(response => {
             if (response.data.state == 0) {
@@ -925,6 +934,13 @@
             val.stock_warn_count = parseInt(val.stock_warn_count)
           }
 
+          if(val.is_zero_flag == 1){
+            if(val.split_of_number ==""){
+                this.$message.error("拆零次数不能为空!")
+                return
+            }
+          }
+
           //新增
           createGoodInfo(val).then(response => {
             if (response.data.state == 0) {

src/xt_pages/data/components/drugs.vue

@@ -345,6 +345,7 @@
           is_show:"",
           scan_code:"",
           drug_identification_code:"",
+          split_of_number:""
         },
         tempFormValue: {
           drug_name: '',//药品名称
@@ -559,7 +560,12 @@
 
           val.min_number =  parseInt(val.min_number)
           console.log("Val323323232",val)
-
+          if(val.is_zero_flag == 1){
+             if(val.split_of_number == ""){
+               this.$message.error("拆零次数不能为空!")
+               return
+             }
+           }
           editBaseDrugLib(val,untit).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
@@ -572,7 +578,12 @@
           })
         } else if (val.id == 0) {
           //新增
-
+           if(val.is_zero_flag == 1){
+             if(val.split_of_number == ""){
+               this.$message.error("拆零次数不能为空!")
+               return
+             }
+           }
           createBaseDrugLib(val).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1319,6 +1319,8 @@
                             }}
                           </td>
                           <td>
+                           <span v-if="org_id!=9478">
+
                             {{
                               monitor_record.systolic_blood_pressure
                                 ? monitor_record.systolic_blood_pressure + "/"
@@ -1329,6 +1331,21 @@
                                 ? monitor_record.diastolic_blood_pressure
                                 : ""
                             }}
+
+                           </span> 
+                           <span v-if="org_id == 9478">
+                            {{
+                              monitor_record.systolic_blood_pressure
+                                ? monitor_record.systolic_blood_pressure + "/"
+                                : ""
+                            }}
+                            {{
+                              monitor_record.diastolic_blood_pressure
+                                ? monitor_record.diastolic_blood_pressure
+                                : "拒测"
+                            }}
+                           </span>
+                           
                           </td>
 
                           <td>
@@ -3599,7 +3616,12 @@ export default {
           birth.substr(6, 2)
 
         var age = jsGetAge(birthtwo, '-')
-        return age
+        if(age<0){
+          return val.age
+        }else{
+          return age
+        }
+        
       }
     },
     newAdviceGroupObject: function () {

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

@@ -312,7 +312,7 @@
                     <el-col :span="8" v-if="isShows('抗凝剂')">
 
                         <el-form-item label="抗凝剂：" prop="anticoagulant" :rules="isCheckmust('抗凝剂')">
-                            <el-select v-model="dialysisPrescription.anticoagulant" placeholder="请选择"
+                            <el-select filterable  v-model="dialysisPrescription.anticoagulant" placeholder="请选择"
                                        style="width:100%;"
                                        @change="changeThisAnticoagulant">
                                 <el-option :key="0" label="请选择" :value="0"></el-option>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -94,8 +94,8 @@
           <td v-if="isShow('跨膜压')"> {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }} </td>
           <td v-if="isShow('跨膜压1')"> {{ monitor.transmembrane_pressure_one ? monitor.transmembrane_pressure_one : "/" }} </td>
           <td v-if="isShow('超滤量')"> 
-            <span v-if="org_id!=9671 && org_id!=10440 && org_id!=10702 && org_id!=10644 && org_id!=10744">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}  </span> 
-            <span v-if="org_id ==9671 || org_id==10440 || org_id == 10702 || org_id == 10644 || org_id == 10744">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "0" }}  </span> 
+            <span v-if="org_id!=9671 && org_id!=10440 && org_id!=10702 && org_id!=10644 && org_id!=10744 && org_id!=9478">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}  </span> 
+            <span v-if="org_id ==9671 || org_id==10440 || org_id == 10702 || org_id == 10644 || org_id == 10744 || org_id == 9478">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "0" }}  </span> 
           </td>
           <td v-if="isShow('超滤量1')"> 
             {{ monitor.ultrafiltration_volume_one ? monitor.ultrafiltration_volume_one : "/" }}

src/xt_pages/dialysis/patientDoctorAdvice.vue

@@ -9,21 +9,6 @@
             <el-form :inline="true" :model="listQuery">
                 <el-form-item label>
 
-                <!-- <el-autocomplete
-                    class="checkSearch"
-                    popper-class="my-autocomplete"
-                    v-model.trim="listQuery.search"
-                    :fetch-suggestions="querySearchAsync"
-                    :trigger-on-focus="false"
-                    placeholder="病人透析号/姓名"
-                    @select="handleSelect"
-                    style="width:160px;"
-                    >
-                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
-                    <template slot-scope="{ item }">
-                        <div class="name">{{ item.name }}</div>
-                    </template>
-                </el-autocomplete> -->
                 <el-input v-model="listQuery.search" style="width: 200px;" placeholder="请输入患者姓名或透析号"></el-input>
                 <el-button type="primary" size="small" @click="toSeach">搜索</el-button>
                 </el-form-item>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1464,8 +1464,18 @@
                           <td v-if="org_id == 10735">
                             {{ monitor.temperature ? monitor.temperature : "" }}
                           </td>
-                          <td>{{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure + "/" : "" }}
-                            {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}</td>
+                          <td>
+                            <span v-if="org_id!=9478">
+                              {{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure + "/" : "" }}
+                              {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}
+                            </span>
+
+                            <span v-if="org_id == 9478">
+                              {{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure + "/" : "" }}
+                              {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "拒测" }}
+                            </span>
+                            
+                          </td>
                           <td>{{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }}</td>
                           <td v-if="org_id != 10489">{{ monitor.breathing_rate ? monitor.breathing_rate : "" }}</td>
                           <td>{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}</td>
@@ -4679,12 +4689,12 @@ export default {
           birth.substr(4, 2) +
           '-' +
           birth.substr(6, 2)
-        if (this.org_id != 0 && this.org_id != 10460) {
+        if (this.org_id != 10460 && this.org_id!=10751 && this.org_id == 0) {
           var age = jsGetAge(birthtwo, '-')
           return age
         }
 
-        if (this.org_id == 0 || this.org_id == 10460) {
+        if (this.org_id == 10460) {
           console.log("日期搜哦", this.schedule_date_one)
           var strBirthdayArr = this.schedule_date_one.split("-")
           console.log("strBirthdayArr", strBirthdayArr)
@@ -4697,6 +4707,11 @@ export default {
 
         }
 
+        if(this.org_id ==10751 || this.org_id == 0){
+           
+          return val.age
+        }
+
       }
     },
     newAdviceGroupObject: function () {

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -239,6 +239,21 @@
               <el-input v-model="form.number" style="width:180px"></el-input>
             </el-form-item>
 
+            <el-form-item label="是否拆零: " prop="limit_remark" style="width:100%;">
+              <el-select v-model="form.is_zero_flag" style="width:160px;" filterable 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-form-item label="拆零次数:" prop="good_number">
+              <el-input v-model="form.split_of_number" style="width:160px;" placeholder="" maxlength="30"></el-input>
+            </el-form-item>
+
             <el-form-item label="备注 : " prop="name" style="width:100%;">
               <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
             </el-form-item>
@@ -332,16 +347,7 @@
           </el-form-item>
 
 
-          <el-form-item label="是否拆零: " prop="limit_remark" style="width:100%;">
-            <el-select v-model="form.is_zero_flag" style="width:160px;" filterable 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-form>
       </el-tab-pane>
@@ -439,7 +445,7 @@
           bby01:"",
           is_show:"",
           is_zero_flag:"",
-
+          split_of_number:"",
         },
 
         rules: {
@@ -576,8 +582,9 @@
               min_unit:"",
               total:"",
               is_user:"",
-            bbx01:"",
-            bby01:"",
+              bbx01:"",
+              bby01:"",
+              split_of_number:"",
             }
           this.good_status = []
           for (let key in tempform) {
@@ -677,10 +684,7 @@
         form["bby01"] = this.form.bby01
         form["is_show"] = this.form.is_show
         form["is_zero_flag"] = this.form.is_zero_flag
-
-
-
-
+        form["split_of_number"] = this.form.split_of_number
         return form
       }, changeSelected: function(val) {
         console.log(val)

src/xt_pages/stock/detail/stockInDetail.vue

@@ -220,6 +220,20 @@
               <span v-else>{{ scope.row.total }}</span>
             </template>
           </el-table-column>
+          
+          <el-table-column label="耗材追溯码" align="center">
+            <template slot-scope="scope">
+              <div  @click="changeGoodCode(scope.row,scope.$index)">
+                <el-input v-model="scope.row.good_code"  placeholder="请输入耗材追溯码"></el-input>
+              </div>
+            </template>
+          </el-table-column>
+          
+          <el-table-column label="追溯码数量" align="center">
+            <template slot-scope="scope">
+              {{ getGoodCode(scope.row.good_code) }}
+            </template>
+          </el-table-column>
         </el-table>
       </div>
       <el-pagination
@@ -423,6 +437,29 @@
     >
     </good-print>
 
+    <el-dialog
+      title="耗材追溯码"
+      :visible.sync="dialogVisibleCode"
+      width="40%">
+      <div style="margin-bottom: 10px;">
+        <span >追溯码个数:{{getGoodTotal() }} 个</span>
+      </div>
+      <span>
+        <el-input
+         @keyup.native="changeText"
+          type="textarea"
+          placeholder="请输入内容"
+          v-model="textarea"
+          :rows="10"
+        >
+        </el-input>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisibleCode = false">取 消</el-button>
+        <el-button type="primary" @click="saveTextArea()">确 定</el-button>
+      </span>
+    </el-dialog>
+
   </div>
 
   
@@ -440,7 +477,8 @@ import {
   getPrintStockGood,
   getGoodDetailPrintList,
   postSearchGoodList,
-  getGoodWarehosueInPrintList
+  getGoodWarehosueInPrintList,
+  changeGoodWarehouseInfo
 } from "@/api/stock";
 
 export default {
@@ -556,10 +594,89 @@ export default {
       printData:[],
       isVisibility: "",
       propsTable: "",
-
+      textarea:"",
+      currentRow:{},
+      currentIndex:0,
+      dialogVisibleCode:false,
+      id:0,
     };
   },
   methods: {
+    getGoodCode(val){
+      var newArr = []
+      var total = 0
+      if(val!=undefined){
+        newArr = val.split(",") 
+        total = newArr.length - 1
+        if(total >0){
+          return  total
+        }else{
+        return ""
+        }
+      }
+      
+    },
+    changeText(event){
+      // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+      var  textAreaList = this.textarea.split(",")
+      if (event.key === 'Enter') {
+        var textarea = ""
+         textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
+         var  parts = textarea.split(',')
+         for(let i=0;i<textAreaList.length;i++){
+           if(parts[parts.length-2] == textAreaList[i]){
+              this.$message.error("该条码已经存在,不能重复扫码")
+           }
+         }
+        const uniqueStr = [...new Set(textarea.split(','))].join(',');
+        this.textarea = uniqueStr
+      }
+     
+     },
+    getGoodTotal(){
+      if(this.textarea!=null){
+        var  textAreaList = this.textarea.split(",")
+        var arr = []
+        if(textAreaList!=null && textAreaList.length>0){
+          for(let i=0;i<textAreaList.length;i++){
+            if(textAreaList[i]!=""){
+              arr.push(textAreaList[i])
+            }
+          }
+          return  arr.length
+        }else{
+          return ""
+        }
+        
+      }
+    },
+    saveTextArea(){
+        var params = {
+          id:this.id,
+          good_code:this.textarea
+        }
+      changeGoodWarehouseInfo(params).then(response=>{
+        if(response.data.state == 1){
+          this.$message.success("保存成功")
+          for(let i=0;i<this.cancelStockDate.length;i++){
+            if(this.currentIndex == i){
+              this.cancelStockDate[i].good_code = this.textarea 
+            }
+          }
+           this.dialogVisibleCode = false
+        }
+      })
+     
+     },
+    changeGoodCode(row,index){
+        this.id = 0
+        this.id = row.id
+        this.textarea=""
+        this.textarea = row.good_code
+        this.currentRow = row
+        this.currentIndex =index
+        this.dialogVisibleCode = true
+    },
     changeStartTime(){
 
     },

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

@@ -227,6 +227,11 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column label="追溯码数量" width="150" align="center">
+            <template slot-scope="scope">
+              {{ getGoodCode(scope.row.drug_code) }}
+            </template>
+          </el-table-column>
       </el-table>
 
       <el-pagination
@@ -246,6 +251,9 @@
       title="药品追溯码"
       :visible.sync="dialogVisible"
       width="40%">
+      <div style="margin-bottom: 10px;">
+        <span >追溯码个数:{{getDrugTotal() }} 个</span>
+      </div>
       <span>
         <el-input
          @keyup.native="changeText"
@@ -584,6 +592,39 @@ export default {
     };
   },
   methods: {
+    getGoodCode(val){
+      console.log("val-----",val)
+      var newArr = []
+      var total = 0
+      if(val!=undefined){
+        newArr = val.split(",") 
+        total = newArr.length - 1
+        if(total >0){
+          return  total
+        }else{
+        return ""
+        }
+      }
+     
+    },
+    getDrugTotal(){
+      if(this.textarea!=null){
+        var  textAreaList = this.textarea.split(",")
+        console.log("textArrleti",textAreaList)
+        var arr = []
+        if(textAreaList!=null && textAreaList.length>0){
+          for(let i=0;i<textAreaList.length;i++){
+            if(textAreaList[i]!=""){
+              arr.push(textAreaList[i])
+            }
+          }
+          return  arr.length
+        }else{
+          return ""
+        }
+      
+      }
+    },
     batchSelect(selection){
       if(selection.length == 0){
         this.$message.error("请选中需要打印的内容")
@@ -713,13 +754,27 @@ export default {
       this.getDrugWarehouseInfoPrint()
     },
     changeText(event){
-      // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+
+      var  textAreaList = this.textarea.split(",")
       if (event.key === 'Enter') {
         var textarea = ""
-        textarea += this.textarea + ","
-        this.textarea = textarea
-
+         textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
+         var  parts = textarea.split(',')
+         for(let i=0;i<textAreaList.length;i++){
+           if(parts[parts.length-2] == textAreaList[i]){
+              this.$message.error("该条码已经存在,不能重复扫码")
+           }
+         }
+        const uniqueStr = [...new Set(textarea.split(','))].join(',');
+        this.textarea = uniqueStr
       }
+      // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+      // if (event.key === 'Enter') {
+      //   var textarea = ""
+      //   textarea += this.textarea + ","
+      //   this.textarea = textarea
+
+      // }
    },
     changeDrugCode(row,index){
       this.textarea=""

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

@@ -253,7 +253,7 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100,1000,2000,3000,4000,5000,6000,7000]"
+        :page-sizes="[10, 50, 100,1000,2000,3000,4000,5000,6000,7000,8000,9000,10000]"
         :page-size="10"
         background
         style="margin-top:20px;float: right"

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

@@ -47,6 +47,17 @@
               :value="item.value">
             </el-option>
           </el-select>
+          <span style="font-size:14px;color:#606266">库存预警:</span>
+          <el-select v-model="query_type" style="width:250px;margin-right:10px;" placeholder="请选择"
+          filterable
+           @change="changeGoodName">
+            <el-option
+              v-for="item in goodList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
           <el-input v-model="keyword" style="width:200px" placeholder="请输入药品名称或生产厂商" ></el-input>
           <el-button  type="primary" icon="el-icon-search" @click="seach">搜索</el-button>
          </div>
@@ -178,6 +189,8 @@ export default {
      goodList:[
       {id:1,name:"全部药品"},
       {id:2,name:"库存预警"},
+      {id:3,name:"库存为零"},
+      {id:4,name:"库存不为零"},
      ],
      houseList:[],
      storehouse_id:0,
@@ -211,11 +224,15 @@ export default {
             return v.getTime() < 1667491200000
           },
       },
-     dealerList:[]
+     dealerList:[],
+     query_type:1,
     }
 
   },
   methods:{
+    changeGoodName(){
+      this.getlist()
+    },
     GetInitStartFlowPice(val1,val2,val3,val4,val5,min_number,min_unit,max_unit){
      
       var total_one_price =0
@@ -417,6 +434,7 @@ export default {
           limit:this.limit,
           start_time:this.start_time,
           end_time:this.end_time,
+          query_type:this.query_type,
         }
       getPurchaseNewDrugQuery(params).then(response=>{
          if(response.data.state == 1){
@@ -626,14 +644,14 @@ export default {
            
               list[i].over_count_one = this.GetInitStartFlowOne(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit) 
              
-              if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752 || this.org_id == 9478){
+              if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
                 list[i].drugInMoney = ""
               }else{
                 list[i].drugInMoney = list[i].last_price
               }
-              if(this.org_id == 10697){
+              if(this.org_id == 10697 || this.org_id == 9478){
                 list[i].drugSaleMoney =  (list[i].over_count_one * list[i].last_price).toFixed(2)
-              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752 || this.org_id == 9478){
+              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
               
                 list[i].drugSaleMoney =  this.GetInitStartFlowPice(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit)
               } else{
@@ -644,10 +662,10 @@ export default {
               list[i].drugAdd = this.drugAddInfo(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
               list[i].drugAddOne = this.drugAddInfoOne(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
               
-              if( this.org_id == 10697){
+              if( this.org_id == 10697 || this.org_id == 9478){
                  list[i].drugAddPrice = list[i].last_price
                  list[i].drugAddSalePrice = (list[i].last_price *list[i].drugAddOne).toFixed(2)
-              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752 || this.org_id ==9478){
+              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
                 list[i].drugAddPrice = "/"
                 list[i].drugAddSalePrice = this.drugAddInfoOnePirce(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
                 console.log("本期增加加淀粉",list[i].drugAddSalePrice)
@@ -660,10 +678,10 @@ export default {
               list[i].drugOut=  this.getDrugOut(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
               list[i].drugOutOne =this.getDrugOutOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
            
-              if( this.org_id == 10697){
-                list[i].drugOutPrice = list[i].retail_price
-                list[i].drugOutSalePrice = (list[i].drugOutOne * list[i].retail_price).toFixed(2)
-              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752 || this.org_id == 9478){
+              if( this.org_id == 10697 || this.org_id == 9478){
+                list[i].drugOutPrice = list[i].last_price
+                list[i].drugOutSalePrice = (list[i].drugOutOne * list[i].last_price).toFixed(2)
+              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
                 list[i].drugOutPrice = "/"
                 list[i].drugOutSalePrice= this.getDrugOutPriceOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
               } else{
@@ -680,10 +698,10 @@ export default {
             }
              
             list[i].overDrugOne = this.GetDrugOverOne(list[i].over_count_one,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
-            if(this.org_id == 10697){
-                list[i].overDrugPrice = list[i].retail_price
-                list[i].oveDrugSaleMoney = (list[i].overDrugOne * list[i].retail_price).toFixed(2)
-            }else if(this.org_id == 0 || this.org_id ==10644 || this.org_id == 10752 || this.org_id == 9478){
+            if(this.org_id == 10697 || this.org_id == 9478){
+                list[i].overDrugPrice = list[i].last_price
+                list[i].oveDrugSaleMoney = (list[i].overDrugOne * list[i].last_price).toFixed(2)
+            }else if(this.org_id == 0 || this.org_id ==10644 || this.org_id == 10752){
               console.log("加个2323323",list[i].drugAddSalePrice)
                 list[i].overDrugPrice = ""
                 list[i].oveDrugSaleMoney = this.GetDrugOverOnePrice(list[i].drugSaleMoney,list[i].drugAddSalePrice,list[i].drugOutSalePrice,list[i].min_number,list[i].min_unit,list[i].max_unit)
@@ -694,7 +712,7 @@ export default {
            
             }
             
-            if(this.org_id == 10697){
+            if(this.org_id == 10697 || this.org_id == 9478){
               if(list!=null && list.length>0){
                 var obj = {drug_type:"",drug_name:"合计",dose:"",dose_unit:"",min_number:"",min_unit:"",max_unit:"",medical_insurance_number:"",manufacturer:"",dealer:"",drugIn:"",drugInMoney:"",drugSaleMoney:0,drugAdd:"",drugAddPrice:"",drugAddSalePrice:0,drugOut:"",drugOutPrice:"",drugOutSalePrice:0,overDrug:"",overDrugPrice:"",oveDrugSaleMoney:0}
                 for(let i=0;i<list.length;i++){
@@ -1575,7 +1593,7 @@ export default {
 
    },
    toPrint(){
-    this.$router.push({path:"/drugs/purchase/new/query/print?start_time="+this.start_time+"&end_time="+this.end_time+"&page="+this.page+"&limit="+this.limit+"&keyword="+this.keyword+"&good_type="+this.good_type})
+    this.$router.push({path:"/drugs/purchase/new/query/print?start_time="+this.start_time+"&end_time="+this.end_time+"&page="+this.page+"&limit="+this.limit+"&keyword="+this.keyword+"&good_type="+this.good_type+"&query_type="+this.query_type})
    },
     exportList: function() {
        for(let i=0;i<this.tableList.length;i++){

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

@@ -122,7 +122,8 @@ export default {
           cancelCountList:[],
           org_id:0,
           drugTypeList:[],
-          dealerList:[]
+          dealerList:[],
+          query_type:0,
         }
     },
     methods:{
@@ -153,6 +154,7 @@ export default {
           limit:this.limit,
           start_time:this.start_time,
           end_time:this.end_time,
+          query_type:this.query_type,
         }
       getPurchaseNewDrugQuery(params).then(response=>{
          if(response.data.state == 1){
@@ -363,7 +365,7 @@ export default {
                 list[i].drugInMoney = list[i].last_price
               }
 
-                if( this.org_id == 10697){
+                if( this.org_id == 10697 || this.org_id == 9478){
                   list[i].drugSaleMoney =  (list[i].over_count_one * list[i].last_price).toFixed(2)
                 }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
                   list[i].drugAddPrice = ""
@@ -376,7 +378,7 @@ export default {
                 list[i].drugAddOne= this.drugAddInfoOne(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
                
                
-                if(this.org_id == 10697){
+                if(this.org_id == 10697 || this.org_id ==9478){
                  list[i].drugAddPrice = list[i].last_price
                  list[i].drugAddSalePrice = (list[i].last_price *list[i].drugAddOne).toFixed(2)
                 }else if(this.org_id == 0 || this.org_id ==10644 || this.org_id == 10752){
@@ -393,9 +395,9 @@ export default {
                 
               
 
-                if( this.org_id == 10697){
-                  list[i].drugOutPrice = list[i].retail_price
-                  list[i].drugOutSalePrice = (list[i].drugOutOne * list[i].retail_price).toFixed(2)
+                if( this.org_id == 10697 || this.org_id == 9478){
+                  list[i].drugOutPrice = list[i].last_price
+                  list[i].drugOutSalePrice = (list[i].drugOutOne * list[i].last_price).toFixed(2)
                 }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
                   list[i].drugOutPrice = "/"
                   list[i].drugOutSalePrice= this.getDrugOutPriceOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
@@ -412,9 +414,9 @@ export default {
                 }
                
                 list[i].overDrugOne = this.GetDrugOverOne(list[i].over_count_one,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
-                if(this.org_id == 10697){
-                  list[i].overDrugPrice = list[i].retail_price
-                  list[i].oveDrugSaleMoney = (list[i].overDrugOne * list[i].retail_price).toFixed(2)
+                if(this.org_id == 10697 || this.org_id == 9478){
+                  list[i].overDrugPrice = list[i].last_price
+                  list[i].oveDrugSaleMoney = (list[i].overDrugOne * list[i].last_price).toFixed(2)
                 }else if(this.org_id == 0 || this.org_id ==10644 || this.org_id == 10752){
                   list[i].overDrugPrice = ""
                   list[i].oveDrugSaleMoney = this.GetDrugOverOnePrice(list[i].drugSaleMoney,list[i].drugAddSalePrice,list[i].drugOutSalePrice,list[i].min_number,list[i].min_unit,list[i].max_unit)
@@ -423,7 +425,7 @@ export default {
                   list[i].oveDrugSaleMoney = "/"
                 }
             }
-            if(this.org_id == 10697){
+            if(this.org_id == 10697 || this.org_id == 9478){
               if(list!=null && list.length>0){
                 var obj = {drug_type:"",drug_name:"合计",dose:"",dose_unit:"",min_number:"",min_unit:"",max_unit:"",medical_insurance_number:"",manufacturer:"",dealer:"",drugIn:"",drugInMoney:"",drugSaleMoney:0,drugAdd:"",drugAddPrice:"",drugAddSalePrice:0,drugOut:"",drugOutPrice:"",drugOutSalePrice:0,overDrug:"",overDrugPrice:"",oveDrugSaleMoney:0}
                 for(let i=0;i<list.length;i++){
@@ -1655,6 +1657,9 @@ export default {
       this.end_time = endtime
       var good_type = parseInt(this.$route.query.good_type)
       this.good_type = good_type
+
+      var query_type = parseInt(this.$route.query.query_type)
+      this.query_type= query_type
       var keyword = this.$route.query.keyword
       this.keyword = keyword
       this.page = parseInt(this.$route.query.page)

src/xt_pages/stock/drugs/drugInventoryModePrint.vue

@@ -429,7 +429,7 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
                   arr[i].last_price = this.getBuyPrice(arr[i].drug_id)
                   arr[i].month_in_total_price = (this.getBuyPrice(arr[i].drug_id)*this.getInCountOne(arr[i].drug_id,arr[i].min_number,arr[i].min_unit,arr[i].max_unit)).toFixed(2)
                   arr[i].month_in_total_price_one =this.getBuyPrice(arr[i].drug_id)*this.getInCountOne(arr[i].drug_id,arr[i].min_number,arr[i].min_unit,arr[i].max_unit)
-                  arr[i].retail_price = this.getRetailPrice(arr[i].retail_price)
+                  arr[i].retail_price = this.getRetailPrice(arr[i].drug_id)
                   arr[i].month_out_total_price = (this.getOutCountOne(arr[i].drug_id,arr[i].min_number,arr[i].min_unit,arr[i].max_unit) * this.getRetailPrice(arr[i].drug_id)).toFixed(2)
                   
                   arr[i].month_out_total_price_one =this.getOutCountOne(arr[i].drug_id,arr[i].min_number,arr[i].min_unit,arr[i].max_unit) * this.getRetailPrice(arr[i].drug_id)
@@ -804,7 +804,7 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
           var min_price = ""
           for(let i=0;i<this.drugList.length;i++){
             if(drug_id == this.drugList[i].id){
-                min_price = this.drugList[i].min_price
+                min_price = this.drugList[i].last_price
             }
           } 
           return min_price     

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -297,6 +297,11 @@
              {{ scope.row.drug_code }}
           </template>
         </el-table-column>
+        <el-table-column label="追溯码数量" align="center">
+          <template slot-scope="scope">
+            {{ getGoodCode(scope.row.drug_code) }}
+          </template>
+        </el-table-column>
         <el-table-column label="仓库名称" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_total == 0">
@@ -574,6 +579,20 @@ export default {
   },
 
   methods: {
+    getGoodCode(val){
+      var newArr = []
+      var total = 0
+      if(val!=undefined){
+        newArr = val.split(",") 
+        total = newArr.length - 1
+        if(total >0){
+          return  total
+        }else{
+        return ""
+        }
+      }
+     
+    },
     changeTypeName() {
       this.getlist();
     },

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -386,6 +386,12 @@
             </template>
           </el-table-column>
 
+          <el-table-column label="追溯码数量" width="150" align="center">
+            <template slot-scope="scope">
+              {{ getGoodCode(scope.row.drug_code) }}
+            </template>
+          </el-table-column>
+
           <el-table-column label="备注" width="150" align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.remark"  placeholder="请输入备注"></el-input>
@@ -604,6 +610,20 @@ export default {
     };
   },
   methods: {
+    getGoodCode(val){
+      var newArr = []
+      var total = 0
+      newArr = val.split(",") 
+      if(val!=undefined){
+        total = newArr.length - 1
+        if(total >0){
+          return  total
+        }else{
+        return ""
+        }
+      }
+      
+    },
     getTotal(){
       if(this.textarea!=null){
         var  textAreaList = this.textarea.split(",")
@@ -1271,15 +1291,18 @@ export default {
       }
     },
     changeText(event){
-      // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+      var  textAreaList = this.textarea.split(",")
       if (event.key === 'Enter') {
-        // var textarea = ""
-        // textarea += this.textarea + ","
-        // this.textarea = textarea
         var textarea = ""
          textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
-        this.textarea = textarea
-
+         var  parts = textarea.split(',')
+         for(let i=0;i<textAreaList.length;i++){
+           if(parts[parts.length-2] == textAreaList[i]){
+              this.$message.error("该条码已经存在,不能重复扫码")
+           }
+         }
+        const uniqueStr = [...new Set(textarea.split(','))].join(',');
+        this.textarea = uniqueStr
       }
       this.getTotal()
    },

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -347,6 +347,12 @@
             </template>
           </el-table-column>
 
+          <el-table-column label="追溯码数量" width="150" align="center">
+            <template slot-scope="scope">
+              {{ getGoodCode(scope.row.drug_code) }}
+            </template>
+          </el-table-column>
+
           <el-table-column label="备注" width="150" align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.remark"  placeholder="请输入备注" :disabled="disabled"></el-input>
@@ -403,6 +409,9 @@
       title="药品追溯码"
       :visible.sync="dialogVisible"
       width="40%">
+      <div style="margin-bottom: 10px;">
+        <span >追溯码个数:{{getTotal() }} 个</span>
+      </div>
       <span>
         <el-input
          ref="inputRef"
@@ -534,6 +543,39 @@ export default {
     };
   },
   methods: {
+    getTotal(){
+      if(this.textarea!=null){
+        var  textAreaList = this.textarea.split(",")
+        console.log("textArrleti",textAreaList)
+        var arr = []
+        if(textAreaList!=null && textAreaList.length>0){
+          for(let i=0;i<textAreaList.length;i++){
+            if(textAreaList[i]!=""){
+              arr.push(textAreaList[i])
+            }
+          }
+          return  arr.length
+        }else{
+          return ""
+        }
+      
+      }
+
+    },
+    getGoodCode(val){
+      var newArr = []
+      var total = 0
+      if(val!=undefined){
+        newArr = val.split(",") 
+        total = newArr.length - 1
+        if(total >0){
+          return  total
+        }else{
+        return ""
+        }
+      }
+     
+    },
     openDialog(){
       this.$nextTick(() => {
         this.$refs.inputRef.focus()
@@ -541,14 +583,18 @@ export default {
     },
     changeText(event){
       // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+      var  textAreaList = this.textarea.split(",")
       if (event.key === 'Enter') {
-        // var textarea = ""
-        // textarea += this.textarea + ","
-        // this.textarea = textarea
         var textarea = ""
          textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
-        this.textarea = textarea
-
+         var  parts = textarea.split(',')
+         for(let i=0;i<textAreaList.length;i++){
+           if(parts[parts.length-2] == textAreaList[i]){
+              this.$message.error("该条码已经存在,不能重复扫码")
+           }
+         }
+        const uniqueStr = [...new Set(textarea.split(','))].join(',');
+        this.textarea = uniqueStr
       }
    },
     changeDrugCode(row,index){

src/xt_pages/stock/query/goodNewQuery.vue

@@ -27,6 +27,17 @@
               :value="item.id">
             </el-option>
           </el-select>
+          <span style="font-size:14px;color:#606266">耗材类型:</span>
+          <el-select v-model="good_type_id" style="width:200px;margin-right:10px;" placeholder="请选择"
+          filterable
+           @change="changeGoodTypeName">
+            <el-option
+              v-for="item in goodTypeList"
+              :key="item.id"
+              :label="item.type_name"
+              :value="item.id">
+            </el-option>
+          </el-select>
           <el-input v-model="keyword" style="width:200px" placeholder="请输入耗材名称或生产厂商" ></el-input>
           <el-button  type="primary" icon="el-icon-search" @click="seach">搜索</el-button>
          </div>
@@ -438,10 +449,14 @@ export default {
      checkData:[],
      outData:[],
      medicalInsuranceLevelList:[],
+     good_type_id:0
     }
   
   },
   methods:{
+    changeGoodTypeName(){
+       this.getlist()
+    },
     getMedicalInsuranceLeve(id){
       var name = ""
       for(let i=0;i<this.medicalInsuranceLevelList.length;i++){
@@ -497,7 +512,12 @@ export default {
              this.houseList.push(houseList[i])
            }
            this.manufacturerList = response.data.data.manufacturerList
-           this.goodTypeList = response.data.data.goodTypeList
+           var obj = {id:0,type_name:"全部"}
+           this.goodTypeList.push(obj)
+           var goodTypeList = response.data.data.goodTypeList
+           for(let i=0;i<goodTypeList.length;i++){
+             this.goodTypeList.push(goodTypeList[i])
+            }
            this.patientList = response.data.data.patientList
            this.dealerList = response.data.data.dealerList
          }
@@ -517,6 +537,7 @@ export default {
           limit:this.limit,
           start_time:this.start_time,
           end_time:this.end_time,
+          good_type_id:this.good_type_id,
         }
       getGoodNewQuery(params).then(response=>{
          if(response.data.state == 1){
@@ -985,7 +1006,7 @@ export default {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
       toPrint(){
-        this.$router.push("/good/new/query/print?start_time="+this.start_time+"&end_time="+this.end_time+"&keyword="+this.keyword+"&storehouse_id="+this.storehouse_id+"&page="+this.page+"&limit="+this.limit+"&good_type="+this.good_type)
+        this.$router.push("/good/new/query/print?start_time="+this.start_time+"&end_time="+this.end_time+"&keyword="+this.keyword+"&storehouse_id="+this.storehouse_id+"&page="+this.page+"&limit="+this.limit+"&good_type="+this.good_type+"&good_type_id="+this.good_type_id)
       },
       getCancelSotckInfo(arr){
         var cancle_toal = 0

src/xt_pages/stock/query/goodNewQueryPrint.vue

@@ -375,6 +375,7 @@ export default {
       goodTypeList: [],
       houseList: [],
       dealerList:[],
+      good_type_id:0,
     };
   },
   methods: {
@@ -415,6 +416,7 @@ export default {
         limit: this.limit,
         start_time: this.start_time,
         end_time: this.end_time,
+        good_type_id:this.good_type_id,
       };
       getGoodNewQuery(params).then((response) => {
         if (response.data.state == 1) {
@@ -861,6 +863,7 @@ export default {
     this.keyword = keyword;
     this.page = parseInt(this.$route.query.page);
     this.limit = parseInt(this.$route.query.limit);
+    this.good_type_id = parseInt(this.$route.query.good_type_id)
     this.getStorehouseList();
     this.getlist();
   },

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -37,6 +37,17 @@
               :clearable="false"
           ></el-date-picker>  
           <el-button  type="primary" icon="el-icon-search" @click="getAllQuery">查询</el-button>
+          <span style="font-size:14px;color:#606266">库存预警:</span>
+          <el-select v-model="query_type" style="width:250px;margin-right:10px;" placeholder="请选择"
+          filterable
+           @change="changeGoodName">
+            <el-option
+              v-for="item in goodList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
           <span style="font-size:14px;color:#606266">耗材类型:</span>
           <el-select v-model="good_type" style="width:200px;margin-right:10px;" placeholder="请选择"
           filterable
@@ -184,6 +195,8 @@ export default {
      goodList:[
       {id:1,name:"全部耗材"},
       {id:2,name:"库存预警"},
+      {id:3,name:"库存为零"},
+      {id:4,name:"库存不为零"},
      ],
      houseList:[],
      storehouse_id:0,
@@ -218,12 +231,15 @@ export default {
           },
       },
      dealerList:[],
-     medicalInsuranceLevelList:[]
+     medicalInsuranceLevelList:[],
+     query_type:1
     }
   
   },
   methods:{
-    
+    changeGoodName(){
+      this.getlist()
+    },
     changeStorehouseName(){
 
     },
@@ -260,6 +276,7 @@ export default {
           limit:this.limit,
           start_time:this.start_time,
           end_time:this.end_time,
+          query_type:this.query_type,
         }
       getNewPurchaseStockQuery(params).then(response=>{
          if(response.data.state == 1){
@@ -290,13 +307,13 @@ export default {
                
               }
              
-               if(this.org_id ==10697 || this.org_id == 0){
+               if(this.org_id ==10697 || this.org_id == 0 || this.org_id == 9478){
                   list[i].stock_in_price = list[i].buy_price
                   list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
                }else if(this.org_id ==9671){
                 list[i].stock_in_price = list[i].buy_price
                 list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
-               }else if(this.org_id == 10644 || this.org_id == 10752){
+               }else if(this.org_id == 10644){
                  list[i].stock_in_price = "/"
                  console.log("val1",this.getAllStockInPrice(list[i].StWarehousingInfoTwo))
                  console.log("val2",this.getAllStockInFlowPrice(list[i].WareStartInStockFlow))
@@ -319,13 +336,13 @@ export default {
               
               list[i].stockAdd = this.getWarehouseInfoOne(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)//期间增加
 
-              if(this.org_id ==10697){
+              if(this.org_id ==10697  || this.org_id ==9478 ){
                list[i].addStockMoney = list[i].buy_price 
                 list[i].saleStockMoney = (list[i].buy_price *list[i].stockAdd).toFixed(2)
               }else if(this.org_id == 0){
                 list[i].addStockMoney = list[i].buy_price 
                 list[i].saleStockMoney = (list[i].buy_price *list[i].stockAdd).toFixed(2)
-              } else if(this.org_id == 10644 || this.org_id == 10752 || this.org_id ==9478 ){
+              } else if(this.org_id == 10644 || this.org_id == 10752){
                 list[i].addStockMoney = "/"
                 list[i].saleStockMoney = this.getWarehouseInfoOnePrice(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
               } else{
@@ -335,13 +352,13 @@ export default {
              
 
               list[i].outStock = this.getWarehosueOutInfo(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)//本期减少
-              if(this.org_id == 10697){
-                list[i].stockOutprice = list[i].packing_price
-                list[i].saleOutMoney = (list[i].packing_price * list[i].outStock).toFixed(2)
+              if(this.org_id == 10697 || this.org_id == 9478){
+                list[i].stockOutprice = list[i].buy_price
+                list[i].saleOutMoney = (list[i].buy_price * list[i].outStock).toFixed(2)
               }else if(this.org_id == 0){
-                list[i].stockOutprice = list[i].packing_price
-                list[i].saleOutMoney = (list[i].packing_price * list[i].outStock).toFixed(2)
-              }else if(this.org_id == 10644 || this.org_id == 10752 || this.org_id == 9478){
+                list[i].stockOutprice = list[i].buy_price
+                list[i].saleOutMoney = (list[i].buy_price * list[i].outStock).toFixed(2)
+              }else if(this.org_id == 10644 || this.org_id == 10752 ){
                 list[i].stockOutprice = "/"
                 list[i].saleOutMoney = this.getWarehosueOutInfoPrice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
                 if(list[i].saleOutMoney == "NaN"){
@@ -366,13 +383,13 @@ export default {
                
               }
             
-              if(this.org_id ==10697){
-                list[i].overPrice = list[i].packing_price
-                list[i].overMoney = (list[i].packing_price*list[i].overStock).toFixed(2)
+              if(this.org_id ==10697 || this.org_id == 9478){
+                list[i].overPrice = list[i].buy_price
+                list[i].overMoney = (list[i].buy_price*list[i].overStock).toFixed(2)
               }else if(this.org_id == 0){
                 list[i].overPrice = list[i].GoodEndFlowInfo.buy_price
                 list[i].overMoney = (list[i].GoodEndFlowInfo.buy_price*list[i].overStock).toFixed(2)
-              } else if(this.org_id ==10644 || this.org_id == 10752 || this.org_id == 9478){
+              } else if(this.org_id ==10644 || this.org_id == 10752){
                 list[i].overPrice = "/"
                 list[i].overMoney = (parseFloat(list[i].stockMoney)  + parseFloat(list[i].saleStockMoney) - parseFloat(list[i].saleOutMoney)).toFixed(2)
               }else{
@@ -386,7 +403,7 @@ export default {
 
             var obj = {good_number:"",medical_insurance_level:"",social_security_directory_code:"合计",good_type_id:"",good_name:"",specification_name:"",packing_unit:"",manufacturer:"",dealer:"",stockIn:"",stock_in_price:"",stockMoney:0,outStock:"",stockOutprice:"",saleStockMoney:0,saleOutMoney:0,overStock:"",overPrice:"",overMoney:0}
           
-            if(this.org_id == 0 || this.org_id == 10697){
+            if(this.org_id == 0 || this.org_id == 10697 || this.org_id == 9478){
               if(list.length!=null){
                 for(let i=0;i<list.length;i++){
                  
@@ -1170,11 +1187,11 @@ export default {
      }
    },
    toPrint(){
-    this.$router.push({path:"/purchase/new/stock/query/print?start_time="+this.start_time+"&end_time="+this.end_time+"&page="+this.page+"&limit="+this.limit+"&keyword="+this.keyword+"&good_type="+this.good_type})
+    this.$router.push({path:"/purchase/new/stock/query/print?start_time="+this.start_time+"&end_time="+this.end_time+"&page="+this.page+"&limit="+this.limit+"&keyword="+this.keyword+"&good_type="+this.good_type+"&query_type="+this.query_type})
    },
    exportList: function() {
 
-       if(this.org_id!=0&& this.org_id!=9956 && this.org_id!=10697 && this.org_id!=10375){
+       if(this.org_id!=0&& this.org_id!=9956 && this.org_id!=10697 && this.org_id!=10375 && this.org_id!=9478){
          
         for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1
@@ -1236,7 +1253,7 @@ export default {
         })
        }
 
-       if(this.org_id == 10697 || this.org_id == 0 || this.org_id == 10375){
+       if(this.org_id == 10697 || this.org_id == 0 || this.org_id == 10375 || this.org_id == 9478){
         
         for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -125,7 +125,8 @@ export default {
           cancelCountList:[],
           org_id:0,
           goodTypeList:[],
-          dealerList:[]
+          dealerList:[],
+          query_type:0,
         }
     },
     methods:{
@@ -163,6 +164,7 @@ export default {
             limit:this.limit,
             start_time:this.start_time,
             end_time:this.end_time,
+            query_type:this.query_type,
             }
         getNewPurchaseStockQuery(params).then(response=>{
             if(response.data.state == 1){
@@ -184,7 +186,7 @@ export default {
                       }
                     }
                     
-                    if(this.org_id == 0 || this.org_id ==10697){
+                    if(this.org_id == 0 || this.org_id ==10697 || this.org_id == 9478){
                       list[i].stock_in_price = list[i].buy_price
                       list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
                     }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
@@ -201,7 +203,7 @@ export default {
                     
                     list[i].stockAdd = this.getWarehouseInfoOne(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)//期间增加
                    
-                    if(this.org_id == 0 || this.org_id ==10697){
+                    if(this.org_id == 0 || this.org_id ==10697 || this.org_id == 9478){
                         list[i].addStockMoney = list[i].buy_price 
                         list[i].saleStockMoney = (list[i].buy_price *list[i].stockAdd).toFixed(2)
                     }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
@@ -217,9 +219,9 @@ export default {
                     list[i].outStock = this.getWarehosueOutInfo(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)//本期减少
                    
                      
-                    if(this.org_id == 0 || this.org_id == 10697){
-                      list[i].stockOutprice = list[i].packing_price
-                      list[i].saleOutMoney = (list[i].packing_price * list[i].outStock).toFixed(2)
+                    if(this.org_id == 0 || this.org_id == 10697 || this.org_id == 9478){
+                      list[i].stockOutprice = list[i].buy_price
+                      list[i].saleOutMoney = (list[i].buy_price * list[i].outStock).toFixed(2)
                     }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
                       list[i].stockOutprice = "/"
                       list[i].saleOutMoney = this.getWarehosueOutInfoPrice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
@@ -238,9 +240,9 @@ export default {
                         list[i].overStock = list[i].stockIn + list[i].stockAdd - list[i].outStock
                     } 
                   
-                    if(this.org_id == 0 || this.org_id ==10697){
-                      list[i].overPrice = list[i].packing_price
-                      list[i].overMoney = (list[i].packing_price*list[i].overStock).toFixed(2)
+                    if(this.org_id == 0 || this.org_id ==10697 || this.org_id == 9478){
+                      list[i].overPrice = list[i].buy_price
+                      list[i].overMoney = (list[i].buy_price*list[i].overStock).toFixed(2)
                      }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
                       list[i].overPrice = "/"
                       console.log("stockMoney-00000000000000",list[i].stockMoney)
@@ -260,7 +262,7 @@ export default {
                
                var obj = {good_number:"",medical_insurance_level:"",social_security_directory_code:"合计",good_type_id:"",good_name:"",specification_name:"",packing_unit:"",manufacturer:"",dealer:"",stockIn:"",stock_in_price:"",stockMoney:0,outStock:"",stockOutprice:"",saleStockMoney:0,saleOutMoney:0,overStock:"",overPrice:"",overMoney:0}
           
-                if(this.org_id == 0 || this.org_id == 10697){
+                if(this.org_id == 0 || this.org_id == 10697 || this.org_id == 9478){
                   if(list.length!=null){
                     for(let i=0;i<list.length;i++){
                     

src/xt_pages/stock/stockInOrder.vue

@@ -369,6 +369,13 @@
             </span>
           </template>
         </el-table-column>
+        <el-table-column label="耗材追溯码个数" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.is_total == 0">
+               {{ getGoodCodeSumCount(scope.row.good_code)}}
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column label="备注" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_total == 0">
@@ -915,7 +922,18 @@ export default {
 
   },
   methods: {
-          changeTypeName() {
+   getGoodCodeSumCount(val){
+     var total = []
+     if(val!=null && val.length>0){
+        total = val.split(",")
+     }
+     if(total !="" ){
+        return total.length-1
+     }else{
+        return ""
+     }
+   },
+   changeTypeName() {
       this.getlist();
     },
     getlist() {

src/xt_pages/stock/stockInOrderAdd.vue

@@ -270,6 +270,14 @@
 
           </el-table-column>
 
+          <el-table-column label="追溯码数量" align="center" width="150">
+           
+           <template slot-scope="scope">
+               {{ getGoodCode(scope.row.good_code)  }}
+           </template>
+       
+         </el-table-column>
+
           <el-table-column label="备注" align="center" width="150">
             <template slot-scope="scope">
               <el-input placeholder="请输入备注" v-model="scope.row.remark"></el-input>
@@ -313,6 +321,9 @@
        @open="openDialog"
       :visible.sync="dialogVisible"
       width="40%">
+      <div style="margin-bottom: 10px;">
+        <span >追溯码个数:{{getTotal() }} 个</span>
+      </div>
       <span>
         <el-input
          ref="inputRef"
@@ -434,7 +445,8 @@
             remark: '',
             dealer: '',
             manufacturer: '',
-            good_code:""
+            good_code:"",
+            good_code_count:""
           },
           isCreated: 1
 
@@ -479,11 +491,28 @@
         dialogVisible:false,
         currentRow:{},
         currentIndex:0,
-        textarea:""
-
+        textarea:"",
       }
     },
     methods: {
+      getTotal(){
+        if(this.textarea!=null){
+          var  textAreaList = this.textarea.split(",")
+          console.log("textArrleti",textAreaList)
+          var arr = []
+          if(textAreaList!=null && textAreaList.length>0){
+            for(let i=0;i<textAreaList.length;i++){
+              if(textAreaList[i]!=""){
+                arr.push(textAreaList[i])
+              }
+            }
+            return  arr.length
+          }else{
+            return ""
+          }
+        
+        }
+      },
       openDialog(){
        this.$nextTick(() => {
         this.$refs.inputRef.focus()
@@ -644,7 +673,7 @@
         tempObj['register_number'] = ''
         tempObj['good_code'] = ""
         tempObj['good_code_cnt'] = ''
-
+        tempObj["good_code_count"] =''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (this.recordInfo.recordData.length <= 1) {
@@ -1065,21 +1094,26 @@
         this.dialogVisible = true
      },
      changeText(event){
-      // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
-    
-      if (event.key === 'Enter') {
 
+      var  textAreaList = this.textarea.split(",")
+      if (event.key === 'Enter') {
         var textarea = ""
          textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
-        this.textarea = textarea
-
+         var  parts = textarea.split(',')
+         for(let i=0;i<textAreaList.length;i++){
+           if(parts[parts.length-2] == textAreaList[i]){
+              this.$message.error("该条码已经存在,不能重复扫码")
+           }
+         }
+        const uniqueStr = [...new Set(textarea.split(','))].join(',');
+        this.textarea = uniqueStr
       }
      },
      saveTextArea(){
         for(let i=0;i<this.recordInfo.recordData.length;i++){
           if(this.currentIndex == i){
             this.recordInfo.recordData[i].good_code = this.textarea
-
+            this.recordInfo.recordData[i].good_code_count = this.getTotal()
             // 去除换行符
             let noNewLineStr = this.textarea.replace(/\n/g, "");
             // 按逗号分割成数组
@@ -1096,6 +1130,19 @@
         }
         this.dialogVisible = false
       },
+     getGoodCode(val){
+        var newArr = []
+        var total = 0
+        if(val!=undefined){
+          newArr = val.split(",") 
+          total = newArr.length - 1
+          if(total >0){
+            return  total
+          }else{
+            return ""
+          }
+        }
+     }
     }
     ,
     created() {

src/xt_pages/stock/stockInOrderEdit.vue

@@ -310,6 +310,14 @@
               </div>
            </template>
        
+         </el-table-column>
+
+         <el-table-column label="追溯码数量" align="center" width="150">
+           
+           <template slot-scope="scope">
+               {{ getGoodCode(scope.row.good_code) }}
+           </template>
+       
          </el-table-column>
 
 
@@ -366,6 +374,9 @@
       title="耗材追溯码"
       :visible.sync="dialogVisible"
       width="40%">
+      <div style="margin-bottom: 10px;">
+        <span >追溯码个数:{{getTotal() }} 个</span>
+      </div>
       <span>
         <el-input
          @keyup.native="changeText"
@@ -491,6 +502,52 @@ export default {
     };
   },
   methods: {
+    changeText(event){
+      var  textAreaList = this.textarea.split(",")
+      if (event.key === 'Enter') {
+        var textarea = ""
+        textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
+        var  parts = textarea.split(',')
+        for(let i=0;i<textAreaList.length;i++){
+          if(parts[parts.length-2] == textAreaList[i]){
+              this.$message.error("该条码已经存在,不能重复扫码")
+          }
+        }
+        const uniqueStr = [...new Set(textarea.split(','))].join(',');
+        this.textarea = uniqueStr
+      }
+    },
+    getGoodCode(val){
+      var newArr = []
+      var total = 0
+      if(val!=undefined){
+        newArr = val.split(",") 
+        total = newArr.length - 1
+        if(total >0){
+          return  total
+        }else{
+        return ""
+       }
+      }
+     
+    },
+    getTotal(){
+      if(this.textarea!=null){
+        var  textAreaList = this.textarea.split(",")
+        var arr = []
+        if(textAreaList!=null && textAreaList.length>0){
+          for(let i=0;i<textAreaList.length;i++){
+            if(textAreaList[i]!=""){
+              arr.push(textAreaList[i])
+            }
+          }
+          return  arr.length
+        }else{
+          return ""
+        }
+      
+      }
+     },
     comfirm: function(val) {
       this.$refs.dialog.hide();
       this.propForm.goodType = [];
@@ -1060,14 +1117,18 @@ export default {
      },
      changeText(event){
       // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+      var  textAreaList = this.textarea.split(",")
       if (event.key === 'Enter') {
-        // var textarea = ""
-        // textarea += this.textarea + ","
-        // this.textarea = textarea
         var textarea = ""
          textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
-        this.textarea = textarea
-
+         var  parts = textarea.split(',')
+         for(let i=0;i<textAreaList.length;i++){
+           if(parts[parts.length-2] == textAreaList[i]){
+              this.$message.error("该条码已经存在,不能重复扫码")
+           }
+         }
+        const uniqueStr = [...new Set(textarea.split(','))].join(',');
+        this.textarea = uniqueStr
       }
      },
      saveTextArea(){

src/xt_pages/stock/stockInventoryModePrint.vue

@@ -101,7 +101,7 @@
               </td>
               <td align="center">
                 <span v-if="item.is_total == 0"> {{ getPackingPrice(item.good_id) }}</span>
-                <span v-if="item.is_total == 1"> {{ item.packing_price }}</span>
+                <span v-if="item.is_total == 1"> {{ item.buy_price }}</span>
               </td>
               <td align="center">
                 <span v-if="item.is_total == 0"> {{ (getOutCount(item.good_id) * getPackingPrice(item.good_id)).toFixed(2)
@@ -514,7 +514,7 @@ export default {
       var packing_price = ""
       for (let i = 0; i < this.goodInfo.length; i++) {
         if (good_id == this.goodInfo[i].id) {
-          packing_price = this.goodInfo[i].packing_price
+          packing_price = this.goodInfo[i].buy_price
         }
       }
       return packing_price
@@ -556,7 +556,7 @@ export default {
       var packing_price = ""
       for (let i = 0; i < this.goodInfo.length; i++) {
         if (good_id == this.goodInfo[i].id) {
-          packing_price = this.goodInfo[i].packing_price
+          packing_price = this.goodInfo[i].buy_price
         }
       }
       return packing_price

src/xt_pages/user/Informed/Informedconsent.vue

@@ -167,6 +167,18 @@
                 <div v-if="template_id==27">
                   <informef_Twentysevre></informef_Twentysevre>
                 </div>
+
+                <div v-if="template_id==30">
+                  <informef_Thrity></informef_Thrity>
+                </div> 
+
+                <div v-if="template_id==31">
+                  <informef_Thrity_One></informef_Thrity_One>
+                </div> 
+
+                <div v-if="template_id==32">
+                  <informef_Thrity_Two></informef_Thrity_Two>
+                </div> 
               </div>
             </div>
           </el-tab-pane>
@@ -205,6 +217,9 @@ import informef_Twentyfour from './components/informef_Twentyfour'
 import informef_Twentyfive from './components/informef_Twentyfive'
 import informef_Twentysix from './components/informef_Twentysix'
 import informef_Twentysevre from './components/informef_Twentysevre'
+import informef_Thrity from './components/informef_Thrity'
+import informef_Thrity_One  from './components/informef_Thrity_One.vue'
+import informef_Thrity_Two  from './components/informef_Thrity_Two.vue'
 import { getPatientDetailInformedconsent,getFallOutBedPrintList,getFilterInformed,getProfundaInformed,
   getArterOvernous,getHighRiskInformed,getPatientMeDicalList,getAnticoagulationInformed,getCriticalInformed,
   getHemoperfusionInformed,getInformedConsent,getCatheterization,getDialyzerInformed, getTherapyInformed,
@@ -237,7 +252,10 @@ export default {
     informef_Twentyfour,
     informef_Twentyfive,
     informef_Twentysix,
-    informef_Twentysevre
+    informef_Twentysevre,
+    informef_Thrity,
+    informef_Thrity_One,
+    informef_Thrity_Two
   },
   data() {
     return {
@@ -253,9 +271,13 @@ export default {
                 // {date:'疾病诊断证明书',value:'17'},{date:'无肝素血液透析风险知情同意书',value:'18'},
                 // {date:'连续肾脏替代治疗(CRRT)治疗知情同意书',value:'19'},{date:'患方要求终止治疗及风险、责任承担承诺书',value:'20'},
                 // {date:'血液透析知情同意书',value:'21'}
-                {date:'死亡病例讨论记录',value:'22'},{date:'拒绝或放弃医学治疗告知书',value:'23'},
+                {date:'死亡病例讨论记录',value:'22'},
+                {date:'拒绝或放弃医学治疗告知书',value:'23'},
                 // {date:'静脉留置导管护理宣教',value:'24'},{date:'血液净化中心首次透析病人护理宣教单',value:'25'},
                 // {date:'血液净化中心饮食宣教单',value:'26'},{date:'动静脉内瘘护理宣教单',value:'27'}
+                // {date:"血液净化抗凝治疗知情同意书",value:'30'},{date:"血液透析患者须知",value:'31'},
+                // {date:"授权委托书",value:'32'}
+
       ],
 
       face_show:true,

src/xt_pages/user/Informed/components/informef_Thrity.vue

@@ -0,0 +1,365 @@
+<template>
+  <div class="anticoagulation-consent">
+    <div class="toolbar">
+      <el-button type="primary" size="small" @click="editContent">编辑内容</el-button>
+      <el-button type="success" size="small" @click="printDocument">打印文档</el-button>
+      <el-button size="small" @click="resetForm">重置表单</el-button>
+    </div>
+
+    <div id="printable-content" class="document-container">
+      <h1 class="document-title">血液净化抗凝治疗知情同意书</h1>
+
+      <!-- 患者信息表格 -->
+      <table class="patient-info-table">
+        <tr>
+          <td width="25%"><strong>患者姓名</strong>: {{ form.patientName || '_________________' }}</td>
+          <td width="25%"><strong>性别</strong>: {{ form.gender || '______' }}</td>
+          <td width="25%"><strong>年龄</strong>: {{ form.age || '______' }}</td>
+          <td width="25%"><strong>病案号</strong>: {{ form.medicalRecordNo || '_________________' }}</td>
+        </tr>
+      </table>
+
+      <!-- 富文本内容区域 -->
+      <div class="rich-text-content" v-html="formattedContent"></div>
+    </div>
+
+    <!-- 富文本编辑器弹窗 -->
+    <el-dialog
+      title="编辑知情同意书内容"
+      :visible.sync="editorVisible"
+      width="80%"
+      top="5vh"
+    >
+      <keep-alive>
+        <editor ref="editor"
+                id="editor"
+                style="width: 100%"
+                v-bind:r_content="defaultContent">
+        </editor>
+      </keep-alive>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="editorVisible = false">取消</el-button>
+        <el-button type="primary" @click="saveContent">保存</el-button>
+      </span>
+    </el-dialog>
+
+    <!-- 患者信息编辑弹窗 -->
+    <el-dialog
+      title="编辑患者信息"
+      :visible.sync="patientInfoVisible"
+      width="50%"
+    >
+      <el-form label-width="100px">
+        <el-form-item label="患者姓名">
+          <el-input v-model="form.patientName"></el-input>
+        </el-form-item>
+        <el-form-item label="性别">
+          <el-select v-model="form.gender">
+            <el-option label="男" value="男"></el-option>
+            <el-option label="女" value="女"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="年龄">
+          <el-input v-model="form.age" type="number"></el-input>
+        </el-form-item>
+        <el-form-item label="病案号">
+          <el-input v-model="form.medicalRecordNo"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="patientInfoVisible = false">取消</el-button>
+        <el-button type="primary" @click="savePatientInfo">保存</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { printJS } from 'print-js'
+import Editor from '@/components/Editor'
+export default {
+  name: 'AnticoagulationConsentForm',
+  components: {
+    Editor
+  },
+  data() {
+    return {
+      editorVisible: false,
+      patientInfoVisible: false,
+      editorContent: '',
+      form: {
+        patientName: '',
+        gender: '男',
+        age: '',
+        medicalRecordNo: ''
+      },
+      defaultContent: `
+        <h3>疾病介绍和治疗建议</h3>
+        <p>&nbsp;&nbsp;医生已告知我患有__________，需血液净化治疗，治疗过程中需选择抗凝方式。</p>
+        
+        <h4>&nbsp;&nbsp;常用抗凝方式为：_低分子肝素钠_________</h4>
+        
+        <h3>血液净化抗凝治疗潜在风险和对策</h3>
+        <p>&nbsp;&nbsp;医生告知我血液净化抗凝治疗可能发生的一些风险，有些不常见的风险可能没有在此列出。</p>
+        
+        <ol>
+          <li>&nbsp;&nbsp;1.出血，如皮肤粘膜、消化道等脏器出血，手术伤口出血，严重时脑出血等。（少见）</li>
+          <li>&nbsp;&nbsp;2.过敏、血小板减少、骨质疏松、高脂血症、低钙血症、高钠血症和代谢性碱中毒等。（罕见）</li>
+          <li>&nbsp;&nbsp;3.体外循环（包括管道及透析器等）凝血，需及时更换管道及透析器等，费用增加，同时血液丢失，纤溶系统激活继发出血风险。</li>
+          <li>&nbsp;&nbsp;4.透析过程中或结束后发生血栓栓塞性疾病，严重者脑血栓形成。</li>
+          <li>&nbsp;&nbsp;5.其他不可预知的风险。</li>
+        </ol>
+        
+        <h3>特殊风险或主要高危因素</h3>
+        <p>&nbsp;&nbsp;我理解根据我个人的病情，我可能出现未包括在上述所交待并发症以外的风险：</p>
+        <p>&nbsp;&nbsp;一旦发生上述风险和意外，医生会采取积极应对措施。</p>
+        
+        <h3>患者知情选择</h3>
+        <ul>
+          <li>&nbsp;&nbsp;我的医生已经告知我将要进行的治疗方式、此次治疗及治疗后可能发生的并发症和风险、可能存在的其它治疗方法并且解答了我关于此次治疗的相关问题。</li>
+          <li>&nbsp;&nbsp;我同意在治疗中医生可以根据我的病情对预定的治疗方式做出调整。</li>
+          <li>&nbsp;&nbsp;我理解我的治疗需要多位医护人员共同进行。</li>
+          <li>&nbsp;&nbsp;我并未得到治疗百分之百成功的许诺。</li>
+        </ul>
+        
+        <div class="signature-section">
+          <div class="signature-row">
+            <div class="signature-box">
+              <p>患者签名: <span class="signature-line">_________________</span></p>
+              <p>签名日期: <span class="date-line">______年______月______日</span></p>
+            </div>
+            
+            <div class="signature-box">
+              <p class="note">如果患者无法签署知情同意书，请其授权的亲属在此签名:</p>
+              <p>患者授权亲属签名: <span class="signature-line">_________________</span></p>
+              <p>与患者关系: <span class="relationship-line">______</span></p>
+              <p>签名日期: <span class="date-line">______年______月______日</span></p>
+            </div>
+          </div>
+          
+          <div class="signature-row">
+            <div class="signature-box">
+              <h3>医生陈述</h3>
+              <p>我已经告知患者将要进行的手术方式、此次手术及术后可能发生的并发症和风险、可能存在的其它治疗方法并且解答了患者关于此次手术的相关问题。</p>
+              <p>医生签名: <span class="signature-line">_________________</span></p>
+              <p>签名日期: <span class="date-line">______年______月______日</span></p>
+            </div>
+          </div>
+        </div>
+      `,
+      editorConfig: {
+        height: 600,
+        language: 'zh_CN',
+        menubar: false,
+        plugins: [
+          'advlist autolink lists link image charmap print preview anchor',
+          'searchreplace visualblocks code fullscreen',
+          'insertdatetime media table paste code help wordcount'
+        ],
+        toolbar: 'undo redo | formatselect | bold italic | \
+                  alignleft aligncenter alignright alignjustify | \
+                  bullist numlist outdent indent | removeformat | help',
+        content_style: `
+          body { 
+            font-family: "SimSun", "宋体", serif; 
+            font-size: 14px; 
+            line-height: 1.5; 
+          }
+          h3 { 
+            font-size: 16px; 
+            font-weight: bold; 
+            margin: 15px 0 10px 0; 
+          }
+          h4 { 
+            font-size: 15px; 
+            font-weight: bold; 
+            margin: 12px 0 8px 0; 
+          }
+          ul, ol { 
+            margin: 10px 0 10px 20px; 
+          }
+          li { 
+            margin-bottom: 5px; 
+          }
+          p { 
+            margin: 8px 0; 
+          }
+          .signature-section { 
+            margin-top: 30px; 
+          }
+          .signature-row { 
+            margin-bottom: 20px; 
+          }
+          .signature-box { 
+            display: inline-block; 
+            margin-right: 40px; 
+            vertical-align: top; 
+          }
+          .note { 
+            font-style: italic; 
+            margin-bottom: 10px; 
+          }
+          .signature-line, .date-line, .relationship-line { 
+            display: inline-block; 
+            min-width: 150px; 
+            border-bottom: 1px solid #000; 
+          }
+          .date-line { 
+            min-width: 120px; 
+          }
+          .relationship-line { 
+            min-width: 80px; 
+          }
+        `
+      }
+    }
+  },
+  computed: {
+    formattedContent() {
+      return this.editorContent || this.defaultContent
+    }
+  },
+  created() {
+    this.loadFormData()
+  },
+  methods: {
+    loadFormData() {
+      getConsentForm().then(response => {
+        if (response.data) {
+          this.form = { ...this.form, ...response.data.form }
+          this.editorContent = response.data.content || this.defaultContent
+        }
+      })
+    },
+    editContent() {
+      this.editorContent = this.formattedContent
+      this.editorVisible = true
+      this.$nextTick(() => {
+        this.$refs.editor && this.$refs.editor.focus()
+      })
+    },
+    editPatientInfo() {
+      this.patientInfoVisible = true
+    },
+    saveContent() {
+      saveConsentForm({
+        form: this.form,
+        content: this.editorContent
+      }).then(() => {
+        this.$message.success('内容保存成功')
+        this.editorVisible = false
+      })
+    },
+    savePatientInfo() {
+      this.$message.success('患者信息已保存')
+      this.patientInfoVisible = false
+    },
+    printDocument() {
+      printJS({
+        printable: 'printable-content',
+        type: 'html',
+        documentTitle: '血液净化抗凝治疗知情同意书',
+        scanStyles: false,
+        style: `
+          @page { size: A4; margin: 1cm; }
+          body { font-family: "SimSun", "宋体", serif; font-size: 14px; line-height: 1.5; }
+          .document-title { text-align: center; font-size: 18px; font-weight: bold; margin-bottom: 20px; }
+          .patient-info-table { width: 100%; border-collapse: collapse; margin: 15px 0; }
+          .patient-info-table td { padding: 5px 0; }
+          .rich-text-content h3 { font-size: 16px; font-weight: bold; margin: 15px 0 10px 0; }
+          .rich-text-content h4 { font-size: 15px; font-weight: bold; margin: 12px 0 8px 0; }
+          .rich-text-content ul, .rich-text-content ol { margin: 10px 0 10px 20px; }
+          .rich-text-content li { margin-bottom: 5px; }
+          .rich-text-content p { margin: 8px 0; }
+          .signature-section { margin-top: 30px; }
+          .signature-row { margin-bottom: 20px; }
+          .signature-box { display: inline-block; margin-right: 40px; vertical-align: top; }
+          .note { font-style: italic; margin-bottom: 10px; }
+          .signature-line, .date-line, .relationship-line { 
+            display: inline-block; 
+            min-width: 150px; 
+            border-bottom: 1px solid #000; 
+          }
+          .date-line { min-width: 120px; }
+          .relationship-line { min-width: 80px; }
+        `
+      })
+    },
+    resetForm() {
+      this.$confirm('确定要重置表单内容吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.form = {
+          patientName: '',
+          gender: '男',
+          age: '',
+          medicalRecordNo: ''
+        }
+        this.editorContent = this.defaultContent
+        this.$message.success('表单已重置')
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.anticoagulation-consent {
+  padding: 20px;
+  background-color: #fff;
+  border: 1px solid #ebeef5;
+  border-radius: 4px;
+}
+
+.toolbar {
+  margin-bottom: 20px;
+  text-align: right;
+}
+
+.document-container {
+  font-family: "SimSun", "宋体", serif;
+  font-size: 14px;
+  line-height: 1.5;
+  color: #333;
+  padding: 20px;
+  background-color: #fff;
+}
+
+.document-title {
+  text-align: center;
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 20px;
+  color: #333;
+}
+
+.patient-info-table {
+  width: 100%;
+  margin: 15px 0;
+}
+
+.patient-info-table td {
+  padding: 5px 0;
+}
+
+.rich-text-content {
+  margin-top: 15px;
+}
+
+@media print {
+  .toolbar {
+    display: none;
+  }
+  
+  .anticoagulation-consent {
+    padding: 0;
+    border: none;
+  }
+  
+  .document-container {
+    padding: 0;
+  }
+}
+</style>

src/xt_pages/user/Informed/components/informef_Thrity_One.vue

@@ -0,0 +1,253 @@
+<template>
+    <div class="dialysis-instruction-form" style="border:1px solid gainsboro; padding:20px;">
+      <!-- 操作按钮区域 -->
+      <div class="action-buttons" style="position: relative; left: 400px; width: 250px; margin: 20px 0;">
+        <el-button type="primary" @click="editForm">编辑</el-button>
+        <el-button type="success" @click="printForm">打印</el-button>
+      </div>
+  
+      <!-- 打印内容区域 -->
+      <div id="print_content">
+        <div class="print_page_main_content">
+          <div class="content">
+            <div style="text-align: center; font-size: 20px;">{{ orgName }}</div>
+            <div style="text-align: center; font-size: 20px; margin-bottom: 20px;">血液透析患者须知</div>
+            
+            <!-- 患者基本信息 -->
+            <!-- <div class="patient-info">
+              <table style="width: 100%; border-collapse: collapse;">
+                <tr>
+                  <td style="width: 25%;">患者姓名：_________________</td>
+                  <td style="width: 25%;">性别：_________________</td>
+                  <td style="width: 25%;">年龄：_________________</td>
+                  <td style="width: 25%;">病历号：_________________</td>
+                </tr>
+                <tr>
+                  <td colspan="2">联系电话：_________________</td>
+                  <td colspan="2">身份证号：_________________</td>
+                </tr>
+              </table>
+            </div> -->
+  
+            <!-- 患者须知内容 -->
+            <div v-html="formContent"></div>
+          </div>
+        </div>
+      </div>
+  
+      <!-- 编辑对话框 -->
+      <el-dialog
+        title="编辑血液透析患者须知"
+        :visible.sync="dialogVisible"
+        width="70%"
+        top="5vh"
+      >
+        <div>
+          <h2 style="text-align: center;">血液透析患者须知</h2>
+          <keep-alive>
+        <editor ref="editor"
+                id="editor"
+                style="width: 100%"
+                v-bind:r_content="defaultContent">
+        </editor>
+      </keep-alive>
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="saveForm">保存</el-button>
+        </span>
+      </el-dialog>
+    </div>
+  </template>
+  
+  <script>
+  import print from "print-js";
+  import Editor from '@/components/Editor'
+  import { } from '@/api/dialysis'
+  
+  const defaultContent = `
+  <ol>
+    <li>我们认为每个患者都应当得到尊重，同时也希望您应当在每次治疗中发挥积极的作用，以保证治疗的有效性，并有助于提高您的生活质量。如果您对治疗有意见，请在不影响他人治疗的情况下进行沟通，我们会公正、及时地处理。</li>
+    
+    <li>您有权在安静、洁净的环境中进行治疗，您也应该成为环境的保持者。希望您的家人不要在透析过程中进入治疗区，这样会增加您和其他患者的感染机会，同时请您不要大声喧哗，随意走动，以免分散工作人员的注意力。您的家属或陪伴人员可以在专门的患者家属等候区等待。</li>
+    
+    <li>我们会为您提前安排一周的透析时间，请您积极配合治疗，按时来进行透析治疗。我们认为完整地完成每次透析是您治疗中最重要的一个环节。如果由于您个人或社会的原因不得不缩短，您应当在每次治疗开始时告诉您的医生。由于特殊原因，您需要临时改变您的透析治疗时间的安排，请至少提前半天与我们取得联系并得到认可,否则所产生耗材费用由你个人承担。我们透析时间是上午、下午。</li>
+    
+    <li>请您最好不要携带贵重物品进行治疗，如果带来应自己妥善保存。</li>
+    
+    <li>血液透析成本昂贵，为了维持净化中心的正常运作应按时付清透析费用。</li>
+    
+    <li>血管通路，包括动静脉内瘘，是您的生命线，您应该像爱护自己生命一样爱护它们。对于深静脉导管您应该保持局部的清洁，尽量减少插管处肢体的屈曲，注意固定的缝线有无脱落，导管有无滑出。注意防感染、防脱管、防血栓。对于动静脉内瘘，您要做到日常的检查和维护，特别要防止低血压的发生。</li>
+    
+    <li>为了使您有更好的生活质量您应自觉地控制每日摄入的钠盐和液体总量。在透析间期，您的体重每天增加不宜超过干体重的3-5%，要达到这个目标，您除了要控制水分的摄入外，更重要的是尽量少吃盐。</li>
+    
+    <li>患者的营养膳食原则是充足的热量，高蛋白质饮食。充足的热卡能维持您的体重和肌肉量，我们推荐您至少每天每公斤体重摄入35千卡的热量来维持目前的体重。蛋白质是机体组织生长、维持和修复所需要的。每天每公斤体重1.2克蛋白质是比较合适的摄入量；高钾会影响生命，所以含有较多钾的水果如桔子、香蕉、西瓜等，要限制食用。</li>
+    
+    <li>我们不鼓励您在透析治疗期间进食饭菜，因为这可能使您更容易出现透析并发症。如果您觉得饥饿，您可以带些零食食用。</li>
+    
+    <li>由于透析治疗需要使用抗凝药物，所以您在来透析的路上和透析结束回家时，特别注意防止磕碰、跌倒、外伤的发生，如有发生请告知且及时到医院就诊。</li>
+    
+    <li>对于血液透析患者，我们鼓励您重返工作岗位，您可以略微改变您的工作，使工作的压力更小些。我们也推荐您进行适当的锻炼以增强您的体能，而且还可以减少焦虑，提高您的自信心。</li>
+    
+    <li>如果您有任何紧急情况，您应该到距离您最近的医院就诊，同时和我们联系。联系电话：_________________</li>
+  </ol>
+  
+  <p>本须知仅提供您基本的血液透析知识，为了提高您的生活质量，您应该经常学习有关的知识或向我们工作人员询问。希望通过您的配合以及我们工作人员的努力，您在本中心不仅仅得到了疾病的治疗，而且能重新树立战胜疾病的信心。</p>
+  
+  <div style="display: flex; justify-content: space-between; margin-top: 50px;">
+    <div>
+      <p>患者签名：_________________</p>
+      <p>日期：______年______月______日</p>
+    </div>
+    <div>
+      <p>家属签名：_________________</p>
+      <p>日期：______年______月______日</p>
+    </div>
+  </div>
+  `
+  
+  export default {
+    components: {
+      Editor
+    },
+    props: {
+      patientId: {
+        type: Number,
+        default: null
+      },
+      initialData: {
+        type: Object,
+        default: () => ({})
+      }
+    },
+    data() {
+      return {
+        orgName: 'XX医院血液净化中心',
+        formContent: defaultContent,
+        dialogVisible: false,
+        patientInfo: {}
+      }
+    },
+    created() {
+      this.orgName = this.$store.getters.xt_user.org.org_name || 'XX医院血液净化中心'
+      this.loadData()
+    },
+    methods: {
+      loadData() {
+        if (this.patientId) {
+          getDialysisConsent(this.patientId).then(response => {
+            if (response.data.state === 1 && response.data.data.content) {
+              this.formContent = response.data.data.content
+            }
+          })
+        }
+      },
+      editForm() {
+        // this.dialogVisible = true
+        // this.$nextTick(() => {
+        //   this.$refs.editor.setContent(this.formContent)
+        // })
+        this.editorContent = this.formattedContent
+        this.dialogVisible = true
+        this.$nextTick(() => {
+            this.$refs.editor && this.$refs.editor.focus()
+        })
+      },
+      saveForm() {
+        const params = {
+          patient_id: this.patientId,
+          content: this.$refs.editor.getContent()
+        }
+        
+        saveDialysisConsent(params).then(response => {
+          if (response.data.state === 1) {
+            this.$message.success('保存成功')
+            this.formContent = params.content
+            this.dialogVisible = false
+            this.$emit('saved', response.data.data)
+          }
+        })
+      },
+      printForm() {
+        const style = `
+          @media print {
+            body { font-family: "Microsoft YaHei", SimSun; }
+            .content { padding: 20px; }
+            ol { font-size: 16px; line-height: 1.8; }
+            li { margin-bottom: 10px; }
+            p { font-size: 16px; line-height: 1.8; margin: 5px 0; }
+            table { width: 100%; border-collapse: collapse; }
+            table td { padding: 5px 10px; }
+          }
+        `
+        
+        printJS({
+          printable: 'print_content',
+          type: 'html',
+          documentTitle: '血液透析患者须知',
+          style: style,
+          scanStyles: false
+        })
+      }
+    },
+    watch: {
+      patientId(newVal) {
+        if (newVal) {
+          this.loadData()
+        }
+      },
+      initialData: {
+        deep: true,
+        handler(newVal) {
+          if (newVal && newVal.content) {
+            this.formContent = newVal.content
+          }
+        }
+      }
+    }
+  }
+  </script>
+  
+  <style scoped>
+  .dialysis-instruction-form {
+    background-color: white;
+    margin: 20px auto;
+    max-width: 900px;
+  }
+  
+  .content {
+    font-family: "Microsoft YaHei", SimSun;
+    line-height: 1.6;
+  }
+  
+  .content ol {
+    padding-left: 20px;
+  }
+  
+  .content li {
+    margin-bottom: 15px;
+    text-align: justify;
+  }
+  
+  .patient-info {
+    margin: 20px 0;
+    padding: 10px;
+    border: 1px solid #ddd;
+    background-color: #f9f9f9;
+  }
+  
+  @media print {
+    .action-buttons {
+      display: none;
+    }
+    
+    .dialysis-instruction-form {
+      border: none;
+      padding: 0;
+    }
+    
+    .content {
+      padding: 0;
+    }
+  }
+  </style>

src/xt_pages/user/Informed/components/informef_Thrity_Two.vue

@@ -0,0 +1,385 @@
+<template>
+    <div class="power-of-attorney">
+      <div class="toolbar">
+        <el-button type="primary" size="small" @click="editContent">编辑内容</el-button>
+        <el-button type="success" size="small" @click="printDocument">打印文档</el-button>
+        <el-button size="small" @click="resetForm">重置表单</el-button>
+      </div>
+  
+      <div id="printable-content" class="document-container">
+        <h1 class="document-title">授权委托书</h1>
+  
+        <div class="content" v-html="formattedContent"></div>
+  
+        <div class="signature-section">
+          <div class="signature-row">
+            <div class="signature-box">
+              <p><strong>委托人姓名:</strong> <span class="underline">{{ form.principalName || '_________________' }}</span></p>
+              <p><strong>性别:</strong> <span class="underline">{{ form.principalGender || '______' }}</span></p>
+              <p><strong>年龄:</strong> <span class="underline">{{ form.principalAge || '______' }}</span></p>
+              <p><strong>职业:</strong> <span class="underline">{{ form.principalOccupation || '_________________' }}</span></p>
+              <p><strong>工作单位:</strong> <span class="underline">{{ form.principalWorkplace || '_________________' }}</span></p>
+              <p><strong>住址:</strong> <span class="underline">{{ form.principalAddress || '_________________' }}</span></p>
+              <p><strong>联系电话:</strong> <span class="underline">{{ form.principalPhone || '_________________' }}</span></p>
+            </div>
+            
+            <div class="signature-box">
+              <p><strong>受委托人姓名:</strong> <span class="underline">{{ form.agentName || '_________________' }}</span></p>
+              <p><strong>性别:</strong> <span class="underline">{{ form.agentGender || '______' }}</span></p>
+              <p><strong>年龄:</strong> <span class="underline">{{ form.agentAge || '______' }}</span></p>
+              <p><strong>职业:</strong> <span class="underline">{{ form.agentOccupation || '_________________' }}</span></p>
+              <p><strong>工作单位:</strong> <span class="underline">{{ form.agentWorkplace || '_________________' }}</span></p>
+              <p><strong>住址:</strong> <span class="underline">{{ form.agentAddress || '_________________' }}</span></p>
+              <p><strong>与委托人的关系:</strong> <span class="underline">{{ form.relationship || '______' }}</span></p>
+              <p><strong>联系电话:</strong> <span class="underline">{{ form.agentPhone || '_________________' }}</span></p>
+            </div>
+          </div>
+          
+          <div class="signature-row" style="margin-top: 30px;">
+            <div class="signature-box">
+              <p>委托人(签字): <span class="signature-line">_________________</span></p>
+              <p>日期: <span class="date-line">______年______月______日</span></p>
+            </div>
+            
+            <div class="signature-box">
+              <p>受委托人(签字): <span class="signature-line">_________________</span></p>
+              <p>日期: <span class="date-line">______年______月______日</span></p>
+            </div>
+          </div>
+        </div>
+      </div>
+  
+      <!-- 富文本编辑器弹窗 -->
+      <el-dialog
+        title="编辑授权委托书内容"
+        :visible.sync="editorVisible"
+        width="80%"
+        top="5vh"
+      >
+        <keep-alive>
+          <editor ref="editor"
+                  id="editor"
+                  style="width: 100%"
+                  v-bind:r_content="defaultContent">
+          </editor>
+        </keep-alive>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="editorVisible = false">取消</el-button>
+          <el-button type="primary" @click="saveContent">保存</el-button>
+        </span>
+      </el-dialog>
+  
+      <!-- 信息编辑弹窗 -->
+      <el-dialog
+        title="编辑委托人/受委托人信息"
+        :visible.sync="infoVisible"
+        width="50%"
+      >
+        <el-tabs v-model="activeTab">
+          <el-tab-pane label="委托人信息" name="principal">
+            <el-form label-width="100px">
+              <el-form-item label="姓名">
+                <el-input v-model="form.principalName"></el-input>
+              </el-form-item>
+              <el-form-item label="性别">
+                <el-select v-model="form.principalGender">
+                  <el-option label="男" value="男"></el-option>
+                  <el-option label="女" value="女"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="年龄">
+                <el-input v-model="form.principalAge" type="number"></el-input>
+              </el-form-item>
+              <el-form-item label="职业">
+                <el-input v-model="form.principalOccupation"></el-input>
+              </el-form-item>
+              <el-form-item label="工作单位">
+                <el-input v-model="form.principalWorkplace"></el-input>
+              </el-form-item>
+              <el-form-item label="住址">
+                <el-input v-model="form.principalAddress"></el-input>
+              </el-form-item>
+              <el-form-item label="联系电话">
+                <el-input v-model="form.principalPhone"></el-input>
+              </el-form-item>
+            </el-form>
+          </el-tab-pane>
+          
+          <el-tab-pane label="受委托人信息" name="agent">
+            <el-form label-width="100px">
+              <el-form-item label="姓名">
+                <el-input v-model="form.agentName"></el-input>
+              </el-form-item>
+              <el-form-item label="性别">
+                <el-select v-model="form.agentGender">
+                  <el-option label="男" value="男"></el-option>
+                  <el-option label="女" value="女"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="年龄">
+                <el-input v-model="form.agentAge" type="number"></el-input>
+              </el-form-item>
+              <el-form-item label="职业">
+                <el-input v-model="form.agentOccupation"></el-input>
+              </el-form-item>
+              <el-form-item label="工作单位">
+                <el-input v-model="form.agentWorkplace"></el-input>
+              </el-form-item>
+              <el-form-item label="住址">
+                <el-input v-model="form.agentAddress"></el-input>
+              </el-form-item>
+              <el-form-item label="与委托人关系">
+                <el-input v-model="form.relationship"></el-input>
+              </el-form-item>
+              <el-form-item label="联系电话">
+                <el-input v-model="form.agentPhone"></el-input>
+              </el-form-item>
+            </el-form>
+          </el-tab-pane>
+        </el-tabs>
+        
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="infoVisible = false">取消</el-button>
+          <el-button type="primary" @click="saveInfo">保存</el-button>
+        </span>
+      </el-dialog>
+    </div>
+  </template>
+  
+  <script>
+  import { printJS } from 'print-js'
+  import Editor from '@/components/Editor'
+  
+  export default {
+    name: 'PowerOfAttorney',
+    components: {
+      Editor
+    },
+    data() {
+      return {
+        editorVisible: false,
+        infoVisible: false,
+        activeTab: 'principal',
+        editorContent: '',
+        form: {
+          principalName: '',
+          principalGender: '男',
+          principalAge: '',
+          principalOccupation: '',
+          principalWorkplace: '',
+          principalAddress: '',
+          principalPhone: '',
+          agentName: '',
+          agentGender: '男',
+          agentAge: '',
+          agentOccupation: '',
+          agentWorkplace: '',
+          agentAddress: '',
+          relationship: '',
+          agentPhone: ''
+        },
+        defaultContent: `
+          <p>现委托 <span class="underline">_________________</span> 作为我在 <span class="underline">_________________</span> 诊疗期间的代理人，代我行使诊疗工作中涉及病情、诊疗措施、医疗风险、医疗费用等事宜的知情同意权利，并代替我签署所有相关的医疗文件。</p>
+        `,
+        editorConfig: {
+          height: 600,
+          language: 'zh_CN',
+          menubar: false,
+          plugins: [
+            'advlist autolink lists link image charmap print preview anchor',
+            'searchreplace visualblocks code fullscreen',
+            'insertdatetime media table paste code help wordcount'
+          ],
+          toolbar: 'undo redo | formatselect | bold italic | \
+                    alignleft aligncenter alignright alignjustify | \
+                    bullist numlist outdent indent | removeformat | help',
+          content_style: `
+            body { 
+              font-family: "SimSun", "宋体", serif; 
+              font-size: 14px; 
+              line-height: 1.5; 
+            }
+            .underline {
+              text-decoration: underline;
+            }
+          `
+        }
+      }
+    },
+    computed: {
+      formattedContent() {
+        return this.editorContent || this.defaultContent
+      }
+    },
+    created() {
+      this.loadFormData()
+    },
+    methods: {
+      loadFormData() {
+        // 这里可以添加从服务器加载数据的逻辑
+        // getPowerOfAttorneyForm().then(response => {
+        //   if (response.data) {
+        //     this.form = { ...this.form, ...response.data.form }
+        //     this.editorContent = response.data.content || this.defaultContent
+        //   }
+        // })
+      },
+      editContent() {
+        this.editorContent = this.formattedContent
+        this.editorVisible = true
+        this.$nextTick(() => {
+          this.$refs.editor && this.$refs.editor.focus()
+        })
+      },
+      editInfo() {
+        this.infoVisible = true
+      },
+      saveContent() {
+        // 这里可以添加保存内容到服务器的逻辑
+        // savePowerOfAttorneyForm({
+        //   form: this.form,
+        //   content: this.editorContent
+        // }).then(() => {
+        //   this.$message.success('内容保存成功')
+        //   this.editorVisible = false
+        // })
+        this.$message.success('内容保存成功')
+        this.editorVisible = false
+      },
+      saveInfo() {
+        this.$message.success('信息已保存')
+        this.infoVisible = false
+      },
+      printDocument() {
+        printJS({
+          printable: 'printable-content',
+          type: 'html',
+          documentTitle: '授权委托书',
+          scanStyles: false,
+          style: `
+            @page { size: A4; margin: 1cm; }
+            body { font-family: "SimSun", "宋体", serif; font-size: 14px; line-height: 1.5; }
+            .document-title { text-align: center; font-size: 18px; font-weight: bold; margin-bottom: 20px; }
+            .content { margin: 15px 0; }
+            .underline { text-decoration: underline; }
+            .signature-section { margin-top: 30px; }
+            .signature-row { margin-bottom: 20px; }
+            .signature-box { display: inline-block; margin-right: 40px; vertical-align: top; width: 45%; }
+            .signature-line, .date-line { 
+              display: inline-block; 
+              min-width: 150px; 
+              border-bottom: 1px solid #000; 
+            }
+            .date-line { min-width: 120px; }
+          `
+        })
+      },
+      resetForm() {
+        this.$confirm('确定要重置表单内容吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.form = {
+            principalName: '',
+            principalGender: '男',
+            principalAge: '',
+            principalOccupation: '',
+            principalWorkplace: '',
+            principalAddress: '',
+            principalPhone: '',
+            agentName: '',
+            agentGender: '男',
+            agentAge: '',
+            agentOccupation: '',
+            agentWorkplace: '',
+            agentAddress: '',
+            relationship: '',
+            agentPhone: ''
+          }
+          this.editorContent = this.defaultContent
+          this.$message.success('表单已重置')
+        })
+      }
+    }
+  }
+  </script>
+  
+  <style scoped>
+  .power-of-attorney {
+    padding: 20px;
+    background-color: #fff;
+    border: 1px solid #ebeef5;
+    border-radius: 4px;
+  }
+  
+  .toolbar {
+    margin-bottom: 20px;
+    text-align: right;
+  }
+  
+  .document-container {
+    font-family: "SimSun", "宋体", serif;
+    font-size: 14px;
+    line-height: 1.5;
+    color: #333;
+    padding: 20px;
+    background-color: #fff;
+  }
+  
+  .document-title {
+    text-align: center;
+    font-size: 18px;
+    font-weight: bold;
+    margin-bottom: 20px;
+    color: #333;
+  }
+  
+  .content {
+    margin: 15px 0;
+  }
+  
+  .underline {
+    text-decoration: underline;
+  }
+  
+  .signature-section {
+    margin-top: 30px;
+  }
+  
+  .signature-row {
+    margin-bottom: 20px;
+  }
+  
+  .signature-box {
+    display: inline-block;
+    margin-right: 40px;
+    vertical-align: top;
+    width: 45%;
+  }
+  
+  .signature-line, .date-line {
+    display: inline-block;
+    min-width: 150px;
+    border-bottom: 1px solid #000;
+  }
+  
+  .date-line {
+    min-width: 120px;
+  }
+  
+  @media print {
+    .toolbar {
+      display: none;
+    }
+    
+    .power-of-attorney {
+      padding: 0;
+      border: none;
+    }
+    
+    .document-container {
+      padding: 0;
+    }
+  }
+  </style>

src/xt_pages/user/patients.vue

@@ -1688,7 +1688,13 @@
             birth.substr(6, 2)
 
           var age = jsGetAge(birthtwo, '-')
-          return age
+
+          if(age >0){
+            return age
+          }else{
+            return val.age
+          }
+         
       },
 
       OpenView(name, number, id) {

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
 //  // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))