数据

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

@@ -443,7 +443,7 @@
            <el-table-column
             prop="heparin"
             align="center"
-            label="累计血容量"
+            label="累计血容量(ml)"
             width="140"
             v-if="isShow('累计血容量')"
           >
@@ -776,7 +776,7 @@
          </el-col>
 
           <el-col :span="8" v-if=" isShow('累计血容量')">
-            <el-form-item label="累计血容量：">
+            <el-form-item label="累计血容量(ml)：">
               <el-input v-model="form.accumulated_blood_volume"></el-input>
             </el-form-item>
           </el-col>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -31,7 +31,7 @@
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
           <th v-if="isShow('抗凝剂')" width="92px">抗凝剂</th>
-          <th v-if="isShow('累计血容量')" width="92px">累计血容量</th>
+          <th v-if="isShow('累计血容量')" width="92px">累计血容量(ml)</th>
           <th v-if="isShow('血温监测')" width="92px">血温监测</th>
           <th v-if="isShow('尿素监测')" width="92px">尿素监测</th>
           <th v-if="isShow('血浓量')" width="92px">血浓量</th>

src/xt_pages/stock/inventory.vue

@@ -97,9 +97,9 @@
                 <span v-if="scope.row.checker_status == 2">正在盘点</span>
              </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="300">
+            <el-table-column label="操作" align="center" width="200">
                 <template slot-scope="scope">
-                  <el-button type="primary" size="small" @click="getInventory(scope.row.id,scope.row.checker_status)">校对</el-button>
+                  <!-- <el-button type="primary" size="small" @click="getInventory(scope.row.id,scope.row.checker_status)">校对</el-button> -->
                   <el-button type="primary" size="small" @click="getInventoryDetail(scope.row.id,scope.row.checker_status)">编辑</el-button>
                   <el-button type="danger" size="small" @click="deleteInventory(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
                 </template>
@@ -122,7 +122,7 @@
         width="1200px">
             <el-form :model="form" class="modifyDialog" label-width="120px">
                 <el-form-item label="耗材ID">
-                    <el-input v-model="form.good_id"></el-input>
+                    <el-input v-model="form.good_id" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="耗材名称">
                    <el-autocomplete
@@ -143,10 +143,10 @@
                  </el-autocomplete>
                 </el-form-item>
                 <el-form-item label="规格">
-                    <el-input v-model="form.specification_name"></el-input>
+                    <el-input v-model="form.specification_name" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="批号">
-                  <el-select v-model="form.number" filterable placeholder="请选择">
+                  <el-select v-model="form.number" filterable placeholder="请选择" @change="changeNumber">
                       <el-option
                         v-for="(item,index) in numberList"
                         :key="index"
@@ -157,28 +157,28 @@
                 </el-form-item>
 
                 <el-form-item label="单位">
-                    <el-input v-model="form.warehousing_unit"></el-input>
+                    <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="进货价">
-                    <el-input v-model="form.buy_price"></el-input>
+                    <el-input v-model="form.buy_price" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="零售价">
-                    <el-input v-model="form.packing_price"></el-input>
+                    <el-input v-model="form.packing_price" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="盘点数量">
                     <el-input v-model="form.count"></el-input>
                 </el-form-item>
                 <el-form-item label="库存">
-                    <el-input v-model="form.total"></el-input>
+                    <el-input v-model="form.total" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="产地">
                     <el-input v-model="form.good_origin_place"></el-input>
                 </el-form-item>
                 <el-form-item label="批准文号">
-                    <el-input v-model="form.license_number"></el-input>
+                    <el-input v-model="form.license_number" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="生产厂商">
-                    <el-input v-model="form.manufacturer"></el-input>
+                    <el-input v-model="form.manufacturer" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="备注">
                     <div style="display:flex;">
@@ -329,6 +329,47 @@
                     </template>
                     </el-autocomplete>
                 </el-form-item>
