Merge branch 'master' of https://172.16.32.165/lighter/vue-intergration-platform

src/components/si-sheet-upload/jie-suan-dan-xiu-gai/JieSuanDanXiangQing.vue

@@ -14,8 +14,8 @@
           <el-button size="small" type="primary" @click="drgGroupTest">DRG分组测算</el-button>
           <el-button type="info" @click="shenHeClick">审核信息</el-button>
           <el-button size="small" type="primary" @click="shuJuDuiBi">数据对比</el-button>
-          <el-button size="small" :disabled="shenHeSendFlag" type="success" @click="baoCunXiuGai">保存并申请审核</el-button>
-            <el-button size="small" v-if="shenHeQuanXian()" type="success" @click="baoCunXiuGaiShenHeTongGuo">保存并审核通过</el-button>
+          <el-button size="small" :disabled="shenHeSendFlag" type="success" @click="openBaoCun()">保存并申请审核</el-button>
+            <el-button size="small" v-if="shenHeQuanXian()" type="success" @click="openBaoCun('1')">保存并审核通过</el-button>
           <bei-zhu v-if="beiZhuRef" :data="baoCunXiuGaiData" @baoCunHouGuanBi="baoCunHouGuanBi"
                    @close="beiZhuRef = false"></bei-zhu>
         </template>
@@ -323,7 +323,7 @@
     </el-dialog>
     <el-dialog v-model="qualityDialogFlag"  title="质控结果" width="50%" class="maxhight">
       <el-table  :data="qualityData" height="100%"
-                highlight-current-row row-key="id" stripe="true" border="true" >
+                highlight-current-row row-key="id" :stripe="true" :border="true" >
         <el-table-column label="质控字段名称" prop="check_filed"></el-table-column>
         <el-table-column label="字段原始值" prop="original_value"></el-table-column>
         <el-table-column label="规则等级" prop="rule_level">
@@ -345,6 +345,8 @@
       </el-table>
         <el-row>
             <el-button v-show="!shenHeTongGuoFlag" type="primary" @click="queRenShenHeTongGuo">确认审核通过</el-button>
+            <el-button v-if="queRenBaoCunFlag" type="primary" @click="queRenbaoCunXiuGai()">确认保存</el-button>
+            <el-button v-if="zhiJieBaoCunFlag" type="primary" @click="queRenbaoCunXiuGai('1')">确认审核通过并且保存</el-button>
         </el-row>
     </el-dialog>
       <el-dialog v-model="jianYanJianChaDialogFlag" width="60% " title="检验检查">
@@ -664,7 +666,25 @@ const messageColor = (id) => {
         }
 }
 
-const baoCunXiuGai = () => {
+const queRenBaoCunFlag = ref(false)
+const zhiJieBaoCunFlag = ref(false)
+const openBaoCun=(flag)=>{
+    if(flag){
+        zhiJieBaoCunFlag.value = true
+        queRenBaoCunFlag.value = false
+    }else {
+        queRenBaoCunFlag.value = true
+        zhiJieBaoCunFlag.value = false
+    }
+    qualityTest()
+}
+//确认保存修改
+const queRenbaoCunXiuGai = (flag) =>{
+    qualityDialogFlag.value = false
+    baoCunXiuGai(flag)
+}
+
+const baoCunXiuGai = (flag) => {
   if (setlinfo.value.operation === '1' || setlinfo.value.operation === '2' || setlinfo.value.operation === '3') {
     if (listIsBlank(oprninfo.value)) {
       return ElMessage.error('选择治疗类型为手术的，至少要有一个手术。')
@@ -673,7 +693,7 @@ const baoCunXiuGai = () => {
   if (listIsBlank(diseinfo.value)) {
     return ElMessage.error('诊断不能为空。')
   }
-    bingAnShouYeXiaoYan()
+    bingAnShouYeXiaoYan(flag)
 }
 
 function createSaveData(newData,flag) {
@@ -728,18 +748,6 @@ function bingAnShouYeXiaoYan(flag) {
     })
 }
 
-//保存并审核通过
-const baoCunXiuGaiShenHeTongGuo= () =>{
-    if (setlinfo.value.operation === '1' || setlinfo.value.operation === '2' || setlinfo.value.operation === '3') {
-        if (listIsBlank(oprninfo.value)) {
-            return ElMessage.error('选择治疗类型为手术的，至少要有一个手术。')
-        }
-    }
-    if (listIsBlank(diseinfo.value)) {
-        return ElMessage.error('诊断不能为空。')
-    }
-    bingAnShouYeXiaoYan('1')
-}
 
 /**
  * 获取治疗方式