فهرست منبع

:lipstick: Updating the UI and style files.

冷冷 6 سال پیش
والد
کامیت
d7cb78482c

+ 61 - 61
package.json

@@ -1,63 +1,63 @@
 {
-    "name": "pigx-ui",
-    "version": "1.8.0",
-    "private": true,
-    "scripts": {
-        "dev": "vue-cli-service serve",
-        "build": "vue-cli-service build",
-        "lint": "vue-cli-service lint",
-        "test:unit": "vue-cli-service test:unit",
-        "test:e2e": "vue-cli-service test:e2e"
-    },
-    "dependencies": {
-        "@smallwei/avue": "^1.4.3",
-        "avue-plugin-transfer": "^0.0.2",
-        "avue-plugin-ueditor": "^0.0.1",
-        "axios": "^0.18.0",
-        "babel-loader": "^8.0.2",
-        "babel-plugin-transform-runtime": "^6.23.0",
-        "babel-polyfill": "^6.26.0",
-        "classlist-polyfill": "^1.2.0",
-        "driver.js": "^0.6.2",
-        "element-ui": "^2.4.6",
-        "file-saver": "^1.3.8",
-        "html2canvas": "^1.0.0-alpha.12",
-        "js-cookie": "^2.2.0",
-        "mockjs": "^1.0.1-beta3",
-        "moment": "^2.22.2",
-        "nprogress": "^0.2.0",
-        "script-loader": "^0.7.2",
-        "vue": "^2.5.16",
-        "vue-axios": "^2.1.2",
-        "vue-clipboard2": "^0.2.1",
-        "vue-json-editor": "^1.2.3",
-        "vue-json-tree-view": "^2.1.4",
-        "vue-quill-editor": "^3.0.6",
-        "vue-router": "^3.0.1",
-        "vuedraggable": "^2.16.0",
-        "vuex": "^3.0.1",
-        "xlsx": "^0.13.3"
-    },
-    "devDependencies": {
-        "@vue/cli-plugin-babel": "^3.1.1",
-        "@vue/cli-plugin-e2e-cypress": "^3.1.2",
-        "@vue/cli-plugin-eslint": "^3.1.5",
-        "@vue/cli-plugin-unit-mocha": "^3.1.1",
-        "@vue/cli-service": "^3.1.4",
-        "@vue/test-utils": "^1.0.0-beta.25",
-        "chai": "^4.1.2",
-        "node-sass": "^4.9.0",
-        "sass-loader": "^7.0.1",
-        "vue-template-compiler": "^2.5.17"
-    },
-    "lint-staged": {
-        "*.js": [
-            "vue-cli-service lint",
-            "git add"
-        ],
-        "*.vue": [
-            "vue-cli-service lint",
-            "git add"
-        ]
-    }
+  "name": "pigx-ui",
+  "version": "1.8.0",
+  "private": true,
+  "scripts": {
+    "dev": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "lint": "vue-cli-service lint",
+    "test:unit": "vue-cli-service test:unit",
+    "test:e2e": "vue-cli-service test:e2e"
+  },
+  "dependencies": {
+    "@smallwei/avue": "^1.4.6-beta2",
+    "avue-plugin-transfer": "^0.0.2",
+    "avue-plugin-ueditor": "^0.0.1",
+    "axios": "^0.18.0",
+    "babel-loader": "^8.0.2",
+    "babel-plugin-transform-runtime": "^6.23.0",
+    "babel-polyfill": "^6.26.0",
+    "classlist-polyfill": "^1.2.0",
+    "driver.js": "^0.6.2",
+    "element-ui": "^2.4.6",
+    "file-saver": "^1.3.8",
+    "html2canvas": "^1.0.0-alpha.12",
+    "js-cookie": "^2.2.0",
+    "mockjs": "^1.0.1-beta3",
+    "moment": "^2.22.2",
+    "nprogress": "^0.2.0",
+    "script-loader": "^0.7.2",
+    "vue": "^2.5.16",
+    "vue-axios": "^2.1.2",
+    "vue-clipboard2": "^0.2.1",
+    "vue-json-editor": "^1.2.3",
+    "vue-json-tree-view": "^2.1.4",
+    "vue-quill-editor": "^3.0.6",
+    "vue-router": "^3.0.1",
+    "vuedraggable": "^2.16.0",
+    "vuex": "^3.0.1",
+    "xlsx": "^0.13.3"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "^3.1.1",
+    "@vue/cli-plugin-e2e-cypress": "^3.1.2",
+    "@vue/cli-plugin-eslint": "^3.1.5",
+    "@vue/cli-plugin-unit-mocha": "^3.1.1",
+    "@vue/cli-service": "^3.1.4",
+    "@vue/test-utils": "^1.0.0-beta.25",
+    "chai": "^4.1.2",
+    "node-sass": "^4.9.0",
+    "sass-loader": "^7.0.1",
+    "vue-template-compiler": "^2.5.17"
+  },
+  "lint-staged": {
+    "*.js": [
+      "vue-cli-service lint",
+      "git add"
+    ],
+    "*.vue": [
+      "vue-cli-service lint",
+      "git add"
+    ]
+  }
 }