+               <el-form-item label="规格">
+                    <el-input v-model="form.specification_name" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="批号">
+                  <el-select v-model="form.number" filterable placeholder="请选择"  @change="changeNumber">
+                      <el-option
+                        v-for="(item,index) in numberList"
+                        :key="index"
+                        :label="item.number"
+                        :value="item.number">
+                      </el-option>
+                  </el-select>
+                </el-form-item>
+
+                <el-form-item label="单位">
+                    <el-input v-model="form.warehousing_unit" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="进货价">
+                    <el-input v-model="form.buy_price" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="零售价">
+                    <el-input v-model="form.packing_price" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="盘点数量">
+                    <el-input v-model="form.count" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="库存">
+                    <el-input v-model="form.total" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="产地">
+                    <el-input v-model="form.good_origin_place" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="批准文号">
+                    <el-input v-model="form.license_number" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="生产厂商">
+                    <el-input v-model="form.manufacturer" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="经销商">
+                    <el-input v-model="form.dealer" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
                <el-form-item label="盘点数量：">
                  <el-input v-model="form.count" style="width:200px"></el-input>
                </el-form-item>
@@ -360,6 +401,65 @@
           <el-form  :model="form">
             <el-row>
                <el-col>
+                <el-form-item label="耗材名称:">
+                      <el-autocomplete
+                          class="checkSearch"
+                          popper-class="my-autocomplete"
+                          v-model="form.good_name"
+                          :fetch-suggestions="querySearchAsync"
+                          :trigger-on-focus="true"
+                          placeholder="请输入耗材名称"
+                          @select="handleSelect"
+                          @input="changeGoodName(scope.$index)"
+                          style="width:160px;"
+                      >
+                          <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                      <template slot-scope="{ item }">
+                          <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
+                      </template>
+                      </el-autocomplete>
+                </el-form-item>
+                <el-form-item label="规格">
+                    <el-input v-model="form.specification_name" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="批号">
+                  <el-select v-model="form.number" filterable placeholder="请选择"  @change="changeNumber">
+                      <el-option
+                        v-for="(item,index) in numberList"
+                        :key="index"
+                        :label="item.number"
+                        :value="item.number">
+                      </el-option>
+                  </el-select>
+                </el-form-item>
+
+                <el-form-item label="单位">
+                    <el-input v-model="form.warehousing_unit" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="进货价">
+                    <el-input v-model="form.buy_price" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="零售价">
+                    <el-input v-model="form.packing_price" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="盘点数量">
+                    <el-input v-model="form.count" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="库存">
+                    <el-input v-model="form.total" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="产地">
+                    <el-input v-model="form.good_origin_place" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="批准文号">
+                    <el-input v-model="form.license_number" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="生产厂商">
+                    <el-input v-model="form.manufacturer" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
+                <el-form-item label="经销商">
+                    <el-input v-model="form.dealer" :disabled="true" style="width:200px"></el-input>
+                </el-form-item>
                <el-form-item label="盘点数量：">
                  <el-input v-model="form.count" style="width:200px"></el-input>
                </el-form-item>
