user5 2 年 前
コミット
567d2e5d85
90 ファイル変更379 行追加251 行削除
  1. 2 1
      .env.production
  2. 69 69
      package-lock.json
  3. 8 3
      package.json
  4. 1 0
      src/api/sys/OSSService.js
  5. 1 1
      src/utils/validate.js
  6. 1 1
      src/views/modules/changes/dimission/DimissionList.vue
  7. 2 2
      src/views/modules/database/datalink/DataSourceList.vue
  8. 2 2
      src/views/modules/database/datamodel/DataSetList.vue
  9. 3 3
      src/views/modules/datav/DataMapList.vue
  10. 1 1
      src/views/modules/echarts/EchartsList.vue
  11. 1 1
      src/views/modules/finance/invoice/InvoiceList.vue
  12. 1 1
      src/views/modules/finance/invoice/ProgramPageForm.vue
  13. 1 1
      src/views/modules/finance/invoice/ReimbursementTypePullForm.vue
  14. 1 1
      src/views/modules/finance/invoice/UserPullForm.vue
  15. 2 2
      src/views/modules/flowable/extension/ButtonList.vue
  16. 2 2
      src/views/modules/flowable/extension/ConditionList.vue
  17. 4 4
      src/views/modules/flowable/extension/FlowCopyList.vue
  18. 3 3
      src/views/modules/flowable/extension/ListenerList.vue
  19. 3 3
      src/views/modules/flowable/form/FormDefinitionJsonList.vue
  20. 4 4
      src/views/modules/flowable/form/FormDefinitionList.vue
  21. 3 3
      src/views/modules/flowable/process/HistoryList.vue
  22. 6 6
      src/views/modules/flowable/process/ModelList.vue
  23. 4 4
      src/views/modules/flowable/process/RunningList.vue
  24. 1 1
      src/views/modules/flowable/task/ApplyList.vue
  25. 1 1
      src/views/modules/flowable/task/HistoryList.vue
  26. 1 1
      src/views/modules/flowable/task/NoticePageList.vue
  27. 2 2
      src/views/modules/flowable/task/TaskForm.vue
  28. 4 4
      src/views/modules/flowable/task/TaskFormEdit.vue
  29. 1 1
      src/views/modules/flowable/task/TodoList.vue
  30. 19 19
      src/views/modules/form/GenerateList.vue
  31. 3 3
      src/views/modules/form/MakeFormList.vue
  32. 1 1
      src/views/modules/klgBase/questions/KlgBaseQuestionsList.vue
  33. 1 1
      src/views/modules/notify/MyNotifyList.vue
  34. 4 4
      src/views/modules/notify/NotifyList.vue
  35. 1 1
      src/views/modules/position/PositionLog.vue
  36. 1 1
      src/views/modules/position/tabs/JobPositionList.vue
  37. 1 1
      src/views/modules/position/tabs/PositionCategoryList.vue
  38. 1 1
      src/views/modules/position/tabs/PositionList.vue
  39. 1 1
      src/views/modules/program/configuration/fileDict/FileDictList.vue
  40. 1 1
      src/views/modules/program/configuration/proofreadType/BrowseTypeList.vue
  41. 1 1
      src/views/modules/program/configuration/proofreadType/TypeList.vue
  42. 1 1
      src/views/modules/program/configuration/typeDict/TypeDictList.vue
  43. 1 1
      src/views/modules/program/configuration/typeFileDict/TypeFileDictList.vue
  44. 4 4
      src/views/modules/program/registered/ContractForm.vue
  45. 1 1
      src/views/modules/program/registered/ProjectList.vue
  46. 1 1
      src/views/modules/program/registered/WorkClientForm.vue
  47. 3 3
      src/views/modules/quartz/ScheduleJobList.vue
  48. 1 1
      src/views/modules/rank/tabs/RankLevelList.vue
  49. 1 1
      src/views/modules/rank/tabs/RankList.vue
  50. 1 1
      src/views/modules/rank/tabs/RankSequenceList.vue
  51. 1 1
      src/views/modules/rank/tabs/RankSystemTableList.vue
  52. 1 1
      src/views/modules/reimbursement/info/InfoList.vue
  53. 1 1
      src/views/modules/reimbursement/type/TypeList.vue
  54. 3 3
      src/views/modules/reports/index.vue
  55. 1 1
      src/views/modules/roster/RosterList.vue
  56. 2 2
      src/views/modules/sys/dashboard/workBench/Pending.vue
  57. 1 1
      src/views/modules/sys/dict/DictTypeList.vue
  58. 1 1
      src/views/modules/sys/dict/DictValueList.vue
  59. 1 1
      src/views/modules/sys/log/LogList.vue
  60. 1 1
      src/views/modules/sys/menu/DataRuleList.vue
  61. 1 1
      src/views/modules/sys/mould/SerialnumTplList.vue
  62. 2 2
      src/views/modules/sys/post/PostList.vue
  63. 1 1
      src/views/modules/sys/project/AssessList.vue
  64. 1 1
      src/views/modules/sys/project/ConsultationList.vue
  65. 1 1
      src/views/modules/sys/role/RoleList.vue
  66. 1 1
      src/views/modules/sys/role/RoleUserList.vue
  67. 1 1
      src/views/modules/sys/user/UserInfo.vue
  68. 1 1
      src/views/modules/sys/user/UserList.vue
  69. 1 1
      src/views/modules/sys/userInfo/UserInfoList.vue
  70. 15 9
      src/views/modules/sys/workClient/WorkClientList.vue
  71. 8 2
      src/views/modules/sys/workContract/WorkContractFileForm.vue
  72. 4 1
      src/views/modules/sys/workContract/WorkContractForm.vue
  73. 1 1
      src/views/modules/sys/workContract/WorkContractList.vue
  74. 1 1
      src/views/modules/test/activiti/TestActivitiAuditList.vue
  75. 1 1
      src/views/modules/test/activiti/TestActivitiExpenseList.vue
  76. 1 1
      src/views/modules/test/activiti/TestActivitiLeaveList.vue
  77. 1 1
      src/views/modules/test/grid/TestContinentList.vue
  78. 1 1
      src/views/modules/test/grid/TestCountryList.vue
  79. 1 1
      src/views/modules/test/manytomany/CourseList.vue
  80. 1 1
      src/views/modules/test/manytomany/StudentCourseList.vue
  81. 1 1
      src/views/modules/test/manytomany/StudentList.vue
  82. 1 1
      src/views/modules/test/note/TestNoteList.vue
  83. 1 1
      src/views/modules/test/one/TestFormLeaveList.vue
  84. 1 1
      src/views/modules/test/onetomany/TestDataMainFormList.vue
  85. 1 1
      src/views/modules/test/pic/TestPicList.vue
  86. 1 1
      src/views/modules/test/shop/GoodsList.vue
  87. 1 1
      src/views/modules/test/treetable/CarList.vue
  88. 1 1
      src/views/modules/test/validation/TestValidationList.vue
  89. 3 3
      src/views/modules/wps/DocTemplateList.vue
  90. 126 20
      vue.config.js

+ 2 - 1
.env.production

@@ -2,7 +2,8 @@
 ENV = 'production'
 
 #Jeeplus快速开发平台/后台地址
-VUE_APP_SERVER_URL = 'http://pg.xgccpm.com/jeeplus-vue'
+#VUE_APP_SERVER_URL = 'http://pg.xgccpm.com/jeeplus-vue'
+VUE_APP_SERVER_URL = 'http://3081089em4.wicp.vip:36186/jeeplus-vue'
 #单点登录设置
 VUE_APP_SSO_LOGIN  = 'false'
 VUE_APP_CAS_SERVER = 'https://www.cainiao.com:8443/cas'

+ 69 - 69
package-lock.json

