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

src/api/his/his.js

 
 
 
+export function deleteNCDSRecord(params) {
+  return request({
+    url: '/api/psn/ncds/delete',
+    method: 'post',
+    params: params
+  })
+}
+
+
+

src/xt_pages/hospitalStation/components/deskPrescription.vue

       this.sick = sick
       this.diagnoses = diagnoses
       this.department = department
-      this.curMonthPrescriptions = {}
-      this.curPrescriptions = {}
+      // this.curMonthPrescriptions = {}
+      // this.curPrescriptions = {}
       // this.$refs.tabProjectTeam.clearSelection()
 
       for (let i = 0; i < doctors.length; i++) {

src/xt_pages/hospitalStation/doctorDesk.vue

         this.saveLoading = data
       },
       changeTimeTwo() {
+        this.titleType = "电子处方"
         this.getList()
       },
       openPrint() {
 
               }
             }
-            console.log('~~~~~00000222222')
             this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis)
           }
         })
         if (this.titleType == '电子处方') {
           if (this.radio == 1) {
             this.un_cure_data.map(item => {
-              console.log('~~~~~~~~')
               if (item.id == this.patientid) {
-                console.log('~~~~~~~~22222222')
-
                 this.getPatientInfo(item)
               }
             })

src/xt_pages/outpatientRecord/outpatientRecord.vue

                         <el-button type="danger" size="small" icon="el-icon-tickets" v-if="scope.row.record.is_cancel == 1" >
                             <span @click="putOnRecord(2,scope.row)">撤消</span>
                         </el-button>
+
+
+                      <el-button type="primary" size="small" icon="el-icon-tickets" v-if="scope.row.record.is_cancel == 1" >
+                        <span @click="putOnRecord(3,scope.row)">查看备案信息</span>
+                      </el-button>
+
+                      <el-button type="primary" size="small" icon="el-icon-tickets" >
+                        <span @click="putOnRecord(4,scope.row)">删除</span>
+                      </el-button>
                     </template>
                 </el-table-column>
             </el-table>
 
 <script>
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getAllDoctorList, getInitData, getRecordList } from '@/api/his/his'
+  import { getAllDoctorList, getInitData, getRecordList,deleteNCDSRecord } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
   import { fetchAllAdminUsers } from '@/api/doctor'
   import axios from 'axios'
 
           this.getGdybPatientInfo()
 
-        } else {
+        } else if(type == 2) {
           this.$confirm('是否撤销备案', '撤销备案', {
             confirmButtonText: '确 定',
             cancelButtonText: '取 消',
 
           })
 
-        }
+        }else if(type == 3){
+          let params = {
+            'id': row.record.id,
+            'admin_user_id': this.$store.getters.xt_user.user.id
+          };
+          var that = this;
+          axios.get('http://127.0.0.1:9532/api/psn/info', {
+            params: params
+          })
+              .then(function(response) {
+                if (response.data.state == 0) {
+                  that.$message.error(response.data.msg);
+                  return false
+                } else {
+                  if(response.data.data.failed_code == -10){
+                    // that.$message.error(response.data.data.msg)
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+                  }else{
+                    that.$confirm(response.data.data.result, '医保信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+
+                    })
+                  }
+                }
+              })
+              .catch(function(error) {
+              })
+        }else if(type == 4){
+          this.$confirm("是否删除", '删除', {
+            confirmButtonText: '确 定',
+            type: 'warning'
+          }).then(() => {
+            let params = {
+              id: row.record.id,
+            }
+            deleteNCDSRecord(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg);
+                return false
+              } else {
+                this.getList()
+              }
+            })
 
+          }).catch(() => {
+          })
+
+
+        }
       },
       changeDoctor(row, id) {
         for (let i = 0; i < this.doctorList.length; i++) {

src/xt_pages/qcd/officesControlAnalysis/time.vue

           </ul>
         </div>
       </div>
+
+      <div class="cell clearfix">
+        <label class="title"> <span class="name">转归状态</span> : </label>
+        <div class="time">
+          <ul class>
+            <li
+                :class="item.lapseto == lapsetoType ? 'active' : ''"
+                @click="selectLapseTo(item.lapseto)"
+                v-for="item in lapsetoState"
+                :key="item.value"
+            >
+              {{ item.label }}
+            </li>
+          </ul>
+        </div>
+      </div>
+      <div class="cell clearfix">
+        <label class="title"> <span class="name">患者来源</span> : </label>
+        <div class="time">
+          <ul class>
+            <li
+                :class="item.source == originType ? 'active' : ''"
+                @click="selectLapseTo(item.source)"
+                v-for="item in originState"
+                :key="item.value"
+            >
+              {{ item.label }}
+            </li>
+          </ul>
+        </div>
+      </div>
+
+
       <div class="cell clearfix">
         <p class="chartTitle">统计图</p>
       </div>
       modesData: {
         xAxis: [],
         series: []
-      },
+      }, lapsetoType: 0,
+      lapsetoState: [
+        { value: 0, label: '全部', source: 0, lapseto: 0 },
+        { value: 1, label: '转出', source: 0, lapseto: 2 },
+        { value: 2, label: '留治', source: 0, lapseto: 1 }
+      ],originType:0,
+      originState: [
+        { value: 0, label: '全部', source: 0},
+        { value: 1, label: '住院', source: 1},
+        { value: 2, label: '门诊', source: 2}
+      ],
       crumbs: [
         { path: false, name: '质控管理' },
         { path: false, name: '科室质控达标统计' },
           this.chart.series[0].data = this.modesData.series
           this.chart.xAxis.data = this.modesData.xAxis
           this.getArrLength(this.chart.xAxis.data)
-        }else{
+        } else {
           this.isLoading = false
         }
       })