Browse Source

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

lighter 3 years ago
parent
commit
d6ca468504

+ 49 - 48
src/components/si-sheet-upload/jie-suan-dan-xiu-gai/JieSuanDanXiuGaiShouShu.vue

@@ -6,43 +6,43 @@
       </el-form-item>
       <el-form-item label="手术编码" prop="ssbm">
         <input-and-table
-          v-model="formShouShu.ssbm"
-          :data="shouShuData"
-          :table-header="current"
-          valueId="code"
-          @currentChange="shouShuCurrentPage"
-          @fetchData="queryShouShuClick"
-          @rowClick="rowClick"
+            v-model="formShouShu.ssbm"
+            :data="shouShuData"
+            :table-header="current"
+            valueId="code"
+            @currentChange="shouShuCurrentPage"
+            @fetchData="queryShouShuClick"
+            @rowClick="rowClick"
         />
       </el-form-item>
       <el-form-item label="手术日期" prop="ssrq">
         <el-date-picker v-model="formShouShu.ssrq" type="datetime"></el-date-picker>
       </el-form-item>
-      <el-form-item label="手术时间" prop="opDate">
+      <el-form-item label="手术时间" prop="opStartDate">
         <el-date-picker
-          v-model="formShouShu.opDate"
-          :shortcuts="shortcuts"
-          end-placeholder="结束日期"
-          placeholder="选择日期"
-          range-separator="至"
-          size="small"
-          start-placeholder="开始日期"
-          style="width: 400px"
-          type="datetimerange"
-          @change="surgeryDateChanges"
+            v-model="formShouShu.opDate"
+            :shortcuts="shortcuts"
+            end-placeholder="结束日期"
+            placeholder="选择日期"
+            range-separator="至"
+            size="small"
+            start-placeholder="开始日期"
+            style="width: 400px"
+            type="datetimerange"
+            @change="surgeryDateChanges"
         ></el-date-picker>
       </el-form-item>
       <el-form-item label="麻醉时间" prop="anstDate">
         <el-date-picker
-          v-model="formShouShu.anstDate"
-          :shortcuts="shortcuts"
-          end-placeholder="结束日期"
-          placeholder="选择日期"
-          range-separator="至"
-          size="small"
-          start-placeholder="开始日期"
-          style="width: 400px"
-          type="datetimerange"
+            v-model="formShouShu.anstDate"
+            :shortcuts="shortcuts"
+            end-placeholder="结束日期"
+            placeholder="选择日期"
+            range-separator="至"
+            size="small"
+            start-placeholder="开始日期"
+            style="width: 400px"
+            type="datetimerange"
         ></el-date-picker>
       </el-form-item>
       <el-form-item label="手术级别" prop="ssjb">
@@ -91,11 +91,11 @@
 
 <script name="JieSuanDanXiuGaiShouShu" setup>
 import SelectStaffCode from '@/components/SelectStaffCode.vue'
