Merge remote-tracking branch 'origin/weiqiao-vue3' into hongshun

xjrsoft-vue3/src/api/ckgl/kcpd/index.ts

@@ -93,6 +93,11 @@ export async function deleteMesWarehouseInventory(ids: string[], mode: ErrorMess
   );
 }
 
+
+
+/**
+ * @description: 导出MesWarehouseInventory
+ */
 export async function exportMesWarehouseInventory(
   params?: object, 
   mode: ErrorMessageMode = 'modal'

xjrsoft-vue3/src/api/ckgl/kcpd/model/KcpdModel.ts

@@ -135,6 +135,8 @@ export interface MesWarehouseInventoryRelaModel {
 
   cplx: string;
 
+  ck: string;
+
   wz: string;
 
   pch: string;

xjrsoft-vue3/src/api/ckgl/kcyk/model/KcykModel.ts

@@ -10,13 +10,13 @@ export interface MesWarehouseProfitandlossPageParams extends BasicPageParams {
 
   ck: string;
 
+  hw: string;
+
   pch: string;
 
   ykzt: string;
 
   ywzz: string;
-
-  pddid: string;
 }
 
 /**
@@ -25,12 +25,16 @@ export interface MesWarehouseProfitandlossPageParams extends BasicPageParams {
 export interface MesWarehouseProfitandlossPageModel {
   id: string;
 
+  ywzz: string;
+
   cpbm: string;
 
   cpmc: string;
 
   ck: string;
 
+  hw: string;
+
   pch: string;
 
   xtsl: string;
@@ -42,10 +46,6 @@ export interface MesWarehouseProfitandlossPageModel {
   ce: string;
 
   ykzt: string;
-
-  ywzz: string;
-
-  pddid: string;
 }
 
 /**
@@ -66,6 +66,8 @@ export interface MesWarehouseProfitandlossModel {
 
   ck: string;
 
+  hw: string;
+
   xtsl: string;
 
   pdsl: string;

xjrsoft-vue3/src/api/ckgl/qtck/model/QtckModel.ts

@@ -4,10 +4,14 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
  * @description: MesWarehouseOtherout分页参数 模型
  */
 export interface MesWarehouseOtheroutPageParams extends BasicPageParams {
-  ywhb: string;
+  ywzz: string;
 
   ywlx: string;
 
+  dbrq: string;
+
+  lydj: string;
+
   ck: string;
 }
 
@@ -17,7 +21,7 @@ export interface MesWarehouseOtheroutPageParams extends BasicPageParams {
 export interface MesWarehouseOtheroutPageModel {
   id: string;
 
-  ywhb: string;
+  ywzz: string;
 
   ywlx: string;
 
@@ -38,7 +42,7 @@ export interface MesWarehouseOtheroutModel {
 
   deleteMark: string;
 
-  ywhb: string;
+  ywzz: string;
 
   ywlx: string;
 

xjrsoft-vue3/src/api/ckgl/qtrk/model/QtrkModel.ts

@@ -4,7 +4,7 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
  * @description: MesWarehouseOther分页参数 模型
  */
 export interface MesWarehouseOtherPageParams extends BasicPageParams {
-  ywhb: string;
+  ywzz: string;
 
   ywlx: string;
 
@@ -13,8 +13,6 @@ export interface MesWarehouseOtherPageParams extends BasicPageParams {
   lydj: string;
 
   ck: string;
-
-  cgy: string;
 }
 
 /**
@@ -23,7 +21,7 @@ export interface MesWarehouseOtherPageParams extends BasicPageParams {
 export interface MesWarehouseOtherPageModel {
   id: string;
 
-  ywhb: string;
+  ywzz: string;
 
   ywlx: string;
 
@@ -42,7 +40,9 @@ export interface MesWarehouseOtherPageModel {
 export interface MesWarehouseOtherModel {
   id: string;
 
-  ywhb: string;
+  deleteMark: string;
+
+  ywzz: string;
 
   ywlx: string;
 
@@ -54,6 +54,74 @@ export interface MesWarehouseOtherModel {
 
   cgy: string;
 
+  p1: string;
+
+  p2: string;
+
+  p3: string;
+
+  p4: string;
+
+  p5: string;
+
+  p6: string;
+
+  p7: string;
+
+  p8: string;
+
+  p9: string;
+
+  p10: string;
+
+  p11: string;
+
+  p12: string;
+
+  p13: string;
+
+  p14: string;
+
+  p15: string;
+
+  p16: string;
+
+  p17: string;
+
+  p18: string;
+
+  p19: string;
+
+  p20: string;
+
+  p21: string;
+
+  p22: string;
+
+  p23: string;
+
+  p24: string;
+
+  p25: string;
+
+  p26: string;
+
+  p27: string;
+
+  p28: string;
+
+  p29: string;
+
+  p30: string;
+
+  createDate: string;
+
+  createUserId: string;
+
+  modifyDate: string;
+
+  modifyUserId: string;
+
   mesWarehouseOtherInfoList?: MesWarehouseOtherInfoModel;
 }
 
@@ -63,6 +131,8 @@ export interface MesWarehouseOtherModel {
 export interface MesWarehouseOtherInfoModel {
   id: string;
 
+  deleteMark: string;
+
   qtid: string;
 
   cp: string;
@@ -80,6 +150,74 @@ export interface MesWarehouseOtherInfoModel {
   hw: string;
 
   bz: string;
+
+  p1: string;
+
+  p2: string;
+
+  p3: string;
+
+  p4: string;
+
+  p5: string;
+
+  p6: string;
+
+  p7: string;
+
+  p8: string;
+
+  p9: string;
+
+  p10: string;
+
+  p11: string;
+
+  p12: string;
+
+  p13: string;
+
+  p14: string;
+
+  p15: string;
+
+  p16: string;
+
+  p17: string;
+
+  p18: string;
+
+  p19: string;
+
+  p20: string;
+
+  p21: string;
+
+  p22: string;
+
+  p23: string;
+
+  p24: string;
+
+  p25: string;
+
+  p26: string;
+
+  p27: string;
+
+  p28: string;
+
+  p29: string;
+
+  p30: string;
+
+  createDate: string;
+
+  createUserId: string;
+
+  modifyDate: string;
+
+  modifyUserId: string;
 }
 
 /**

xjrsoft-vue3/src/api/jcsj/cplx/index.ts

+
+import { MesBaseCplxPageModel, MesBaseCplxPageParams, MesBaseCplxPageResult } from './model/CplxModel';
+import { defHttp } from '/@/utils/http/axios';
+import { ErrorMessageMode } from '/#/axios';
+
+enum Api {
+  Page = '/jcsj/cplx/page',
+  List = '/jcsj/cplx/list',
+  Info = '/jcsj/cplx/info',
+  MesBaseCplx = '/jcsj/cplx',
+  
+  
+  
+}
+
+/**
+ * @description: 查询MesBaseCplx分页列表
+ */
+export async function getMesBaseCplxPage(params: MesBaseCplxPageParams, mode: ErrorMessageMode = 'modal') {
+  return defHttp.get<MesBaseCplxPageResult>(
+    {
+      url: Api.Page,
+      params,
+    },
+    {
+      errorMessageMode: mode,
+    },
+  );
+}
+
+/**
+ * @description: 获取MesBaseCplx信息
+ */
+export async function getMesBaseCplx(id: String, mode: ErrorMessageMode = 'modal') {
+  return defHttp.get<MesBaseCplxPageModel>(
+    {
+      url: Api.Info,
+      params: { id },
+    },
+    {
+      errorMessageMode: mode,
+    },
+  );
+}
+
+/**
+ * @description: 新增MesBaseCplx
+ */
+export async function addMesBaseCplx(mesBaseCplx: Recordable, mode: ErrorMessageMode = 'modal') {
+  return defHttp.post<boolean>(
+    {
+      url: Api.MesBaseCplx,
+      params: mesBaseCplx,
+    },
+    {
+      errorMessageMode: mode,
+    },
+  );
+}
+
+/**
+ * @description: 更新MesBaseCplx
+ */
+export async function updateMesBaseCplx(mesBaseCplx: Recordable, mode: ErrorMessageMode = 'modal') {
+  return defHttp.put<boolean>(
+    {
+      url: Api.MesBaseCplx,
+      params: mesBaseCplx,
+    },
+    {
+      errorMessageMode: mode,
+    },
+  );
+}
+
+/**
+ * @description: 删除MesBaseCplx（批量删除）
+ */
+export async function deleteMesBaseCplx(ids: string[], mode: ErrorMessageMode = 'modal') {
+  return defHttp.delete<boolean>(
+    {
+      url: Api.MesBaseCplx,
+      data: ids,
+    },
+    {
+      errorMessageMode: mode,
+    },
+  );
+}
+
+
+
+

xjrsoft-vue3/src/api/jcsj/cplx/model/CplxModel.ts

+import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
+
+/**
+ * @description: MesBaseCplx分页参数 模型
+ */
+export interface MesBaseCplxPageParams extends BasicPageParams {
+  cm: string;
+
+  pid: string;
+}
+
+/**
+ * @description: MesBaseCplx分页返回值模型
+ */
+export interface MesBaseCplxPageModel {
+  id: string;
+
+  cm: string;
+
+  pid: string;
+
+  bh: string;
+
+  paixu: string;
+
+  bz: string;
+}
+
+/**
+ * @description: MesBaseCplx表类型
+ */
+export interface MesBaseCplxModel {
+  id: string;
+
+  deleteMark: string;
+
+  pid: string;
+
+  cm: string;
+
+  bh: string;
+
+  paixu: string;
+
+  bz: string;
+
+  p1: string;
+
+  p2: string;
+
+  p3: string;
+
+  p4: string;
+
+  p5: string;
+
+  p6: string;
+
+  p7: string;
+
+  p8: string;
+
+  p9: string;
+
+  p10: string;
+
+  createDate: string;
+
+  createUserId: string;
+
+  modifyDate: string;
+
+  modifyUserId: string;
+}
+
+/**
+ * @description: MesBaseCplx分页返回值结构
+ */
+export type MesBaseCplxPageResult = BasicFetchResult<MesBaseCplxPageModel>;

xjrsoft-vue3/src/api/jcsj/cpxx/model/CpxxModel.ts

@@ -9,14 +9,6 @@ export interface MesBaseProductInfoPageParams extends BasicPageParams {
   cpbh: string;
 
   cplx: string;
-
-  xh: string;
-
-  hjzt: string;
-
-  nbdm: string;
-
-  sfyx: string;
 }
 
 /**
@@ -29,19 +21,13 @@ export interface MesBaseProductInfoPageModel {
 
   cpbh: string;
 
-  cplx: string;
-
   gg: string;
 
   xh: string;
 
-  hjzt: string;
-
-  nbdm: string;
-
-  erpid: string;
+  cplx: string;
 
-  sfyx: string;
+  bzzl: string;
 }
 
 /**
@@ -86,7 +72,7 @@ export interface MesBaseProductInfoModel {
 
   bz: string;
 
-  p1: string;
+  dw: string;
 
   p2: string;
 
@@ -113,6 +99,8 @@ export interface MesBaseProductInfoModel {
   modifyDate: string;
 
   modifyUserId: string;
+
+  p1: string;
 }
 
 /**

xjrsoft-vue3/src/views/ckgl/kcpd/components/Form.vue

@@ -35,6 +35,10 @@
       type: Number,
       default: FromPageType.MENU,
     },
+    isView: {
+      type: Boolean,
+      default: false,
+    },
   });
   const systemFormRef = ref();
   const data: { formDataProps: FormDataProps } = reactive({
@@ -49,12 +53,109 @@
     () => state.formModel,
     (val) => { 
       emits('update:value', val);
+      // Update button and field states based on form state
+      updateButtonVisibility();
+      updateHeaderFieldDisabledState();
+      updateDetailFieldDisabledState();
     },
     {
       deep: true,
     },
   );
-  
+
+  // Update button disabled state based on form state
+  function updateButtonVisibility() {
+    const hasId = !!state.formModel.id;
+    const isCompleted = state.formModel.zt === '已完成';
+    const isCancelled = state.formModel.zt === '取消';
+    // Find the grid component that contains the buttons
+    const gridComponent = data.formDataProps.schemas.find(schema => schema.component === 'Grid' && schema.children);
+    if (gridComponent && gridComponent.children) {
+      // Update each button's disabled state
+      gridComponent.children.forEach(child => {
+        if (child.list && child.list.length > 0) {
+          child.list.forEach(button => {
+            if (props.isView || isCancelled) {
+              // Disable all buttons in view mode or if status is cancelled
+              button.componentProps.disabled = true;
+              button.componentProps.isShow = true;
+            } else if (button.label === '开始盘点') {
+              // Disable start inventory button in edit mode
+              button.componentProps.disabled = hasId;
+              // Always show the button
+              button.componentProps.isShow = true;
+            } else if (['确认盘点', '取消盘点'].includes(button.label)) {
+              // Disable these buttons in add mode or if status is completed
+              button.componentProps.disabled = !hasId || isCompleted;
+              // Always show the buttons
+              button.componentProps.isShow = true;
+            } else if (button.label === '处理盈亏') {
+              // Disable in add mode or when status is not completed
+              button.componentProps.disabled = !hasId || !isCompleted;
+              // Always show the button
+              button.componentProps.isShow = true;
+            }
+          });
+        }
+      });
+    }
+  }
+
+  // Update header field disabled state based on form state
+  function updateHeaderFieldDisabledState() {
+    const hasId = !!state.formModel.id;
+    const isCompletedOrCancelled = state.formModel.zt === '已完成' || state.formModel.zt === '取消';
+    // Find the grid component that contains the header fields
+    const headerGridComponent = data.formDataProps.schemas.find(schema => 
+      schema.component === 'Grid' && 
+      schema.children && 
+      schema.children.some(child => 
+        child.list && 
+        child.list.some(field => field.field === 'ckwz' || field.field === 'cplx' || field.field === 'cp' || field.field === 'pdrq' || field.field === 'bz')
+      )
+    );
+    if (headerGridComponent && headerGridComponent.children) {
+      // Update each header field's disabled state
+      headerGridComponent.children.forEach(child => {
+        if (child.list && child.list.length > 0) {
+          child.list.forEach(field => {
+            if (field.componentProps) {
+              // Disable header fields in edit mode, view mode, or if status is completed or cancelled
+              field.componentProps.disabled = props.isView || hasId || isCompletedOrCancelled;
+            }
+          });
+        }
+      });
+    }
+  }
+
+  // Update inventory detail fields disabled state based on form state
+  function updateDetailFieldDisabledState() {
+    const isCompletedOrCancelled = state.formModel.zt === '已完成' || state.formModel.zt === '取消';
+    // Find the tab component that contains the inventory detail subform
+    const tabComponent = data.formDataProps.schemas.find(schema => schema.component === 'Tab' && schema.children);
+    if (tabComponent && tabComponent.children) {
+      // Find the inventory detail subform
+      tabComponent.children.forEach(tab => {
+        if (tab.list && tab.list.length > 0) {
+          tab.list.forEach(item => {
+            if (item.component === 'SubForm' && item.componentProps && item.componentProps.columns) {
+              // Update each detail field's disabled state
+              item.componentProps.columns.forEach(column => {
+                if (column.componentProps) {
+                  // For pdsl field, disable in view mode or if status is completed or cancelled
+                  if (column.dataIndex === 'pdsl') {
+                    column.componentProps.disabled = props.isView || isCompletedOrCancelled;
+                  }
+                }
+              });
+            }
+          });
+        }
+      });
+    }
+  }
+
   onMounted(async () => {
     try {
       if (props.fromPage == FromPageType.MENU) {
@@ -70,6 +171,10 @@
         await loadFormEvent(formEventConfigs, state.formModel,
           systemFormRef.value,
           formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：加载表单
+        // Update button and field states after form initialization
+        updateButtonVisibility();
+        updateHeaderFieldDisabledState();
+        updateDetailFieldDisabledState();
       } else if (props.fromPage == FromPageType.FLOW) {
         emits('loadingCompleted'); //告诉系统表单已经加载完毕
         // loadingCompleted后 工作流页面直接利用Ref调用setWorkFlowForm方法
@@ -84,6 +189,10 @@
         await loadFormEvent(formEventConfigs, state.formModel,
           systemFormRef.value,
           formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：加载表单
+        // Update button and field states after form initialization
+        updateButtonVisibility();
+        updateHeaderFieldDisabledState();
+        updateDetailFieldDisabledState();
       }
     } catch (error) {}
   });
@@ -116,6 +225,10 @@
       await getFormDataEvent(formEventConfigs, state.formModel,
         systemFormRef.value,
         formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：获取表单数据
+      // Update button and field states after setting form data
+      updateButtonVisibility();
+      updateHeaderFieldDisabledState();
+      updateDetailFieldDisabledState();
     } catch (error) {
       
     }
@@ -222,4 +335,3 @@
   });
 </script>
 
-  
\ No newline at end of file

xjrsoft-vue3/src/views/ckgl/kcpd/components/KcpdModal.vue

@@ -6,7 +6,7 @@
     :height="1080"   
      v-bind="$attrs" @register="registerModal" :title="getTitle"
       @ok="handleSubmit" @cancel="handleClose"  >
-      <ModalForm ref="formRef" v-model:value="state.formModel" :fromPage="FromPageType.MENU" />
+      <ModalForm ref="formRef" v-model:value="state.formModel" :fromPage="FromPageType.MENU" :isView="state.isView" />
       <template #footer v-if=" !state.isView">
       <template v-for="(item, index) in sortBy(formButtons, 'index')" :key="item.key">
       <template v-if="item.isShow">
@@ -26,7 +26,7 @@
   
 </template>
 <script lang="ts" setup>
-  import { ref, computed, reactive, provide, Ref  } from 'vue';
+  import { ref, computed, reactive, provide, Ref, onMounted, onBeforeUnmount  } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
     
       import { CustomButtonModalType } from '/@/enums/userEnum';
@@ -36,7 +36,7 @@
   import { formProps ,formButtons } from './config';
   import ModalForm from './Form.vue';
   import { FromPageType } from '/@/enums/workflowEnum';
-  
+
    import { sortBy } from 'lodash-es';  
        import { executeCurFormEvent } from '/@/utils/event/data'; 
 
@@ -58,6 +58,24 @@
       await handleInner(data); 
   });
 
+  // Handle postMessage event to close modal or trigger confirm button
+  function handlePostMessage(event) {
+    if (event.data && event.data.type === 'CLOSE_MODAL') {
+      closeModal();
+    } else if (event.data && event.data.type === 'TRIGGER_CONFIRM_BUTTON') {
+      // Trigger confirm button click event
+      handleSubmit();
+    }
+  }
+
+  onMounted(() => {
+    window.addEventListener('message', handlePostMessage);
+  });
+
+  onBeforeUnmount(() => {
+    window.removeEventListener('message', handlePostMessage);
+  });
+
   const getTitle = computed(() => (state.isView ? '查看' : state.isUpdate ? '编辑' : isCopy.value ? '复制数据' : '新增'));
 
   

xjrsoft-vue3/src/views/ckgl/kcpd/components/workflowPermission.ts

@@ -210,6 +210,21 @@ export const permissionList = [
         isSaveTable: false,
         showChildren: false,
         tableName: 'mesWarehouseInventoryRelaList',
+        fieldName: '产品编号',
+        fieldId: 'cpbh',
+        type: 'Input',
+        key: '6baef041c82842dc9adb2d4cfb7b5ad3',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesWarehouseInventoryRelaList',
         fieldName: '产品',
         fieldId: 'cp',
         type: 'XjrSelect',
@@ -240,6 +255,21 @@ export const permissionList = [
         isSaveTable: false,
         showChildren: false,
         tableName: 'mesWarehouseInventoryRelaList',
+        fieldName: '仓库',
+        fieldId: 'ck',
+        type: 'Input',
+        key: '14b12cc2cf3a40bdae1fa6869902252a',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesWarehouseInventoryRelaList',
         fieldName: '位置',
         fieldId: 'wz',
         type: 'XjrSelect',

xjrsoft-vue3/src/views/ckgl/kcyk/components/workflowPermission.ts

@@ -57,6 +57,23 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
+    fieldName: '货位',
+    fieldId: 'hw',
+    isSubTable: false,
+    showChildren: true,
+    type: 'input',
+    key: '54500356c99e4d06a53a79a442d348e0',
+    children: [],
+    options: {},
+    defaultValue: '',
+  },
+  {
+    required: false,
+    view: true,
+    edit: true,
+    disabled: false,
+    isSaveTable: false,
+    tableName: '',
     fieldName: '批次号',
     fieldId: 'pch',
     isSubTable: false,
@@ -78,8 +95,8 @@ export const permissionList = [
     fieldId: 'xtsl',
     isSubTable: false,
     showChildren: true,
-    type: 'input',
-    key: 'c29582cdbd274b0cbd798fe5a4642cc9',
+    type: 'number',
+    key: 'c2620adb8c7e41578bfb7b20e9355d5c',
     children: [],
     options: {},
     defaultValue: '',
@@ -95,8 +112,8 @@ export const permissionList = [
     fieldId: 'pdsl',
     isSubTable: false,
     showChildren: true,
-    type: 'input',
-    key: 'c04bb88244fe43349bebf968fdce3ce9',
+    type: 'number',
+    key: 'dd2024cad3a14e06b5e961826ec9a1e4',
     children: [],
     options: {},
     defaultValue: '',
@@ -129,8 +146,8 @@ export const permissionList = [
     fieldId: 'ce',
     isSubTable: false,
     showChildren: true,
-    type: 'input',
-    key: '10186fcaa02b4481be4c236037f0783a',
+    type: 'number',
+    key: '3668d0679a244117acf2ce4bbc5e14dd',
     children: [],
     options: {},
     defaultValue: '',

xjrsoft-vue3/src/views/ckgl/qtck/components/config.ts

@@ -3,8 +3,8 @@ import { BasicColumn } from '/@/components/Table';
 
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'ywhb',
-    label: '业务伙伴',
+    field: 'ywzz',
+    label: '业务组织',
     defaultValue: undefined,
     component: 'Input',
   },
@@ -15,6 +15,24 @@ export const searchFormSchema: FormSchema[] = [
     component: 'Input',
   },
   {
+    field: 'dbrq',
+    label: '调拨日期',
+    defaultValue: undefined,
+    component: 'RangePicker',
+    componentProps: {
+      format: 'YYYY-MM-DD HH:mm:ss',
+      style: { width: '100%' },
+      getPopupContainer: () => document.body,
+    },
+  },
+
+  {
+    field: 'lydj',
+    label: '来源单据',
+    defaultValue: undefined,
+    component: 'Input',
+  },
+  {
     field: 'ck',
     label: '仓库',
     defaultValue: undefined,
@@ -34,8 +52,8 @@ export const searchFormSchema: FormSchema[] = [
 export const columns: BasicColumn[] = [
   {
     resizable: true,
-    dataIndex: 'ywhb',
-    title: '业务伙伴',
+    dataIndex: 'ywzz',
+    title: '业务组织',
     componentType: 'input',
 
     fixed: false,
@@ -194,8 +212,8 @@ export const formProps: FormProps = {
           list: [
             {
               key: '47ec86ca7bf342d798e4ef44e302f987',
-              field: 'ywhb',
-              label: '业务伙伴',
+              field: 'ywzz',
+              label: '业务组织',
               type: 'input',
               component: 'Input',
               colProps: { span: 24 },
@@ -204,7 +222,7 @@ export const formProps: FormProps = {
                 width: '100%',
                 span: 7,
                 defaultValue: '',
-                placeholder: '请输入业务伙伴',
+                placeholder: '请输入业务组织',
                 prefix: '',
                 suffix: '',
                 addonBefore: '',
@@ -584,14 +602,21 @@ export const formProps: FormProps = {
                 { key: 2, label: 'Option 2', value: 'Option 2' },
                 { key: 3, label: 'Option 3', value: 'Option 3' },
               ],
-              datasourceType: 'dic',
-              params: { itemId: '2010541442849521665' },
-              labelField: 'name',
+              datasourceType: 'api',
+              params: null,
+              labelField: 'label',
               valueField: 'value',
               apiConfig: {
-                path: 'CodeGeneration/selection',
+                path: '/getStoreLocation',
                 method: 'GET',
-                apiId: '93d735dcb7364a0f8102188ec4d77ac7',
+                apiId: 'd55f1866db284ecd8b038a3956b9c5b7',
+                apiParams: [
+                  { key: '1', title: 'Query Params', tableInfo: [] },
+                  { key: '2', title: 'Header', tableInfo: [] },
+                  { key: '3', title: 'Body' },
+                ],
+                script:
+                  'var sql="select name as value,name as label from mes_storage_location where delete_mark = 0 ";\r\nreturn db.select(sql);',
               },
               dicOptions: [],
               required: false,
@@ -600,6 +625,7 @@ export const formProps: FormProps = {
               isShow: true,
               tooltipConfig: { visible: false, title: '提示文本' },
               itemId: '2010541442849521665',
+              defaultSelect: null,
               listStyle: "return 'border: 0'",
             },
           },

xjrsoft-vue3/src/views/ckgl/qtck/components/workflowPermission.ts

@@ -6,8 +6,8 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '业务伙伴',
-    fieldId: 'ywhb',
+    fieldName: '业务组织',
+    fieldId: 'ywzz',
     isSubTable: false,
     showChildren: true,
     type: 'input',

xjrsoft-vue3/src/views/ckgl/qtck/index.vue

@@ -133,7 +133,7 @@
   //展示在列表内的按钮
   const actionButtons = ref<string[]>(["view","edit","delete"]);
   const buttonConfigs = computed(()=>{
-    const list = [{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isEnableLock":true},{"isUse":true,"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true}]
+    const list = [{"buttonId":"2010602997717409792","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2010602997717409793","name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"buttonId":"2010602997717409794","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2010602997717409795","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]
     return filterButtonAuth(list);
   })
 
@@ -176,7 +176,7 @@
     formConfig: {
       labelWidth: 100,
       schemas: searchFormSchema,
-      fieldMapToTime: [],
+      fieldMapToTime: [['dbrq', ['dbrqStart', 'dbrqEnd'], 'YYYY-MM-DD HH:mm:ss ', true],],
       showResetButton: false,
     },
      bordered:false,
@@ -382,4 +382,4 @@
   
   
   
-</style>
\ No newline at end of file
+</style>

xjrsoft-vue3/src/views/ckgl/qtrk/components/config.ts

@@ -3,8 +3,8 @@ import { BasicColumn } from '/@/components/Table';
 
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'ywhb',
-    label: '业务伙伴',
+    field: 'ywzz',
+    label: '业务组织',
     defaultValue: undefined,
     component: 'Input',
   },
@@ -47,19 +47,13 @@ export const searchFormSchema: FormSchema[] = [
       getPopupContainer: () => document.body,
     },
   },
-  {
-    field: 'cgy',
-    label: '仓管员',
-    defaultValue: undefined,
-    component: 'Input',
-  },
 ];
 
 export const columns: BasicColumn[] = [
   {
     resizable: true,
-    dataIndex: 'ywhb',
-    title: '业务伙伴',
+    dataIndex: 'ywzz',
+    title: '业务组织',
     componentType: 'input',
 
     fixed: false,
@@ -218,8 +212,8 @@ export const formProps: FormProps = {
           list: [
             {
               key: '47ec86ca7bf342d798e4ef44e302f987',
-              field: 'ywhb',
-              label: '业务伙伴',
+              field: 'ywzz',
+              label: '业务组织',
               type: 'input',
               component: 'Input',
               colProps: { span: 24 },
@@ -228,7 +222,7 @@ export const formProps: FormProps = {
                 width: '100%',
                 span: 7,
                 defaultValue: '',
-                placeholder: '请输入业务伙伴',
+                placeholder: '请输入业务组织',
                 prefix: '',
                 suffix: '',
                 addonBefore: '',
@@ -657,14 +651,21 @@ export const formProps: FormProps = {
                 { key: 2, label: 'Option 2', value: 'Option 2' },
                 { key: 3, label: 'Option 3', value: 'Option 3' },
               ],
-              datasourceType: 'dic',
-              params: { itemId: '2010541442849521665' },
-              labelField: 'name',
+              datasourceType: 'api',
+              params: null,
+              labelField: 'label',
               valueField: 'value',
               apiConfig: {
-                path: 'CodeGeneration/selection',
+                path: '/getStoreLocation',
                 method: 'GET',
-                apiId: '93d735dcb7364a0f8102188ec4d77ac7',
+                apiId: 'd55f1866db284ecd8b038a3956b9c5b7',
+                apiParams: [
+                  { key: '1', title: 'Query Params', tableInfo: [] },
+                  { key: '2', title: 'Header', tableInfo: [] },
+                  { key: '3', title: 'Body' },
+                ],
+                script:
+                  'var sql="select name as value,name as label from mes_storage_location where delete_mark = 0 ";\r\nreturn db.select(sql);',
               },
               dicOptions: [],
               required: false,
@@ -673,6 +674,7 @@ export const formProps: FormProps = {
               isShow: true,
               tooltipConfig: { visible: false, title: '提示文本' },
               itemId: '2010541442849521665',
+              defaultSelect: null,
               listStyle: "return 'border: 0'",
             },
           },

xjrsoft-vue3/src/views/ckgl/qtrk/components/workflowPermission.ts

@@ -6,8 +6,8 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '业务伙伴',
-    fieldId: 'ywhb',
+    fieldName: '业务组织',
+    fieldId: 'ywzz',
     isSubTable: false,
     showChildren: true,
     type: 'input',

xjrsoft-vue3/src/views/ckgl/scbl/components/PickListModal.vue

@@ -51,19 +51,19 @@
       // 常驻输入框
       customRender: ({ record }) =>
         h(InputNumber, {
-          value: 0,
+          //value: 0,
           min: 0,
           max: 999999,
           size: 'small',
           style: { width: '100%' },
-          // onChange: (val) => (record.sl = val),
+          onChange: (val) => (record.sl = val),
         }),
     },
   ];
 
   /* 打开弹窗 - 父组件调用 */
   function open(rows: any[]) {
-    tableData.value = rows.map((r) => ({ ...r, blsl: r.blsl || 0 }));
+    tableData.value = rows.map((r) => ({ ...r,sl: 0}));
     openModal(true);
   }
 
@@ -73,7 +73,7 @@
     if (loading.value) return;
 
     // 简单校验：数量不能全 0
-    const allZero = tableData.value.every((r) => r.blsl === 0);
+    const allZero = tableData.value.every((r) => r.sl === null || r.sl === 0);
     if (allZero) {
       createMessage.warning('请至少输入一行领料数量'); // ✅ 用 createMessage
       return;

xjrsoft-vue3/src/views/jcsj/cplx/components/CplxModal.vue

+
+<template>
+
+
+    <BasicModal 
+    :height="500"   
+     v-bind="$attrs" @register="registerModal" :title="getTitle"
+      @ok="handleSubmit" @cancel="handleClose"  >
+      <ModalForm ref="formRef" v-model:value="state.formModel" :fromPage="FromPageType.MENU" />
+      
+    </BasicModal>
+  
+</template>
+<script lang="ts" setup>
+  import { ref, computed, reactive, provide, Ref  } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { formProps  } from './config';
+  import ModalForm from './Form.vue';
+  import { FromPageType } from '/@/enums/workflowEnum';
+  
+   
+
+  const emit = defineEmits(['success', 'register']);
+
+  const { notification } = useMessage();
+  const formRef = ref();
+  const isCopy = ref<boolean>(false)
+  const state = reactive({
+    formModel: {},
+    isUpdate: true,
+    isView: false,
+    rowId: '',
+  });
+  provide<Ref<boolean>>('isCopy', isCopy);
+
+  const { t } = useI18n();
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+      await handleInner(data); 
+  });
+
+  const getTitle = computed(() => (state.isView ? '查看' : state.isUpdate ? '编辑' : isCopy.value ? '复制数据' : '新增'));
+
+  
+  async function handleInner(data){
+    state.isUpdate = !!data?.isUpdate;
+    state.isView = !!data?.isView;
+    isCopy.value = !!data?.isCopy;
+    
+    setModalProps({
+      destroyOnClose: true,
+      maskClosable: false,
+      showCancelBtn: !state.isView,
+      showOkBtn: !state.isView,
+      canFullscreen: true,
+      width: 900, 
+      footer: state.isView ? null : undefined,defaultFullscreen:true,
+    });
+    
+    if (state.isUpdate || state.isView || isCopy.value) {
+      state.rowId = data.id;
+      if (state.isView) {
+        await formRef.value.setDisabledForm();
+      }
+      
+      await formRef.value.setFormDataFromId(state.rowId);
+    } else {
+      formRef.value.resetFields();
+     
+    }
+    
+  }
+  async function saveModal() {
+    let saveSuccess = false;
+    try {
+      const values = await formRef.value?.validate();
+      //添加隐藏组件
+      if (formProps.hiddenComponent?.length) {
+        formProps.hiddenComponent.forEach((component) => {
+          values[component.bindField] = component.value;
+        });
+      }
+      if (values !== false) {
+        try {
+          if (!state.isUpdate || isCopy.value) {
+            saveSuccess = await formRef.value.add(values);
+          } else {
+            saveSuccess = await formRef.value.update({ values, rowId: state.rowId });
+          }
+          return saveSuccess;
+        } catch (error) {}
+      }
+    } catch (error) {
+      return saveSuccess;
+    }
+  }
+
+  async function handleSubmit() {
+    try {
+      const saveSuccess = await saveModal();
+      
+      setModalProps({ confirmLoading: true });
+      
+      if (saveSuccess) {
+        if (!state.isUpdate || isCopy.value) {
+          //false 新增
+          notification.success({
+            message: 'Tip',
+            description: isCopy.value ? '复制成功' : t('新增成功！'),
+          }); //提示消息
+        } else {
+          notification.success({
+            message: 'Tip',
+            description: t('修改成功！'),
+          }); //提示消息
+        }
+        
+        closeModal();
+        
+        formRef.value.resetFields();
+        emit('success');
+      }
+    } finally {
+      
+      setModalProps({ confirmLoading: false });
+      
+    }
+  }
+    
+  function handleClose() {
+    formRef.value.resetFields();
+  }
+  
+</script>
+

xjrsoft-vue3/src/views/jcsj/cplx/components/Form.vue

+
+<template>
+  <div class="pt-4">
+    <SimpleForm
+      ref="systemFormRef"
+      :formProps="data.formDataProps"
+      :formModel="state.formModel"
+      :isWorkFlow="props.fromPage!=FromPageType.MENU"
+      :isCamelCase="true" 
+      @model-change="handleChange"
+    />
+  </div>
+</template>
+<script lang="ts" setup>
+  import { reactive, ref, onMounted, nextTick, watch } from 'vue';
+  import { formProps, formEventConfigs } from './config';
+  import SimpleForm from '/@/components/SimpleForm/src/SimpleForm.vue';
+  import { addMesBaseCplx, getMesBaseCplx, updateMesBaseCplx } from '/@/api/jcsj/cplx';
+  import { cloneDeep, isString  } from 'lodash-es';
+  import { FormDataProps } from '/@/components/Designer/src/types';
+  import { usePermission } from '/@/hooks/web/usePermission';
+  import CustomButtonModal from '/@/components/Form/src/components/CustomButtonModal.vue';
+  import { FromPageType } from '/@/enums/workflowEnum';
+  import { createFormEvent, getFormDataEvent, loadFormEvent, submitFormEvent,} from '/@/hooks/web/useFormEvent';
+  import { changeWorkFlowForm, changeSchemaDisabled } from '/@/hooks/web/useWorkFlowForm';
+  import { WorkFlowFormParams } from '/@/model/workflow/bpmnConfig';
+  import { useRouter } from 'vue-router';
+  
+  const { filterFormSchemaAuth } = usePermission();
+
+  const RowKey = 'id';
+  const emits = defineEmits(['changeUploadComponentIds','loadingCompleted', 'update:value']);
+  const props = defineProps({
+    fromPage: {
+      type: Number,
+      default: FromPageType.MENU,
+    },
+  });
+  const systemFormRef = ref();
+  const data: { formDataProps: FormDataProps } = reactive({
+    formDataProps: cloneDeep(formProps),
+  });
+  const state = reactive({
+    formModel: {},
+    formInfo:{formId:'',formName:''}
+  });
+  const { currentRoute } = useRouter();
+  watch(
+    () => state.formModel,
+    (val) => { 
+      emits('update:value', val);
+    },
+    {
+      deep: true,
+    },
+  );
+  
+  onMounted(async () => {
+    try {
+      if (props.fromPage == FromPageType.MENU) {
+        setMenuPermission();
+        if(currentRoute.value.meta){
+          state.formInfo.formName = currentRoute.value.meta.title&&isString(currentRoute.value.meta.title)?currentRoute.value.meta.title:'';
+          state.formInfo.formId = currentRoute.value.meta.formId&&isString(currentRoute.value.meta.formId)?currentRoute.value.meta.formId:'';
+        }
+        await createFormEvent(formEventConfigs, state.formModel,
+          systemFormRef.value,
+          formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：初始化表单
+        await nextTick();
+        await loadFormEvent(formEventConfigs, state.formModel,
+          systemFormRef.value,
+          formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：加载表单
+      } else if (props.fromPage == FromPageType.FLOW) {
+        emits('loadingCompleted'); //告诉系统表单已经加载完毕
+        // loadingCompleted后 工作流页面直接利用Ref调用setWorkFlowForm方法
+      } else if (props.fromPage == FromPageType.PREVIEW) {
+        // 预览 无需权限，表单事件也无需执行
+      } else if (props.fromPage == FromPageType.DESKTOP) {
+        // 桌面设计 表单事件需要执行
+        emits('loadingCompleted'); //告诉系统表单已经加载完毕
+        await createFormEvent(formEventConfigs, state.formModel,
+          systemFormRef.value,
+          formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：初始化表单
+        await loadFormEvent(formEventConfigs, state.formModel,
+          systemFormRef.value,
+          formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：加载表单
+      }
+    } catch (error) {}
+  });
+  // 根据菜单页面权限，设置表单属性（必填，禁用，显示）
+  function setMenuPermission() {
+    data.formDataProps.schemas = filterFormSchemaAuth(data.formDataProps.schemas!);
+  }
+
+  // 校验form 通过返回表单数据
+  async function validate() {
+    let values = [];
+    try {
+      values = await systemFormRef.value?.validate();
+      //添加隐藏组件
+      if (data.formDataProps.hiddenComponent?.length) {
+        data.formDataProps.hiddenComponent.forEach((component) => {
+          values[component.bindField] = component.value;
+        });
+      }
+    } finally {
+    }
+    return values;
+  }  
+  // 根据行唯一ID查询行数据，并设置表单数据   【编辑】
+  async function setFormDataFromId(rowId) {
+    try {
+    const record = await getMesBaseCplx(rowId);
+      setFieldsValue(record);
+      state.formModel = record;
+      await getFormDataEvent(formEventConfigs, state.formModel,
+        systemFormRef.value,
+        formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：获取表单数据
+    } catch (error) {
+      
+    }
+  }
+  // 辅助返回表单数据
+  async function getFieldsValue() {
+    let values = [];
+    try {
+      values = await systemFormRef.value?.getFieldsValue();
+      //添加隐藏组件
+      if (data.formDataProps.hiddenComponent?.length) {
+        data.formDataProps.hiddenComponent.forEach((component) => {
+          values[component.bindField] = component.value;
+        });
+      }
+    } finally {
+    }
+    return values;
+  }
+  // 辅助设置表单数据
+  function setFieldsValue(record) {
+    systemFormRef.value.setFieldsValue(record);
+  }
+  // 重置表单数据
+  async function resetFields() {
+    await systemFormRef.value.resetFields();
+  }
+  //  设置表单数据全部为Disabled  【查看】
+  async function setDisabledForm( ) {
+    data.formDataProps.schemas = changeSchemaDisabled(cloneDeep(data.formDataProps.schemas));
+  }
+  // 获取行键值
+  function getRowKey() {
+    return RowKey;
+  }
+  // 更新api表单数据
+  async function update({ values, rowId }) {
+    try {
+      values[RowKey] = rowId;
+      state.formModel = values;
+      let saveVal = await updateMesBaseCplx(values);
+      await submitFormEvent(formEventConfigs, state.formModel,
+        systemFormRef.value,
+        formProps.schemas, true,  state.formInfo.formName,state.formInfo.formId); //表单事件：提交表单
+      return saveVal;
+    } catch (error) {}
+  }
+  // 新增api表单数据
+  async function add(values) {
+    try {
+      state.formModel = values;
+      let saveVal = await addMesBaseCplx(values);
+      await submitFormEvent(formEventConfigs, state.formModel,
+        systemFormRef.value,
+        formProps.schemas, true,  state.formInfo.formName,state.formInfo.formId); //表单事件：提交表单
+      return saveVal;
+    } catch (error) {}
+  }
+  // 根据工作流页面权限，设置表单属性（必填，禁用，显示）
+  async function setWorkFlowForm(obj: WorkFlowFormParams) { 
+    try {
+      if (obj.formId) state.formInfo.formId = obj.formId;
+      if (obj.formName) state.formInfo.formName = obj.formName;
+      let flowData = await changeWorkFlowForm(cloneDeep(formProps), obj);
+      let { buildOptionJson, uploadComponentIds, formModels, isViewProcess } = flowData;
+      data.formDataProps = buildOptionJson;
+      emits('changeUploadComponentIds', uploadComponentIds); //工作流中必须保存上传组件id【附件汇总需要】
+      if (isViewProcess) {
+        setDisabledForm(); //查看
+      }
+      state.formModel = formModels;
+      setFieldsValue(formModels);
+    } catch (error) {}
+    await createFormEvent(formEventConfigs, state.formModel,
+      systemFormRef.value,
+      formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：初始化表单
+    await loadFormEvent(formEventConfigs, state.formModel,
+      systemFormRef.value,
+      formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：加载表单
+  }
+  function handleChange(val) { 
+    emits('update:value', val);
+  }
+   async function sendMessageForAllIframe() {
+    try {
+      if (systemFormRef.value && systemFormRef.value.sendMessageForAllIframe) {
+        systemFormRef.value.sendMessageForAllIframe();
+      }
+    } catch (error) {}
+  }
+  defineExpose({
+    setFieldsValue,
+    resetFields,
+    validate,
+    add,
+    update,
+    setFormDataFromId,
+    setDisabledForm,
+    setMenuPermission,
+    setWorkFlowForm,
+    getRowKey,
+    getFieldsValue,
+    sendMessageForAllIframe
+  });
+</script>
+

xjrsoft-vue3/src/views/jcsj/cplx/components/workflowPermission.ts

+export const permissionList = [
+  {
+    required: true,
+    view: true,
+    edit: true,
+    disabled: false,
+    isSaveTable: false,
+    tableName: '',
+    fieldName: '类型名称',
+    fieldId: 'cm',
+    isSubTable: false,
+    showChildren: true,
+    type: 'input',
+    key: 'db121a41243b404a90482cb07852313a',
+    children: [],
+    options: {},
+    defaultValue: '',
+  },
+  {
+    required: false,
+    view: true,
+    edit: true,
+    disabled: false,
+    isSaveTable: false,
+    tableName: '',
+    fieldName: '父类别',
+    fieldId: 'pid',
+    isSubTable: false,
+    showChildren: true,
+    type: 'cascader',
+    key: '8eaade4e896f41d1a0d1c0374a7268c7',
+    children: [],
+    options: {},
+  },
+  {
+    required: false,
+    view: true,
+    edit: false,
+    disabled: true,
+    isSaveTable: false,
+    tableName: '',
+    fieldName: '类型编码',
+    fieldId: 'bh',
+    isSubTable: false,
+    showChildren: true,
+    type: 'auto-code',
+    key: 'e0ca71c675704d2db7029f845aba3f86',
+    children: [],
+    options: {},
+  },
+  {
+    required: false,
+    view: true,
+    edit: true,
+    disabled: false,
+    isSaveTable: false,
+    tableName: '',
+    fieldName: '排序',
+    fieldId: 'paixu',
+    isSubTable: false,
+    showChildren: true,
+    type: 'input',
+    key: 'ec842ddda4a14613b585f6e9904257ec',
+    children: [],
+    options: {},
+    defaultValue: '',
+  },
+  {
+    required: false,
+    view: true,
+    edit: true,
+    disabled: false,
+    isSaveTable: false,
+    tableName: '',
+    fieldName: '备注',
+    fieldId: 'bz',
+    isSubTable: false,
+    showChildren: true,
+    type: 'textarea',
+    key: '9501144a835544dab10f5dd0b1fbf0ca',
+    children: [],
+    options: {},
+    defaultValue: '',
+  },
+];

xjrsoft-vue3/src/views/jcsj/cplx/index.vue

+
+<template>
+
+
+<ResizePageWrapper   :hasLeft="false">
+ 
+ 
+ <template #resizeRight>
+<BasicTable @register="registerTable" isMenuTable ref="tableRef"  
+   
+  >
+       
+        <template #toolbar>
+          <template v-for="button in tableButtonConfig" :key="button.code">
+            <a-button v-if="button.isDefault" type="primary" @click="buttonClick(button.code)">
+              <template #icon><Icon :icon="button.icon" /></template>
+              {{ button.name }}
+            </a-button>
+            <CustomButtonModal v-else-if="button.buttonType == 'modal'" :info="button" />
+            <a-button v-else :type="button.buttonType === 'danger' ? 'default' : button.buttonType || 'primary'" :danger="button.buttonType === 'danger'" >
+              <template #icon><Icon :icon="button.icon" /></template>
+              {{ button.name }}
+            </a-button>
+          </template>
+        </template>
+        <template #bodyCell="{ column, record }">
+          
+          
+         
+          <template v-if="column.dataIndex === 'action'">
+          
+           <TableAction
+              :actions="getLessActions(record)"
+              :dropDownActions="getMoreActions(record)"
+            />
+          </template>
+          
+          <template v-else-if="column.dataIndex && column?.listStyle">
+            <span :style="executeListStyle(getValue(record, column, 'style'), column?.listStyle)">{{
+              getValue(record, column, 'value')
+            }}</span>
+          </template>
+        </template>
+        
+           
+        
+      </BasicTable>
+ </template>
+ 
+  
+  
+   <CplxModal @register="registerModal" @success="handleFormSuccess"   @cancel="handleFormCancel"/>
+  
+  
+   
+  
+  
+</ResizePageWrapper>
+
+
+</template>
+<script lang="ts" setup>
+  import { ref, computed,provide,Ref, createVNode, 
+} from 'vue';
+  
+  import { Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import { BasicTable, useTable, TableAction, ActionItem } from '/@/components/Table';
+  import { getMesBaseCplxPage, deleteMesBaseCplx} from '/@/api/jcsj/cplx';
+  import { ResizePageWrapper } from '/@/components/Page';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { usePermission } from '/@/hooks/web/usePermission';
+    import CustomButtonModal from '/@/components/Form/src/components/CustomButtonModal.vue';
+  import { executeListStyle, getValue } from '/@/hooks/web/useListStyle';//列表样式配置
+  import { useRouter } from 'vue-router';
+  
+  
+  
+  
+  
+  import { useModal } from '/@/components/Modal';
+  
+  
+  
+  import CplxModal from './components/CplxModal.vue';
+  
+  
+  
+  
+  
+  
+  
+  import { searchFormSchema, columns  } from './components/config';
+  
+  import Icon from '/@/components/Icon/index';
+   
+   
+  
+  
+  
+  
+  
+  
+
+  
+   const listSpliceNum = ref(3); //操作列最先展示几个
+   
+  
+  
+
+
+ 
+  import { useConcurrentLock } from '/@/hooks/web/useConcurrentLock';
+
+  const pageParamsInfo = ref<any>({});
+  const { enableLockeData,handleOpenFormEnableLockeData, handleCloseFormEnableLocke, handleHasEnableLocke } =
+    useConcurrentLock();
+
+  const { notification } = useMessage();
+  const { t } = useI18n();
+  defineEmits(['register']);
+  const { filterColumnAuth, filterButtonAuth, hasPermission } = usePermission();
+
+  const filterColumns = filterColumnAuth(columns);
+  const tableRef = ref();
+  
+
+  
+  
+
+  
+  //展示在列表内的按钮
+  const actionButtons = ref<string[]>(["view","edit","delete"]);
+  const buttonConfigs = computed(()=>{
+    const list = [{"buttonId":"2019334653844258816","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2019334653844258817","name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"buttonId":"2019334653844258818","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2019334653844258819","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]
+    return filterButtonAuth(list);
+  })
+
+  const tableButtonConfig = computed(() => {
+    return buttonConfigs.value?.filter((x) => !actionButtons.value.includes(x.code));
+  });
+
+  const actionButtonConfig = computed(() => {
+    return buttonConfigs.value?.filter((x) => actionButtons.value.includes(x.code));
+  });
+
+  const btnEvent = {view : handleView,add : handleAdd,edit : handleEdit,delete : handleDelete,}
+
+  
+  const { currentRoute } = useRouter();
+  
+  
+  const formIdComputedRef = computed(() => currentRoute.value.meta.formId as string);
+  provide<Ref<string>>('currentFormId', formIdComputedRef);
+  
+   
+   
+  
+  
+   
+  
+  const [registerModal, { openModal }] = useModal();
+  
+  
+   
+   
+  const [registerTable, { reload,   }] = useTable({
+    title: 'Cplx列表',
+    api: getMesBaseCplxPage,
+    rowKey: 'id',
+    columns: filterColumns,
+    pagination: {
+      pageSize: 10,
+    },
+    formConfig: {
+      labelWidth: 100,
+      schemas: searchFormSchema,
+      fieldMapToTime: [],
+      showResetButton: false,
+    },
+     bordered:false,
+          beforeFetch: (params) => {
+      pageParamsInfo.value = {...params, FormId: formIdComputedRef.value,PK: 'id' }
+      return pageParamsInfo.value;
+    },
+    afterFetch: (res) => {
+      
+      
+       
+      
+      
+    },
+    useSearchForm: true,
+    showTableSetting: true,
+    
+    
+    
+    striped: false,
+    actionColumn: {
+      width: 195,
+      title: '操作',
+      dataIndex: 'action',
+      slots: { customRender: 'action' },
+    },
+    tableSetting: {
+      size: false,
+    },
+    customRow,
+    isAdvancedQuery:  false,
+    querySelectOption: JSON.stringify(searchFormSchema),
+    objectId: formIdComputedRef.value, ////系统表单formId,自定义表单releaseId的id值
+  });
+
+  
+  
+
+  function buttonClick(code) {
+    
+    btnEvent[code]();
+  }
+    
+  
+  function handleAdd() {
+  
+ 
+      openModal(true, { isUpdate: false, });
+ 
+      }
+      
+  
+  async function handleEdit(record: Recordable) {
+    let field = 'id';
+  try {
+      let hasIn = handleHasEnableLocke(buttonConfigs.value, 'edit');
+      if (hasIn) { 
+        let res = await handleOpenFormEnableLockeData(
+          record[field],
+          formIdComputedRef.value,
+        );
+        if (res !== null) {
+          return;
+        }
+      } 
+    
+    let info = {
+      id: record[field],
+      
+      isUpdate: true,
+      
+    };
+    
+    openModal(true, info);
+      } catch (error) {} 
+  }
+  
+   
+  
+    
+  function handleDelete(record: Recordable) {
+  deleteList([record.id]);
+  }
+    
+  function deleteList(ids) {
+    Modal.confirm({
+      title: '提示信息',
+      icon: createVNode(ExclamationCircleOutlined),
+      content: '是否确认删除？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        deleteMesBaseCplx(ids).then((_) => {
+          handleSuccess();
+          notification.success({
+            message: 'Tip',
+            description: t('删除成功！'),
+          });
+        });
+      },
+      onCancel() {},
+    });
+  }
+  
+  
+  
+  
+  
+  
+  function customRow(record: Recordable) {
+    return {
+      
+      ondblclick: () => {
+        if (record.isCanEdit && hasPermission("cplx:edit")) {
+          handleEdit(record);
+        }
+      },
+    };
+  }
+  
+  function handleSuccess() {
+    
+    
+    reload();
+    
+  }
+    
+  
+    function handleFormSuccess() {
+    handleSuccess();
+    handleCloseFormEnableLocke(buttonConfigs.value, 'edit');
+  }
+  function handleFormCancel() {
+    handleCloseFormEnableLocke(buttonConfigs.value, 'edit');
+  }
+
+  
+  function handleView(record: Recordable) {
+  let info={
+      isView: true,
+     id: record.id,
+    }
+
+    openModal(true, info);    
+  }
+  
+  
+  
+  
+  function getLessActions(record: Recordable) {
+    let list = getActions(record);
+    return list.slice(0, listSpliceNum.value);
+  }
+  function getMoreActions(record: Recordable) {
+    let list = getActions(record);
+    return list.slice(listSpliceNum.value);
+  }
+  function getActions(record: Recordable):ActionItem[] {
+    record.isCanEdit = false;
+    
+    let actionsList: ActionItem[] = [];  
+    actionButtonConfig.value?.map((button) => {
+    if (!record?.workflowData?.processId) {
+        record.isCanEdit = true;
+        actionsList.push({
+          ...button,
+           
+          auth: `cplx:${button.code}`,
+          label: button?.name,
+          color: button.code === 'delete' ? 'error' : undefined,
+          onClick: btnEvent[button.code]?.bind(null, record),
+        });
+      } else {
+        if (!['edit', 'delete'].includes(button.code)) {
+          actionsList.push({
+             
+            auth: `cplx:${button.code}`,
+            label: button?.name,
+            onClick: btnEvent[button.code]?.bind(null, record),
+          });
+        } 
+      }
+    });
+    return actionsList;
+  }
+  
+  
+</script>
+<style lang="less" scoped>
+
+  :deep(.ant-table-selection-col) {
+    width: 50px;
+  }
+
+  .show{
+    display: flex;
+  }
+
+  .hide{
+    display: none !important;
+  }
+  
+  
+  
+  
+</style>

xjrsoft-vue3/src/views/jcsj/cpxx/components/workflowPermission.ts

@@ -127,8 +127,8 @@ export const permissionList = [
     fieldId: 'cplx',
     isSubTable: false,
     showChildren: true,
-    type: 'select',
-    key: '61a60627cf7b44b5a3131074bebc5a64',
+    type: 'cascader',
+    key: '2c05765e50b44fa8be4aec443066f781',
     children: [],
     options: {},
   },

xjrsoft-vue3/src/views/jcsj/cpxx/index.vue

@@ -5,24 +5,7 @@
 <ResizePageWrapper   :hasLeft="true" :formLeftWidth="300">
  <template #resizeLeft>
  
-        <BasicTree
-          title="产品类别"
-          toolbar
-          search
-          switcher
-          :clickRowToExpand="true"
-          :treeData="treeData"
-          :fieldNames="{ key: 'value', title: 'name' }"
-          @select="handleSelect"
-        >
-          <template #title="item">
-          
-          <template v-if="item.renderIcon === 'childIcon'">
-                  <Icon icon="ant-design:appstore-outlined" />
-                </template>
-            &nbsp;&nbsp;{{ item.name }}
-          </template>
-        </BasicTree>
+        <TreeStructure :treeConfig="treeConfig" @select="handleSelectTree"/>
         
  </template>
  
@@ -45,14 +28,7 @@
           </template>
         </template>
         <template #bodyCell="{ column, record }">
-          <template v-if="column.componentType === 'switch'">
-                  <a-switch
-                    v-model:checked="record[column.dataIndex]"
-                    :unCheckedValue="0"
-                    :checkedValue="1"
-                    :disabled="true"
-                  />
-                </template>
+          
           
          
           <template v-if="column.dataIndex === 'action'">
@@ -125,7 +101,7 @@
   import Icon from '/@/components/Icon/index';
    
   import { BasicTree, TreeItem } from '/@/components/Tree'; 
-  import { getDicDetailList } from '/@/api/system/dic';
+  
   
   
   
@@ -376,9 +352,6 @@
     
   }
   async function fetch() {
-    treeData.value = (await getDicDetailList({
-      itemId: '2003761375221407745',
-    })) as unknown as TreeItem[];
     
     
     
@@ -448,4 +421,4 @@
   
   
   
-</style>
\ No newline at end of file
+</style>

xjrsoft-vue3/src/views/scgl/scrw/components/workflowPermission.ts

 export const permissionList = [
-  {
-    required: true,
-    view: true,
-    edit: true,
-    disabled: false,
-    isSaveTable: false,
-    tableName: '',
-    fieldName: '业务组织',
-    fieldId: 'ywzz',
-    isSubTable: false,
-    showChildren: true,
-    type: 'select',
-    key: 'lkajsldjaljdla',
-    children: [],
-    options: {},
-  },
+
   {
     required: false,
     view: true,
@@ -38,23 +23,6 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '铸次号',
-    fieldId: 'zch',
-    isSubTable: false,
-    showChildren: true,
-    type: 'input',
-    key: 'b22f0a133613428f84ee08c70c61311b',
-    children: [],
-    options: {},
-    defaultValue: '',
-  },
-  {
-    required: false,
-    view: true,
-    edit: true,
-    disabled: false,
-    isSaveTable: false,
-    tableName: '',
     fieldName: '重量/KG',
     fieldId: 'zl',
     isSubTable: false,
@@ -182,6 +150,22 @@ export const permissionList = [
     options: {},
   },
   {
+    required: true,
+    view: true,
+    edit: true,
+    disabled: false,
+    isSaveTable: false,
+    tableName: '',
+    fieldName: '业务组织',
+    fieldId: 'ywzz',
+    isSubTable: false,
+    showChildren: true,
+    type: 'select',
+    key: 'm7r1m6f9e6z4l0l7d4c7q8a2f3o2m7c4',
+    children: [],
+    options: {},
+  },
+  {
     required: false,
     view: true,
     edit: true,
@@ -225,7 +209,7 @@ export const permissionList = [
     isSubTable: false,
     showChildren: true,
     type: 'input',
-    key: 'fsdfsdf',
+    key: 'u2r5o6w9o9l2w3k4z4g5f7x9w4b5b1a0',
     children: [],
     options: {},
     defaultValue: '',
@@ -242,7 +226,7 @@ export const permissionList = [
     isSubTable: false,
     showChildren: true,
     type: 'input',
-    key: '312djfjdjd',
+    key: 'i3r5y5h5u6w6v0m9i5v0z5w0i4f8b8m6',
     children: [],
     options: {},
     defaultValue: '',
@@ -259,7 +243,7 @@ export const permissionList = [
     isSubTable: false,
     showChildren: true,
     type: 'input',
-    key: 'fsfsdfsdfsfa',
+    key: 'v2n5h0j9v1k1b5n6n7i2a1d8t8y4x8s7',
     children: [],
     options: {},
     defaultValue: '',