Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/xt_pages/data/printTemplate.vue

@@ -222,8 +222,9 @@ export default {
               this.radio = template_id.toString();
               this.tempRadio = template_id.toString();
               // 同步
+              console.log(response.data.data.fileds)
               this.loading = false;
-               // store.dispatch("updateAllFiledConfigList", response.data.data.fileds).then(() => {});
+               store.dispatch("updateAllFiledConfigList", response.data.data.fileds).then(() => {});
               this.$message({
                 type: "success",
                 message: "切换成功"

src/xt_pages/user/components/PatientDetail.vue

@@ -391,6 +391,11 @@
           </el-radio-group>
         </el-form-item>
       </el-col>
+        <el-col :span="6" >
+          <el-form-item label="系统前透析次数 : " prop="first_dialysis_hospital">
+            <el-input v-model="form.user_sys_before_count" disabled></el-input>
+          </el-form-item>
+        </el-col>
       <el-col :span="6">
         <el-form-item label="首次诊治日期 : "  >
             <el-date-picker v-model="form.first_treatment_date" type="date" disabled format="yyyy-MM-dd" value-format="yyyy-MM-dd"></el-date-picker>
@@ -812,6 +817,8 @@ export default {
             // this.form.record_date = patietInfo.is_infectious
             this.form.response_result = patietInfo.response_result
             this.form.remind_cycle = patietInfo.remind_cycle
+            this.form.user_sys_before_count = patietInfo.user_sys_before_count
+
             this.infections = response.data.data.infections
             this.form.formItem = this.infections
             if (this.infections != null) {

src/xt_pages/user/components/PatientForm.vue

@@ -587,6 +587,14 @@
               </el-form-item>
             </el-col>
 
+
+            <el-col :span="6" :style="isEdit?'width:360px':''">
+                <el-form-item label="系统前透析次数 : " prop="user_sys_before_count">
+                  <el-input v-model="form.user_sys_before_count"></el-input>
+              </el-form-item>
+            </el-col>
+
+
             <el-col :span="6" :style="isEdit?'width:360px':''">
               <el-form-item label="首次诊治时间 : ">
                 <el-date-picker
@@ -747,6 +755,7 @@ const defaultForm = {
   dialysis_age: "",
   expense_kind: "",
   contact_name: "",
+  user_sys_before_count:"",
 
   formItem: [
     {
@@ -1220,7 +1229,6 @@ export default {
                   this.$refs[formName].resetFields();
                   this.$store.dispatch("SetSubscibePatients");
                   var sub = this.$store.getters.xt_user.subscibe;
-                  console.log(sub);
                   if (action !== "renew") {
                     this.$router.back(-1);
                   }
@@ -1387,6 +1395,8 @@ export default {
             this.form.homeAddress = patietInfo.home_address;
             this.form.work = patietInfo.work_unit;
             this.form.unit_address = patietInfo.unit_address;
+            this.form.user_sys_before_count = patietInfo.user_sys_before_count;
+
 
             if (patietInfo.profession > 0) {
               this.form.profession = patietInfo.profession;

src/xt_pages/user/patient.vue

@@ -15,7 +15,7 @@
 	    <label class="title"><span class="name">日期查询</span> : </label>
        <el-date-picker size="small" v-model="listQuery.start_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
        <span class="cellLine"> - </span>
-       <el-date-picker size="small" v-model="listQuery.end_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>       
+       <el-date-picker size="small" v-model="listQuery.end_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>
     </div>
     <div class="cell clearfix">
 	    <label class="title"><span class="name">排班班次</span> : </label>
@@ -95,9 +95,9 @@
         </el-table-column> -->
         <el-table-column align="center" label="全选" width="60px" type="selection" ></el-table-column>
         <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
-        <el-table-column  label="透析号" min-width="80" property="dialysis_no" align="center"></el-table-column>         
+        <el-table-column  label="透析号" min-width="80" property="dialysis_no" align="center"></el-table-column>
         <el-table-column  label="住院号" min-width="80"  property="admission_number" align="center"> </el-table-column>
-        <el-table-column property="name" label="姓名" min-width="80" align="center"> 
+        <el-table-column property="name" label="姓名" min-width="80" align="center">
           <template slot-scope="scope" >
             <router-link :to="'/patients/edit/'+scope.row.id" style="color:#409eff" >{{scope.row.name}}</router-link>
           </template>
@@ -116,7 +116,11 @@
             <span v-else>未知</span>
           </template>
         </el-table-column>
-        <el-table-column property="total_dialysis" label="透析次数" min-width="94" align="center"> </el-table-column>
+        <el-table-column property="total_dialysis" label="透析次数" min-width="94" align="center">
+          <template slot-scope="scope" >
+            <span>{{getCount(scope.row)}}</span>
+          </template>
+        </el-table-column>
         <el-table-column min-width="150" label="二维码" align="center">
           <template slot-scope="scope"  type="text">
             <a style="color:#409eff"  v-if="scope.row.binding_state==1" @click="openWechatBindDialog">已绑定</a>
@@ -129,9 +133,9 @@
         </template>
         </el-table-column>
       </el-table>
-      
+
       <!-- <pagi-nation title="分页"></pagi-nation> -->
-      
+
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -143,7 +147,7 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">
       </el-pagination>
-      
+
 
       <el-dialog
       title="微信绑定"
@@ -157,8 +161,8 @@
       </span>
     </el-dialog>
 
-    </div> 
-    
+    </div>
+
 </template>
 
 
@@ -282,6 +286,10 @@ export default {
     this.reimbursement_ways = this.$store.getters.reimbursement_ways;
   },
   methods: {
+    getCount(row){
+      console.log(row)
+      return row.total_dialysis + row.user_sys_before_count
+    },
     openWechatBindDialog(){
       this.bindWechatDialog = true;
     },
@@ -320,7 +328,7 @@ export default {
       this.sourceID = sourceID;
       this.lapsetoType = lapseto;
       this.listQuery.source = sourceID;
-      this.listQuery.lapseto = lapseto; 
+      this.listQuery.lapseto = lapseto;
       this.getList();
     },
     changeTime(){
@@ -345,7 +353,7 @@ export default {
         }
       });
     },
-    
+
   //  components:{
   //    pagiNation
   //  }

src/xt_pages/user/patients.vue

@@ -265,11 +265,13 @@
           </template>
         </el-table-column>
         <el-table-column
-          property="total_dialysis"
           label="透析次数"
           min-width="94"
           align="center"
         >
+          <template slot-scope="scope" >
+            <span>{{getCount(scope.row)}}</span>
+          </template>
         </el-table-column>
         <!-- <el-table-column min-width="150" label="二维码" align="center">
         <template slot-scope="scope"  type="text">
@@ -574,6 +576,10 @@ export default {
   },
 
   methods: {
+    getCount(row){
+      console.log(row)
+      return row.total_dialysis + row.user_sys_before_count
+    },
     EditLapseto() {
       if (this.lapsetoForm.lapseto_time == "") {
         this.$message.error("请选择时间");