-import { maZuiFangShis, qks } from '../jieSuanDanXiuGai'
-import { shouShuBianMa } from '@/api/medical-insurance/si-setl-upload'
-import { current } from '@/data/input-table-header'
-import { shortcuts } from '@/data/shortcuts.js'
-import { getDateRangeFormatDateTime } from '@/utils/date'
+import {maZuiFangShis, qks} from '../jieSuanDanXiuGai'
+import {shouShuBianMa} from '@/api/medical-insurance/si-setl-upload'
+import {current} from '@/data/input-table-header'
+import {shortcuts} from '@/data/shortcuts.js'
+import {getDateRangeFormatDateTime} from '@/utils/date'
 
 const props = defineProps({
   data: {
@@ -146,13 +146,13 @@ const surgeryDateChanges = (date) => {
 
 // 限制
 const shouShuRules = ref({
-  ssmc: [{ required: true, message: '该项不能为空', trigger: 'blur' }],
-  ssrq: [{ required: true, message: '该项不能为空', trigger: 'blur' }],
-  ssjb: [{ required: true, message: '该项不能为空', trigger: 'blur' }],
-  ssbm: [{ required: true, message: '该项不能为空', trigger: 'blur' }],
-  ssysName: [{ required: true, message: '该项不能为空', trigger: 'blur' }],
-  qkName: [{ required: true, message: '该项不能为空', trigger: 'blur' }],
-  opDate: [{ required: true, message: '该项不能为空', trigger: 'blur' }],
+  ssmc: [{required: true, message: '该项不能为空', trigger: 'blur'}],
+  ssrq: [{required: true, message: '该项不能为空', trigger: 'blur'}],
+  ssjb: [{required: true, message: '该项不能为空', trigger: 'blur'}],
+  ssbm: [{required: true, message: '该项不能为空', trigger: 'blur'}],
+  ssysName: [{required: true, message: '该项不能为空', trigger: 'blur'}],
+  qkName: [{required: true, message: '该项不能为空', trigger: 'blur'}],
+  opStartDate: [{required: true, message: '该项不能为空', trigger: 'blur'}],
 })
 
 const formQieKou = (val) => {
@@ -181,17 +181,16 @@ const rowClick = (row) => {
 
 const addShouShuClick = async () => {
   let form = unref(formShouShuRef)
+  let opdateS = getDateRangeFormatDateTime(formShouShu.opDate) //3389
+  formShouShu.opStartDate = opdateS.startTime
+  formShouShu.opEndDate = opdateS.endTime
+
+  let anstDateS = getDateRangeFormatDateTime(formShouShu.anstDate)
+  formShouShu.anstStartDate = anstDateS.startTime
+  formShouShu.anstEndDate = anstDateS.endTime
   if (!form) return
   try {
     await form.validate()
-    let opdateS = getDateRangeFormatDateTime(formShouShu.opDate) //3389
-    formShouShu.opStartDate = opdateS.startTime
-    formShouShu.opEndDate = opdateS.endTime
-
-    let anstDateS = getDateRangeFormatDateTime(formShouShu.anstDate)
-    formShouShu.anstStartDate = anstDateS.startTime
-    formShouShu.anstEndDate = anstDateS.endTime
-
     emit('addShouShuClick', formShouShu)
   } catch (e) {
     console.log(e)
@@ -199,11 +198,13 @@ const addShouShuClick = async () => {
 }
 
 onMounted(() => {
-  if (props.data !== null) {
+  if (props.data) {
     formShouShu = props.data
+    formShouShu.qkName = formShouShu.qkjb + '/' + formShouShu.yhqk
     formShouShu.opDate = [formShouShu.opStartDate, formShouShu.opEndDate]
     formShouShu.anstDate = [formShouShu.anstStartDate, formShouShu.anstEndDate]
   }
+
 })
 </script>
 

+ 4 - 10
src/components/si-sheet-upload/jieSuanDanDaYing.vue

@@ -146,15 +146,9 @@
           <!--   第四行     -->
           <div class="tanXingHeZiHeng">
             <div class="wen-zi">
-              <div>工作单位名称</div>
-              <div class="w125">
-                <span>{{ setlinfo.empName }}</span>
-              </div>
-            </div>
-            <div class="wen-zi">
-              <div>工作单位地址</div>
-              <div class="w100">
-                <span>{{ setlinfo.empAddr }}</span>
+              <div>工作单位及地址</div>
+              <div style="width: 330px">
+                <span>{{ setlinfo.empName }} {{ setlinfo.empAddr }}</span>
               </div>
             </div>
             <div class="wen-zi">
@@ -728,7 +722,7 @@
                 <td>{{ setlinfo.mafPay }}</td>
               </tr>
               <tr>
-                <th :rowspan="3 + qiTaPayinfoData.length">补充医疗保险支付</th>
+                <th :rowspan="3 + qiTaPayinfoData.length">其他支付</th>
                 <th>企业补充</th>
                 <td>{{ payinfoData['370100'].fundPayamt }}</td>
               </tr>