seo

src/components/report/TurnoverReportReal.vue

@@ -16,6 +16,7 @@
               <el-option label="体检日期" :value="'2'" />
               <el-option label="总检日期" :value="'3'" />
               <el-option label="收费日期" :value="'6'" />
+              <el-option label="记账日期" :value="'7'" />
             </el-select>
             <!-- dateType  1 登记，2 体检，3 总检日期-->
             <el-date-picker v-model="query.startDate" type="date" placeholder="起始日期" size="small" style="width:90px;"
@@ -86,7 +87,7 @@
             </el-select>
           </div>
           <div class="query">
-            <span>收费员</span>
+            <span>记账员</span>
             <el-select v-model="query.feeUserIds" placeholder="请选择" style="margin-left: 10px;width: 170px;" filterable clearable
               size="small" multiple collapse-tags>
               <el-option v-for="item in users" :key="item.id" :label="item.surname" :value="item.id" />
@@ -161,7 +162,7 @@ export default {
       dictSalesman: [],
       users:[],
       query: {
-        dateType: '6',
+        dateType: '7',
         startDate: '',
         endDate: '',
         customerOrgIds: [],

src/views/fee-settings/cardBill.vue

@@ -71,7 +71,11 @@
                 <div>{{ dddw(dict.payMode, "id", scope.row.payModeId, "displayName") }}</div>
               </template>
             </el-table-column>
-            <el-table-column prop="billMoney" label="记账金额" align="center" />
+            <el-table-column prop="billMoney" label="记账金额" align="center">
+              <template slot-scope="scope">
+                <div :style="`color: ${scope.row.billFlag == '1' ? 'red':''};`">{{ scope.row.billFlag == '1' ? '-'+scope.row.billMoney : scope.row.billMoney  }}</div>
+              </template>
+            </el-table-column>
             <el-table-column prop="billFlag" label="记账标志" align="center">
               <template slot-scope="scope">
                 <div>{{ dddw(dict.billFlag, "id", scope.row.billFlag, "displayName") }}</div>

src/views/fee-settings/cardRegister.vue

@@ -182,7 +182,11 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="billMoney" label="记账金额" align="center" />
+            <el-table-column prop="billMoney" label="记账金额" align="center" >
+              <template slot-scope="scope">
+                <div :style="`color: ${scope.row.billFlag == '1' ? 'red':''};`">{{ scope.row.billFlag == '1' ? '-'+scope.row.billMoney : scope.row.billMoney  }}</div>
+              </template>
+            </el-table-column>
             <el-table-column prop="billFlag" label="记账标志" align="center">
               <template slot-scope="scope">
                 <div>

src/views/report/report.vue

@@ -125,13 +125,14 @@
           <div class="listBtn">
             <el-dropdown @command="btnExportComm">
               <el-button type="primary" class="commonbutton">
-                导出<i class="el-icon-arrow-down el-icon--right"></i>
+                导出/推送<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="exp" @click="btnExport">人员信息导出</el-dropdown-item>
                 <el-dropdown-item command="zip" @click="exportZip">导出Zip</el-dropdown-item>
                 <el-dropdown-item command="jpg" @click="exportJpg">导出Jpg</el-dropdown-item>
                 <el-dropdown-item command="pdf" @click="btnReportExport(false)">导出 pdf 报告</el-dropdown-item>
+                <el-dropdown-item command="tsjh" @click="upTsjh">推送检后信息</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </div>
@@ -288,8 +289,8 @@ export default {
         medicalConclusionId: [],
         personnelTypeIds: [],
         isRecoverGuide: '',
-        personnelTypeId:'',
-        completeFlag:'',
+        personnelTypeId: '',
+        completeFlag: '',
 
       },
 
@@ -1079,6 +1080,9 @@ export default {
         case 'pdf':
           this.btnReportExport(false)
           break;
+        case 'tsjh': // 推送检后--健康评估
+          this.upTsjh()
+          break;
         default: //lis
           this.btnExport()
           break;
@@ -1262,6 +1266,46 @@ export default {
       }
     },
 
+
+    //推送检后信息--健康评估
+    async upTsjh() {
+      
+      if (
+        this.checkedRows &&
+        this.checkedRows.length > 0
+      ) {
+        this.elProgress.display = true;
+        this.elProgress.percentage = 0;
+        
+        for (
+          let i = 0;
+          i < this.checkedRows.length;
+          i++
+        ) {
+          let e = this.checkedRows[i];
+          this.elProgress.percentage = Math.floor(
+            ((i + 1) * 100) / this.checkedRows.length
+          );
+
+          // 调上传接口
+          try {
+            let res = await postapi('/api/app/ThirdResultPush/PushHtyResultByPatientRegisterId',{patientRegisterId:e.patientRegisterId})
+            if(res.code > -1){
+              // 推送检后成功，更新状态
+              e.isUploadAppoint = "Y";
+            }            
+          } catch (error) {
+            console.log("error", error);
+            this.$message.warning({ showClose: true, message: error });
+          }
+        }
+        this.elProgress.display = false;
+      } else {
+        this.$message.warning({ showClose: true, message: "请勾选择记录！" });
+        return;
+      }
+    },
+
     //体检报告打印（预览）
     async btnReport(isPreview) {
       if (!this.$peisAPI) {