@@ -482,7 +582,7 @@ export default {
          dealerList:[],
          goodList:[],
          currentIndex: 0,
-         inventory_status:"",
+         inventory_status:0,
          limit:10,
          page:1,
          doctorList:[],
@@ -591,6 +691,14 @@ export default {
           this.getlist()
         },
         addInventory(){
+           if(this.form.good_name == ""){
+             this.$message.error("请输入耗材名称")
+             return 
+           }
+           if(this.form.count == ""){
+             this.$message.error("请输入盘点数量")
+             return
+           }
            var obj = {
             good_id:this.form.good_id,
             good_name:this.form.good_name,
@@ -643,6 +751,18 @@ export default {
          if(response.data.state == 1){
            var msg = response.data.data.msg
            this.$message.success("保存成功")
+           this.tableData = []
+           this.form.good_id = ""
+           this.form.good_name = ""
+           this.form.specification_name = ""
+           this.form.manufacturer = ""
+           this.form.dealer = ""
+           this.form.good_origin_place = ""
+           this.form.buy_price = ""
+           this.form.packing_price = ""
+           this.form.count = ""
+           this.form.remark = ""
+           this.form.number = ""
            this.dialogVisible = false
            this.getlist()
          }
@@ -719,6 +839,14 @@ export default {
      },
      toEdit(row){
       this.form.good_name = row.good_name
+      this.form.specification_name = row.specification_name
+      this.form.number = row.number
+      this.form.warehousing_unit = row.warehousing_unit
+      this.form.manufacturer = row.manufacturer
+      this.form.dealer = row.dealer
+      this.form.buy_price = row.buy_price
+      this.form.packing_price = row.packing_price
+      this.form.good_origin_place = row.good_origin_place
       this.form.count = row.count
       this.form.remark = row.remark
       this.form.id = row.id
@@ -728,7 +856,14 @@ export default {
        for(let i=0;i<this.tableData.length;i++){
          if(this.form.id == this.tableData[i].id){
             this.tableData[i].good_name = this.form.good_name
-            // this.tableData[i].packing_price = this.form.packing_price
+            this.tableData[i].packing_price = this.form.packing_price
+            this.tableData[i].buy_price = this.form.buy_price
+            this.tableData[i].specification_name = this.form.specification_name
+            this.tableData[i].warehousing_unit = this.form.warehousing_unit
+            this.tableData[i].number = this.form.number
+            this.tableData[i].good_origin_place = this.form.good_origin_place
+            this.tableData[i].dealer = this.form.dealer
+            this.tableData[i].manufacturer = this.form.manufacturer
             this.tableData[i].count = this.form.count
             this.tableData[i].remark = this.form.remark
          }
@@ -766,9 +901,22 @@ export default {
           if(response.data.state == 1){
             var detail =  response.data.data.detail
             console.log("detial",detail)
+            this.form.good_name = detail.good_name
+            this.form.good_id = detail.good_id
+            this.form.specification_name = detail.specification_name
+            this.form.number = detail.number
+            this.form.license_number = detail.license_number
+            this.form.good_origin_place = detail.good_origin_place
+            this.form.dealer = detail.dealer
+            this.form.manufacturer = detail.manufacturer
             this.form.count = detail.count
             this.form.remark = detail.remark
+            this.form.warehousing_info_id = detail.warehousing_info_id
             this.id = detail.id
+            this.form.buy_price = detail.buy_price
+            this.form.packing_price = detail.packing_price
+            this.form.warehousing_unit = detail.warehousing_unit
+            this.form.total = detail.total
             this.modefiyePriceDialogVisible = true
 
           }
@@ -777,6 +925,18 @@ export default {
      modifyInventory(){
          var params = {
            id:this.id,
+           good_id:this.form.good_id,
+           good_name:this.form.good_name,
+           specification_name:this.form.specification_name,
+           number:this.form.number,
+           warehousing_unit:this.form.warehousing_unit,
+           buy_price:this.form.buy_price.toString(),
+           packing_price:this.form.packing_price.toString(),
+           total:parseInt(this.form.total),
+           good_origin_place:this.form.good_origin_place,
+           license_number:this.form.license_number,
+           dealer:this.form.dealer,
+           manufacturer:this.form.manufacturer,
            count:parseInt(this.form.count),
            remark:this.form.remark,
          }
@@ -901,7 +1061,15 @@ export default {
      changeEndTime(val){
        this.end_time = this.getTime(val)
        this.getlist()
+     },
+    changeNumber(val){
+      
+     for(let i=0;i<this.numberList.length;i++){
+       if(val == this.numberList[i].number){
+         this.form.warehousing_info_id = this.numberList[i].id
+       }
      }
+    }
     },
     created(){
       this.getlist()

src/xt_pages/stock/stockDamaged.vue

@@ -54,6 +54,16 @@
               <template  slot-scope="scope">
                 {{getTime(scope.row.start_time)}}
                </template>    
+            </el-table-column>
+            <el-table-column prop="date" label="耗材名称"  align="center">
+              <template  slot-scope="scope">
+                {{scope.row.good_name}}
+               </template>    
+            </el-table-column>
+            <el-table-column prop="date" label="耗材规格"  align="center">
+              <template  slot-scope="scope">
+                {{scope.row.specification_name}}
+               </template>    
             </el-table-column>
              <el-table-column prop="date" label="报损数量"  align="center">
               <template  slot-scope="scope">
@@ -81,7 +91,7 @@
                 <span v-if="scope.row.checker_status == 2">未核对</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作"  align="center">
+            <el-table-column label="操作"  align="center"  width="200" >
                 <template slot-scope="scope">
                 <el-button type="primary" size="small" @click="editStockDamage(scope.row.id,scope.row.checker_status)">编辑</el-button>
                 <el-button type="danger" size="small" @click="deleteStockDamage(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
@@ -132,7 +142,7 @@
                 <el-input v-model="form.specification_name" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="批号">
-                 <el-select v-model="form.number" filterable placeholder="请选择">
+                 <el-select v-model="form.number" filterable placeholder="请选择"  @change="chageNumberlist">
                   <el-option
                     v-for="(item,index) in numberList"
                     :key="index"
@@ -287,7 +297,7 @@
 
 <!-- 编辑 -->
       <el-dialog
-        title="编辑"
+        title="编辑报损"
         :visible.sync="editPriceDialogVisible"
         width="50%">
         <span>
@@ -316,7 +326,7 @@
                  <el-input v-model="form.specification_name" style="width:200px"></el-input>
                </el-form-item>
                <el-form-item label="批号">
-                 <el-select v-model="form.number" filterable placeholder="请选择">
+                 <el-select v-model="form.number" filterable placeholder="请选择"  @change="chageNumberlist">
                   <el-option
                     v-for="(item,index) in numberList"
                     :key="index"
@@ -326,7 +336,28 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="单位">
-                 <el-input v-model="form.warehousing_unit"></el-input>
+                 <el-input v-model="form.warehousing_unit" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+              <el-form-item label="进货价">
+                  <el-input v-model="form.buy_price" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+              <el-form-item label="零售价">
+                  <el-input v-model="form.packing_price" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+              <el-form-item label="库存">
+                  <el-input v-model="form.total" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+              <el-form-item label="产地">
+                  <el-input v-model="form.good_origin_place" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+              <el-form-item label="批准文号">
+                  <el-input v-model="form.license_number" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+              <el-form-item label="生产厂商">
+                  <el-input v-model="form.manufacturer" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+              <el-form-item label="供应商">
+                  <el-input v-model="form.dealer" style="width:200px" :disabled="true"></el-input>
               </el-form-item>
                 <el-form-item label="报损数量：">
                  <el-input v-model="form.count" style="width:200px"></el-input>
@@ -358,7 +389,62 @@
         <span>
           <el-form  :model="form">
             <el-row>
-               <el-col>
+             <el-col>
+                <el-form-item label="耗材名称:">
+                    <el-autocomplete
+                        class="checkSearch"
+                        popper-class="my-autocomplete"
+                        v-model="form.good_name"
+                        :fetch-suggestions="querySearchAsync"
+                        :trigger-on-focus="true"
+                        placeholder="请输入耗材名称"
+                        @select="handleSelect"
+                        @input="changeGoodName(scope.$index)"
+                        style="width:160px;"
+                    >
+                        <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                    <template slot-scope="{ item }">
+                        <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
+                    </template>
+                    </el-autocomplete>
+                </el-form-item>
+               <el-form-item label="规格：">
+                 <el-input v-model="form.specification_name" style="width:200px" :disabled="true"></el-input>
+               </el-form-item>
+               <el-form-item label="批号">
+                 <el-select v-model="form.number" filterable placeholder="请选择" @change="chageNumberlist">
+                  <el-option
+                    v-for="(item,index) in numberList"
+                    :key="index"
+                    :label="item.number"
+                    :value="item.number">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+               <el-form-item label="单位">
+                 <el-input v-model="form.warehousing_unit" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+              <el-form-item label="进货价">
+                  <el-input v-model="form.buy_price" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+              <el-form-item label="零售价">
+                  <el-input v-model="form.packing_price" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+              <el-form-item label="库存">
+                  <el-input v-model="form.total" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+              <el-form-item label="产地">
+                  <el-input v-model="form.good_origin_place" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+              <el-form-item label="批准文号">
+                  <el-input v-model="form.license_number" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+              <el-form-item label="生产厂商">
+                  <el-input v-model="form.manufacturer" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+              <el-form-item label="供应商">
+                  <el-input v-model="form.dealer" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
                <el-form-item label="报损数量：">
                  <el-input v-model="form.count" style="width:200px"></el-input>
                </el-form-item>
@@ -519,7 +605,11 @@ export default {
           this.form.packing_price = val.packing_price
           this.form.warehousing_order = val.warehousing_order
           this.form.license_number = val.license_number
-          this.form.dealer = val.dealer
+          if(this.form.dealer == 0){
+            this.form.dealer = ""
+          }else{
+            this.form.dealer = val.dealer
+          }
           this.form.manufacturer = val.manufacturer
           this.form.specification_name = val.specification_name
           this.form.remark = val.remark
@@ -555,6 +645,7 @@ export default {
           warehousing_info_id:0,
           product_date:this.form.product_date,
           expiry_date:this.form.expiry_date,
+          total:this.form.total,
         } 
         this.tableData.push(obj)
         this.form.good_id = 0
@@ -572,6 +663,7 @@ export default {
         this.form.dealer = ""
         this.form.number = ""
         this.form.good_id = ""
+        this.form.total= ""
       },
       saveReportStock(){
          for(let i = 0;i<this.tableData.length;i++){
@@ -600,6 +692,7 @@ export default {
             tableData:this.tableData,
           }
           console.log("params",params)
+       
         saveReportStock(params).then(response=>{
            if(response.data.state == 1){
              var msg = response.data.data.msg
@@ -715,6 +808,10 @@ export default {
       this.editPriceDialogVisible = true  
      },
      upatePrice(){
+       if(this.form.count == ""){
+         this.$message.error("请输入报损数量")
+         return false
+       }
        for(let i=0;i<this.tableData.length;i++){
          if(this.form.id == this.tableData[i].id){
             this.tableData[i].good_name = this.form.good_name
@@ -744,8 +841,22 @@ export default {
        getStockDamageDetail(id).then(response=>{
          if(response.data.state == 1){
            var detail = response.data.data.detail
+           console.log("hhhhh32233223",detail)
            this.form.count = detail.count
+           this.form.good_name = detail.good_name
+           this.form.specification_name = detail.specification_name
+           this.form.total = detail.total
+           this.form.buy_price = detail.buy_price
+           this.form.packing_price = detail.packing_price
+           this.form.good_origin_place = detail.good_origin_place
+           this.form.warehousing_unit = detail.warehousing_unit
+           this.form.manufacturer = detail.manufacturer
+           this.form.dealer = detail.dealer
+           this.form.license_number = detail.license_number
+           this.form.number = detail.number
            this.id = detail.id
+           this.form.good_id = detail.good_id
+           this.form.warehousing_info_id = detail.warehousing_info_id
            this.modifyPriceDialogVisible = true
          }
        })
@@ -754,8 +865,21 @@ export default {
         var params = {
           count:parseInt(this.form.count),
           id:this.id,
+          good_name:this.form.good_name,
+          specification_name:this.form.specification_name,
+          number:this.form.number,
+          warehousing_unit:this.form.warehousing_unit,
+          buy_price:this.form.buy_price.toString(),
+          packing_price:this.form.packing_price.toString(),
+          good_origin_place:this.form.good_origin_place,
+          manufacturer:this.form.manufacturer,
+          dealer:this.form.dealer,
+          license_number:this.form.license_number,
+          warehousing_info_id:this.form.warehousing_info_id,
+          good_id:this.form.good_id,
         }
         console.log("param2323",params)
+       
        modifyPrice(params).then(response=>{
          if(response.data.state ==1){
            var adjust = response.data.data.adjust
@@ -850,6 +974,14 @@ export default {
      changeEndTime(val){
        this.end_time = this.getTime(val)
        this.getlist()
+     },
+     chageNumberlist(val){
+       console.log("val2323322",val)
+       for(let i=0;i<this.numberList.length;i++){
+         if(this.numberList[i].number == val){
+            this.form.warehousing_info_id = this.numberList[i].id
+         }
+       }
      }
     },
     created(){

src/xt_pages/user/templateSummary.vue

@@ -109,10 +109,9 @@
                   </div>
                 </div>
 
-                <div style="padding:10px;line-height:20px;">阶段小结个体化透析方案:
-                  <!-- {{editObj.template_plan_content}} -->
+                <!-- <div style="padding:10px;line-height:20px;">阶段小结个体化透析方案:
                   <span v-html="editObj.template_plan_content"></span>
-                </div>
+                </div> -->
               </div>
             </el-col>
           </el-row>
@@ -315,7 +314,7 @@
                     </keep-alive>
                      <!-- <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_summary_content"></el-input> -->
                   </el-row>
-                  <el-row>
+                  <!-- <el-row>
                     <label class="title"><span class="name">阶段小结个体化透析方案</span> : </label>
                      <el-select v-model="form.template_plan_id" placeholder="请选择" @change="changeTempalte">
                         <el-option
@@ -332,8 +331,8 @@
                                 v-bind:r_content="form.template_plan_content">
                         </editor>
                     </keep-alive>
-                     <!-- <el-input style="margin:10px 0;" type="textarea"  autosize v-model="form.template_plan_content"></el-input> -->
-                  </el-row>
+                    
+                  </el-row> -->
                   <el-row>
                     <label class="title"><span class="name">阶段小结化验结果</span> : </label>
                     <el-button type="primary" @click="toInspection">选择检验检查</el-button>
@@ -578,16 +577,16 @@
                         :value="item.value">
                         </el-option>
                      </el-select>
-                      <keep-alive>
-                        <editor ref="editor"
-                                id="edit_editor1"
+                       <keep-alive>
+                        <editor ref="edit_neditor"
+                                id="edit_editor2"
                                 style="width: 800px"
                                 v-bind:r_content="form.template_summary_content">
                         </editor>
-                    </keep-alive>
+                      </keep-alive>
                      <!-- <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_summary_content"></el-input> -->
                   </el-row>
-                  <el-row>
+                  <!-- <el-row>
                     <label class="title"><span class="name">阶段小结个体化透析方案</span> : </label>
                      <el-select v-model="form.template_plan_id" placeholder="请选择" @change="changeTempalte">
                         <el-option
@@ -604,8 +603,7 @@
                                 v-bind:r_content="form.template_plan_content">
                         </editor>
                     </keep-alive>
-                     <!-- <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_plan_content"></el-input> -->
-                  </el-row>
+                  </el-row> -->
                   <el-row>
                     <label class="title"><span class="name">阶段小结化验结果</span> : </label>
                     <el-button type="primary" @click="toInspection">选择检验检查</el-button>
@@ -1294,8 +1292,7 @@
         console.log("年",year)
         var month = this.form.start_year+"-"+this.form.start_month+"-"+"01"
         console.log("月",this.$refs)
-        console.log("hhhhhh",this.$refs.edit_neditor.content)
-        console.log("ooooo",this.$refs.edit_neditorOne.content)
+      
 
          var params = {
             title:this.form.title,
@@ -1316,15 +1313,12 @@
             befor_weight:this.form.befor_weight.toString(),
             after_weight:this.form.after_weight.toString(),
             befor_pressure:this.form.befor_pressure,
-            // template_plan_content:this.form.template_plan_content,
-            template_plan_content:this.$refs.edit_neditor.content,
-            // template_inspection_content:JSON.stringify(this.form.template_inspection_content),
+            template_plan_content:"",
             admin_user_id:this.form.admin_user_id,
             record_time:this.form.record_time,
             after_pressure:this.form.after_pressure,
             template_summary_id:this.form.template_summary_id,
-            // template_summary_content:this.form.template_summary_content,
-            template_summary_content:this.$refs.edit_neditorOne.content,
+            template_summary_content:this.$refs.edit_neditor.content,
             template_plan_id:this.form.template_plan_id,
             template_inspection_id:this.form.template_inspection_id,
             patient_id:parseInt(this.patient_id),
@@ -1515,7 +1509,6 @@
                  this.form.template_plan_id = list.template_plan_id
                }
 
-               console.log("hhhhhhhhh",list.template_plan_id)
                this.form.template_summary_content =list.template_summary_content
                if(list.template_summary_id == 0){
                  this.form.template_summary_id = ""
@@ -1559,8 +1552,8 @@
         if(this.form.template_plan_id == ""){
            this.form.template_plan_id = 0
         }
-        if(this.dialysis_count == ""){
-            this.dialysis_count = 0
+        if(this.form.dialysis_count == ""){
+            this.form.dialysis_count = 0
         }
         var params = {
             id:this.form.id,
@@ -1584,8 +1577,8 @@
             befor_pressure:this.form.befor_pressure,
             // template_summary_content:this.form.template_summary_content,
             // template_plan_content:this.form.template_plan_content,
-            template_plan_content:this.$refs.editor.content,
-            template_summary_content:this.$refs.editorOne.content,
+            template_plan_content:"",
+            template_summary_content:this.$refs.edit_neditor.content,
             admin_user_id:this.form.admin_user_id,
             record_time:this.form.record_time,
             after_pressure:this.form.after_pressure,

src/xt_pages/user/templateSummaryPrint.vue

@@ -72,11 +72,11 @@
           </div>
         </div> 
       </div>
-      <div style="padding:20px 0;border-bottom:1px solid #000;min-height:200px;">
+      <!-- <div style="padding:20px 0;border-bottom:1px solid #000;min-height:200px;">
         <span style="font-weight:bold;">阶段小结个性化方案:</span>
-        <!-- <div style="line-height:24px;">{{patientList.template_plan_content}}</div> -->
+      
          <div v-html="patientList.template_plan_content"></div>
-      </div>
+      </div> -->
      <div style="margin-top:10px;">
        <span>记录医生:{{getPatientList(patientList.admin_user_id)}}</span>  
        <span style="margin-left:20px;">记录时间:{{getTime(patientList.record_time)}}</span>  

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -58,7 +58,7 @@
     </div>
     <div class="cell clearfix">
       <div  class="title"><span class="name">分区</span> :</div>
-      <div class="time">
+      <!-- <div class="time">
         <ul class>
           <li
             :class="item.id == zone ? 'active' : ''"
@@ -69,7 +69,15 @@
             {{ item.name }}
           </li>
         </ul>
-      </div>
+      </div> -->
+       <el-select v-model="zone" multiple placeholder="请选择" @change="changeZone">
+          <el-option
+            v-for="item in zoneList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+       </el-select>
     </div>
     <el-table
       :row-style="{ color: '#303133' }"
@@ -260,7 +268,8 @@ export default {
         {id:2,name:"未确认"},
       ],
       zone:"",
-      zoneList:[{id:0,name:"全部"}],
+      // zoneList:[{id:0,name:"全部"}],
+      zoneList:[],
     };
   },
   watch: {
@@ -274,8 +283,21 @@ export default {
 
   methods: {
     printAction() {
+       var zone = this.zone
+        var newArr = []
+        for(let i=0;i<this.zoneList.length;i++){
+           newArr.push(this.zoneList[i].id)
+        }
+        var arr = newArr.join(",")
+        var str = ""
+        if(this.zone == 0){
+           str = arr  
+        }
+        if(zone != 0){
+          str = zone.join(",")
+        }
       this.$router.push({
-        path: "/schedule/remind/print/next?week_type=" + this.week_type+"&week_time="+this.week_time+"&zone="+this.zone+"&prestatus="+this.pre_status
+        path: "/schedule/remind/print/next?week_type=" + this.week_type+"&week_time="+this.week_time+"&zone="+str+"&prestatus="+this.pre_status
       });
     },
    compare(property) {
@@ -289,13 +311,25 @@ export default {
         const start = moment().weekday(1).format('YYYY-MM-DD'); //本周一
         const end = moment().weekday(7).format('YYYY-MM-DD')
         // console.log("start",moment(start).unix())
-      
+        var zone = this.zone
+        var newArr = []
+        for(let i=0;i<this.zoneList.length;i++){
+           newArr.push(this.zoneList[i].id)
+        }
+        var arr = newArr.join(",")
+        var str = ""
+        if(this.zone == 0){
+           str = arr  
+        }
+        if(zone != 0){
+          str = zone.join(",")
+        }
         const params = {
           start_time:moment().week(moment().week() + 1).startOf('week').unix(),
           end_time:moment().week(moment().week() + 1).endOf('week').unix(),
           week_type:this.week_type,
           week_time:this.week_time,
-          zone:this.zone,
+          zone:str,
         }
         // const params = {
         //   start_time:1609603200,
@@ -546,7 +580,7 @@ export default {
          if(response.data.state == 1){
             var zonelist = response.data.data.zoneList
             this.zoneList.push(...zonelist)
-           
+            this.getNextScheduleWeekDay()
          }
       })
     },
@@ -574,6 +608,10 @@ export default {
         }
        return name
     }, 
+    changeZone(val){
+      this.zone = val
+      this.getNextScheduleWeekDay()
+    }
   },
   components: {
     WeekItem
@@ -586,7 +624,6 @@ export default {
       this.week_type = 7;
     }
     this.getAllZoneList()
-    this.getNextScheduleWeekDay();
     this.org_id = this.$store.getters.xt_user.org.id
    
   }

src/xt_pages/workforce/components/tableWeeks.vue

@@ -75,10 +75,10 @@
         </div>
         <div class="cell clearfix">
             <div class="title"><span class="name">分区</span> :</div>
-            <div class="time">
+            <!-- <div class="time">
                 <ul class>
                     <li
-                            :class="item.id == zone ? 'active' : ''"
+                          :class="item.id == zone ? 'active' : ''"
                             @click="selectZoneList(item.id)"
                             v-for="item in zoneList"
                             :key="item.id"
@@ -86,7 +86,15 @@
                         {{ item.name }}
                     </li>
                 </ul>
-            </div>
+            </div> -->
+            <el-select v-model="zone" multiple placeholder="请选择" @change="changeZone">
+              <el-option
+                v-for="item in zoneList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+            </el-select>
         </div>
         <el-table
                 v-loading="isloading"
@@ -437,9 +445,11 @@
           anticoagulant_zongliang: '',
           doctor_advice: ''
         },
-        zone: 0,
-        zoneList: [{ id: 0, name: '全部' }],
-        summarySchData: []
+        // zone: 0,
+        // zoneList: [{ id: 0, name: '全部' }],
+        summarySchData: [],
+        zone:0,
+        zoneList:[],
       }
     },
     watch: {
@@ -844,14 +854,40 @@
       }
       ,
       printAction() {
+        var zone = this.zone
+        var newArr = []
+        for(let i=0;i<this.zoneList.length;i++){
+           newArr.push(this.zoneList[i].id)
+        }
+        var arr = newArr.join(",")
+        var str = ""
+        if(this.zone == 0){
+           str = arr  
+        }
+        if(zone != 0){
+          str = zone.join(",")
+        }
         this.$router.push({
-          path: '/schedule/remind/print?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + this.zone
+          path: '/schedule/remind/print?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str
         })
       }
       ,
       signPrint() {
+        var zone = this.zone
+        var newArr = []
+        for(let i=0;i<this.zoneList.length;i++){
+           newArr.push(this.zoneList[i].id)
+        }
+        var arr = newArr.join(",")
+        var str = ""
+        if(this.zone == 0){
+           str = arr  
+        }
+        if(zone != 0){
+          str = zone.join(",")
+        }
         this.$router.push({
-          path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + this.zone + '&prestatus=' + this.pre_status
+          path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status
         })
       }
       ,
@@ -915,11 +951,26 @@
       ,
 
       getScheduleList() {
+        
+        var zone = this.zone
+        var newArr = []
+        for(let i=0;i<this.zoneList.length;i++){
+           newArr.push(this.zoneList[i].id)
+        }
+        var arr = newArr.join(",")
+        var str = ""
+        if(this.zone == 0){
+           str = arr  
+        }
+        if(zone != 0){
+          str = zone.join(",")
+        }
         const params = {
           week_type: this.week_type,
           week_time: this.week_time,
-          zone: this.zone
+          zone: str,
         }
+        console.log("param",params)
         this.scheduleData = []
         this.isloading = true
         getScheduleList(params).then(response => {
@@ -1433,7 +1484,7 @@
           if (response.data.state == 1) {
             var zonelist = response.data.data.zoneList
             this.zoneList.push(...zonelist)
-
+            this.getScheduleList()
           }
         })
       }
@@ -1464,6 +1515,10 @@
         }
         console.log('name', name)
         return name
+      },
+      changeZone(val){
+        this.zone = val
+        this.getScheduleList()
       }
     },
     components: {
@@ -1471,6 +1526,7 @@
     }
     ,
     created() {
+      this.getAllZoneList()
       this.modeOptions = this.$store.getters.treatment_mode
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
       this.week_type = new Date().getDay()
@@ -1478,8 +1534,8 @@
         this.week_type = 7
       }
       this.org_id = this.$store.getters.xt_user.org.id
-      this.getScheduleList()
-      this.getAllZoneList()
+     
+     
     }
   }
 </script>