refactor（zlgl）：修改不合格品页面字段

xjrsoft-vue3/src/api/zlgl/cpbhgcllcd/model/CpbhgcllcdModel.ts

@@ -6,19 +6,15 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
 export interface MesQualityUnqualifiedWorkflowPageParams extends BasicPageParams {
   bhgid: string;
 
-  jyrq: string;
-
-  hjph: string;
-
-  lch: string;
+  djbh: string;
 
-  jyy: string;
+  lydjlx: string;
 
-  gkmc: string;
+  clr: string;
 
-  qxmc: string;
+  jyrq: string;
 
-  qxms: string;
+  lch: string;
 
   qxmssfss: string;
 
@@ -43,18 +39,8 @@ export interface MesQualityUnqualifiedWorkflowPageModel {
 
   jyrq: string;
 
-  hjph: string;
-
   lch: string;
 
-  jyy: string;
-
-  gkmc: string;
-
-  qxmc: string;
-
-  qxms: string;
-
   qxmssfss: string;
 
   jzyfcsyz1: string;
@@ -66,6 +52,12 @@ export interface MesQualityUnqualifiedWorkflowPageModel {
   jzyfcs: string;
 
   gbyyfx: string;
+
+  djbh: string;
+
+  lydjlx: string;
+
+  clr: string;
 }
 
 /**
@@ -84,8 +76,6 @@ export interface MesQualityUnqualifiedWorkflowModel {
 
   gbyyfx: string;
 
-  spr: string;
-
   jzcsyz2: string;
 
   jzyfcsyz1: string;
@@ -94,18 +84,10 @@ export interface MesQualityUnqualifiedWorkflowModel {
 
   images: string;
 
-  qxms: string;
-
-  qxmc: string;
-
-  gkmc: string;
-
-  jyy: string;
+  clr: string;
 
   lch: string;
 
-  hjph: string;
-
   jyrq: string;
 
   createDate: string;
@@ -115,6 +97,10 @@ export interface MesQualityUnqualifiedWorkflowModel {
   modifyDate: string;
 
   modifyUserId: string;
+
+  lydjlx: string;
+
+  djbh: string;
 }
 
 /**

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

@@ -40,55 +40,38 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
   {
-    field: 'jyrq',
-    label: '检验日期',
+    field: 'djbh',
+    label: '单据编号',
     defaultValue: undefined,
-    component: 'RangePicker',
-    componentProps: {
-      format: 'YYYY-MM-DD HH:mm:ss',
-      style: { width: '100%' },
-      getPopupContainer: () => document.body,
-    },
+    component: 'Input',
   },
-
   {
-    field: 'hjph',
-    label: '合金牌号',
+    field: 'lydjlx',
+    label: '来源单据',
     defaultValue: undefined,
     component: 'Input',
   },
   {
-    field: 'lch',
-    label: '炉次号',
+    field: 'clr',
+    label: '检验员',
     defaultValue: undefined,
     component: 'Input',
   },
   {
-    field: 'jyy',
-    label: '检验员',
+    field: 'jyrq',
+    label: '检验日期',
     defaultValue: undefined,
-    component: 'User',
+    component: 'RangePicker',
     componentProps: {
-      suffix: 'ant-design:setting-outlined',
-      placeholder: '请选择',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      style: { width: '100%' },
+      getPopupContainer: () => document.body,
     },
   },
 
   {
-    field: 'gkmc',
-    label: '顾客名称',
-    defaultValue: undefined,
-    component: 'Input',
-  },
-  {
-    field: 'qxmc',
-    label: '缺陷名称',
-    defaultValue: undefined,
-    component: 'Input',
-  },
-  {
-    field: 'qxms',
-    label: '缺陷描述',
+    field: 'lch',
+    label: '炉次号',
     defaultValue: undefined,
     component: 'Input',
   },
@@ -195,19 +178,6 @@ export const columns: BasicColumn[] = [
 
   {
     resizable: true,
-    dataIndex: 'hjph',
-    title: '合金牌号',
-    componentType: 'input',
-
-    fixed: false,
-    sorter: true,
-
-    styleConfig: undefined,
-    listStyle: '',
-  },
-
-  {
-    resizable: true,
     dataIndex: 'lch',
     title: '炉次号',
     componentType: 'input',
@@ -221,58 +191,6 @@ export const columns: BasicColumn[] = [
 
   {
     resizable: true,
-    dataIndex: 'jyy',
-    title: '检验员',
-    componentType: 'user',
-
-    fixed: false,
-    sorter: true,
-
-    styleConfig: undefined,
-    listStyle: undefined,
-  },
-
-  {
-    resizable: true,
-    dataIndex: 'gkmc',
-    title: '顾客名称',
-    componentType: 'input',
-
-    fixed: false,
-    sorter: true,
-
-    styleConfig: undefined,
-    listStyle: '',
-  },
-
-  {
-    resizable: true,
-    dataIndex: 'qxmc',
-    title: '缺陷名称',
-    componentType: 'input',
-
-    fixed: false,
-    sorter: true,
-
-    styleConfig: undefined,
-    listStyle: '',
-  },
-
-  {
-    resizable: true,
-    dataIndex: 'qxms',
-    title: '缺陷描述',
-    componentType: 'input',
-
-    fixed: false,
-    sorter: true,
-
-    styleConfig: undefined,
-    listStyle: '',
-  },
-
-  {
-    resizable: true,
     dataIndex: 'qxmssfss',
     title: '缺陷描述是否属实',
     componentType: 'select',
@@ -375,6 +293,45 @@ export const columns: BasicColumn[] = [
     styleConfig: undefined,
     listStyle: '',
   },
+
+  {
+    resizable: true,
+    dataIndex: 'djbh',
+    title: '单据编号',
+    componentType: 'input',
+
+    fixed: false,
+    sorter: true,
+
+    styleConfig: undefined,
+    listStyle: '',
+  },
+
+  {
+    resizable: true,
+    dataIndex: 'lydjlx',
+    title: '来源单据',
+    componentType: 'input',
+
+    fixed: false,
+    sorter: true,
+
+    styleConfig: undefined,
+    listStyle: '',
+  },
+
+  {
+    resizable: true,
+    dataIndex: 'clr',
+    title: '检验员',
+    componentType: 'input',
+
+    fixed: false,
+    sorter: true,
+
+    styleConfig: undefined,
+    listStyle: '',
+  },
 ];
 //表头合并配置
 export const headerMergingData = [];
@@ -498,36 +455,9 @@ export const formProps: FormProps = {
       },
     },
     {
-      key: 'e3ddb10b34544215939acd3c8e5ac645',
-      field: 'jyrq',
-      label: '检验日期',
-      type: 'date',
-      component: 'DatePicker',
-      colProps: { span: 24 },
-      defaultValue: '',
-      componentProps: {
-        span: '',
-        defaultValue: '',
-        width: '100%',
-        placeholder: '请选择检验日期',
-        format: 'YYYY-MM-DD HH:mm:ss',
-        showLabel: true,
-        allowClear: false,
-        disabled: false,
-        required: true,
-        isShow: true,
-        rules: [],
-        events: {},
-        isGetCurrent: false,
-        tooltipConfig: { visible: false, title: '提示文本' },
-        searchType: 'time',
-        style: { width: '100%' },
-      },
-    },
-    {
-      key: '928a3689145b40068812ae200ef4192e',
-      field: 'hjph',
-      label: '合金牌号',
+      key: '1d828f089157445fbb5434ab99aedaea',
+      field: 'djbh',
+      label: '单据编号',
       type: 'input',
       component: 'Input',
       colProps: { span: 24 },
@@ -536,8 +466,7 @@ export const formProps: FormProps = {
         width: '100%',
         span: '',
         defaultValue: '',
-        placeholder: '请输入合金牌号',
-        maxlength: null,
+        placeholder: '请输入单据编号',
         prefix: '',
         suffix: '',
         addonBefore: '',
@@ -545,7 +474,7 @@ export const formProps: FormProps = {
         disabled: false,
         allowClear: false,
         showLabel: true,
-        required: true,
+        required: false,
         rules: [],
         events: {},
         listStyle: '',
@@ -559,9 +488,9 @@ export const formProps: FormProps = {
       },
     },
     {
-      key: 'f27565fe96154a06b5e68bd5e738f22e',
-      field: 'lch',
-      label: '炉次号',
+      key: '504f107faad1420988e91ce9a5a10db9',
+      field: 'lydjlx',
+      label: '来源单据',
       type: 'input',
       component: 'Input',
       colProps: { span: 24 },
@@ -570,8 +499,7 @@ export const formProps: FormProps = {
         width: '100%',
         span: '',
         defaultValue: '',
-        placeholder: '请输入炉次号',
-        maxlength: null,
+        placeholder: '请输入来源单据',
         prefix: '',
         suffix: '',
         addonBefore: '',
@@ -579,7 +507,7 @@ export const formProps: FormProps = {
         disabled: false,
         allowClear: false,
         showLabel: true,
-        required: true,
+        required: false,
         rules: [],
         events: {},
         listStyle: '',
@@ -593,35 +521,9 @@ export const formProps: FormProps = {
       },
     },
     {
-      key: '086ea409b1834b86a61bf38537d80ce4',
-      field: 'jyy',
+      key: '3f2ffa3c09a74bf897bd34a317832c41',
+      field: 'clr',
       label: '检验员',
-      type: 'user',
-      component: 'User',
-      colProps: { span: 24 },
-      defaultValue: '',
-      componentProps: {
-        span: '',
-        width: '100%',
-        defaultValue: '',
-        placeholder: '请选择人员',
-        userType: 0,
-        prefix: '',
-        suffix: 'ant-design:setting-outlined',
-        showLabel: true,
-        disabled: false,
-        required: true,
-        multiple: true,
-        isShow: true,
-        events: {},
-        tooltipConfig: { visible: false, title: '提示文本' },
-        style: { width: '100%' },
-      },
-    },
-    {
-      key: 'e689f5cfe2804ebc9582de1743bb493e',
-      field: 'gkmc',
-      label: '顾客名称',
       type: 'input',
       component: 'Input',
       colProps: { span: 24 },
@@ -630,8 +532,7 @@ export const formProps: FormProps = {
         width: '100%',
         span: '',
         defaultValue: '',
-        placeholder: '请输入顾客名称',
-        maxlength: null,
+        placeholder: '请输入检验员',
         prefix: '',
         suffix: '',
         addonBefore: '',
@@ -639,7 +540,7 @@ export const formProps: FormProps = {
         disabled: false,
         allowClear: false,
         showLabel: true,
-        required: true,
+        required: false,
         rules: [],
         events: {},
         listStyle: '',
@@ -653,34 +554,36 @@ export const formProps: FormProps = {
       },
     },
     {
-      key: '5945de2c060e43d99d44bac3c8a9e30c',
-      field: 'images',
-      label: '附件',
-      type: 'upload',
-      component: 'Upload',
+      key: 'e3ddb10b34544215939acd3c8e5ac645',
+      field: 'jyrq',
+      label: '检验日期',
+      type: 'date',
+      component: 'DatePicker',
       colProps: { span: 24 },
+      defaultValue: '',
       componentProps: {
-        api: uploadApi,
         span: '',
         defaultValue: '',
-        accept: '',
-        maxNumber: 5,
-        maxSize: 5,
+        width: '100%',
+        placeholder: '请选择检验日期',
+        format: 'YYYY-MM-DD HH:mm:ss',
         showLabel: true,
-        multiple: false,
+        allowClear: false,
         disabled: false,
         required: false,
         isShow: true,
+        rules: [],
         events: {},
-        listType: 'text',
-        sourceType: 'album,camera',
+        isGetCurrent: false,
         tooltipConfig: { visible: false, title: '提示文本' },
+        searchType: 'time',
+        style: { width: '100%' },
       },
     },
     {
-      key: '9f2b5aa4478e4dc38f97f2aecc70f5e7',
-      field: 'qxmc',
-      label: '缺陷名称',
+      key: 'f27565fe96154a06b5e68bd5e738f22e',
+      field: 'lch',
+      label: '炉次号',
       type: 'input',
       component: 'Input',
       colProps: { span: 24 },
@@ -689,8 +592,7 @@ export const formProps: FormProps = {
         width: '100%',
         span: '',
         defaultValue: '',
-        placeholder: '请输入缺陷名称',
-        maxlength: null,
+        placeholder: '请输入炉次号',
         prefix: '',
         suffix: '',
         addonBefore: '',
@@ -698,7 +600,7 @@ export const formProps: FormProps = {
         disabled: false,
         allowClear: false,
         showLabel: true,
-        required: true,
+        required: false,
         rules: [],
         events: {},
         listStyle: '',
@@ -712,37 +614,28 @@ export const formProps: FormProps = {
       },
     },
     {
-      key: '8e00995380d0400b8873d5f598f12616',
-      field: 'qxms',
-      label: '缺陷描述',
-      type: 'input',
-      component: 'Input',
+      key: '5945de2c060e43d99d44bac3c8a9e30c',
+      field: 'images',
+      label: '附件',
+      type: 'upload',
+      component: 'Upload',
       colProps: { span: 24 },
-      defaultValue: '',
       componentProps: {
-        width: '100%',
+        api: uploadApi,
         span: '',
         defaultValue: '',
-        placeholder: '请输入缺陷描述',
-        maxlength: null,
-        prefix: '',
-        suffix: '',
-        addonBefore: '',
-        addonAfter: '',
-        disabled: false,
-        allowClear: false,
+        accept: '',
+        maxNumber: 5,
+        maxSize: 5,
         showLabel: true,
+        multiple: false,
+        disabled: false,
         required: false,
-        rules: [],
-        events: {},
-        listStyle: '',
-        isSave: false,
         isShow: true,
-        scan: false,
-        bordered: true,
-        isShowAi: false,
+        events: {},
+        listType: 'text',
+        sourceType: 'album,camera',
         tooltipConfig: { visible: false, title: '提示文本' },
-        style: { width: '100%' },
       },
     },
     {
@@ -767,7 +660,6 @@ export const formProps: FormProps = {
         ],
         defaultSelect: '',
         datasourceType: 'staticData',
-        params: null,
         labelField: 'label',
         valueField: 'value',
         apiConfig: {
@@ -806,7 +698,6 @@ export const formProps: FormProps = {
         ],
         defaultSelect: '',
         datasourceType: 'staticData',
-        params: null,
         labelField: 'label',
         valueField: 'value',
         apiConfig: {
@@ -845,7 +736,6 @@ export const formProps: FormProps = {
         ],
         defaultSelect: '',
         datasourceType: 'staticData',
-        params: null,
         labelField: 'label',
         valueField: 'value',
         apiConfig: {
@@ -875,7 +765,6 @@ export const formProps: FormProps = {
         span: '',
         defaultValue: '',
         placeholder: '请输入纠正措施实施有效性验证',
-        maxlength: null,
         prefix: '',
         suffix: '',
         addonBefore: '',
@@ -909,7 +798,6 @@ export const formProps: FormProps = {
         span: '',
         defaultValue: '',
         placeholder: '请输入纠正预防措施',
-        maxlength: null,
         prefix: '',
         suffix: '',
         addonBefore: '',
@@ -943,7 +831,6 @@ export const formProps: FormProps = {
         span: '',
         defaultValue: '',
         placeholder: '请输入根本原因分析',
-        maxlength: null,
         prefix: '',
         suffix: '',
         addonBefore: '',

xjrsoft-vue3/src/views/zlgl/cpbhgcllcd/components/workflowPermission.ts

@@ -16,86 +16,86 @@ export const permissionList = [
     options: {},
   },
   {
-    required: true,
+    required: false,
     view: true,
     edit: true,
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '检验日期',
-    fieldId: 'jyrq',
+    fieldName: '单据编号',
+    fieldId: 'djbh',
     isSubTable: false,
     showChildren: true,
-    type: 'date',
-    key: 'e3ddb10b34544215939acd3c8e5ac645',
+    type: 'input',
+    key: '1d828f089157445fbb5434ab99aedaea',
     children: [],
     options: {},
     defaultValue: '',
   },
   {
-    required: true,
+    required: false,
     view: true,
     edit: true,
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '合金牌号',
-    fieldId: 'hjph',
+    fieldName: '来源单据',
+    fieldId: 'lydjlx',
     isSubTable: false,
     showChildren: true,
     type: 'input',
-    key: '928a3689145b40068812ae200ef4192e',
+    key: '504f107faad1420988e91ce9a5a10db9',
     children: [],
     options: {},
     defaultValue: '',
   },
   {
-    required: true,
+    required: false,
     view: true,
     edit: true,
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '炉次号',
-    fieldId: 'lch',
+    fieldName: '检验员',
+    fieldId: 'clr',
     isSubTable: false,
     showChildren: true,
     type: 'input',
-    key: 'f27565fe96154a06b5e68bd5e738f22e',
+    key: '3f2ffa3c09a74bf897bd34a317832c41',
     children: [],
     options: {},
     defaultValue: '',
   },
   {
-    required: true,
+    required: false,
     view: true,
     edit: true,
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '检验员',
-    fieldId: 'jyy',
+    fieldName: '检验日期',
+    fieldId: 'jyrq',
     isSubTable: false,
     showChildren: true,
-    type: 'user',
-    key: '086ea409b1834b86a61bf38537d80ce4',
+    type: 'date',
+    key: 'e3ddb10b34544215939acd3c8e5ac645',
     children: [],
     options: {},
     defaultValue: '',
   },
   {
-    required: true,
+    required: false,
     view: true,
     edit: true,
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '顾客名称',
-    fieldId: 'gkmc',
+    fieldName: '炉次号',
+    fieldId: 'lch',
     isSubTable: false,
     showChildren: true,
     type: 'input',
-    key: 'e689f5cfe2804ebc9582de1743bb493e',
+    key: 'f27565fe96154a06b5e68bd5e738f22e',
     children: [],
     options: {},
     defaultValue: '',
@@ -124,40 +124,6 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '缺陷名称',
-    fieldId: 'qxmc',
-    isSubTable: false,
-    showChildren: true,
-    type: 'input',
-    key: '9f2b5aa4478e4dc38f97f2aecc70f5e7',
-    children: [],
-    options: {},
-    defaultValue: '',
-  },
-  {
-    required: false,
-    view: true,
-    edit: true,
-    disabled: false,
-    isSaveTable: false,
-    tableName: '',
-    fieldName: '缺陷描述',
-    fieldId: 'qxms',
-    isSubTable: false,
-    showChildren: true,
-    type: 'input',
-    key: '8e00995380d0400b8873d5f598f12616',
-    children: [],
-    options: {},
-    defaultValue: '',
-  },
-  {
-    required: true,
-    view: true,
-    edit: true,
-    disabled: false,
-    isSaveTable: false,
-    tableName: '',
     fieldName: '缺陷描述是否属实',
     fieldId: 'qxmssfss',
     isSubTable: false,

xjrsoft-vue3/src/views/zlgl/cpbhgcllcd/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":"2026191505324105728","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2026191505324105729","name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"buttonId":"2026191505324105730","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2026191505324105731","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]
     return filterButtonAuth(list);
   })