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

# Conflicts:
#	xjrsoft-vue3/src/api/jcsj/cjx/model/CjxModel.ts

xjrsoft-vue3/src/api/jcsj/cjx/model/CjxModel.ts

@@ -180,14 +180,6 @@ export interface MesCollectionScItOptionModel {
 
   modifyUserId: string;
 }
-  modifyUserId: string;
-
-  sc: string;
-
-  dt: string;
-
-  bb: string;
-}
 
 /**
  * @description: MesCollectionItem分页返回值结构

xjrsoft-vue3/src/api/workflow/design.ts

@@ -41,7 +41,7 @@ export async function exportDesign(id: string, mode: ErrorMessageMode = 'modal')
 /**
  * @description: 查询Workflow分页列表
  */
-export async function getDesignPage(params: WorkflowPageParams, mode: ErrorMessageMode = 'modal') {
+export async function getDesignPage(params: WorkflowPageParams, mode: ErrorMessageMode = 'modal') { 
   return defHttp.get<WorkflowPageResult>(
     {
       url: Api.Page,

xjrsoft-vue3/src/components/CreateCodeStep/src/components/PickTemplateFlow.vue

@@ -123,7 +123,7 @@
       };
       let res = await getDesignPage(params);
       page.total = res.total;
-      template.list = res.list;
+      // template.list = res.list;
     } catch (error) {}
   }
   function submit() {

xjrsoft-vue3/src/views/scgl/trqxjd/components/config.ts

@@ -210,15 +210,37 @@ export const formProps: FormProps = {
                 style: { width: '100%' },
               },
             },
-          ],
-        },
-        {
-          span: 12,
-          list: [
             {
-              key: 'f9d86621c3354428b91bfa63ffc6f3b8',
-              field: 'mc',
-              label: '名称',
+              key: '2e56c34cf7564c8b94e4362f576852ad',
+              field: 'createDate',
+              label: '巡检时间',
+              type: 'date',
+              component: 'DatePicker',
+              colProps: { span: 24 },
+              defaultValue: '',
+              componentProps: {
+                span: 7,
+                defaultValue: '',
+                width: '100%',
+                placeholder: '',
+                format: 'YYYY-MM-DD HH:mm:ss',
+                showLabel: true,
+                allowClear: true,
+                disabled: false,
+                required: false,
+                isShow: true,
+                rules: [],
+                events: {},
+                isGetCurrent: false,
+                tooltipConfig: { visible: false, title: '提示文本' },
+                searchType: 'time',
+                style: { width: '100%' },
+              },
+            },
+            {
+              key: '47a71bc316a94794bbf45ec7b26ce391',
+              field: 'bz',
+              label: '备注',
               type: 'input',
               component: 'Input',
               colProps: { span: 24 },
@@ -343,36 +365,9 @@ export const formProps: FormProps = {
           span: 12,
           list: [
             {
-              key: '2e56c34cf7564c8b94e4362f576852ad',
-              field: 'createDate',
-              label: '巡检时间',
-              type: 'date',
-              component: 'DatePicker',
-              colProps: { span: 24 },
-              defaultValue: '',
-              componentProps: {
-                span: 7,
-                defaultValue: '',
-                width: '100%',
-                placeholder: '',
-                format: 'YYYY-MM-DD HH:mm:ss',
-                showLabel: true,
-                allowClear: true,
-                disabled: false,
-                required: false,
-                isShow: true,
-                rules: [],
-                events: {},
-                isGetCurrent: false,
-                tooltipConfig: { visible: false, title: '提示文本' },
-                searchType: 'time',
-                style: { width: '100%' },
-              },
-            },
-            {
-              key: '47a71bc316a94794bbf45ec7b26ce391',
-              field: 'bz',
-              label: '备注',
+              key: 'f9d86621c3354428b91bfa63ffc6f3b8',
+              field: 'mc',
+              label: '名称',
               type: 'input',
               component: 'Input',
               colProps: { span: 24 },
@@ -394,7 +389,7 @@ export const formProps: FormProps = {
                 events: {},
                 listStyle: '',
                 isSave: false,
-                isShow: true,
+                isShow: false,
                 scan: false,
                 bordered: true,
                 isShowAi: false,

xjrsoft-vue3/src/views/zlgl/bhgpcl/components/config.ts

@@ -150,7 +150,7 @@ export const columns: BasicColumn[] = [
   {
     resizable: true,
     dataIndex: 'lydjlx',
-    title: '来源单据',
+    title: '来源单据111',
     componentType: 'input',
 
     fixed: false,