Merge branch 'master' of http://140.143.162.39:3000/shentun/peisweb

src/components/follow/FollowList.vue

@@ -29,20 +29,16 @@
             <el-table-column prop="sexName" label="性别" width="50" align="center" />
             <el-table-column prop="birthDate" label="出生日期" width="90" align="center" />
             <el-table-column prop="age" label="年龄" width="50" align="center" />
-            <!-- <el-table-column prop="abnormalAsbitemDetail" label="组合项目异常" width="200">
+            <el-table-column prop="isSmsComplete" label="短信随访创建完成" width="200">
               <template slot-scope="scope">
-                <div v-for="(item,index) in scope.row.abnormalAsbitemDetail" :key="index">
-                  {{item.asbitemName+' '+item.isCriticalValue+' '+item.isReview}}
-                </div>
+                <el-checkbox v-model="scope.row.isSmsComplete" disabled true-label="Y" false-label="N"></el-checkbox>
               </template>
             </el-table-column>
-            <el-table-column prop="abnormalItemDetail" label="项目异常" width="200">
+            <el-table-column prop="isPhoneComplete" label="电话随访创建完成" width="200">
               <template slot-scope="scope">
-                <div v-for="(item,index) in scope.row.abnormalItemDetail" :key="index">
-                  {{item.itemName+' '+item.isCriticalValue+' '+item.isReview}}
-                </div>
+                 <el-checkbox v-model="scope.row.isPhoneComplete" disabled true-label="Y" false-label="N"></el-checkbox>
               </template>
-            </el-table-column> -->
+            </el-table-column>
             <el-table-column prop="jobCardNo" label="工卡号" width="90" align="center" />
             <el-table-column prop="medicalCardNo" label="体检卡号" width="90" align="center" />
             <el-table-column prop="maritalStatusName" label="婚姻状况" width="90" align="center" />
@@ -50,13 +46,21 @@
             <el-table-column prop="personnelTypeName" label="人员类型" width="90" align="center" />
             <el-table-column prop="jobPost" label="职务" width="90" align="center" />
             <el-table-column prop="jobTitle" label="职称" width="90" align="center" />
-            <el-table-column prop="isUpload" label="上传WEB" width="90" align="center" />
+            <el-table-column prop="isUpload" label="上传WEB" width="90" align="center">
+              <template slot-scope="scope">
+                 <el-checkbox v-model="scope.row.isUpload" disabled true-label="Y" false-label="N"></el-checkbox>
+              </template>
+            </el-table-column>
             <el-table-column prop="completeFlag" label="状态" width="90" align="center">
               <template slot-scope="scope">
                 <div>{{ dddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}</div>
               </template>
             </el-table-column>
-            <el-table-column prop="isMedicalStart" label="开始标志" width="90" align="center" />
+            <el-table-column prop="isMedicalStart" label="开始标志" width="90" align="center">
+              <template slot-scope="scope">
+                <el-checkbox v-model="scope.row.isMedicalStart" disabled true-label="Y" false-label="N"></el-checkbox>
+              </template>
+            </el-table-column>
             <el-table-column prop="medicalStartDate" label="开始日期" width="90" align="center" />
             <el-table-column prop="patientNo" label="档案号" width="90" align="center" />
             <el-table-column prop="telephone" label="电话" width="90" align="center" />
@@ -789,6 +793,12 @@ export default {
       if (this.patientRegister.query.phone)
         body.phone = this.patientRegister.query.phone;
 
+      if (this.patientRegister.query.isSmsComplete)
+        body.isSmsComplete = this.patientRegister.query.isSmsComplete;
+
+      if (this.patientRegister.query.isPhoneComplete)
+        body.isPhoneComplete = this.patientRegister.query.isPhoneComplete;
+
       if (this.patientRegister.query.idCardNo)
         body = {
           idNo: this.patientRegister.query.idCardNo,

src/components/follow/FollowQuery.vue

@@ -58,6 +58,14 @@
           </el-option>
         </el-select>
       </div>
+      <div class="query">
+        <span class="spanClass">短信随访创建完成</span>
+        <el-checkbox v-model="patientRegister.query.isSmsComplete" true-label="Y" false-label="N"></el-checkbox>
+      </div>
+      <div class="query">
+        <span class="spanClass">电话随访创建完成</span>
+        <el-checkbox v-model="patientRegister.query.isPhoneComplete" true-label="Y" false-label="N"></el-checkbox>
+      </div>
     </div>
 
     <!-- 按钮区域 -->

src/store/index.js

@@ -213,6 +213,8 @@ export default new Vuex.Store({
                 sex: '', //性别
                 idCardNo: '', //身份证号
                 isSeries: 'N',
+                isSmsComplete: "N",
+                isPhoneComplete: "N"
             }, //查询条件
             customerOrgGroup: [], //分组（针对单位）
             patientRegisterAbs: [], //人员已选组合项目