@@ -1961,75 +1961,6 @@
         "webpack-chain": "^6.4.0",
         "webpack-dev-server": "^3.11.0",
         "webpack-merge": "^4.2.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "vue-loader-v16": {
-          "version": "npm:vue-loader@16.8.3",
-          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
-          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chalk": "^4.1.0",
-            "hash-sum": "^2.0.0",
-            "loader-utils": "^2.0.0"
-          }
-        }
       }
     },
     "@vue/cli-shared-utils": {
@@ -14863,6 +14794,75 @@
         }
       }
     },
+    "vue-loader-v16": {
+      "version": "npm:vue-loader@16.8.3",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
+      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chalk": "^4.1.0",
+        "hash-sum": "^2.0.0",
+        "loader-utils": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "vue-print-nb": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/vue-print-nb/-/vue-print-nb-1.7.5.tgz",

+ 8 - 3
package.json

@@ -1,8 +1,8 @@
 {
   "name": "jeeplus-ui",
   "version": "1.0.0",
-  "description": "jeeplus快速开发平台",
-  "author": "www.jeeplus.org",
+  "description": "兴光管理平台",
+  "author": "http://www.xgccpm.com/",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "@jiaminghi/data-view": "^2.10.0",
+    "add-asset-html-webpack-plugin": "^5.0.2",
     "ali-oss": "^6.17.1",
     "axios": "^0.19.0",
     "bpmn-js-cli": "1.4.1",
@@ -71,6 +72,7 @@
     "babel-polyfill": "^6.26.0",
     "babel-register": "^6.26.0",
     "classlist-polyfill": "^1.2.0",
+    "compression-webpack-plugin": "^6.1.1",
     "copy-webpack-plugin": "^5.0.5",
     "eslint": "^3.19.0",
     "eslint-config-standard": "^10.2.1",
@@ -83,8 +85,11 @@
     "less-loader": "^5.0.0",
     "sass": "^1.23.7",
     "sass-loader": "^8.0.0",
+    "uglifyjs-webpack-plugin": "^2.2.0",
     "vue-template-compiler": "2.6.14",
-    "webpack": "^4.41.2"
+    "webpack": "^4.41.2",
+    "webpack-bundle-analyzer": "^4.6.1",
+    "webpack-cli": "^4.10.0"
   },
   "eslintConfig": {
     "root": true,

+ 1 - 0
src/api/sys/OSSService.js

@@ -53,6 +53,7 @@ export const client = new OSS({
   accessKeyId: 'LTAI5tQDWoM9c1WyJNPs86rX', // 通过阿里云控制台创建的AccessKey ID。
   accessKeySecret: '84dDIx4edT1n78KUOqqSmDZ35pchJv', // 通过阿里云控制台创建的AccessKey Secret。
   bucket: 'xgxm-test', // 仓库名字
+  // bucket: 'xg-pg', // 仓库名字
   useFetch: true, // 支持上传大于100KB的文件
   secure: false // 返回的url为https
 })

+ 1 - 1
src/utils/validate.js

@@ -353,7 +353,7 @@ export function isTel (value) {
  * 匹配QQ
  */
 export function isQq (value) {
-  return /^[1-9]\d{4,12}$/.test(value)
+  return /^[1-9]\d{1,12}$/.test(value)
 }
 
 /*

+ 1 - 1
src/views/modules/changes/dimission/DimissionList.vue

@@ -54,7 +54,7 @@
           :data="dataList"
           :import-config="{}"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
 <!--          <vxe-column type="checkbox"  width="40px"></vxe-column>-->
           <vxe-column width="150" title="姓名" field="rosterBaseDTO.name">
             <template slot-scope="scope">

+ 2 - 2
src/views/modules/database/datalink/DataSourceList.vue

@@ -40,7 +40,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
             <vxe-column field="name" title="连接名"></vxe-column>
             <vxe-column field="enName" title="连接英文名"></vxe-column>
@@ -52,7 +52,7 @@
             <vxe-column field="host" title="主机地址"></vxe-column>
             <vxe-column field="port" title="端口"></vxe-column>
             <vxe-column field="databaseName" title="数据库名"></vxe-column>
-            <vxe-column field="enable" title="是否启用"> 
+            <vxe-column field="enable" title="是否启用">
               <template slot-scope="scope">
                 <el-tag size="small" v-if="scope.row.enable" >

+ 2 - 2
src/views/modules/database/datamodel/DataSetList.vue

@@ -41,7 +41,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
             <vxe-column
               field="name"
@@ -232,4 +232,4 @@
       }
     }
   }
-</script>
+</script>

+ 3 - 3
src/views/modules/datav/DataMapList.vue

@@ -44,7 +44,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
             <vxe-column  title="地图名称" field="name" sortable>
               <template slot-scope="scope">
@@ -53,7 +53,7 @@
                 <span v-else>{{scope.row.name}}</span>
               </template>
             </vxe-column>
-      
+
             <vxe-column  title="地图说明" field="remarks" sortable></vxe-column>
             <vxe-column title="操作" width="200px" fixed="right" align="center">
                 <template  slot-scope="scope">
@@ -177,4 +177,4 @@
       }
     }
   }
-</script>
+</script>

+ 1 - 1
src/views/modules/echarts/EchartsList.vue

@@ -39,7 +39,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
             <vxe-column  title="组件名称" field="name" sortable>
                 <template slot-scope="scope">

+ 1 - 1
src/views/modules/finance/invoice/InvoiceList.vue

@@ -178,7 +178,7 @@
           :sort-config="{remote:true}"
           :data="dataList"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="40" ></vxe-column>
           <vxe-column min-width="150" title="项目名称"align="center" field="programName">
             <template slot-scope="scope">

+ 1 - 1
src/views/modules/finance/invoice/ProgramPageForm.vue

@@ -45,7 +45,7 @@
           :sort-config="{remote:true}"
           :data="dataList"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="40px"></vxe-column>
 
           <vxe-column  title="项目名称" field="name"></vxe-column>

+ 1 - 1
src/views/modules/finance/invoice/ReimbursementTypePullForm.vue

@@ -37,7 +37,7 @@
           :data="dataList"
           :tree-config="{transform: true, rowField: 'id', parentField: 'parentId'}"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="40" ></vxe-column>
           <vxe-column title="报销内容名称" field="name" align="left" tree-node></vxe-column>
           <vxe-column width="100" title="序号" field="sort"></vxe-column>

+ 1 - 1
src/views/modules/finance/invoice/UserPullForm.vue

@@ -37,7 +37,7 @@
           :data="dataList"
           :tree-config="{transform: true, rowField: 'id', parentField: 'parentId'}"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="40" ></vxe-column>
 
           <vxe-column title="姓名" field="name" align="left" tree-node></vxe-column>

+ 2 - 2
src/views/modules/flowable/extension/ButtonList.vue

@@ -41,7 +41,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
             <vxe-column  title="名称" field="name" sortable>
                 <template slot-scope="scope">
@@ -185,4 +185,4 @@
       }
     }
   }
-</script>
+</script>

+ 2 - 2
src/views/modules/flowable/extension/ConditionList.vue

@@ -38,7 +38,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
             <vxe-column  title="名称" field="name" sortable>
                 <template slot-scope="scope">
@@ -172,4 +172,4 @@
       }
     }
   }
-</script>
+</script>

+ 4 - 4
src/views/modules/flowable/extension/FlowCopyList.vue

@@ -27,7 +27,7 @@
                 :sort-config="{remote:true}"
                 :data="dataList"
                 :checkbox-config="{}">
-                <vxe-column type="seq" width="40"></vxe-column>
+                <vxe-column type="seq" width="60" title="序号"></vxe-column>
                 <vxe-column type="checkbox"  width="40px"></vxe-column>
                 <vxe-column  title="实例标题" field="procInsName" sortable></vxe-column>
                 <vxe-column  title="抄送日期" field="createDate" sortable> </vxe-column>
@@ -51,7 +51,7 @@
             </vxe-pager>
         </div>
       </div>
-      
+
 </template>
 
 <script>
@@ -147,7 +147,7 @@
           })
         })
       }
-  
+
     }
   }
-</script>
+</script>

+ 3 - 3
src/views/modules/flowable/extension/ListenerList.vue

@@ -46,7 +46,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
             <vxe-column  title="名称" field="name" sortable>
               <template slot-scope="scope">
@@ -55,7 +55,7 @@
                 <span v-else>{{scope.row.name}}</span>
               </template>
             </vxe-column>
-            <vxe-column  title="监听器类型" field="listenerType" sortable> 
+            <vxe-column  title="监听器类型" field="listenerType" sortable>
               <template slot-scope="scope">
                   {{ scope.row.listenerType === '1'?'执行监听器':'任务监听器'}}
               </template>
@@ -197,4 +197,4 @@
       }
     }
   }
-</script>
+</script>

+ 3 - 3
src/views/modules/flowable/form/FormDefinitionJsonList.vue

@@ -23,7 +23,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
             <vxe-column  title="表单定义id" field="formDefinitionId" sortable>
                 <template slot-scope="scope">
@@ -105,7 +105,7 @@
         handler (val) {
           this.searchForm.formDefinitionId = val
         },
-  
+
         immediate: true,
         deep: false
       }
@@ -190,4 +190,4 @@
   border-bottom: 1px solid #eaeefb;
   overflow: hidden;
 }
-</style>
+</style>

+ 4 - 4
src/views/modules/flowable/form/FormDefinitionList.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="jp-common-layout page">
       <div class="jp-common-layout-left">
-        <div class="jp-common-title"> 
+        <div class="jp-common-title">
           <el-row :gutter="5">
             <el-col :span="20">
               <el-input
@@ -103,7 +103,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
             <vxe-column  title="表单名称" field="name" sortable>
                 <template slot-scope="scope">
@@ -148,7 +148,7 @@
       </vxe-pager>
       </div>
 
-      
+
           <!-- 弹窗, 新增 / 修改 -->
       <FormDefinitionForm  ref="formDefinitionForm" @showDesignForm="showDesignForm" @refreshDataList="refreshList"></FormDefinitionForm>
       <FormCategoryForm  ref="formCategoryForm"  @refreshTree="refreshTree"></FormCategoryForm>
@@ -331,4 +331,4 @@
       }
     }
   }
-</script>
+</script>

+ 3 - 3
src/views/modules/flowable/process/HistoryList.vue

@@ -25,7 +25,7 @@
                 :export-config="{}"
                 :data="dataList"
                 :checkbox-config="{}">
-                <vxe-column type="seq" width="40"></vxe-column>
+                <vxe-column type="seq" width="60" title="序号"></vxe-column>
                 <vxe-column type="checkbox"  width="40px"></vxe-column>
                 <vxe-column  title="实例名称" field="vars.title" >
                 </vxe-column>
@@ -75,7 +75,7 @@
         </el-dialog>
         </div>
       </div>
-      
+
 </template>
 
 <script>
@@ -165,4 +165,4 @@
       }
     }
   }
-</script>
+</script>

+ 6 - 6
src/views/modules/flowable/process/ModelList.vue

@@ -36,18 +36,18 @@
                 :export-config="{}"
                 :data="dataList"
                 :checkbox-config="{}">
-                <vxe-column type="seq" width="40"></vxe-column>
+                <vxe-column type="seq" width="60" title="序号"></vxe-column>
                 <vxe-column type="checkbox"  width="40px"></vxe-column>
                 <vxe-column  title="流程名称" field="name" sortable> </vxe-column>
                 <vxe-column  title="流程KEY" field="key" sortable> </vxe-column>
                 <vxe-column  title="分类" field="procDef.category" sortable> </vxe-column>
                 <vxe-column  title="流程版本" field="version" sortable>
-                    <template slot-scope="scope">       
+                    <template slot-scope="scope">
                       <el-tag>{{scope.row.procDef.version || '0'}}</el-tag>
                     </template>
                 </vxe-column>
                  <vxe-column  title="流程状态" field="version" sortable>
-                    <template slot-scope="scope">       
+                    <template slot-scope="scope">
                       <el-tag :type="scope.row.procDef.suspended===false?'success':(scope.row.procDef.suspended===undefined?'primary':'danger')">{{scope.row.procDef.suspended===false?'已发布':(scope.row.procDef.suspended===undefined?'草稿':'已挂起')}}</el-tag>
                     </template>
                 </vxe-column>
@@ -81,7 +81,7 @@
               :page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
               :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
               @page-change="currentChangeHandle">
-            </vxe-pager>  
+            </vxe-pager>
       </div>
        <el-dialog
         title="查看进度"
@@ -89,11 +89,11 @@
         :visible.sync="visible"
          v-dialogDrag
         height="600px">
-       
+
           <iframe :src="processPhotoUrl" frameborder="0" scrolling="auto" width="100%" height="600px"></iframe>
         </el-dialog>
 
-        
+
     <!-- 弹窗, 新增 / 修改 -->
     <model-form  ref="modelForm"  @create="create"></model-form>
     <!--模型编辑-->

+ 4 - 4
src/views/modules/flowable/process/RunningList.vue

@@ -25,7 +25,7 @@
                 :export-config="{}"
                 :data="dataList"
                 :checkbox-config="{}">
-                <vxe-column type="seq" width="40"></vxe-column>
+                <vxe-column type="seq" width="60" title="序号"></vxe-column>
                 <vxe-column type="checkbox"  width="40px"></vxe-column>
                 <vxe-column  title="标题" field="vars.title" >
                 </vxe-column>
@@ -73,7 +73,7 @@
         </el-dialog>
         </div>
       </div>
-      
+
 </template>
 
 <script>
@@ -161,7 +161,7 @@
           })
         })
       }
-  
+
     }
   }
-</script>
+</script>

+ 1 - 1
src/views/modules/flowable/task/ApplyList.vue

@@ -40,7 +40,7 @@
                 :export-config="{}"
                 :data="dataList"
                 :checkbox-config="{}">
-                <vxe-column type="seq" width="40"></vxe-column>
+                <vxe-column type="seq" width="60" title="序号"></vxe-column>
                 <vxe-column type="checkbox"  width="40px"></vxe-column>
                 <vxe-column  title="流程标题" field="vars.title" >
                 </vxe-column>

+ 1 - 1
src/views/modules/flowable/task/HistoryList.vue

@@ -40,7 +40,7 @@
                 :export-config="{}"
                 :data="dataList"
                 :checkbox-config="{}">
-                <vxe-column type="seq" width="40"></vxe-column>
+                <vxe-column type="seq" width="60" title="序号"></vxe-column>
                 <vxe-column type="checkbox"  width="40px"></vxe-column>
                 <vxe-column  title="任务" field="name" >
                     <template slot-scope="scope">

+ 1 - 1
src/views/modules/flowable/task/NoticePageList.vue

@@ -21,7 +21,7 @@
               :export-config="{}"
               :data="dataList"
               :checkbox-config="{}">
-              <vxe-column type="seq" width="40"></vxe-column>
+              <vxe-column type="seq" width="60" title="序号"></vxe-column>
               <vxe-column type="checkbox"  width="40px"></vxe-column>
               <vxe-column  title="实例标题" field="title" >
                 <template slot-scope="scope">

+ 2 - 2
src/views/modules/flowable/task/TaskForm.vue

@@ -30,7 +30,7 @@
 <el-card style="margin-top:10px; padding-bottom:66px" v-if="!procInsId || taskId">
     <el-form size="small" :model="auditForm"   ref="auditForm" label-width="120px">
       <el-col :span="16">
-        <el-form-item  v-if="!procInsId && isShow !== 'false'"  label="流程标题" prop="title">
+        <!--<el-form-item  v-if="!procInsId && isShow !== 'false'"  label="流程标题" prop="title">
           <el-input
             placeholder="请输入流程标题"
             v-model="title">
@@ -41,7 +41,7 @@
             placeholder="请输入流程标题"
             v-model="this.contractTitle">
           </el-input>
-        </el-form-item>
+        </el-form-item>-->
       <el-form-item  v-if="taskId"  label="审批信息" prop="message">
           <el-input
             type="textarea"

+ 4 - 4
src/views/modules/flowable/task/TaskFormEdit.vue

@@ -5,7 +5,7 @@
   <el-tabs type="border-card" v-model="taskSelectedTab">
     <el-tab-pane label="表单信息" name="form-first">
       <component id="printForm" :formReadOnly="formReadOnly" v-if="formType === '2'" :class="formReadOnly?'readonly':''"  ref="form" :businessId="businessId" :is="form"></component>
-      
+
       <PreviewForm  id="printForm"   v-if="formType !== '2'"  :processDefinitionId="procDefId" :edit="true" :taskFormData="taskFormData" ref="form"/>
     </el-tab-pane>
     <el-tab-pane label="流程信息" v-if="procInsId"  name="form-second">
@@ -27,12 +27,12 @@
 <el-card style="margin-top:10px; padding-bottom:66px">
     <el-form size="small" :model="auditForm"   ref="auditForm" label-width="120px">
       <el-col :span="16">
-        <el-form-item  v-if="!procInsId"  label="流程标题" prop="title">
+        <!--<el-form-item  v-if="!procInsId"  label="流程标题" prop="title">
           <el-input
             placeholder="请输入流程标题"
             v-model="title">
           </el-input>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item  v-if="taskId"  label="审批信息" prop="message">
           <el-input
             type="textarea"
@@ -461,4 +461,4 @@
       }
     }
   }
-</script>
+</script>

+ 1 - 1
src/views/modules/flowable/task/TodoList.vue

@@ -40,7 +40,7 @@
                 :export-config="{}"
                 :data="dataList"
                 :checkbox-config="{}">
-                <vxe-column type="seq" width="40"></vxe-column>
+                <vxe-column type="seq" width="60" title="序号"></vxe-column>
                 <vxe-column type="checkbox"  width="40px"></vxe-column>
                 <vxe-column  title="实例标题" field="vars.title" >
                     <template slot-scope="scope">

+ 19 - 19
src/views/modules/form/GenerateList.vue

@@ -6,13 +6,13 @@
            return field.isSearch})"
           :key="index"
           :prop="option.model">
-            <user-select 
+            <user-select
                 v-if="option.type === 'user'"
                 size="small"
                 v-model="params[`${option.model}`]"
                 @getValue='(value, label) => {params[`${option.model}`]= value}'>
             </user-select>
-            <SelectTree 
+            <SelectTree
              v-else-if="option.type === 'office'"
              size="small"
              v-model="params[`${option.model}`]"
@@ -21,12 +21,12 @@
                   label: 'name',         // 显示名称
                   children: 'children'    // 子级字段名
                 }"
-               
+
               :url="`/sys/office/treeData`"
-              :clearable="true" 
+              :clearable="true"
               :accordion="true"
               @getValue="(value) => {params[`${option.model}`]= value}"/>
-            <SelectTree 
+            <SelectTree
                  v-else-if="option.type === 'area'"
                  size="small"
                  v-model="params[`${option.model}`]"
@@ -36,7 +36,7 @@
                     children: 'children'    // 子级字段名
                   }"
                 :url="`/sys/area/treeData`"
-                :clearable="true" 
+                :clearable="true"
                 :accordion="true"
                 @getValue="(value) => {params[`${option.model}`]= value}"/>
 
@@ -52,12 +52,12 @@
         v-else-if="option.type === 'rate'"
         v-model="params[`${option.model}`]"
       ></el-rate> -->
-      <!-- <el-color-picker 
+      <!-- <el-color-picker
         v-else-if="option.type === 'color'"
         size="small"
         v-model="params[`${option.model}`]"
       ></el-color-picker> -->
- 
+
       <!-- <el-select
         v-else-if="option.type === 'select'"
         v-model="params[`${option.model}`]"
@@ -71,12 +71,12 @@
         v-model="params[`${option.model}`]"
       >
       </el-switch> -->
-        <!-- <el-slider 
+        <!-- <el-slider
           v-else-if="option.type === 'slider'"
           size="small"
           v-model="params[`${option.model}`]"
         ></el-slider> -->
-          <el-time-picker 
+          <el-time-picker
             v-else-if="option.type === 'time'"
             size="small"
             :placeholder="option.name"
@@ -154,9 +154,9 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
-       <vxe-column 
+       <vxe-column
         v-for="(option, index) in dataBindFields.filter((item)=>{
           return item.isShow
           })"
@@ -185,7 +185,7 @@
                   {{$dictUtils.getDictLabel(`${option.options.dictType}`, scope.row[`${option.model}`])}}
           </div>
           <div v-else-if="option.type === 'selectTree'">
-                  <TreeSelectText 
+                  <TreeSelectText
              size="small"
              v-model="scope.row[`${option.model}`]"
               :props="{
@@ -193,22 +193,22 @@
                   label: 'name',         // 显示名称
                   children: 'children'    // 子级字段名
                 }"
-               
+
               :url="option.options.dataUrl"
-              :clearable="true" 
+              :clearable="true"
               :accordion="true"
              />
           </div>
            <div v-else-if="option.type === 'checkbox' && option.options.remote === 3">
-                 
+
                     <span :key="index" v-for="(item, index) in JSON.parse(scope.row[`${option.model}`] || '[]')">
-                      {{$dictUtils.getDictLabel(`${option.options.dictType}`, item)}} 
+                      {{$dictUtils.getDictLabel(`${option.options.dictType}`, item)}}
                       <span v-if="index+1 !==  JSON.parse(scope.row[`${option.model}`] || '[]').length">
                         |
                       </span>
                     </span>
           </div>
-          
+
            <div v-else-if="option.type === 'select' && option.options.remote === 3 && option.options.multiple">
                     <span :key="index" v-for="(item, index) in JSON.parse(scope.row[`${option.model}`] || '[]')">
                         {{$dictUtils.getDictLabel(`${option.options.dictType}`, item)}}
@@ -514,4 +514,4 @@
        }
      }
 }
-</script>
+</script>

+ 3 - 3
src/views/modules/form/MakeFormList.vue

@@ -43,7 +43,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
             <vxe-column  title="表单名称" field="name" sortable>
                 <template slot-scope="scope">
@@ -64,7 +64,7 @@
                 </p>
               </template>
             </vxe-column>
-            <vxe-column  title="版本号" field="version" sortable> 
+            <vxe-column  title="版本号" field="version" sortable>
                 <template slot-scope="scope">
                     {{'V ' + scope.row.version + '.0'}}
                 </template>
@@ -246,4 +246,4 @@
       }
     }
   }
-</script>
+</script>

+ 1 - 1
src/views/modules/klgBase/questions/KlgBaseQuestionsList.vue

@@ -35,7 +35,7 @@
           :sort-config="{remote:true}"
           :data="dataList"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="40" ></vxe-column>
           <vxe-column min-width="160" title="标题" field="title"></vxe-column>
           <vxe-column min-width="160" title="问题类型" field="type"></vxe-column>

+ 1 - 1
src/views/modules/notify/MyNotifyList.vue

@@ -33,7 +33,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
             <vxe-column  title="标题" field="title" sortable>
               <template slot-scope="scope">

+ 4 - 4
src/views/modules/notify/NotifyList.vue

@@ -38,7 +38,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
             <vxe-column  title="标题" field="title" sortable>
               <template slot-scope="scope">
@@ -47,7 +47,7 @@
                 <span v-else>{{scope.row.title}}</span>
               </template>
             </vxe-column>
-            <vxe-column  title="类型" field="type" sortable> 
+            <vxe-column  title="类型" field="type" sortable>
                 <template slot-scope="scope">
                   {{ $dictUtils.getDictLabel("oa_notify_type", scope.row.type, '-') }}
                 </template>
@@ -72,7 +72,7 @@
               </template>
             </vxe-column>
              <vxe-column  title="发布者" field="createBy.name" sortable></vxe-column>
-             
+
             <vxe-column title="操作" width="200px" fixed="right" align="center">
                 <template  slot-scope="scope">
                   <el-button v-if="hasPermission('notify:view')" type="text" icon="el-icon-view" size="small" @click="view(scope.row.id)">查看</el-button>
@@ -203,4 +203,4 @@
       }
     }
   }
-</script>
+</script>

+ 1 - 1
src/views/modules/position/PositionLog.vue

@@ -63,7 +63,7 @@
           :sort-config="{remote:true}"
           :data="dataList"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
 <!--          <vxe-column type="checkbox"  width="40px"></vxe-column>-->
           <vxe-column width="160"  title="操作时间" field="createDate"></vxe-column>
           <vxe-column width="100px"  title="操作人" field="createBy" > </vxe-column>

+ 1 - 1
src/views/modules/position/tabs/JobPositionList.vue

@@ -58,7 +58,7 @@
           :sort-config="{remote:true}"
           :data="dataList"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="40" ></vxe-column>
           <vxe-column  title="职位名称" field="name">
             <template slot-scope="scope">

+ 1 - 1
src/views/modules/position/tabs/PositionCategoryList.vue

@@ -37,7 +37,7 @@
           :sort-config="{remote:true}"
           :data="dataList"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="40" ></vxe-column>
           <vxe-column field="name" title="职务分类名称" :edit-render="{}">
             <template #edit="{ row }">

+ 1 - 1
src/views/modules/position/tabs/PositionList.vue

@@ -36,7 +36,7 @@
           :sort-config="{remote:true}"
           :data="dataList"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="40" ></vxe-column>
           <vxe-column width="180" title="职务名称" field="name"></vxe-column>
           <vxe-column width="180" title="职务分类" field="categoryId"></vxe-column>

+ 1 - 1
src/views/modules/program/configuration/fileDict/FileDictList.vue

@@ -36,7 +36,7 @@
           :data="dataList"
           :tree-config="{transform: true, rowField: 'id', parentField: 'parentId', expandAll: true}"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="40" ></vxe-column>
           <vxe-column width="160" title="附件结构名称" field="name" align="left" tree-node></vxe-column>
           <vxe-column  title="类型" field="type"></vxe-column>

+ 1 - 1
src/views/modules/program/configuration/proofreadType/BrowseTypeList.vue

@@ -36,7 +36,7 @@
           :data="dataList"
           :tree-config="{transform: true, rowField: 'id', parentField: 'parentId'}"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="40" ></vxe-column>
           <vxe-column title="浏览审核类型名称" field="name" align="left" tree-node></vxe-column>
 

+ 1 - 1
src/views/modules/program/configuration/proofreadType/TypeList.vue

@@ -36,7 +36,7 @@
           :data="dataList"
           :tree-config="{transform: true, rowField: 'id', parentField: 'parentId'}"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="40" ></vxe-column>
           <vxe-column title="自检内容名称" field="name" align="left" tree-node></vxe-column>
 

+ 1 - 1
src/views/modules/program/configuration/typeDict/TypeDictList.vue

@@ -35,7 +35,7 @@
           :data="dataList"
           :tree-config="{transform: true, rowField: 'id', parentField: 'parentId'}"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="40" ></vxe-column>
           <vxe-column width="180" title="项目类型名称" field="type" align="left" tree-node></vxe-column>
           <vxe-column width="180" title="序号" field="sort"></vxe-column>

+ 1 - 1
src/views/modules/program/configuration/typeFileDict/TypeFileDictList.vue

@@ -60,7 +60,7 @@
           :data="dataList"
           :tree-config="{transform: true, rowField: 'fileId', parentField: 'parentId', expandAll: true}"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="40" ></vxe-column>
           <vxe-column width="180" title="附件名称" field="name" align="left" tree-node></vxe-column>
           <vxe-column title="必填阶段" field="requiredStage">

+ 4 - 4
src/views/modules/program/registered/ContractForm.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-dialog
-      :title="title"
+      title="选择合同"
       :close-on-click-modal="false"
       v-dialogDrag
       width="1100px"
@@ -18,7 +18,7 @@
           <el-form-item label="委派方" prop="clientName">
             <el-input size="small" v-model="searchForm.clientName" placeholder="请输入委派方" clearable></el-input>
           </el-form-item>
-          <el-form-item label="创建人" prop="createBy">
+          <!--<el-form-item label="创建人" prop="createBy">
             <SelectUserTree
               ref="companyTree"
               :props="{
@@ -31,7 +31,7 @@
               :clearable="true"
               :accordion="true"
               @getValue="(value) => {searchForm.createBy=value}"/>
-          </el-form-item>
+          </el-form-item>-->
 
           <el-form-item>
             <el-button type="primary" @click="list()" size="small" icon="el-icon-search">查询</el-button>
@@ -56,7 +56,7 @@
           :sort-config="{remote:true}"
           :data="dataList"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="radio" width="40px"></vxe-column>
 
           <vxe-column width="200px" title="合同编号" field="no"></vxe-column>

+ 1 - 1
src/views/modules/program/registered/ProjectList.vue

@@ -86,7 +86,7 @@
           :data="dataList"
           :tree-config="{transform: true, rowField: 'id', parentField: 'parentId'}"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="40" ></vxe-column>
           <vxe-column min-width="170" align="center" title="项目名称" field="name" >
             <template slot-scope="scope">

+ 1 - 1
src/views/modules/program/registered/WorkClientForm.vue

@@ -91,7 +91,7 @@
           :sort-config="{remote:true}"
           :data="dataList"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="radio" width="40px"></vxe-column>
 
           <vxe-column width="300px"  title="客户名称" field="name">

+ 3 - 3
src/views/modules/quartz/ScheduleJobList.vue

@@ -42,7 +42,7 @@
               :sort-config="{remote:true}"
               :data="dataList"
               :checkbox-config="{}">
-              <vxe-column type="seq" width="40"></vxe-column>
+              <vxe-column type="seq" width="60" title="序号"></vxe-column>
               <vxe-column type="checkbox"  width="40px"></vxe-column>
               <vxe-column  title="任务名" field="name" sortable>
                   <template slot-scope="scope">
@@ -50,7 +50,7 @@
                       <span v-else>{{scope.row.name}}</span>
                   </template>
               </vxe-column>
-              <vxe-column  title="任务组" field="jobGroup" sortable> 
+              <vxe-column  title="任务组" field="jobGroup" sortable>
                   <template slot-scope="scope">
                       {{ $dictUtils.getDictLabel("schedule_task_group", scope.row.jobGroup, '-') }}
                   </template>
@@ -247,4 +247,4 @@
       }
     }
   }
-</script>
+</script>

+ 1 - 1
src/views/modules/rank/tabs/RankLevelList.vue

@@ -37,7 +37,7 @@
           :sort-config="{remote:true}"
           :data="dataList"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="40" ></vxe-column>
           <vxe-column field="name" title="职层名称" :edit-render="{}"></vxe-column>
           <vxe-column title="操作" width="200px" fixed="right" align="center">

+ 1 - 1
src/views/modules/rank/tabs/RankList.vue

@@ -52,7 +52,7 @@
           :sort-config="{remote:true}"
           :data="dataList"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="40" ></vxe-column>
           <vxe-column field="groupName" title="分组名称" :edit-render="{}"></vxe-column>
           <vxe-column field="rankList" title="职级" :edit-render="{}">

+ 1 - 1
src/views/modules/rank/tabs/RankSequenceList.vue

@@ -52,7 +52,7 @@
           :sort-config="{remote:true}"
           :data="dataList"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="40" ></vxe-column>
           <vxe-column field="name" title="序列名称" :edit-render="{}">
             <template scope="scope">

+ 1 - 1
src/views/modules/rank/tabs/RankSystemTableList.vue

@@ -70,7 +70,7 @@
           :sort-config="{remote:true}"
           :data="dataList"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
 <!--          <vxe-column type="checkbox" width="40" ></vxe-column>-->
           <vxe-column field="sequenceName" title="序列" :edit-render="{}"></vxe-column>
           <vxe-column v-if="isShowC === true" field="sequenceChildName" title="子序列" :edit-render="{}"></vxe-column>

+ 1 - 1
src/views/modules/reimbursement/info/InfoList.vue

@@ -101,7 +101,7 @@
           :sort-config="{remote:true}"
           :data="dataList"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="40" ></vxe-column>
           <vxe-column width="200" title="报销编号" field="no" align="left">
             <template slot-scope="scope">

+ 1 - 1
src/views/modules/reimbursement/type/TypeList.vue

@@ -39,7 +39,7 @@
           :data="dataList"
           :tree-config="{transform: true, rowField: 'id', parentField: 'parentId'}"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="40" ></vxe-column>
           <vxe-column title="报销内容名称" field="name" align="left" tree-node></vxe-column>
           <vxe-column width="100" title="序号" field="sort"></vxe-column>

+ 3 - 3
src/views/modules/reports/index.vue

@@ -23,14 +23,14 @@
             :export-config="{}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column  title="报表名" field="name" sortable> </vxe-column>
             <vxe-column  title="更新日期" field="updateDate" sortable>
               <template slot-scope="scope">
                 {{moment(scope.row.updateDate).format('YYYY-MM-DD HH:mm:ss')}}
               </template>
             </vxe-column>
-       
+
             <vxe-column title="操作" width="200px" fixed="right" align="center">
               <template slot-scope="scope">
                 <el-button
@@ -119,4 +119,4 @@ export default {
 
   }
 }
-</script>
+</script>

+ 1 - 1
src/views/modules/roster/RosterList.vue

@@ -45,7 +45,7 @@
           :data="dataList"
           :import-config="{}"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox"  width="40px"></vxe-column>
           <vxe-column title="姓名" field="name">
             <template slot-scope="scope">

+ 2 - 2
src/views/modules/sys/dashboard/workBench/Pending.vue

@@ -52,7 +52,7 @@
                 :data="dataList"
                 header-align="center"
                 :checkbox-config="{}">
-                <!--<vxe-column type="seq" width="40"></vxe-column>
+                <!--<vxe-column type="seq" width="60" title="序号"></vxe-column>
                 <vxe-column type="checkbox"  width="40px"></vxe-column>-->
                 <vxe-column title="实例标题" field="vars.title">
                   <template slot-scope="scope">
@@ -147,7 +147,7 @@
                 :sort-config="{remote:true}"
                 :data="dataLists"
                 :checkbox-config="{}">
-                <!--<vxe-column type="seq" width="40"></vxe-column>
+                <!--<vxe-column type="seq" width="60" title="序号"></vxe-column>
                 <vxe-column type="checkbox"  width="40px"></vxe-column>-->
                 <vxe-column  title="标题" field="title">
                   <template slot-scope="scope">

+ 1 - 1
src/views/modules/sys/dict/DictTypeList.vue

@@ -37,7 +37,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox"  width="40px"></vxe-column>
           <vxe-column  title="类型" field="type" sortable>
             <template slot-scope="scope">

+ 1 - 1
src/views/modules/sys/dict/DictValueList.vue

@@ -23,7 +23,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox"  width="40px"></vxe-column>
           <vxe-column
             field="label"

+ 1 - 1
src/views/modules/sys/log/LogList.vue

@@ -92,7 +92,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
             <vxe-column type="expand" width="80"  v-if="searchForm.type == '3'">
               <template #content="{ row }">

+ 1 - 1
src/views/modules/sys/menu/DataRuleList.vue

@@ -25,7 +25,7 @@
               :sort-config="{remote:false}"
               :data="dataList"
               :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column width="160px"  title="数据规则名称"  field="name" sortable></vxe-column>
             <vxe-column width="160px"  title="规则mapper方法" field="className" sortable></vxe-column>
             <vxe-column width="160px"  title="规则字段" field="field" sortable></vxe-column>

+ 1 - 1
src/views/modules/sys/mould/SerialnumTplList.vue

@@ -36,7 +36,7 @@
                 :sort-config="{remote:true}"
                 :data="dataList"
                 :checkbox-config="{}">
-                <vxe-column type="seq" width="40"></vxe-column>
+                <vxe-column type="seq" width="60" title="序号"></vxe-column>
                 <vxe-column type="checkbox"  width="40px"></vxe-column>
                 <vxe-column width="300px"  title="模板名称" field="tplName">
                     <template slot-scope="scope">

+ 2 - 2
src/views/modules/sys/post/PostList.vue

@@ -41,7 +41,7 @@
                 :sort-config="{remote:true}"
                 :data="dataList"
                 :checkbox-config="{}">
-                <vxe-column type="seq" width="40"></vxe-column>
+                <vxe-column type="seq" width="60" title="序号"></vxe-column>
                 <vxe-column type="checkbox"  width="40px"></vxe-column>
                 <vxe-column  title="岗位名称" field="name" sortable>
                     <template slot-scope="scope">
@@ -192,4 +192,4 @@
       }
     }
   }
-</script>
+</script>

+ 1 - 1
src/views/modules/sys/project/AssessList.vue

@@ -94,7 +94,7 @@
                     types: ['xls', 'xlsx'],
                     remote: true}"
                 :checkbox-config="{}">
-                <vxe-column type="seq" width="40"></vxe-column>
+                <vxe-column type="seq" width="60" title="序号"></vxe-column>
                 <vxe-column type="checkbox"  width="40px"></vxe-column>
                 <vxe-column width="400px"  title="项目名称" field="projectName">
                     <template slot-scope="scope">

+ 1 - 1
src/views/modules/sys/project/ConsultationList.vue

@@ -94,7 +94,7 @@
                     types: ['xls', 'xlsx'],
                     remote: true}"
                 :checkbox-config="{}">
-                <vxe-column type="seq" width="40"></vxe-column>
+                <vxe-column type="seq" width="60" title="序号"></vxe-column>
                 <vxe-column type="checkbox"  width="40px"></vxe-column>
               <vxe-column width="400px"  title="项目名称" field="projectName">
                 <template slot-scope="scope">

+ 1 - 1
src/views/modules/sys/role/RoleList.vue

@@ -37,7 +37,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox"  width="40px"></vxe-column>
           <vxe-column  title="角色名称" field="name" sortable>
               <template slot-scope="scope">

+ 1 - 1
src/views/modules/sys/role/RoleUserList.vue

@@ -38,7 +38,7 @@
               :sort-config="{remote:true}"
               :data="dataList"
               :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
             <vxe-column  title="头像" field="photo">
               <template slot-scope="scope">

+ 1 - 1
src/views/modules/sys/user/UserInfo.vue

@@ -105,7 +105,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column title="操作菜单" field="title" sortable></vxe-column>
           <vxe-column title="耗时(毫秒)" field="recordTime" sortable></vxe-column>
           <vxe-column title="请求参数" field="params" sortable></vxe-column>

+ 1 - 1
src/views/modules/sys/user/UserList.vue

@@ -85,7 +85,7 @@
                   :sort-config="{remote:true}"
                   :data="dataList"
                   >
-                <vxe-column type="seq" width="40"></vxe-column>
+                <vxe-column type="seq" width="60" title="序号"></vxe-column>
                 <vxe-column type="checkbox"  width="40px"></vxe-column>
                 <vxe-column  title="头像" field="photo">
                     <template slot-scope="scope">

+ 1 - 1
src/views/modules/sys/userInfo/UserInfoList.vue

@@ -46,7 +46,7 @@
           :sort-config="{remote:true}"
           :data="dataList"
           :checkbox-config="{}">
-          <vxe-column type="seq" width="40"></vxe-column>
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox"  width="40px"></vxe-column>
           <vxe-column width="100px"  title="工号" field="jobNo">
             <template slot-scope="scope">

+ 15 - 9
src/views/modules/sys/workClient/WorkClientList.vue

@@ -128,9 +128,9 @@
                 :sort-config="{remote:true}"
                 :data="dataList"
                 :checkbox-config="{}">
-                <vxe-column type="seq" width="40"></vxe-column>
+                <vxe-column type="seq" width="60" title="序号"></vxe-column>
                 <vxe-column type="checkbox"  width="40px"></vxe-column>
-                <vxe-column width=""  title="客户名称" field="name">
+                <vxe-column  title="客户名称" field="name">
                     <template slot-scope="scope">
                         <el-link  type="primary" :underline="false" v-if="hasPermission('sys:project:edit')" @click="view(scope.row.id)">{{scope.row.name}}</el-link>
                         <el-link  type="primary" :underline="false" v-else-if="hasPermission('sys:project:view')"  @click="view(scope.row.id)">{{scope.row.name}}</el-link>
@@ -148,7 +148,7 @@
                     {{ $dictUtils.getDictLabel("industry", scope.row.companyIndustry, '-') }}
                   </template>
                 </vxe-column>
-                <vxe-column width="100px"  title="所在地区" field="areaId" >
+                <vxe-column width="100px" title="所在地区" field="areaId" >
                   <SelectTree
                     ref="areaTree"
                     :props="{
@@ -163,9 +163,9 @@
                     v-if="visible"
                     @getValue="(value) => {scope.row.areaId=value}"/>
                 </vxe-column>
-                <vxe-column width="200px" title="统一社会信用代码" field="uscCode" > </vxe-column>
-                <vxe-column width="100px" title="创建人" field="createBy" > </vxe-column>
-                <vxe-column width="150px" title="创建时间" field="createDate" > </vxe-column>
+                <vxe-column width="150px" title="统一社会信用代码" field="uscCode" > </vxe-column>
+                <vxe-column width="80px" title="创建人" field="createBy" > </vxe-column>
+                <vxe-column width="100px" title="创建时间" field="createDate" > </vxe-column>
 
                 <vxe-column title="操作" width="200px" fixed="right" align="center">
                     <template  slot-scope="scope">
@@ -292,9 +292,15 @@
         }).then(() => {
           this.loading = true
           this.workClientService.remove(ids).then(({data}) => {
-            this.$message.success(data)
-            this.refreshList()
-            this.loading = false
+            if (data.success) {
+              this.$message.success(data.message)
+              this.refreshList()
+              this.loading = false
+            } else {
+              this.$message.error(data.message)
+              this.refreshList()
+              this.loading = false
+            }
           })
         })
       },

+ 8 - 2
src/views/modules/sys/workContract/WorkContractFileForm.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="method==='view'"
+    <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="formReadOnly"
              label-width="150px">
       <el-row  :gutter="0">
         <el-col :span="12">
@@ -422,11 +422,17 @@
                 this.workContractFileService.findById(this.inputForm.id).then(({data}) => {
                   this.workContractService.findById(data.contractInfoId).then(async ({data}) => {
                     await this.saveData(data)
+                    if (this.formReadOnly) {
+                      method = 'view'
+                    }
                     this.$refs.uploadComponent.newUpload(method, this.inputForm.workAttachmentList, 'workContract', 300, '合同文本、补充协议')
                   })
                 })
               } else {
                 await this.saveData(data)
+                if (this.formReadOnly) {
+                  method = 'view'
+                }
                 this.$refs.uploadComponent.newUpload(method, this.inputForm.workAttachmentList, 'workContract', 300, '合同文本、补充协议')
               }
               const f = []
@@ -699,7 +705,7 @@
         }
       },
       filedNoIsEmpty (callback) {
-        if (this.commonJS.isEmpty(this.inputForm.filedNo) || this.commonJS.isEmpty(this.inputForm.filedNo)) {
+        if (this.commonJS.isEmpty(this.inputForm.filedNo) || this.commonJS.isEmpty(this.inputForm.confirmFiledNo)) {
           this.$message.warning(`请输入案卷号和确认案卷号`)
           let i = 'false'
           console.log('callback', 'false')

+ 4 - 1
src/views/modules/sys/workContract/WorkContractForm.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="method==='view'"
+    <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="formReadOnly"
              label-width="150px">
       <el-row  :gutter="0">
         <el-col :span="12">
@@ -368,6 +368,9 @@
                 })
               }
               this.inputForm.contractFees = f
+              if (this.formReadOnly) {
+                method = 'view'
+              }
               this.$refs.uploadComponent.newUpload(method, this.inputForm.workAttachmentList, 'workContract', 300, '合同文本、补充协议')
               this.loading = false
             })

+ 1 - 1
src/views/modules/sys/workContract/WorkContractList.vue

@@ -93,7 +93,7 @@
                 :sort-config="{remote:true}"
                 :data="dataList"
                 :checkbox-config="{}">
-                <vxe-column type="seq" width="40"></vxe-column>
+                <vxe-column type="seq" width="60" title="序号"></vxe-column>
                 <vxe-column type="checkbox" width="40px"></vxe-column>
 
                 <vxe-column width="200px" title="合同编号" field="no"></vxe-column>

+ 1 - 1
src/views/modules/test/activiti/TestActivitiAuditList.vue

@@ -37,7 +37,7 @@
             :expand-config="{accordion: true, lazy: true,loadMethod:detail}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
             <vxe-column type="expand" width="80" >
                 <template #content="{ row }">

+ 1 - 1
src/views/modules/test/activiti/TestActivitiExpenseList.vue

@@ -40,7 +40,7 @@
             :expand-config="{accordion: true, lazy: true,loadMethod:detail}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
             <vxe-column type="expand" width="80" >
                 <template #content="{ row }">

+ 1 - 1
src/views/modules/test/activiti/TestActivitiLeaveList.vue

@@ -37,7 +37,7 @@
             :expand-config="{accordion: true, lazy: true,loadMethod:detail}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
             <vxe-column type="expand" width="80" >
                 <template #content="{ row }">

+ 1 - 1
src/views/modules/test/grid/TestContinentList.vue

@@ -39,7 +39,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
     <vxe-column
         field="name"

+ 1 - 1
src/views/modules/test/grid/TestCountryList.vue

@@ -39,7 +39,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
     <vxe-column
         field="name"

+ 1 - 1
src/views/modules/test/manytomany/CourseList.vue

@@ -39,7 +39,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
     <vxe-column
         field="name"

+ 1 - 1
src/views/modules/test/manytomany/StudentCourseList.vue

@@ -88,7 +88,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
       <vxe-column
         field="student.name"

+ 1 - 1
src/views/modules/test/manytomany/StudentList.vue

@@ -39,7 +39,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
     <vxe-column
         field="name"

+ 1 - 1
src/views/modules/test/note/TestNoteList.vue

@@ -39,7 +39,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
     <vxe-column
         field="title"

+ 1 - 1
src/views/modules/test/one/TestFormLeaveList.vue

@@ -97,7 +97,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
       <vxe-column
         field="company.name"

+ 1 - 1
src/views/modules/test/onetomany/TestDataMainFormList.vue

@@ -61,7 +61,7 @@
             :expand-config="{accordion: true, lazy: true,loadMethod:detail}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
             <vxe-column type="expand" width="80" >
                 <template #content="{ row }">

+ 1 - 1
src/views/modules/test/pic/TestPicList.vue

@@ -36,7 +36,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
     <vxe-column
         field="title"

+ 1 - 1
src/views/modules/test/shop/GoodsList.vue

@@ -65,7 +65,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
     <vxe-column
         field="name"

+ 1 - 1
src/views/modules/test/treetable/CarList.vue

@@ -94,7 +94,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
     <vxe-column
         field="name"

+ 1 - 1
src/views/modules/test/validation/TestValidationList.vue

@@ -42,7 +42,7 @@
             :sort-config="{remote:true}"
             :data="dataList"
             :checkbox-config="{}">
-            <vxe-column type="seq" width="40"></vxe-column>
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
             <vxe-column type="checkbox"  width="40px"></vxe-column>
     <vxe-column
         field="num"

+ 3 - 3
src/views/modules/wps/DocTemplateList.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="jp-common-layout page">
       <div class="jp-common-layout-left">
-        <div class="jp-common-title"> 
+        <div class="jp-common-title">
           <el-row :gutter="5">
             <el-col :span="20">
               <el-input
@@ -124,7 +124,7 @@
                   :sort-config="{remote:true}"
                   :data="dataList"
                   :checkbox-config="{}">
-                <vxe-column type="seq" width="40"></vxe-column>
+                <vxe-column type="seq" width="60" title="序号"></vxe-column>
                 <vxe-column type="checkbox"  width="40px"></vxe-column>
                 <vxe-column  title="名称" field="name" sortable>
                   <template slot-scope="scope">
@@ -137,7 +137,7 @@
                     <span v-else>{{ scope.row.name }}</span>
                   </template>
                 </vxe-column>
-              
+
                 <vxe-column  title="文件" field="path" sortable>
                    <template slot-scope="scope" v-if="scope.row.path">
                       <el-link type="primary" :underline="false" v-if="hasPermission('wps:docTemplate:edit')" @click="design(scope.row)">

+ 126 - 20
vue.config.js

@@ -1,15 +1,138 @@
 const path = require('path')
+const CompressionPlugin = require("compression-webpack-plugin")
 
+const { config } = require('process');
 function resolve(dir) {
   return path.join(__dirname, dir)
 }
-
 module.exports = {
   publicPath: "./",
   productionSourceMap: false,
+  // 入口设置
+  pages: {
+    datav: {
+      entry: 'src/pages/datav/main.js',
+      template: 'src/pages/datav/index.html',
+      title: 'datav',
+      filename: 'datav.html',
+      chunks: ['chunk-libs', 'chunk-commons','datav','chunk-element-ui']
+    },
+    index: {
+      entry: 'src/main.js',
+      template: 'public/index.html',
+      title: 'index.html',
+      filename: 'index.html',
+      chunks: ['index','chunk-libs','chunk-commons',
+        'chunk-element-ui','chunk-jeeplus-form',
+        'chunk-jeeplus-filemanager','chunk-jeeplus-gencode',
+        'chunk-jeeplus-flowable', 'chunk-echarts','chunk-brace'
+        ,'chunk-vxe-table','chunk-ali-oss','chunk-exceljs'
+      ]
+    }
+  },
   chainWebpack: (config) => {
     config.resolve.alias.set('@/', resolve('src'))
-    // config.plugins.delete('prefetch')
+
+    // config
+    //     .plugin('webpack-bundle-analyzer')
+    //     .use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin);
+    // if (process.env.NODE_ENV === 'production') {
+    config.plugin('compressionPlugin').use(new CompressionPlugin({
+      test: new RegExp('\\.(js|css)$'), // 匹配文件名
+      threshold: 10240, // 对超过10k的数据压缩
+      deleteOriginalAssets: false, // 不删除源文件
+      minRatio: 0.8,
+      algorithm:'gzip'
+    }))
+    // }
+
+  },
+  configureWebpack: (config) => {
+    let optimization = {
+      splitChunks: {
+        chunks: "all",
+        minSize: 30 * 1024, // 允许新拆出 chunk 的最小体积,也是异步 chunk 公共模块的强制拆分体积
+        cacheGroups: {
+          libs: { // 第三方库
+            name: "chunk-libs",
+            test: /[\\/]node_modules[\\/]/,
+            priority: 10,
+            chunks: "initial", // 只打包初始时依赖的第三方
+            enforce: true
+          },
+          'element-ui': {
+            name: "chunk-element-ui",
+            test: /[\\/]node_modules[\\/]element-ui[\\/]/,
+            priority: 20,
+            enforce: true
+          },
+          'jeeplus-filemanager': {
+            name: "chunk-jeeplus-filemanager",
+            test: /[\\/]node_modules[\\/]jeeplus-filemanager[\\/]/,
+            priority: 20,
+            enforce: true
+          },
+          'jeeplus-form': {
+            name: "chunk-jeeplus-form",
+            test: /[\\/]node_modules[\\/]jeeplus-form[\\/]/,
+            priority: 20,
+            enforce: true
+          },
+          'jeeplus-gencode': {
+            name: "chunk-jeeplus-gencode",
+            test: /[\\/]node_modules[\\/]jeeplus-gencode[\\/]/,
+            priority: 20,
+            enforce: true
+          },
+          'jeeplus-flowable': {
+            name: "chunk-jeeplus-flowable",
+            test: /[\\/]node_modules[\\/]jeeplus-flowable[\\/]/,
+            priority: 20,
+            enforce: true
+          },
+          'echarts': {
+            name: "chunk-echarts",
+            test: /[\\/]node_modules[\\/]echarts[\\/]/,
+            priority: 20,
+            enforce: true
+          },
+          'brace': {
+            name: "chunk-brace",
+            test: /[\\/]node_modules[\\/]brace[\\/]/,
+            priority: 20,
+            enforce: true
+          },
+          'vxe-table': {
+            name: "chunk-vxe-table",
+            test: /[\\/]node_modules[\\/]vxe-table[\\/]/,
+            priority: 20,
+            enforce: true
+          },
+          'ali-oss': {
+            name: "chunk-ali-oss",
+            test: /[\\/]node_modules[\\/]ali-oss[\\/]/,
+            priority: 20,
+            enforce: true
+          },
+          'exceljs': {
+            name: "chunk-exceljs",
+            test: /[\\/]node_modules[\\/]exceljs[\\/]/,
+            priority: 20,
+            enforce: true
+          },
+          commons: { // 公共模块包
+            name: `chunk-commons`,
+            minChunks: 2,
+            priority: 0,
+            reuseExistingChunk: true,
+            enforce: true
+          }
+        },
+      }
+    }
+    Object.assign(config, {
+      optimization
+    })
   },
 
   css: {
@@ -21,23 +144,6 @@ module.exports = {
       }
     }
   },
-
-    // 入口设置
-    pages: {
-      datav: {
-        entry: 'src/pages/datav/main.js',
-        template: 'src/pages/datav/index.html',
-        title: 'datav',
-        filename: 'datav.html',
-        chunks: ['chunk-vendors', 'chunk-common',  'datav']
-      },
-      index: {
-        entry: 'src/main.js',
-        template: 'public/index.html',
-        title: 'index.html',
-        filename: 'index.html'
-      }
-    },
   devServer: {
     index: '/index.html', // 运行时,默认打开index页面
     port: 3000,
@@ -60,4 +166,4 @@ module.exports = {
   },
 
   lintOnSave: undefined
-}
+}