diff --git a/attendance-performance-manager-ui/admin/src/components/FormField.vue b/attendance-performance-manager-ui/admin/src/components/FormField.vue index b6f3d84f174a02effde4a71194e25e09b2094a2c..1abccae8672e96de2c68fac92b4bdc0fe76fed38 100644 --- a/attendance-performance-manager-ui/admin/src/components/FormField.vue +++ b/attendance-performance-manager-ui/admin/src/components/FormField.vue @@ -4,12 +4,12 @@ <el-form-item :label="label" :prop="prop" class='my-form-field'> <slot> - <el-input show-word-limit :maxlength="maxLength" :disabled='disabled' :placeholder='placeholder' v-model="field" @change="emit" @input="emit" @focus="emit" v-if='type === "text"' :class="inputClass" :clearable='clearable'></el-input> + <el-input show-word-limit :maxlength="maxLength" :disabled='disabled' :placeholder='placeholder' v-model="field" @change="emit" @input="emit" v-if='type === "text"' :class="inputClass" :clearable='clearable'></el-input> <el-input show-word-limit :maxlength="maxLength" :disabled='disabled' :placeholder='placeholder' v-model="field" @change="emit" @input="emit" type='password' v-if='type === "password"'></el-input> <el-input-number :disabled='disabled' v-model="field" size="small" :placeholder='placeholder' @change="emit" @input="emit" v-if='type === "num"'></el-input-number> - <el-input show-word-limit :disabled='disabled' :placeholder='placeholder' v-model="field" :maxlength="maxLength" + <el-input show-word-limit :disabled='disabled' :placeholder='placeholder' v-model="field" :maxlength="maxLength" @change="emit" :rows='rows' @input="emit" v-if='type === "textarea"' type='textarea' :autosize="textareaSize" :class="inputClass"></el-input> <!-- 涓€绾� --> @@ -64,12 +64,12 @@ export default { type: [String, Number, Array], }, // 缁勪欢鐨別l-col span瀹藉害 1-24,榛樿12 - span: { + span: { type: Number, default: 12, }, // 瀛楁绫诲瀷: text,password,textarea,select,radio,checkbox,date,datetime - type: { + type: { type: String, default: 'text', }, @@ -93,10 +93,6 @@ export default { type: String, default: '', }, - multiple:{ - type: Boolean, - default: false, - }, // 瀛楁鎵€闇€鐨勬灇涓剧被鍨� enumData: { type: Object, @@ -144,7 +140,7 @@ export default { emit() { this.$emit('input', this.newVal) this.$emit('change', this.newVal) - this.$emit('focus') + //this.$emit('focus', this.newVal) this.$emit('cascaderChange',this.newVal) } }, diff --git a/attendance-performance-manager-ui/admin/src/views/system/menu/dialogshow.vue b/attendance-performance-manager-ui/admin/src/views/system/menu/dialogshow.vue index fc342478ce5f8becc615fe8c686f6c43eb601c7e..f7396580ed9ed59c9c93c1074770ce215ef92521 100644 --- a/attendance-performance-manager-ui/admin/src/views/system/menu/dialogshow.vue +++ b/attendance-performance-manager-ui/admin/src/views/system/menu/dialogshow.vue @@ -125,8 +125,6 @@ export default { if(this.id){ this.form.parentId=this.id } - console.log("data",data) - console.log("name",this.form.name) this.open = true; }, afterSubmit(data) { @@ -147,6 +145,7 @@ export default { }, // 琛ㄥ崟閲嶇疆 reset() { + this.resetForm("form"); this.form = { name : "", url : null, @@ -165,10 +164,11 @@ export default { authType : 3, createUserName : null, }; - this.resetForm("form"); + }, resetForm(refName) { if (this.$refs[refName]) { + console.log("閲嶇疆琛ㄥ崟") this.$refs[refName].resetFields(); } }, diff --git a/attendance-performance-manager-ui/admin/src/views/system/menu/list.vue b/attendance-performance-manager-ui/admin/src/views/system/menu/list.vue index d38540ab680def35a1f7b84b32d4b41251e67bc4..750d01efc33645e403e657358640554a8212586f 100644 --- a/attendance-performance-manager-ui/admin/src/views/system/menu/list.vue +++ b/attendance-performance-manager-ui/admin/src/views/system/menu/list.vue @@ -24,7 +24,6 @@ export default { methods: { afterRender(data) { data.data = handleTree(data.data, "id", "parentId"); - console.log("tree data:",data.data) this.menuOptions = data.data; this.$refs.layoutTable.showType = "treetable" }, @@ -116,24 +115,6 @@ export default { }) } }, - - // 鎿嶄綔鑿滃崟鐘舵€� - changeStatus(row, column) { - return ( - <my-switch - confirm - url='/menu/save' - row={row} - onChange={this.statusChange} - value={this.tableData.data} - onInput={(data)=>{ - this.tableData.data = data; - }}/> - ) - }, - statusChange() { - this.$store.dispatch('login'); - }, }, data() { return {