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

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

@@ -21,13 +21,13 @@
             <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="穿刺护士"  v-if="isShowFiled('穿刺护士')">
+        <el-form-item label="穿刺者"  v-if="isShowFiled('穿刺者')">
           <el-select v-model="form.puncture_nurse_id" placeholder="请选择穿刺护士">
             <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="冲管护士"  v-if="isShowFiled('冲管护士')">
-          <el-select v-model="form.washpipe_nurse" placeholder="请选择穿刺护士">
+          <el-select v-model="form.washpipe_nurse" placeholder="请选择冲管护士">
             <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
           </el-select>
         </el-form-item>

src/xt_pages/dialysis/details/dialysisComputer.vue

@@ -17,8 +17,8 @@
         </li>
       </ul>
       <ul>
-        <li v-if="isShow('穿刺护士')">
-          <label>穿刺护士 : </label>
+        <li v-if="isShow('穿刺者')">
+          <label>穿刺者 : </label>
           <span class="content">{{ puncture_nurse }}</span>
         </li>
         <li v-if="isShow('冲管护士')">

src/xt_pages/user/components/PatientDetail.vue

@@ -633,6 +633,20 @@
           </el-form-item>
         </el-col>
 
+        <el-col :span="24">
+          <el-form-item label="" prop="sch_remark">
+            <!-- <textarea v-model="form.remark" class="textarea" disabled></textarea> -->
+            <el-input
+              type="textarea"
+              :rows="3"
+              v-model="form.sch_remark"
+              resize="none"
+              placeholder=""
+              readonly
+            ></el-input>
+          </el-form-item>
+        </el-col>
+
         <el-col :span="24">
           <el-form-item label="慢性病 : " prop="diseases">
             <el-checkbox-group v-model="form.diseases">
@@ -1055,7 +1069,8 @@ const defaultForm = {
   first_treatment_date: "",
   dialysis_age: "",
   expense_kind: "",
-  contact_name: ""
+  contact_name: "",
+  sch_remark:"",
 };
 
 export default {
@@ -1334,6 +1349,8 @@ export default {
             this.form.contagions = response.data.data.contagions;
             this.form.diseases = response.data.data.diseases;
             this.form.remark = patietInfo.remark;
+            this.form.sch_remark = patietInfo.sch_remark;
+
             this.form.diagnose = patietInfo.diagnose;
 
             this.form.patient_complains = patietInfo.patient_complains;
@@ -1478,6 +1495,10 @@ export default {
               /\n/g,
               "<br/>"
             );
+            this.patientPrint.sch_remark = patietInfo.sch_remark.replace(
+              /\n/g,
+              "<br/>"
+            );
             this.patientPrint.diagnose = patietInfo.diagnose.replace(
               /\n/g,
               "<br/>"

src/xt_pages/user/components/PatientForm.vue

@@ -280,6 +280,22 @@
                   </el-radio-group>
                 </el-form-item>
               </el-col>
+
+              <el-col :span="24">
+                <el-form-item
+                  label="备注 : "
+                  prop="sch_remark">
+                  <el-input
+                    type="textarea"
+                    :rows="3"
+                    v-model="form.sch_remark"
+                    resize="none"
+                    placeholder
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+
+
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''" v-show="showLapseto">
                 <el-form-item
                   label="治疗状态(转归) : "
@@ -716,6 +732,8 @@
               ></el-input>
             </el-form-item>
           </el-col>
+
+
           <!--<el-col :span="24">-->
           <!--<el-form-item label="传染病 : " prop="checkContagions">-->
           <!--<el-checkbox-group v-model="form.contagions">-->
@@ -949,6 +967,7 @@ const defaultForm = {
   contagions: [],
   diseases: [],
   remark: "",
+  sch_remark:"",
   diagnose: "",
   is_infectious: 1,
   age: "",
@@ -1661,6 +1680,8 @@ export default {
             this.form.contagions = response.data.data.contagions;
             this.form.diseases = response.data.data.diseases;
             this.form.remark = patietInfo.remark;
+            this.form.sch_remark = patietInfo.sch_remark;
+
             this.form.diagnose = patietInfo.diagnose;
 
             this.form.patient_complains = patietInfo.patient_complains;

src/xt_pages/workforce/components/tableData.vue

@@ -426,6 +426,13 @@
             </span>
           </template>
         </el-table-column>
+        <el-table-column
+          property="sch_remark"
+          label="备注"
+          min-width="200"
+          align="center"
+        >
+        </el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer">
         <el-button @click="closePatientPanel()">取 消</el-button>