+ 2 - 7
src/const/crud/activiti/activiti.js

@@ -57,7 +57,7 @@ export const tableOption = {
         prop: 'createTime',
         type: 'datetime',
         format: 'yyyy-MM-dd HH:mm',
-        valueFormat: 'yyyy-MM-dd HH:mm:ss',
+        valueFormat: 'timestamp',
         editDisabled: true,
         addVisdiplay: false
     }, {
@@ -66,13 +66,8 @@ export const tableOption = {
         prop: 'lastUpdateTime',
         type: 'datetime',
         format: 'yyyy-MM-dd HH:mm',
-        valueFormat: 'yyyy-MM-dd HH:mm:ss',
+        valueFormat: 'timestamp',
         editDisabled: true,
         addVisdiplay: false
-    }, {
-        label: '备注',
-        prop: 'desc',
-        editVisdiplay: false,
-        hide: true
     }]
 }

+ 20 - 16
src/const/crud/activiti/leave-bill.js

@@ -49,6 +49,7 @@ export const tableOption = {
       label: '请假时间',
       prop: 'leaveTime',
       type: 'datetime',
+      overHidden:true,
       format: 'yyyy-MM-dd HH:mm',
       valueFormat: "yyyy-MM-dd hh:mm:ss"
       },
@@ -56,25 +57,28 @@ export const tableOption = {
           label: '提交时间',
           prop: 'createTime',
           type: 'datetime',
+          overHidden:true,
           format: 'yyyy-MM-dd HH:mm',
           editDisabled: true,
+          addVisdiplay: false,
+          hide: true
+      },
+      {
+          label: '状态',
+          prop: 'state',
+          type: 'select',
+          dicData: 'leave_status',
+          search: true,
           addVisdiplay: false
       },
-    {
-        label: '备注',
-        prop: 'content',
-        type:'textarea',
-        minRows:2,
-        row:true,
-        span:24
-    },
-    {
-        label: '状态',
-        prop: 'state',
-        type: 'select',
-        dicData: 'leave_status',
-        search: true,
-        addVisdiplay: false
-    }
+      {
+          label: '备注',
+          prop: 'content',
+          type:'textarea',
+          overHidden:true,
+          minRows:2,
+          row:true,
+          span:24
+      }
   ]
 }

+ 1 - 1
src/const/crud/activiti/process.js

@@ -54,7 +54,7 @@ export const tableOption = {
         prop: 'deploymentTime',
         type: 'datetime',
         format: 'yyyy-MM-dd HH:mm',
-        valueFormat: 'yyyy-MM-dd HH:mm:ss',
+        valueFormat: 'timestamp',
         editDisabled: true,
         addVisdiplay: false
     }]

+ 0 - 1
src/const/crud/admin/role.js

@@ -77,7 +77,6 @@ export const tableOption = {
         width: 180,
         label: '创建时间',
         prop: 'createTime',
-        more: true,
         type: 'datetime',
         format: 'yyyy-MM-dd HH:mm',
         valueFormat: 'yyyy-MM-dd HH:mm:ss',

+ 0 - 1
src/const/crud/admin/user.js

@@ -141,7 +141,6 @@ export const tableOption = {
         type: 'datetime',
         format: 'yyyy-MM-dd HH:mm',
         valueFormat: 'yyyy-MM-dd HH:mm:ss',
-        more: true,
         editDisabled: true,
         addVisdiplay: false,
         span: 24,