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

src/api/drug/drug_stock.js

@@ -1,11 +1,7 @@
 import request from '@/utils/request'
 
 export function postDrugWarehouse(params, warehousing_time, manufacturer_id, dealer_id, type) {
-  console.log("params----",params)
-  console.log("warehousintg",warehousing_time)
-  console.log("manufactureer_id",manufacturer_id)
-  console.log("dealer_id",dealer_id)
-  console.log("type",type)
+
   return request({
     url: '/api/drugwarehouse/create?warehousing_time=' + warehousing_time + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type,
     method: 'post',

src/api/role/admin.js

@@ -39,7 +39,7 @@ export function addAdmin(mobile, name, type, title, role, intro, user_title_name
     department_id:department_id,
   }
   console.log("epa",department_id,department)
-  
+
   return request({
     url: '/api/admin/add',
     method: 'post',
@@ -72,8 +72,8 @@ export function modifyAdmin(uid, name, type, title, role, intro, user_title_name
     department:department,
     department_id:department_id
   }
- 
- 
+
+
   return request({
     url: '/api/admin/edit',
     method: 'post',
@@ -110,3 +110,4 @@ export function submitDialysisRecordPermissionUsers(ids_str) {
     params: params
   })
 }
+

src/router/modules/dialysis.js

@@ -292,6 +292,18 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/seventeen',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_seventeen'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_seventeen',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/twenty',
       component: () =>

src/xt_pages/data/components/addDrugs.vue

@@ -212,7 +212,7 @@
               <el-input v-model="form.agent" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item> -->
 
-          <el-form-item label="经销商 : " prop="manufacturer" style="width:100%">
+          <el-form-item label="经销商 : " prop="dealer" style="width:100%">
              
                <el-select v-model="form.dealer" style="width:100%;" filterable placeholder="请选择">
                   <el-option
@@ -446,7 +446,8 @@
           last_price: [{ required: true, message: '请填写上次进价',trigger: 'blur'  }],
           drug_classify: [{ required: true, message: '请选择药物分类',trigger: 'change'  }],
           drug_dose: [{ required: true, message: '请填写剂量',trigger: 'blur'  }],
-          manufacturer: [{ required: true, message: '请选择生产产商',trigger: 'change'  }]
+          manufacturer: [{ required: true, message: '请选择生产产商',trigger: 'change'  }],
+          dealer:[{required:true,message:'请选择经销商',trigger:'change'}]
         },
         page:1,
         limit:500,
@@ -598,7 +599,7 @@
         form['is_charge_use'] = this.form.is_charge_use
         form['drug_code'] = this.form.drug_code
         form['drug_classify'] = this.form.drug_classify
-
+        form['dealer'] = this.form.dealer
 
 
         return form

src/xt_pages/data/components/drugTable.vue

@@ -199,6 +199,7 @@
         this.temp.config_field = newValue.replace(/[^A-Za-z]/g, "");
       },
       handleRowChange(currentRow, oldCurrentRow) {
+       
         if (currentRow != undefined) {
           this.currentId = currentRow.id;
           bus.$emit("drugParentChangeId", currentRow);

src/xt_pages/data/components/drugTableSon.vue

@@ -84,6 +84,17 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+             <el-form-item label="代码" prop="order" v-show="showOne">
+              <el-input
+                type="age"
+                v-model="temp.code"
+                placeholder="请输入代码"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-form-item :label="$t('data_config.remark')">
           <el-input
             type="textarea"
@@ -203,7 +214,8 @@
           field_name: undefined,
           value: "",
           remark: "",
-          orders: 0
+          orders: 0,
+          code:""
         },
         dialogFormVisible: false,
         dialogStatus: "",
@@ -223,7 +235,8 @@
         },
         downloadLoading: false,
         parentConfig: undefined,
-        addState: true
+        addState: true,
+        showOne:false
       };
     },
     computed: {
@@ -260,6 +273,14 @@
     mounted() {
       var _this = this;
       bus.$on("drugParentChangeId", function(parentData) {
+        console.log("parentData22222",parentData)
+         if(parentData.name == "药品剂型"){
+           console.log("333333")
+           _this.showOne = true
+         }else{
+           _this.showOne = false
+         }
+
         _this.parentConfig = parentData;
         // _this.list = parentData.childs
         console.log(parentData)
@@ -368,8 +389,11 @@
         });
       },
       createData() {
+        
         this.$refs["dataForm"].validate(valid => {
           if (valid) {
+            console.log("33333333",this.temp)
+           
             createDictionaryChildConfig(this.temp).then(response => {
               if (!response.data) {
                 // 由于mockjs 不支持自定义状态码只能这样hack

src/xt_pages/data/components/drugs.vue

@@ -332,6 +332,8 @@
           })
         } else if (val.id == 0) {
           //新增
+          console.log("vale222222",val)
+         
           createBaseDrugLib(val).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)

src/xt_pages/device/airDisinfect.vue

@@ -48,7 +48,7 @@
                   {{getName(scope.row.creator)}}
                 </template>
             </el-table-column>
-            <el-table-column label="检查结果" width="180">
+            <el-table-column label="检查结果" min-width="180">
                 <template slot-scope="scope">
                    {{scope.row.detection_result}}
                 </template>

src/xt_pages/device/objectTableDisinfect.vue

@@ -49,7 +49,7 @@
                   {{getName(scope.row.creator)}}
                 </template>
             </el-table-column>
-            <el-table-column label="检查结果" width="180">
+            <el-table-column label="检查结果" min-width="180">
                 <template slot-scope="scope">
                    {{scope.row.detection_result}}
                 </template>

src/xt_pages/dialysis/batch_print/batch_print_order_thirteen.vue

@@ -387,7 +387,7 @@
                   </div>
                   出血
                   <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
-                    {{ record.assessment_before_dislysis.is_hemorrhage == 1 && record.assessment_before_dislysis.hemorrhage ? record.assessment_before_dislysis.hemorrhage : "" }}
+                    {{ record.assessment_before_dislysis.is_hemorrhage == 1 && (record.assessment_before_dislysis.hemorrhage || record.assessment_before_dislysis.hemorrhage_other)? record.assessment_before_dislysis.hemorrhage + " " + record.assessment_before_dislysis.hemorrhage_other : "" }}
                   </div>
                   跌倒风险预防措施
                   <div class="inline_block under_line" style="width:100px;text-align: center;">

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -160,6 +160,16 @@
           >批量打印</el-button
         >
       </template>
+      <template v-if="this.template_id == 17">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template>
       <template v-if="this.template_id == 20">
         <el-button
           size="small"
@@ -801,6 +811,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/thirteen" });
       } else if (this.template_id == 15) {
         this.$router.push({ path: "/dialysis/print/batch/fifteen" });
+      } else if (this.template_id == 17) {
+        this.$router.push({ path: "/dialysis/print/batch/seventeen" });
       } else if (this.template_id == 20) {
         this.$router.push({ path: "/dialysis/print/batch/twenty" });
       } else if (this.template_id == 22) {

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -434,11 +434,13 @@ export default {
      
       this.schedulType = scheduleType;
       this.listQuery.schedul_type = scheduleType;
+      console.log("班次",this.listQuery.schedul_type)
       this.requestSchedualDoctors(this.time);
     },
     selectPartitionType(partitionType) {
       this.partitionType = partitionType;
       this.listQuery.partition_type = partitionType;
+      console.log("分区",this.listQuery.partition_type)
       this.requestSchedualDoctors(this.time);
     },
     
@@ -480,17 +482,19 @@ export default {
         }
 
         let newTime =  moment(time).format('YYYY-MM-DD')
-        getSchedualDoctors({
-        date: newTime,
-        patient_type: 0,
-        advice_type: 2,
-        delivery_way:name}).then(rs => {
+       
+         var schedule_type = this.listQuery.schedul_type
+         var partition_type = this.listQuery.partition_type
+        
+        console.log("班次",schedule_type,"分区",partition_type)
+        getSchedualDoctors({date: newTime,patient_type: 0,advice_type: 2,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type}).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
             this.admin_users = resp.data.adminUser
             var schedules = resp.data.scheduals
-            console.log("schedules",schedules)
+            console.log("列表数据",schedules)
             var config = resp.data.config
+            console.log("config222222",config.is_open)
            if(config.is_open == 0){
             this.show = true
             this.showOne = false
@@ -512,6 +516,7 @@ export default {
                     arr.push(it)
                 })
             })
+            console.log("班次3333333",this.schedulType)
             if(this.schedulType == 0){
                 newSchedules = arr
             }else{
@@ -522,7 +527,7 @@ export default {
                 })
             }
             
-            
+            console.log("分区",this.partitionType)
             if(this.partitionType == 0){
                 this.scheduleMap = newSchedules
             }else {
@@ -609,9 +614,8 @@ export default {
             })
             this.indexInfoList = newArr
            }
-         
-  
          }
+         console.log("列表22222",this.scheduleMap)
         })
     },
     getValue: function(val) {

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -305,7 +305,7 @@
         </div>
         出血
         <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
-          {{ predialysis.is_hemorrhage == 1 && predialysis.hemorrhage ? predialysis.hemorrhage : "" }}
+          {{ predialysis.is_hemorrhage == 1 && (predialysis.hemorrhage || predialysis.hemorrhage_other) ? predialysis.hemorrhage + " " + predialysis.hemorrhage_other : "" }}
         </div>
         跌倒风险预防措施
         <div class="inline_block under_line" style="width:100px;text-align: center;">

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -204,11 +204,11 @@
                     </td>
                     <td width="50">
                       <div>
-                        <label-box :isChecked="predialysis.hemorrhage_other != '' ? true : false" showValue="其他"></label-box>
+                        <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage_other != '' ? true : false" showValue="其他"></label-box>
                       </div>
                     </td>
                     <td width="100">
-                        <div class="under-line">&nbsp;{{ predialysis.hemorrhage_other ? predialysis.hemorrhage_other : '' }}</div>
+                        <div class="under-line">&nbsp;{{ predialysis.is_hemorrhage == 1 && predialysis.hemorrhage_other ? predialysis.hemorrhage_other : '' }}</div>
                     </td>
                     <td></td>
                   </tr>

src/xt_pages/home/index.vue

@@ -201,7 +201,8 @@ export default {
       }
     },
     jump(id) {
-      this.$router.push({ path: "patients/inspection?id=" + id });
+      // this.$router.push({ path: "patients/inspection?id=" + id });
+      this.$router.push({path:"/patients/patients/"+id+"/inspectionInfectious"})
     },
     handleSizeChange(val) {},
     handleCurrentChange(val) {

src/xt_pages/outpatientCharges/summary.vue

@@ -40,7 +40,7 @@
           <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
         </div>
         <div>
-          <el-popover
+          <!-- <el-popover
             placement="bottom"
             width="210"
             trigger="click">
@@ -48,7 +48,7 @@
             <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
             <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
 
-          </el-popover>
+          </el-popover> -->
           <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
         </div>
       </div>

src/xt_pages/role/components/AdminInfoForm.vue

@@ -37,24 +37,10 @@
         </el-select>
       </el-form-item>
 
-
-      <el-form-item label="科室:">
-         <el-select v-model="form.department_id" placeholder="科室">
-          <el-option
-            v-for="item in departMent"
-            :label="item.name"
-            :value="item.id"
-            :key="item.id"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-
       <el-form-item label="职位 : ">
         <el-input v-model="form.user_title_name" placeholder="输入职位"></el-input>
       </el-form-item>
 
-       
-
       <el-form-item label="介绍 : ">
         <Tinymce :height="400" menubar ref="editor" v-model="form.intro" :show_upload_img="false"/>
       </el-form-item>
@@ -69,7 +55,7 @@
 <script>
   import Tinymce from '@/components/Tinymce'
   import { addAdmin, getAddAdminInitData, getModifyAdminInitData, modifyAdmin } from '@/api/role/admin'
-  import { getAllDePartmentList } from "@/api/project/project"
+
   export default {
     name: 'AdminInfoForm',
     components: {
@@ -132,10 +118,7 @@
           user_title: '',
           role: '', // 其实应该是 int 类型
           intro: '',
-          department:'',
-          department_id:"",
         },
-        departMent:[],
         rules: {
           mobile: [{ required: true, validator: checkMobile, trigger: 'blur' }],
           name: [{ required: true, validator: checkName, trigger: 'blur' }],
@@ -153,7 +136,7 @@
           this.loading = false
           return
         }
-         // let localthis.$store.getters.xt_user.user.id
+        // let localthis.$store.getters.xt_user.user.id
         let local_user_id = this.$store.getters.xt_user.user.id
         this.form.id = this.admin_id
         if (this.admin_id === 0) {
@@ -176,7 +159,7 @@
             .then(rs => {
               this.loading = false
               var resp = rs.data
-              
+
               if (resp.state === 1) {
                 // this.roles.push(...resp.data.roles)
                 this.roles = resp.data.roles
@@ -226,7 +209,6 @@
                 }
                 this.form.user_title = admin.user_title
                 this.form.role = admin.role_ids
-                this.form.department_id = admin.department_id
                 this.form.role_ids = []
                 for (let i = 0; i < this.form.role.split(",").length; i++) {
                   if (this.form.role.split(',')[i].length > 0) {
@@ -273,16 +255,7 @@
 
         this.dialogFormVisible = true
       },
-      submitAction: function() {   
-       console.log("第是",this.form.department_id)  
-        var department = ""
-        for(let i=0;i<this.departMent.length;i++){
-          if(this.form.department_id == this.departMent[i].id){
-              department = this.departMent[i].name
-          }
-        }
-        this.form.department = department
-        
+      submitAction: function() {
         if (this.admin_id < 0) {
           return
         }
@@ -294,7 +267,6 @@
             }
 
             this.loading = true
-            console.log("id-----",this.form.id)
             if (this.form.id === 0) {
               this.form.role = this.form.role_ids.join(',')
               addAdmin(
@@ -304,40 +276,38 @@
                 this.form.user_title,
                 this.form.role,
                 this.form.intro,
-                this.form.user_title_name,
-                this.form.department,
-                this.form.department_id,
+                this.form.user_title_name
               ).then(rs => {
-                  this.loading = false
-                  var resp = rs.data
-                  if (resp.state === 1) {
-                    this.$store.dispatch('DidChangeAdmins')
-                    var _this = this
-                    setTimeout(() => {
-                      _this.$store.dispatch('RecoverAdminsChangeState')
-                    }, 500)
-                    this.dialogFormVisible = false
-                  } else {
-                    this.$message.error(resp.msg)
-                  }
-                })
+                this.loading = false
+                var resp = rs.data
+                if (resp.state === 1) {
+                  this.$store.dispatch('DidChangeAdmins')
+                  var _this = this
+                  setTimeout(() => {
+                    _this.$store.dispatch('RecoverAdminsChangeState')
+                  }, 500)
+                  this.dialogFormVisible = false
+                } else {
+                  this.$message.error(resp.msg)
+                }
+              })
                 .catch(err => {
                   this.loading = false
                   this.$message.error(err)
                 })
             } else {
               this.form.role = this.form.role_ids.join(',')
-             
-               var department = ""
-               for(let i=0;i<this.departMent.length;i++){
-                if(this.form.department_id == this.departMent[i].id){
-                    department = this.departMent[i].name
-                }
-              }
-              this.form.department = department
-           
-             
-              modifyAdmin(this.form.id,this.form.name,this.form.user_type,this.form.user_title,this.form.role,this.form.intro, this.form.user_title_name,this.form.sort,this.form.department,this.form.department_id).then(rs => {
+
+              modifyAdmin(
+                this.form.id,
+                this.form.name,
+                this.form.user_type,
+                this.form.user_title,
+                this.form.role,
+                this.form.intro,
+                this.form.user_title_name,
+              )
+                .then(rs => {
                   this.loading = false
                   var resp = rs.data
                   if (resp.state === 1) {
@@ -361,23 +331,8 @@
             return false
           }
         })
-      },
-
-      getlist(){
-        getAllDePartmentList().then(response=>{
-         if(response.data.state == 1){
-           var department =   response.data.data.departMent
-           console.log("department2222",department)
-           this.departMent = department
-         
-         }
-        })
       }
-    },
-
-    created(){
-        //获取所有科室
-       this.getlist()
     }
   }
 </script>
+

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -131,7 +131,7 @@
               </el-checkbox-group>
             </el-form-item>
 
-           <!-- <el-form-item label="经销商 : " prop="manufacturer" style="width:100%">
+           <el-form-item label="经销商 : " prop="manufacturer" style="width:100%">
              
                <el-select v-model="form.dealer" style="width:100%;" filterable placeholder="请选择">
                   <el-option
@@ -141,7 +141,7 @@
                     :value="item.id">
                   </el-option>
               </el-select>
-           </el-form-item> -->
+           </el-form-item>
 
 
             <el-form-item label="备注 : " prop="name" style="width:100%;">

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -638,7 +638,7 @@ export default {
             console.log("stockTotal",stockTotal)
             this.stockTotal = stockTotal
             var list =  response.data.data.list
-            console.log("导出数据",list)
+            // console.log("导出数据",list)
             for(let i=0;i<list.length;i++){
               if (list[i].query_warehouseout_info.length > 0) {
                 this.tableList.push(list[i])

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -337,7 +337,7 @@ export default {
     //  this.start_time = agoDay
     //  console.log("333333332222",this.start_time)
     this.GetWarehouse();
-    this.GetConfigInfo();
+    // this.GetConfigInfo();
     this.fetchAllAdminUsers();
   },
   data() {
@@ -485,6 +485,7 @@ export default {
         console.log(response);
         if (response.data.state == 1) {
           this.adminUserOptions = response.data.data.users;
+          console.log("制单人2222222",this.adminUserOptions)
           var alen = this.adminUserOptions.length;
           for (let index = 0; index < alen; index++) {
             if (this.adminUserOptions[index].user_type == 2) {

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -567,6 +567,7 @@
           manufacturer_id: this.form.manufacturer,
           dealer_id: this.form.dealer
         }
+        console.log("2222",this.form.dealer)
         GetAllDrugInfoByID(params).then(response => {
           
             if (response.data.state == 0) {
@@ -581,12 +582,12 @@
                 this.$message.error('该厂商或经销商没有药品信息')
                 return
               }
-              this.$refs.dialog.show()
               for (let i = 0; i < response.data.data.drugs.length; i++) {
                 this.propForm.goods.push(
                   response.data.data.drugs[i]
                 );
               }
+              this.$refs.dialog.show()
               const obj = {};
               this.propForm.goods = this.propForm.goods.reduce(
                 (cur, next) => {
@@ -595,6 +596,7 @@
                 },
                 []
               ); // 设置cur默认类型为数组，并且初始值为空的数组
+              
             }
 
             for (let i = 0; i < this.propForm.goods.length; i++) {
@@ -678,7 +680,8 @@
 
       }, 
       changeDealer(val) {
-
+        this.form.dealer = val;
+        this.propForm.goods= []
       },
       getDataConfig(module, filed_name){
         return getDataConfig(module, filed_name)

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -576,7 +576,10 @@ export default {
       this.propForm.manufacturer = val;
     },
     changeDealer(val) {
+      this.propForm.goods = []
       this.propForm.dealer = val;
+      this.form.dealer = val
+     
     },
     getDataConfig(module, filed_name){
      return getDataConfig(module, filed_name)

src/xt_pages/user/patients.vue

@@ -1330,6 +1330,7 @@
         this.getList()
       },
       getList() {
+        console.log("parasm2222",this.listQuery)
         fetchList(this.listQuery).then(response => {
           if (response.data.state === 0) {
             this.$message.error(response.data.msg)

src/xt_pages/user/vascularAccess.vue

@@ -55,6 +55,33 @@
            <span v-if="scope.row.stop_time>0&&(scope.row.stop_time - scope.row.start_time)/86400 != 0">{{(scope.row.stop_time - scope.row.start_time)/86400}}</span>
           </template>
       </el-table-column>
+       
+      <el-table-column prop="date" label="导管感染转归" align="center" width="120">
+          <template slot-scope="scope">
+             <span v-if="scope.row.ci_type == 1">拔管</span>
+             <span v-if="scope.row.ci_type == 2">治愈</span>
+             <span v-if="scope.row.ci_type == 3">死亡</span>
+             <span v-if="scope.row.ci_type == 4">放弃</span>
+             <span v-if="scope.row.ci_type == 9">其它</span>
+          </template>
+      </el-table-column>
+       
+       <el-table-column prop="date" label="血培养检查结果" align="center" width="120">
+          <template slot-scope="scope">
+             <span v-if="scope.row.blood_cultupe == 0">阴性</span>
+             <span v-if="scope.row.blood_cultupe == 1">阳性</span>
+             <span v-if="scope.row.blood_cultupe == 9">未查</span>
+          </template>
+      </el-table-column>
+      
+     <el-table-column prop="date" label="患者导管转归类型" align="center" width="120">
+          <template slot-scope="scope">
+             <span v-if="scope.row.sequelae_type == 1">局部感染</span>
+             <span v-if="scope.row.sequelae_type == 2">静脉炎</span>
+             <span v-if="scope.row.sequelae_type == 3">导管细菌定植</span>
+             <span v-if="scope.row.sequelae_type == 4">导管相关血型感染</span>
+          </template>
+      </el-table-column>
        <el-table-column prop="date" label="备注" align="center" width="180">
           <template slot-scope="scope">
              <span>{{scope.row.remark}}</span>
@@ -105,7 +132,7 @@
          :visible.sync="dialogVisible"
          width="65%"
          center>
-      <el-form label-width="120px" :model="form" ref="form" :rules="rules" >
+      <el-form label-width="150px" :model="form" ref="form" :rules="rules" >
          <el-row :gutter="24">
             <el-col :span="24">
                 <el-form-item label="通路项目:" :required="true" prop="access_project"  > 
@@ -125,13 +152,13 @@
                     value-format="yyyy-MM-dd"
                     placeholder="选择时间"
                     v-model="form.start_time"
-                    style="width:150px">
+                    style="width:200px">
                  </el-date-picker>
                </el-form-item>
             </el-col>
              <el-col :span="8">
                <el-form-item label="血管通路类型:" :required="true" prop="blood_access_part_opera_id">
-                 <el-select v-model="form.blood_access_part_opera_id" placeholder="请选择"  style="width:150px">
+                 <el-select v-model="form.blood_access_part_opera_id" placeholder="请选择"  style="width:200px">
                     <el-option
                         v-for="item in blood_access_part_opera"
                         :key="item.id"
@@ -144,7 +171,7 @@
             </el-col>
              <el-col :span="8">
                <el-form-item label="血管通路部位:" :required="true" prop="blood_access_part_id">
-                  <el-input v-model="form.blood_access_part_id" readonly @focus="showInnerDialog('17')" style="width:150px"></el-input>
+                  <el-input v-model="form.blood_access_part_id" readonly @focus="showInnerDialog('17')" style="width:200px"></el-input>
                </el-form-item>
             </el-col>
          </el-row>
@@ -159,7 +186,7 @@
                         :value="item.id">
                     </el-option>
                   </el-select> -->
-                  <el-input v-model="form.other_vascular" style="width:200"></el-input>
+                  <el-input v-model="form.other_vascular" style="width:200px"></el-input>
                </el-form-item>
             </el-col>
              <el-col :span="8">
@@ -170,13 +197,13 @@
                     value-format="yyyy-MM-dd"
                     placeholder="选择时间"
                     v-model="form.first_start_time"
-                    style="width:150px">
+                    style="width:200px">
                  </el-date-picker>
                </el-form-item>
             </el-col>
              <el-col :span="8">
                <el-form-item label="使用状态:" :required="true" prop="user_status">
-                 <el-select v-model="form.user_status" placeholder="请选择" style="width:150px" @change="changeStatus">
+                 <el-select v-model="form.user_status" placeholder="请选择" style="width:200px" @change="changeStatus">
                     <el-option
                         v-for="item in options"
                         :key="item.id"
@@ -187,6 +214,44 @@
                </el-form-item>
             </el-col>
          </el-row>
+         <el-row :gutter="24" v-show="showOne">
+            <el-col :span="8">
+               <el-form-item label="导管感染转归:">
+                  <el-select v-model="form.ci_type" placeholder="请选择" style="width:200px" @change="changeStatus">
+                     <el-option
+                           v-for="item in optionsTwo"
+                           :key="item.id"
+                           :label="item.name"
+                           :value="item.id">
+                     </el-option>
+                  </el-select>
+               </el-form-item>
+             </el-col>
+             <el-col :span="8">
+               <el-form-item label="血培养检查结果:">
+                  <el-select v-model="form.blood_cultupe" placeholder="请选择" style="width:200px" @change="changeStatus">
+                     <el-option
+                           v-for="item in optionsThree"
+                           :key="item.id"
+                           :label="item.name"
+                           :value="item.id">
+                     </el-option>
+                  </el-select>
+               </el-form-item>
+            </el-col>
+            <el-col :span="8">
+               <el-form-item label="患者导管转归类型:">
+                  <el-select v-model="form.sequelae_type" placeholder="请选择" style="width:200px" @change="changeStatus">
+                     <el-option
+                           v-for="item in optionsOne"
+                           :key="item.id"
+                           :label="item.name"
+                           :value="item.id">
+                     </el-option>
+                  </el-select>
+               </el-form-item>
+             </el-col>
+         </el-row>
          <el-row v-show="show">
             <el-col :span="8">
                <el-form-item label="停用日期:">
@@ -196,7 +261,7 @@
                     value-format="yyyy-MM-dd"
                     placeholder="选择时间"
                     v-model="form.stop_time"
-                    style="width:150px">
+                    style="width:200px">
                  </el-date-picker>
                </el-form-item>
             </el-col>
@@ -320,6 +385,44 @@
                   </el-select>
                </el-form-item>
             </el-col>
+         </el-row>
+           <el-row v-show="showOne">
+            <el-col :span="8">
+               <el-form-item label="导管感染转归:">
+                  <el-select v-model="form.ci_type" placeholder="请选择" style="width:150px" @change="changeStatus">
+                     <el-option
+                           v-for="item in optionsTwo"
+                           :key="item.id"
+                           :label="item.name"
+                           :value="item.id">
+                     </el-option>
+                  </el-select>
+               </el-form-item>
+             </el-col>
+             <el-col :span="8">
+               <el-form-item label="血培养检查结果:">
+                  <el-select v-model="form.blood_cultupe" placeholder="请选择" style="width:150px" @change="changeStatus">
+                     <el-option
+                           v-for="item in optionsThree"
+                           :key="item.id"
+                           :label="item.name"
+                           :value="item.id">
+                     </el-option>
+                  </el-select>
+               </el-form-item>
+            </el-col>
+            <el-col :span="8">
+               <el-form-item label="患者导管转归类型:">
+                  <el-select v-model="form.sequelae_type" placeholder="请选择" style="width:150px" @change="changeStatus">
+                     <el-option
+                           v-for="item in optionsOne"
+                           :key="item.id"
+                           :label="item.name"
+                           :value="item.id">
+                     </el-option>
+                  </el-select>
+               </el-form-item>
+             </el-col>
          </el-row>
          <el-row v-show="show">
             <el-col :span="8">
@@ -411,7 +514,10 @@
          user_status:1,
          remark:"",
          stop_time:"",
-         other_vascular:""
+         other_vascular:"",
+         ci_type:"",//导管感染转归
+         blood_cultupe:"", //血培养检查结果
+         sequelae_type:"",//患者导管转归类型
         },
         options:[
          {id:1,name:"启用"},
@@ -421,6 +527,7 @@
           {id:1,name:"流入-动脉"},
           {id:2,name:"流出-静脉"},
         ],
+
         blood_access_part_opera:[],
         blood_access_part:[],
         show:false,
@@ -435,6 +542,28 @@
         },
         new_blood_access_part_opera:[],
         new_blood_access_part:[],
+       // 导管感染类型
+        optionsOne:[
+           {id:1,name:"局部感染"},
+           {id:2,name:"静脉炎"},
+           {id:3,name:"导管细菌定植"},
+           {id:4,name:"导管相关血型感染"},
+        ],
+      //   导管转归类型
+        optionsTwo:[
+           {id:1,name:"拔管"},
+           {id:2,name:"治愈"},
+           {id:3,name:"死亡"},
+           {id:4,name:"放弃"},
+           {id:9,name:"其它"},
+        ],
+      //  血培养检查结果
+        optionsThree:[
+           {id:0,name:"阴性"},
+           {id:1,name:"阳性"},
+           {id:9,name:"未查"}
+        ],
+        showOne:false
       }
     },
     methods: {
@@ -497,8 +626,12 @@
                 remark:this.form.remark,
                 stop_time:this.form.stop_time,
                 other_vascular:this.form.other_vascular,
+                ci_type:this.form.ci_type,
+                blood_cultupe:this.form.blood_cultupe,
+                sequelae_type:this.form.sequelae_type,
               }
               console.log("params",params)
+            
              saveVasularAccess(params).then(response=>{
                 if(response.data.state == 1){
                    var access =  response.data.data.access
@@ -576,6 +709,7 @@
               }
 
               if(accessDetail.access_project == "2"){
+               this.showOne = true
                for(let i=0;i<this.new_blood_access_part_opera.length;i++){ 
                   if(this.new_blood_access_part_opera[i].field_type == 2){
                      arrOne.push(this.new_blood_access_part_opera[i])  
@@ -620,6 +754,9 @@
  
              this.form.user_status = accessDetail.user_status
              this.form.other_vascular = accessDetail.other_vascular
+             this.form.ci_type = accessDetail.ci_type
+             this.form.blood_cultupe = accessDetail.blood_cultupe
+             this.form.sequelae_type = accessDetail.sequelae_type
              if(accessDetail.user_status == 1){
                this.show = false
              }
@@ -693,9 +830,12 @@
                 remark:this.form.remark,
                 stop_time:this.form.stop_time,
                 patient_id:this.patientID,
-                other_vascular:this.form.other_vascular
+                other_vascular:this.form.other_vascular,
+                ci_type:this.form.ci_type,
+                blood_cultupe:this.form.blood_cultupe,
+                sequelae_type:this.form.sequelae_type
               }
-              console.log("编辑",params)
+            
               updatedVasularAccess(params).then(response=>{
                 if(response.data.state == 1){
                   var access =  response.data.data.access
@@ -800,11 +940,13 @@
         if(val == 1){
            this.blood_access_part_opera = arr
            this.blood_access_part = arrTwo
+           this.showOne = false
           
         }
         if(val == 2){
           this.blood_access_part_opera = arrOne
           this.blood_access_part = arrThree
+          this.showOne = true
         }
         
         console.log("arr",arr)

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -249,7 +249,7 @@ export default {
         //   week_type:this.week_type,
         //   week_time:this.week_time,
         // }
-      
+     
       getNextScheduleWeekDay(params).then(response => {
         this.scheduleData = [];
         if (response.data.state == 1) {

src/xt_pages/workforce/next_remind_print.vue

@@ -18,7 +18,8 @@
       <div id="print_content">
         <div class="print_main_content">
           <div class="order_title_panl">
-            <span class="main_title">{{day}}排班提醒（{{ currentDate }}）</span>
+            <!-- <span class="main_title">{{day}}排班提醒（{{ currentDate }}）</span> -->
+            <span class="main_title">{{day}}排班提醒（{{ getTime(now_time) }}）</span>
           </div>
           <div class="table_panel">
             <table class="table">
@@ -94,6 +95,7 @@
 <script>
   import { getNextScheduleWeekDay } from '@/api/schedule'
   import { parseTime } from '@/utils'
+  import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import print from 'print-js'
   const moment = require('moment') 
@@ -118,6 +120,7 @@
         start_time:moment().week(moment().week() + 1).startOf('week').unix(),
         end_time:moment().week(moment().week() + 1).endOf('week').unix(),
         org_id:0,
+        now_time:0
       }
     },
     components: {
@@ -126,6 +129,7 @@
     created() {
      this.org_id = this.$store.getters.xt_user.org.id
      this.currentDate = this.getCurrentDate()
+   
       this.modeOptions = this.$store.getters.treatment_mode
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
       this.week_type = this.$route.query.week_type
@@ -145,6 +149,8 @@
         //   end_time:1610208000,
         // }
       console.log("打印下周",params)
+     
+      console.log("start",this.start_time)
       getNextScheduleWeekDay(params).then(rs => {
         var resp = rs.data
         console.log(resp)
@@ -163,6 +169,10 @@
       }).catch(err => {
         this.$message.error(err)
       })
+
+      var now_time = parseInt(this.week_type) * 86400 + this.start_time
+      console.log("now",now_time)
+      this.now_time = now_time
     },
     methods: {
       getAdvice:function(doctor_advice) {
@@ -301,6 +311,13 @@
           return value1 - value2;
       }
      },
+     getTime(val) {
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
     }
   }
 </script>

src/xt_pages/workforce/remind_print.vue

@@ -133,13 +133,15 @@
           week_type:this.week_type,
           week_time:this.week_time,
         }
-
+       console.log("params",params)
       getScheduleWeekDay(params).then(rs => {
         var resp = rs.data
         console.log(resp)
+        
         if (resp.state == 1) {
           var scheduleData = resp.data.schdules
           let a = resp.data.day
+          console.log("a",a)
           var myDate = new Date(a);
           var year = myDate.getFullYear(); //年
           var month = myDate.getMonth() + 1; //月