diff --git a/package.json b/package.json index 08000df..a84b5cb 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "vue-meta": "2.4.0", "vue-quill-editor": "^3.0.6", "vue-router": "3.4.9", - "vuedraggable": "2.24.3", + "vuedraggable": "^2.24.3", "vuex": "3.6.0", "xlsx": "^0.17.0" }, diff --git a/src/views/masterDataOptions/compoments/baseNewForm.vue b/src/views/masterDataOptions/compoments/baseNewForm.vue index 2670cfa..183c7ff 100644 --- a/src/views/masterDataOptions/compoments/baseNewForm.vue +++ b/src/views/masterDataOptions/compoments/baseNewForm.vue @@ -104,7 +104,7 @@ @input="(val) => limitPhoneNum(val, ruleForm, row.id)" :maxlength="row.maxlength ? row.maxlength * 1 : 50" :min="1" - :max="row.max ? row.max : 99999" + :max="row.max ? row.max : 255" :label="!row.placeholder ? '描述文字' : row.placeholder" > diff --git a/src/views/masterDataOptions/dataOrigin/configData.js b/src/views/masterDataOptions/dataOrigin/configData.js index 57b4e64..5e00452 100644 --- a/src/views/masterDataOptions/dataOrigin/configData.js +++ b/src/views/masterDataOptions/dataOrigin/configData.js @@ -73,6 +73,7 @@ const optionFormRow = [ type: "num", title: "长度", id: "filedLength", + max:255, row: 24, disabled: false, required: true, diff --git a/src/views/masterDataOptions/dataOrigin/images/删除.png b/src/views/masterDataOptions/dataOrigin/images/删除.png new file mode 100644 index 0000000..7370c1d Binary files /dev/null and b/src/views/masterDataOptions/dataOrigin/images/删除.png differ diff --git a/src/views/masterDataOptions/dataOrigin/images/设置.png b/src/views/masterDataOptions/dataOrigin/images/设置.png new file mode 100644 index 0000000..eeae824 Binary files /dev/null and b/src/views/masterDataOptions/dataOrigin/images/设置.png differ diff --git a/src/views/masterDataOptions/dataOrigin/index.vue b/src/views/masterDataOptions/dataOrigin/index.vue index d04c6b8..1af6c79 100644 --- a/src/views/masterDataOptions/dataOrigin/index.vue +++ b/src/views/masterDataOptions/dataOrigin/index.vue @@ -1,271 +1,505 @@ -