服务指令同步功能调整

src/views/synchronization/directive/serviceDirective/ConfigServiceDirective.data.ts

@@ -5,7 +5,6 @@ export const columns: BasicColumn[] = [
     title: '分类标签',
     align: 'center',
     dataIndex: 'instructionTagId_dictText',
-    width: 100,
     customCell: (record, index, column) => {
       if (record.instructionRowSpan != null) {
         return { rowSpan: record.instructionRowSpan };
@@ -16,7 +15,6 @@ export const columns: BasicColumn[] = [
     title: '服务类别',
     align: 'center',
     dataIndex: 'categoryId_dictText',
-    width: 100,
     customCell: (record, index, column) => {
       if (record.categoryRowSpan != null) {
         return { rowSpan: record.categoryRowSpan };
@@ -27,7 +25,6 @@ export const columns: BasicColumn[] = [
     title: '服务类型',
     align: 'center',
     dataIndex: 'typeId_dictText',
-    width: 100,
     customCell: (record, index, column) => {
       if (record.typeRowSpan != null) {
         return { rowSpan: record.typeRowSpan };
@@ -43,7 +40,6 @@ export const columns: BasicColumn[] = [
     title: '体型标签',
     align: 'center',
     dataIndex: 'bodyTagList',
-    width: 150,
     ellipsis: false,
     defaultHidden: true,
     // format(text, record, index) {
@@ -58,7 +54,6 @@ export const columns: BasicColumn[] = [
     title: '情绪标签',
     align: 'center',
     dataIndex: 'emotionTagList',
-    width: 150,
     ellipsis: false,
     defaultHidden: true,
     // format(text, record, index) {
@@ -73,7 +68,6 @@ export const columns: BasicColumn[] = [
     title: '收费价格',
     align: 'center',
     dataIndex: 'tollPrice',
-    width: 100,
     defaultHidden: true,
   },
   {
@@ -86,33 +80,128 @@ export const columns: BasicColumn[] = [
     title: '医保报销',
     align: 'center',
     dataIndex: 'izReimbursement_dictText',
-    width: 100,
     defaultHidden: true,
   },
   {
     title: '机构优惠',
     align: 'center',
     dataIndex: 'izPreferential_dictText',
-    width: 100,
     defaultHidden: true,
   },
   {
     title: '周期类型',
     align: 'center',
     dataIndex: 'cycleType_dictText',
-    width: 100,
   },
   {
     title: '服务时长（分钟）',
     align: 'center',
     dataIndex: 'serviceDuration',
-    width: 80,
   },
   {
     title: '是否启用',
     align: 'center',
     dataIndex: 'izEnabled_dictText',
-    width: 80,
+  },
+];
+
+export const sourceColumns: BasicColumn[] = [
+  {
+    title: '分类标签',
+    align: 'center',
+    dataIndex: 'instructionTagId_dictText',
+    customCell: (record, index, column) => {
+      if (record.instructionRowSpan != null) {
+        return { rowSpan: record.instructionRowSpan };
+      }
+    },
+  },
+  {
+    title: '服务类别',
+    align: 'center',
+    dataIndex: 'categoryId_dictText',
+    customCell: (record, index, column) => {
+      if (record.categoryRowSpan != null) {
+        return { rowSpan: record.categoryRowSpan };
+      }
+    },
+  },
+  {
+    title: '服务类型',
+    align: 'center',
+    dataIndex: 'typeId_dictText',
+    customCell: (record, index, column) => {
+      if (record.typeRowSpan != null) {
+        return { rowSpan: record.typeRowSpan };
+      }
+    },
+  },
+  {
+    title: '服务指令',
+    align: 'center',
+    dataIndex: 'directiveName',
+  },
+  {
+    title: '体型标签',
+    align: 'center',
+    dataIndex: 'bodyTagList',
+    ellipsis: false,
+    defaultHidden: true,
+    // format(text, record, index) {
+    //   if (!!text) {
+    //     return text.map((item) => item.tagName).join('、');
+    //   } else {
+    //     return '-';
+    //   }
+    // },
+  },
+  {
+    title: '情绪标签',
+    align: 'center',
+    dataIndex: 'emotionTagList',
+    ellipsis: false,
+    defaultHidden: true,
+    // format(text, record, index) {
+    //   if (!!text) {
+    //     return text.map((item) => item.tagName).join('、');
+    //   } else {
+    //     return '-';
+    //   }
+    // },
+  },
+  {
+    title: '收费价格',
+    align: 'center',
+    dataIndex: 'tollPrice',
+    defaultHidden: true,
+  },
+  {
+    title: '提成价格',
+    align: 'center',
+    dataIndex: 'comPrice',
+    defaultHidden: true,
+  },
+  {
+    title: '医保报销',
+    align: 'center',
+    dataIndex: 'izReimbursement_dictText',
+    defaultHidden: true,
+  },
+  {
+    title: '机构优惠',
+    align: 'center',
+    dataIndex: 'izPreferential_dictText',
+    defaultHidden: true,
+  },
+  {
+    title: '周期类型',
+    align: 'center',
+    dataIndex: 'cycleType_dictText',
+  },
+  {
+    title: '服务时长（分钟）',
+    align: 'center',
+    dataIndex: 'serviceDuration',
   },
 ];
 

src/views/synchronization/directive/serviceDirective/DirectiveChooseCom.vue

@@ -56,13 +56,13 @@
                 placeholder="请选择情绪标签" allowClear />
             </a-form-item>
           </a-col> -->
-          <a-col :lg="6">
+          <!-- <a-col :lg="6">
             <a-form-item name="izEnabled">
               <template #label><span title="是否启用">是否启用</span></template>
               <j-dict-select-tag type='list' v-model:value="queryParam.izEnabled" dictCode="iz_enabled"
                 :ignoreDisabled="true" placeholder="请选择是否启用" allowClear @select="reload()" />
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
@@ -111,7 +111,7 @@
       </a-col>
       <a-col :lg="12" :sm="24">
         <a-tag color="green" style="margin-left: 10px;margin-top: 10px;">已选择 {{ rightList.length }} 条</a-tag>
-        <BasicTable :dataSource="rightList" :columns="columns" size="small" :scroll="{ y: '46vh' }"
+        <BasicTable :dataSource="rightList" :columns="sourceColumns" size="small" :scroll="{ y: '46vh' }"
           :pagination="{ current: 1, pageSize: 50, total: rightList.length, showSizeChanger: true, pageSizeOptions: ['10', '20', '50', '100'] }">
         </BasicTable>
       </a-col>
@@ -124,7 +124,7 @@
 import { ref, reactive, onMounted, watch } from 'vue';
 import { BasicTable, TableAction } from '/@/components/Table';
 import { useListPage } from '/@/hooks/system/useListPage';
-import { columns, superQuerySchema } from './ConfigServiceDirective.data';
+import { columns, sourceColumns, superQuerySchema } from './ConfigServiceDirective.data';
 import { listByDS } from './ConfigServiceDirective.api';
 import { useUserStore } from '/@/store/modules/user';
 import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
@@ -148,7 +148,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
   tableProps: {
     title: '服务指令',
     api: listByDS,
-    columns,
+    columns: sourceColumns,
     canResize: false,
     useSearchForm: false,
     showIndexColumn: true,
@@ -160,6 +160,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
       pageSizeOptions: ['10', '20', '50', '100'],
     },
     beforeFetch: async (params) => {
+      queryParam.izEnabled = '0'
       return Object.assign(params, queryParam);
     },
     actionColumn: {

src/views/synchronization/directive/syncStep/SyncStepList.vue

@@ -136,6 +136,8 @@ function changeStepVal(isAdd) {
 function orgSourceChangedFunc(orgInfo_) {
   orgInfo.value = orgInfo_
   directiveChooseRef.value?.controlShowJSCom()
+  targetOrgListComRef.value?.reload()
+  directiveChooseRef?.value?.init({ orgInfo: orgInfo.value[0] })
 }
 
 //目标机构被选择/变更
@@ -147,8 +149,8 @@ watch(
   () => stepVal.value,
   (newstepVal, oldValue) => {
     if (newstepVal == 2 && oldValue == 1) {
-      targetOrgListComRef.value?.reload()
-      directiveChooseRef?.value?.init({ orgInfo: orgInfo.value[0] })
+      // targetOrgListComRef.value?.reload()
+      // directiveChooseRef?.value?.init({ orgInfo: orgInfo.value[0] })
     }
     if (newstepVal == 3) {
       targetOrgListComRef.value?.checkAllOrEmpty(false)