src/components/Crontab/index.vue
@@ -105,7 +105,7 @@ <div class="pop_btn"> <el-button size="small" type="primary" @click="submitFill">ç¡®å®</el-button> <el-button size="small" type="warning" @click="clearCron">éç½®</el-button> <el-button size="small" type="warning" @click="clearCron">é ç½®</el-button> <el-button size="small" @click="hidePopup">åæ¶</el-button> </div> </div> src/components/RightToolbar/index.vue
@@ -90,7 +90,7 @@ } }, methods: { // æç´¢ // æ¥ è¯¢ toggleSearch() { this.$emit("update:showSearch", !this.showSearch); }, src/router/index.js
@@ -160,6 +160,13 @@ // ] }, { // æ°æ®åå ¸ path: '/customer', component: Layout, hidden: true, permissions: ['customer:edit'], }, { path: '/monitor/job-log', component: Layout, hidden: true, src/utils/generator/html.js
@@ -57,7 +57,7 @@ if (conf.formBtns && type === 'file') { str = `<el-form-item size="large"> <el-button type="primary" @click="submitForm">æäº¤</el-button> <el-button @click="resetForm">éç½®</el-button> <el-button @click="resetForm">é ç½®</el-button> </el-form-item>` if (someSpanIsNot24) { str = `<el-col :span="24"> src/views/business/materialOrder/index.vue
@@ -983,7 +983,7 @@ }) } }, // éç½® // é ç½® refresh() { this.entity = this.HaveJson(this.entityEmpty) if (this.tabIndex === 0) { src/views/business/rawMaterialInspection/index.vue
@@ -623,7 +623,7 @@ this.$refs['ValueTable4'].selectList(e) } }, // éç½® // é ç½® refresh() { this.entity.date = null this.componentData.entity = this.HaveJson(this.entityCopy) src/views/monitor/job/index.vue
@@ -30,8 +30,8 @@ </el-select> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">éç½®</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æ¥ è¯¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é ç½®</el-button> </el-form-item> </el-form> src/views/monitor/job/log.vue
@@ -52,8 +52,8 @@ ></el-date-picker> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">éç½®</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æ¥ è¯¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é ç½®</el-button> </el-form-item> </el-form> src/views/monitor/logininfor/index.vue
@@ -47,8 +47,8 @@ ></el-date-picker> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">éç½®</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æ¥ è¯¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é ç½®</el-button> </el-form-item> </el-form> src/views/monitor/online/index.vue
@@ -18,8 +18,8 @@ /> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">éç½®</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æ¥ è¯¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é ç½®</el-button> </el-form-item> </el-form> src/views/monitor/operlog/index.vue
@@ -71,8 +71,8 @@ ></el-date-picker> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">éç½®</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æ¥ è¯¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é ç½®</el-button> </el-form-item> </el-form> src/views/system/config/index.vue
@@ -41,8 +41,8 @@ ></el-date-picker> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">éç½®</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æ¥ è¯¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é ç½®</el-button> </el-form-item> </el-form> src/views/system/customer/index.vue
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,320 @@ <template> <div class="app-container"> <div class="search"> <div> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true"> <el-form-item label="ç¶æ" prop="state"> <el-input size="small" placeholder="请è¾å ¥" clearable v-model="queryParams.company" @keyup.enter.native="refreshTable()"></el-input> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">æ¥ è¯¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="refresh">é ç½®</el-button> </el-form-item> </el-form> </div> <div> <el-button size="small" type="primary" @click="addDia = true" v-if="addPower" icon="el-icon-plus">æ°å¢</el-button> </div> </div> <!-- <div class="table">--> <!-- <ValueTable ref="ValueTable" :url="$api.user.selectCustomPageList" :delUrl="$api.user.delCustomById"--> <!-- :componentData="componentData" :key="upIndex" :upUrl="$api.user.upCustom"/>--> <!-- </div>--> <el-dialog title="æ°å¢å®¢æ·" :visible.sync="addDia" width="450px"> <div style="margin-bottom: 15px;"> <el-row style="line-height: 50px;"> <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">* </span>客æ·åç§°ï¼</el-col> <el-col :span="15"> <el-input v-model="user.company" size="small" clearable></el-input> </el-col> </el-row> <el-row style="line-height: 50px;"> <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">* </span>客æ·åä½ENï¼</el-col> <el-col :span="15"> <el-input v-model="user.companyEn" size="small" clearable></el-input> </el-col> </el-row> <el-row style="margin-top: 15px;"> <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">* </span>åä½å°åï¼</el-col> <el-col :span="15"> <el-input type="textarea" v-model="user.address" size="small" clearable :autosize="{minRows: 2, maxRows: 4}"></el-input> </el-col> </el-row> <el-row style="margin-top: 15px;"> <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">* </span>客æ·å°åENï¼</el-col> <el-col :span="15"> <el-input type="textarea" v-model="user.addressEn" size="small" clearable :autosize="{minRows: 2, maxRows: 4}"></el-input> </el-col> </el-row> <el-row style="line-height: 50px;"> <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">* </span>å æ¥é¢åº¦ï¼</el-col> <el-col :span="15"> <el-input v-model="user.num" size="small" clearable></el-input> </el-col> </el-row> <el-row style="line-height: 50px;"> <el-col :span="7" style="text-align: right;padding-right: 8px;">åä½çµè¯ï¼</el-col> <el-col :span="15"> <el-input v-model="user.phone" size="small" clearable></el-input> </el-col> </el-row> <el-row style="line-height: 50px;"> <el-col :span="7" style="text-align: right;padding-right: 8px;">å·¥ååï¼</el-col> <el-col :span="15"> <el-input v-model="user.code" size="small" clearable></el-input> </el-col> </el-row> <el-row style="line-height: 50px;"> <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">* </span>客æ·ç¼å·ï¼</el-col> <el-col :span="15"> <el-input v-model="user.code2" size="small" clearable></el-input> </el-col> </el-row> </div> <span slot="footer" class="dialog-footer"> <el-button @click="addDia = false">å æ¶</el-button> <el-button type="primary" @click="customAdd" :loading="loading">ç¡® å®</el-button> </span> </el-dialog> <el-dialog title="éæ©ç¨æ·" :visible.sync="selectUserDia" width="70%"> <div class="search" style="height: 35px; margin-bottom: 9px;"> <div class="search_thing"> <div class="search_label">ç¨æ·åï¼</div> <div class="search_input"><el-input size="small" placeholder="请è¾å ¥" clearable v-model="componentData2.entity.name" @keyup.enter.native="$refs.ValueTable2.selectList()"></el-input></div> </div> </div> <!-- <div class="body" style="height: 60vh;" v-if="selectUserDia">--> <!-- <ValueTable ref="ValueTable2" :url="$api.user.selectUserList" :componentData="componentData2" />--> <!-- </div>--> <span slot="footer" class="dialog-footer"> <el-button @click="selectUserDia = false">å æ¶</el-button> <el-button type="primary" @click="selectUser">ç¡® å®</el-button> </span> </el-dialog> </div> </template> <script> import ValueTable from '@/components/Table/value-table.vue' export default { components: { ValueTable }, data() { return { queryParams: { company: '' }, componentData: { entity: { company: null, orderBy: { field: 'id', order: 'asc' } }, isIndex: true, showSelect: false, select: false, do: [{ font: 'å§æè®°å½', type: 'text', method: 'entrust' }, { font: 'å议记å½', type: 'text', method: 'protocol' },{ id: 'update', font: 'ç¼è¾', type: 'text', method: 'doDiy', field:[] },{ id: 'delete', font: 'å é¤', type: 'text', method: 'doDiy' }], tagField: { state: { select: [{ value: 1, type: 'success', label: 'å¯ç¨' }, { value: 0, type: 'danger', label: 'åç¨' }] } }, selectField: { state: { select: [{ value: 1, type: 'success', label: 'å¯ç¨' }, { value: 0, type: 'danger', label: 'åç¨' }] } }, requiredAdd: [], requiredUp: ['company','address','code2','companyEn','addressEn','num'] }, entityCopy: {}, upIndex: 0, addDia: false, addPower: true, user: { name: null }, selectUserDia: false, loading: false, componentData2: { entity: { isCustom: 0, orderBy: { field: 'id', order: 'asc' } }, isIndex: true, showSelect: true, select: false, do: [], tagField: { state: { select: [{ value: 1, type: 'success', label: 'å¯ç¨' }, { value: 0, type: 'danger', label: 'åç¨' }] } }, selectField: {}, needSort: ['company'], } } }, mounted() { this.entityCopy = this.HaveJson(this.componentData.entity) this.getPower() }, methods: { refreshTable() { this.$refs['ValueTable'].selectList() }, refresh() { this.componentData.entity = this.HaveJson(this.entityCopy) this.upIndex++ }, customAdd() { if (this.user.company == '' || this.user.company == null) { this.$message.error('请填å客æ·åä½') return } if (this.user.address == '' || this.user.address == null) { this.$message.error('请填ååä½å°å') return } if (this.user.companyEn == '' || this.user.companyEn == null) { this.$message.error('请填åè±æå®¢æ·åä½') return } if (this.user.addressEn == '' || this.user.addressEn == null) { this.$message.error('请填åè±æåä½å°å') return } if (this.user.code2 == '' || this.user.code2 == null) { this.$message.error('请填å客æ·ç¼å·') return } if (this.user.code2 == '' || this.user.code2 == null) { this.$message.error('请填åå æ¥é¢åº¦') return } this.loading = true this.$axios.post(this.$api.user.addCustom, this.user, { headers: { 'Content-Type': 'application/json' } }).then(res => { if (res.code == 201) return this.$message.success('æ·»å æå') this.refreshTable() this.loading = false this.addDia = false }) }, // æéåé getPower() { let power = JSON.parse(sessionStorage.getItem('power')) let up = false let del = false let add = false for (var i = 0; i < power.length; i++) { if (power[i].menuMethod == 'delCustomById') { del = true } if (power[i].menuMethod == 'addCustom') { add = true } if (power[i].menuMethod == 'upCustom') { up = true } } if (!del) { this.componentData.do.splice(3, 1) } if (!up) { this.componentData.do.splice(2, 1) } this.addPower = add }, entrust(data) { }, protocol(data) { }, selectUser() { let selects = this.$refs.ValueTable2.multipleSelection if (selects.length == 0) { this.$message.error('æªéæ©æ°æ®') return } delete selects['orderBy'] delete selects['updateUser'] delete selects['updateTime'] this.user = selects this.selectUserDia = false } } } </script> <style scoped> .search { height: 80px; display: flex; justify-content: space-between; } </style> src/views/system/dept/index.vue
@@ -20,8 +20,8 @@ </el-select> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">éç½®</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æ¥ è¯¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é ç½®</el-button> </el-form-item> </el-form> src/views/system/dict/data.vue
@@ -30,8 +30,8 @@ </el-select> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">éç½®</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æ¥ è¯¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é ç½®</el-button> </el-form-item> </el-form> @@ -399,4 +399,4 @@ } } }; </script> </script> src/views/system/dict/index.vue
@@ -22,8 +22,8 @@ /> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">éç½®</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æ¥ è¯¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é ç½®</el-button> </el-form-item> </el-form> </div> src/views/system/menu/index.vue
@@ -20,8 +20,8 @@ </el-select> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">éç½®</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æ¥ è¯¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é ç½®</el-button> </el-form-item> </el-form> src/views/system/notice/index.vue
@@ -28,8 +28,8 @@ </el-select> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">éç½®</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æ¥ è¯¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é ç½®</el-button> </el-form-item> </el-form> src/views/system/post/index.vue
@@ -28,8 +28,8 @@ </el-select> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">éç½®</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æ¥ è¯¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é ç½®</el-button> </el-form-item> </el-form> src/views/system/role/authUser.vue
@@ -20,8 +20,8 @@ /> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">éç½®</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æ¥ è¯¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é ç½®</el-button> </el-form-item> </el-form> @@ -196,4 +196,4 @@ } } }; </script> </script> src/views/system/role/index.vue
@@ -1,65 +1,61 @@ <template> <div class="app-container"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"> <el-form-item label="è§è²åç§°" prop="roleName"> <el-input v-model="queryParams.roleName" placeholder="请è¾å ¥è§è²åç§°" clearable style="width: 240px" @keyup.enter.native="handleQuery" /> </el-form-item> <el-form-item label="æéå符" prop="roleKey"> <el-input v-model="queryParams.roleKey" placeholder="请è¾å ¥æéå符" clearable style="width: 240px" @keyup.enter.native="handleQuery" /> </el-form-item> <el-form-item label="ç¶æ" prop="status"> <el-select v-model="queryParams.status" placeholder="è§è²ç¶æ" clearable style="width: 240px" > <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" /> </el-select> </el-form-item> <el-form-item label="å建æ¶é´"> <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="å¼å§æ¥æ" end-placeholder="ç»ææ¥æ" ></el-date-picker> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">éç½®</el-button> </el-form-item> </el-form> <div class="addButton mb8"> <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:role:add']" >æ°å¢</el-button> <div class="search"> <div> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"> <el-form-item label="è§è²åç§°" prop="roleName"> <el-input v-model="queryParams.roleName" placeholder="请è¾å ¥è§è²åç§°" clearable style="width: 200px" @keyup.enter.native="handleQuery" /> </el-form-item> <el-form-item label="æéå符" prop="roleKey"> <el-input v-model="queryParams.roleKey" placeholder="请è¾å ¥æéå符" clearable style="width: 200px" @keyup.enter.native="handleQuery" /> </el-form-item> <el-form-item label="ç¶æ" prop="status"> <el-select v-model="queryParams.status" placeholder="è§è²ç¶æ" clearable style="width: 200px" > <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" /> </el-select> </el-form-item> <el-form-item label="å建æ¶é´"> <el-date-picker v-model="dateRange" style="width: 200px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="å¼å§æ¥æ" end-placeholder="ç»ææ¥æ" ></el-date-picker> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æ¥ è¯¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é ç½®</el-button> </el-form-item> </el-form> </div> <div class="addButton mb8"> <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:role:add']">æ°å¢</el-button> </div> </div> <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange"> @@ -598,7 +594,11 @@ </script> <style scoped> .search { display: flex; justify-content: space-between; } .addButton { text-align: right; margin-top: 3px; } </style> src/views/system/role/selectUser.vue
@@ -19,8 +19,8 @@ /> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">éç½®</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æ¥ è¯¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é ç½®</el-button> </el-form-item> </el-form> <el-row> @@ -129,7 +129,7 @@ this.$modal.msgSuccess(res.msg); this.visible = false; this.$emit("ok"); }); }); } } }; src/views/system/user/index.vue
@@ -28,8 +28,8 @@ </el-select> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">éç½®</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æ¥ è¯¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é ç½®</el-button> </el-form-item> </el-form> </div> src/views/tool/gen/importTable.vue
@@ -19,8 +19,8 @@ /> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">éç½®</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æ¥ è¯¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é ç½®</el-button> </el-form-item> </el-form> <el-row> src/views/tool/gen/index.vue
@@ -29,8 +29,8 @@ ></el-date-picker> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æç´¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">éç½®</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">æ¥ è¯¢</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">é ç½®</el-button> </el-form-item> </el-form>