Merge branch 'openIm_ysy' of http://1.14.104.71:10880/root/ylrz_his_scrm_doctorUI into openIm_ysy

src/views/his/personalPrescribe/index.vue

@@ -68,6 +68,19 @@
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="是否完善" align="center" prop="completeStatus" width="270">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.completeStatus === 0" type="danger" size="small">
+            待销售完善患者采集信息
+          </el-tag>
+          <el-tag v-else-if="scope.row.completeStatus === 1" type="success" size="small">
+            已完善
+          </el-tag>
+          <el-tag v-else type="info" size="small">
+            未知状态
+          </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button v-if="scope.row.doctorConfirm == 0" size="mini" type="text" icon="el-icon-edit" @click="handleViewOrPrescribe(scope.row)">开方</el-button>
@@ -487,8 +500,13 @@ export default {
       this.ids = selection.map(item => item.prescribeId);
     },
     handleViewOrPrescribe(row) {
-      if (row.prescribeSource === 1 && row.completeStatus === 0) {
-        this.$message.warning('请联系销售完善患者采集信息！');
+      // 如果处方对应的采集信息未完善（completeStatus !== 1）
+      if (row.completeStatus === 0) {
+        this.$message.warning('待销售完善患者采集信息！');
+        return;
+      } else if (row.completeStatus !== 1) {
+        // 只对非0非1的状态显示系统繁忙
+        this.$message.warning('系统繁忙，请稍后再试');
         return;
       }
       this.resetFormData();