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

xjrsoft-vue3/src/api/sbgl/shebeigl/model/ShebeiglModel.ts

@@ -6,9 +6,35 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
 export interface MesEquipmentPageParams extends BasicPageParams {
   name: string;
 
+  workCenterId: string;
+
+  specification: string;
+
+  archivesCode: string;
+
   code: string;
 
+  location: string;
+
+  registerCode: string;
+
+  createArchivesUserId: string;
+
+  categoryId: string;
+
+  userId: string;
+
+  usePermitCode: string;
+
+  manufacturer: string;
+
   eState: string;
+
+  companyId: string;
+
+  indexCode: string;
+
+  manufactureDate: string;
 }
 
 /**
@@ -30,6 +56,24 @@ export interface MesEquipmentPageModel {
   eState: string;
 
   companyId: string;
+
+  workCenterId: string;
+
+  archivesCode: string;
+
+  location: string;
+
+  registerCode: string;
+
+  createArchivesUserId: string;
+
+  usePermitCode: string;
+
+  manufacturer: string;
+
+  indexCode: string;
+
+  manufactureDate: string;
 }
 
 /**

xjrsoft-vue3/src/components/Designer/src/types/index.ts

@@ -22,6 +22,19 @@ export interface WidgetForm {
     };
     formWidth: number;
     formHeight?: number;
+    formStyle?: {
+      background: {
+        isShow: boolean;
+        bgColor: string;
+        bgImgUrl: string;
+        fontColor: string;
+        borderColor: string;
+        bgType: string;
+        gradientAngle?: number | null;
+        gradientColors?: string;
+        repeat?: string;
+      };
+    };
   };
   hiddenComponent: HiddenComponentInfo[];
   buttonList: buttonListInfo[];
@@ -40,6 +53,20 @@ export const widgetForm: WidgetForm = {
     },
     formWidth: 900,
     formHeight: 500,
+    // 背景样式
+    formStyle: {
+      background: {
+        isShow: false,
+        bgColor: '',
+        bgImgUrl: '',
+        fontColor: '',
+        borderColor: '',
+        bgType: '',
+        gradientAngle: null,
+        gradientColors: '',
+        repeat: '',
+      },
+    },
   },
   hiddenComponent: [],
   buttonList: [],
@@ -130,7 +157,7 @@ export const basicComponents = [
     options: {
       width: '100%',
       span: '',
-      defaultValue: 0,
+      defaultValue: '',
       min: 0,
       max: 100,
       step: 1,
@@ -143,6 +170,7 @@ export const basicComponents = [
       isShow: true,
       rules: [],
       events: {},
+      placeholder: '请输入计数组件',
       tooltipConfig: defaultTooltipConfig,
     },
   },
@@ -1128,6 +1156,36 @@ export const layoutComponents = [
       showLabel: true,
       showComponentBorder: true,
       showBorder: false,
+      // 背景样式
+      backgroundStyle: {
+        isShow: false,
+        bgColor: '#ffffff',
+        bgImgUrl: '',
+        fontColor: '',
+        borderColor: '',
+      },
+      theadStyle: {
+        isShow: false,
+        fontSize: 14,
+        fontColor: '#000000',
+        bgType: 'color',
+        gradientDegree: '',
+        gradientColors: '',
+        bgImageUrl: '',
+        bgColor: '',
+        bgRepeat: 'no-repeat',
+      },
+      tbodyStyle: {
+        isShow: false,
+        fontSize: 14,
+        fontColor: '#000000',
+        bgType: 'color',
+        gradientDegree: '',
+        gradientColors: '',
+        bgImageUrl: '',
+        bgColor: '',
+        bgRepeat: 'no-repeat',
+      },
       bordercolor: '#f0f0f0',
       bordershowtype: [true, true, true, true],
       borderwidth: 1,
@@ -1144,6 +1202,8 @@ export const layoutComponents = [
       isShowAdd: true,
       isShowDelete: true,
       hasCheckedCol: false,
+      checkedColType: 'checkbox',
+      pageSize: 10,
       events: {},
     },
   },
@@ -1193,6 +1253,34 @@ export const layoutComponents = [
       events: {},
       defaultValue: '',
       multiple: true,
+      // 背景样式
+      backgroundStyle: {
+        isShow: false,
+        bgColor: '#ffffff',
+        bgImgUrl: '',
+        fontColor: '',
+        borderColor: '',
+      },
+      backgroundTheadStyle: {
+        isShow: false,
+        bgType: 'color',
+        fontColor: '',
+        fontSize: 14,
+        bgImgUrl: '',
+        gradientDegree: '',
+        gradientColors: '',
+        bgRepeat: 'no-repeat',
+      },
+      backgroundTbodyStyle: {
+        isShow: false,
+        bgType: 'color',
+        fontColor: '',
+        fontSize: 14,
+        bgImgUrl: '',
+        gradientDegree: '',
+        gradientColors: '',
+        bgRepeat: 'no-repeat',
+      },
     },
   },
   {
@@ -1305,11 +1393,13 @@ export const layoutComponents = [
           isShow: false,
           bgColor: '#ffffff',
           bgImgUrl: '',
+          bgRepeat: 'no-repeat',
         },
         content: {
           isShow: false,
           bgColor: '#ffffff',
           bgImgUrl: '',
+          bgRepeat: 'no-repeat',
         },
         divider: {
           isShow: true,
@@ -1731,7 +1821,7 @@ export const noHaveTableAndField = [
   'title',
   'button',
   'opinion',
-  'qrcode',
+  // 'qrcode',
   'iframe',
   'table-layout',
   'text',
@@ -1754,7 +1844,7 @@ export const noHaveField = [
   'form',
   'time-range',
   'date-range',
-  'qrcode',
+  // 'qrcode',
   'iframe',
   'table-layout',
   'text',

xjrsoft-vue3/src/views/sbgl/shebeigl/components/workflowPermission.ts

@@ -275,7 +275,7 @@ export const permissionList = [
     isSaveTable: false,
     tableName: '',
     fieldName: '设备二维码',
-    fieldId: '',
+    fieldId: 'p10',
     isSubTable: false,
     showChildren: true,
     type: 'qrcode',

xjrsoft-vue3/src/views/sbgl/shebeigl/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":"2013864545785094144","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2013864545789288448","name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"buttonId":"2013864545789288449","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2013864545789288450","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: [['manufactureDate', ['manufactureDateStart', 'manufactureDateEnd'], 'YYYY-MM-DD ', true],],
       showResetButton: false,
     },
      bordered:false,