Merge branch 'feature/isoffline-bug' into develop

src/pages/index/care/conditioningRecord.vue

@@ -82,7 +82,7 @@ const gridOptions = reactive<VxeGridProps<ConditioningRecordListModel>>({
     custom: true,
     zoom: true,
     slots: {
-      buttons: 'handle',
+      // buttons: 'handle',
       tools: 'toolbar-extra',
     },
   },
@@ -103,6 +103,7 @@ const gridOptions = reactive<VxeGridProps<ConditioningRecordListModel>>({
     { field: 'estimatedStartDate', title: '开始调养日期' },
     { field: 'progress', title: '调理状态', slots: { default: 'patients' } },
     {
+      field: 'action',
       title: '操作',
       align: 'center',
       width: 120,

src/pages/index/care/institutionService.vue

@@ -95,7 +95,7 @@ const gridOptions = reactive<VxeGridProps<SystemCwModel>>({
     custom: true,
     zoom: true,
     slots: {
-      buttons: 'handle',
+      // buttons: 'handle',
       tools: 'toolbar-extra',
     },
   },
@@ -115,6 +115,7 @@ const gridOptions = reactive<VxeGridProps<SystemCwModel>>({
     { field: 'createBy', title: '创建者' },
     { field: 'createTime', title: '创建时间' },
     {
+      field: 'action',
       title: '操作',
       align: 'center',
       width: 150,

src/pages/index/care/issueService.vue

@@ -27,7 +27,7 @@ import { VxeUI } from 'vxe-pc-ui';
 import type { PatientTagModel } from '@/model/patient.model';
 import dayjs from 'dayjs';
 type FollowModel = Partial<OpenConditioningSchemeModel>;
-const props = defineProps<{ data: FollowModel }>();
+// const props = defineProps<{ data: FollowModel }>();
 
 const form = reactive<FollowModel>({
   id: 0,

src/pages/index/care/supplier.vue

@@ -106,6 +106,14 @@ const gridOptions = reactive<VxeGridProps<SupplierModel>>({
   autoResize: false,
   syncResize: true,
   scrollY: { enabled: true, gt: 0 },
+  toolbarConfig: {
+    custom: true,
+    zoom: true,
+    slots: {
+      // buttons: 'handle',
+      tools: 'toolbar-extra',
+    },
+  },
   columnConfig: {
     resizable: true,
   },
@@ -118,6 +126,7 @@ const gridOptions = reactive<VxeGridProps<SupplierModel>>({
     { field: 'kahuna', title: '负责人' },
     { field: 'phone', title: '联系电话' },
     {
+      field: 'collaborateDepts',
       title: '合作机构',
       align: 'center',
       width: 120,
@@ -139,6 +148,7 @@ const gridOptions = reactive<VxeGridProps<SupplierModel>>({
       },
     },
     {
+      field: 'projectAction',
       title: '供应项目',
       align: 'center',
       width: 120,
@@ -160,6 +170,7 @@ const gridOptions = reactive<VxeGridProps<SupplierModel>>({
       },
     },
     {
+      field: 'action',
       title: '操作',
       align: 'center',
       width: 120,
@@ -314,8 +325,13 @@ function editSupplier(model?: SupplierModel, index?: number) {
       <vxe-form v-bind="searchFormProps" v-on="searchFormEmits"></vxe-form>
     </header>
     <main class="flex-auto overflow-hidden">
-      <vxe-grid ref="gridRef" v-bind="gridOptions" v-on="gridEvents" :loading="loading"> </vxe-grid>
+      <vxe-grid ref="gridRef" v-bind="gridOptions" v-on="gridEvents" :loading="loading">
+        <template #toolbar-extra>
+          <vxe-button style="margin-right: 12px" icon="vxe-icon-repeat" circle @click="refresh(page)"></vxe-button>
+        </template>
+      </vxe-grid>
     </main>
+
     <footer class="flex-none">
       <vxe-pager
         v-model:current-page="page"

src/pages/index/care/systemService.vue

@@ -81,6 +81,13 @@ const gridOptions = reactive<VxeGridProps<SystemCwModel>>({
   autoResize: false,
   syncResize: true,
   scrollY: { enabled: true, gt: 0 },
+  toolbarConfig: {
+    custom: true,
+    zoom: true,
+    slots: {
+      tools: 'toolbar-extra',
+    },
+  },
   columnConfig: {
     resizable: true,
   },
@@ -96,6 +103,7 @@ const gridOptions = reactive<VxeGridProps<SystemCwModel>>({
     { field: 'createBy', title: '创建者' },
     { field: 'createTime', title: '创建时间' },
     {
+      field: 'action',
       title: '操作',
       align: 'center',
       width: 150,
@@ -219,7 +227,11 @@ function editSystemService(model?: SystemCwModel, index?: number) {
       <vxe-form v-bind="searchFormProps" v-on="searchFormEmits"></vxe-form>
     </header>
     <main class="flex-auto overflow-hidden">
-      <vxe-grid ref="gridRef" v-bind="gridOptions" v-on="gridEvents" :loading="loading"> </vxe-grid>
+      <vxe-grid ref="gridRef" v-bind="gridOptions" v-on="gridEvents" :loading="loading">
+        <template #toolbar-extra>
+          <vxe-button style="margin-right: 12px;" icon="vxe-icon-repeat" circle @click="refresh(page)"></vxe-button>
+        </template>  
+      </vxe-grid>
     </main>
     <footer class="flex-none">
       <vxe-pager

src/service/AddItems.vue

@@ -70,7 +70,7 @@ const rules = {
   name: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
   conditioningProgramType: [{ required: true, message: '请选择方案类型', trigger: 'change' }],
   pricingType: [{ required: true, message: '请选择计价规则', trigger: 'change' }],
-  // conditioningProgramSupplierId: [{ required: true, message: '请选择供应商', trigger: 'change' }],
+  conditioningProgramSupplierId: [{ required: true, message: '请选择供应商', trigger: 'change' }],
   institutionId: [{ required: true, message: '请选择机构名称', trigger: 'change' }],
   isOffline: [{ required: true, message: '请选择线下项目', trigger: 'change' }],
 };
@@ -94,12 +94,14 @@ function getisOffline(e: any, newOffline: any, newDelivery: any, newType: any) {
   let filterSupplierArr = supplierArr.value.filter((item: any) => item.id === e);
   if (filterSupplierArr.length > 0) {
     isShowOnline.value = filterSupplierArr.every((items: any) => {
+      console.log(items, 'filterSupplierArr');
       if (newType.length > 0) {
         return items.offlineCPTypes?.includes(newType[0]) && items.onlineCPTypes?.includes(newType[0]);
       } else {
         return false;
       }
     });
+    console.log(isShowOnline.value, 'isShowOnline2222');
     if (isShowOnline.value) {
       if (newOffline) {
         onlineArr.value = [newOffline];
@@ -133,6 +135,7 @@ function getisOffline(e: any, newOffline: any, newDelivery: any, newType: any) {
     onlineArr.value = [];
     deliverArr.value = [];
   }
+  console.log(isShowOnline.value, 'isShowOnline');
 }
 watch(
   [() => form.conditioningProgramType, () => form.institutionId, () => form.conditioningProgramSupplierId, () => form.isOffline, () => form.isDelivery],

src/service/ServiceItemsConfirm.vue

@@ -88,6 +88,7 @@ const gridOptions = reactive<VxeGridProps<SystemItemModel>>({
     { field: 'cpFixedPricingRule.convertDose', title: '计价说明', slots: { default: 'convertDoseCell' } },
     { field: 'conditioningProgramSupplierName', title: '供应商' },
     {
+      field: 'action',
       title: '操作',
       align: 'center',
       width: 120,

src/service/ServiceItemsList.vue

@@ -100,6 +100,7 @@ const gridOptions = reactive<VxeGridProps<SystemItemModel>>({
     { field: 'conditioningProgramSupplierName', title: '供应商' },
     { field: 'institutionName', title: '机构名称' },
     {
+      field: 'action',
       title: '操作',
       align: 'center',
       width: 150,

src/service/ServiceItemsSystem.vue

@@ -129,6 +129,7 @@ const gridOptions = reactive<VxeGridProps<SystemItemModel>>({
     { field: 'conditioningProgramSupplierName', title: '供应商' },
 
     {
+      field: 'action',
       title: '操作',
       align: 'center',
       width: 160,