diff --git a/src/components/noTemplateComponents/richInput.js b/src/components/noTemplateComponents/richInput.js index 4b90362..401fa95 100644 --- a/src/components/noTemplateComponents/richInput.js +++ b/src/components/noTemplateComponents/richInput.js @@ -32,20 +32,16 @@ export default { [{ 'font': [] }], [{ 'size': ['small', false, 'large', 'huge'] }], // custom dropdown ['bold', 'italic', 'underline', 'strike'], // toggled buttons + [{ 'color': [] }, { 'background': [] }], // dropdown with defaults from theme ['blockquote', 'code-block'], - [{ 'header': 1 }, { 'header': 2 }], // custom button values [{ 'list': 'ordered'}, { 'list': 'bullet' }], - [{ 'script': 'sub'}, { 'script': 'super' }], // superscript/subscript + // [{ 'script': 'sub'}, { 'script': 'super' }], // superscript/subscript [{ 'indent': '-1'}, { 'indent': '+1' }], // outdent/indent [{ 'direction': 'rtl' }], // text direction - - [{ 'header': [1, 2, 3, 4, 5, 6, false] }], - - [{ 'color': [] }, { 'background': [] }], // dropdown with defaults from theme + // [{ 'header': [1, 2, 3, 4, 5, 6, false] }], [{ 'align': [] }], - - ['clean'] // remove formatting button + // ['clean'] // remove formatting button ]; // const editor = new Quill(this.$refs['quill-editor'], this.defaultConfig) const editor = new Quill(this.$refs['quill-editor'], { diff --git a/src/views/modules/pms/car/config.js b/src/views/modules/pms/car/config.js index b3cfb9d..9b405dc 100644 --- a/src/views/modules/pms/car/config.js +++ b/src/views/modules/pms/car/config.js @@ -8,10 +8,10 @@ export default function () { const tableProps = [ { prop: "name", label: "窑车号" }, { prop: "code", label: "编码" }, - { prop: "typeDictValue", label: "过渡车", filter: val => ['否', '是'](val) }, + // { prop: "typeDictValue", label: "过渡车", filter: val => ['否', '是'][val] }, { prop: "status", label: "状态", subcomponent: switchBtn }, // subcomponent - { prop: "currentQty", label: "载量" }, - { prop: "currentPos", label: "当前位置" }, + // { prop: "currentQty", label: "载量" }, + // { prop: "currentPos", label: "当前位置" }, { prop: "description", label: "描述" }, { prop: "remark", label: "备注" }, { @@ -32,7 +32,7 @@ export default function () { default: { value: "" }, bind: { // placeholder: '请输入产线名称或编码' - placeholder: '请输入料仓名称' + placeholder: '请输入窑车号' } }, { diff --git a/src/views/modules/pms/equipmentType/config.js b/src/views/modules/pms/equipmentType/config.js index 27defa1..5db1c01 100644 --- a/src/views/modules/pms/equipmentType/config.js +++ b/src/views/modules/pms/equipmentType/config.js @@ -83,6 +83,7 @@ export default function () { // fetchTreeData() 获取需要展示层级结构的数据 fetchTreeData: () => { return this.$http.get('/pms/equipmentType/page', { + // TODO:前提是工厂里总的设备类型数不会超过 999 limit: 999, page: 1, key: "" }) },