Merge remote-tracking branch 'origin/dev' into dev

src/api/mes/pro/protask.js

@@ -28,10 +28,13 @@ export function listTaskListDetail(query) {
 }
 // 查询根据任务id获取刀模板
 export function getTaskIdMaxProcessTool(query) {
+  const params = Object.assign({}, query)
+  const id = query.taskId;
+  delete params.taskId
   return request({
-    url: `/mes/pro/protask/getMaxProcessTool/${query.taskId}`,
+    url: `/mes/pro/protask/getMaxProcessTool/${id}`,
     method: "get",
-    params: query,
+    params
   });
 }
 

src/views/mes/md/client/index.vue

 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-row>
-        <el-col :span="8">
           <el-form-item label="客户编码" prop="clientCode">
             <el-input
               v-model="queryParams.clientCode"
@@ -11,8 +9,6 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-        </el-col>
-        <el-col :span="8">
           <el-form-item label="客户名称" prop="clientName">
             <el-input
               v-model="queryParams.clientName"
@@ -21,8 +17,6 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-        </el-col>
-        <el-col :span="8">
           <el-form-item label="客户简称" prop="clientNick">
             <el-input
               v-model="queryParams.clientNick"
@@ -31,10 +25,6 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
           <el-form-item label="客户英文名称" prop="clientEn">
             <el-input
               v-model="queryParams.clientEn"
@@ -43,14 +33,11 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-        </el-col>
-        <el-col :span="8">
           <el-form-item label="是否启用" prop="enableFlag">
             <el-select
               v-model="queryParams.enableFlag"
               placeholder="是否启用"
               clearable
-              style="width: 215px"
             >
               <el-option
                 v-for="dict in dict.type.sys_yes_no"
@@ -60,14 +47,10 @@
               />
             </el-select>
           </el-form-item>
-        </el-col>
-        <el-col :span="8">
           <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-col>
-      </el-row>
     </el-form>
 
     <el-row :gutter="10" class="mb8">

src/views/mes/md/product/index.vue

@@ -362,7 +362,7 @@
           <el-col :span="12">
             <el-form-item label="单位" prop="unitOfMeasure">
               <el-select
-
+                style="width: 100%;"
                 v-model="form.unitOfMeasure"
                 disabled
                 v-if="optType == 'view'"
@@ -377,6 +377,7 @@
               </el-select>
 
               <el-select
+                style="width: 100%;"
                 v-model="form.unitOfMeasure"
                 placeholder="请选择单位"
                 filterable

src/views/mes/md/sizegroup/index.vue

@@ -141,9 +141,9 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-row>
-            <el-col :span="10">
+            <el-col :span="12">
               <el-form-item label="尺码组类型" label-width="100px" prop="sizeType">
-                <el-select v-model="form.sizeType" disabled v-if="optType=='view'">
+                <el-select style="width: 100%;" v-model="form.sizeType" disabled v-if="optType=='view'">
                   <el-option
                     v-for="dict in dict.type.size_type"
                     :key="dict.value"
@@ -152,7 +152,7 @@
                     ></el-option>
                 </el-select>
 
-                <el-select v-model="form.sizeType" placeholder="请选择尺码组类型" v-else>
+                <el-select style="width: 100%;" v-model="form.sizeType" placeholder="请选择尺码组类型" v-else>
                   <el-option
                     v-for="dict in dict.type.size_type"
                     :key="dict.value"
@@ -162,7 +162,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="10">
+            <el-col :span="12">
               <el-form-item label="是否启用" label-width="100px" prop="enableFlag">
                 <el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
                   <el-radio
@@ -183,13 +183,13 @@
           </el-row>
         </el-row>
         <el-row>
-          <el-col :span="10">
+          <el-col :span="12">
             <el-form-item label="尺码组编码" label-width="100px" prop="sizeGroupCode">
               <el-input v-model="form.sizeGroupCode" readonly="readonly" v-if="optType == 'view'"/>
               <el-input v-model="form.sizeGroupCode" placeholder="请输入尺码组编码" v-else/>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
+          <el-col :span="12">
             <el-form-item label="尺码组名称" label-width="100px" prop="sizeGroupName">
               <el-input v-model="form.sizeGroupName" readonly="readonly" v-if="optType=='view'"/>
               <el-input v-model="form.sizeGroupName" placeholder="请输入尺码组名称" v-else/>

src/views/mes/md/vendor/index.vue

 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-row>
-        <el-col :span="8">
           <el-form-item label="供应商编码" prop="vendorCode">
             <el-input
               v-model="queryParams.vendorCode"
@@ -11,8 +9,6 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-        </el-col>
-        <el-col :span="8">
           <el-form-item label="供应商名称" prop="vendorName">
             <el-input
               v-model="queryParams.vendorName"
@@ -21,8 +17,6 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-        </el-col>
-        <el-col :span="8">
           <el-form-item label="供应商简称" prop="vendorNick">
             <el-input
               v-model="queryParams.vendorNick"
@@ -31,10 +25,6 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
           <el-form-item label="英文名称" prop="vendorEn">
             <el-input
               v-model="queryParams.vendorEn"
@@ -43,8 +33,6 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-        </el-col>
-        <el-col :span="8">
           <el-form-item label="是否启用" prop="enableFlag">
             <el-select
               v-model="queryParams.enableFlag"
@@ -60,14 +48,10 @@
               />
             </el-select>
           </el-form-item>
-        </el-col>
-        <el-col :span="8">
           <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-col>
-      </el-row>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -182,20 +166,19 @@
 
     <!-- 添加或修改供应商对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
         <el-row>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="供应商编码" prop="vendorCode">
+              <div style="display:flex;align-items: center;">
                 <el-input v-model="form.vendorCode" placeholder="请输入供应商编码" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item  label-width="80">
                 <el-switch v-model="autoGenFlag"
                     active-color="#13ce66"
                     active-text="自动生成"
+                    style="width:175px;margin-left:10px;"
                     @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
                 </el-switch>
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="12">

src/views/mes/md/workstation/index.vue

@@ -8,8 +8,6 @@
       v-show="showSearch"
       label-width="100px"
     >
-      <el-row>
-        <el-col :span="8">
           <el-form-item label="工作站编码" prop="workstationCode">
             <el-input
               v-model="queryParams.workstationCode"
@@ -18,8 +16,6 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-        </el-col>
-        <el-col :span="8">
           <el-form-item label="工作站名称" prop="workstationName">
             <el-input
               v-model="queryParams.workstationName"
@@ -28,8 +24,6 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-        </el-col>
-        <el-col :span="8">
           <el-form-item label="所在车间名称" prop="workshopName">
             <el-select
               v-model="queryParams.workshopId"
@@ -43,10 +37,6 @@
               ></el-option>
             </el-select>
           </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
           <el-form-item label="所属工序" prop="processName">
             <el-select v-model="queryParams.processId" placeholder="请选择工序">
               <el-option
@@ -57,8 +47,6 @@
               ></el-option>
             </el-select>
           </el-form-item>
-        </el-col>
-        <el-col :span="8">
           <el-form-item>
             <el-button
               type="primary"
@@ -71,8 +59,6 @@
               >重置</el-button
             >
           </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -236,7 +222,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="所在车间" prop="workshopId">
-              <el-select v-model="form.workshopId" placeholder="请选择车间">
+              <el-select style="width:100%;" v-model="form.workshopId" placeholder="请选择车间">
                 <el-option
                   v-for="item in workshopOptions"
                   :key="item.workshopId"
@@ -248,9 +234,9 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="所属工序" prop="processId">
-              <el-select v-model="form.processId" placeholder="请选择工序">
+              <el-select style="width:100%;" v-model="form.processId" placeholder="请选择工序">
                 <el-option
                   v-for="item in processOptions"
                   :key="item.processId"

src/views/mes/pro/request/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="产品编号" prop="itemCode">
         <el-input
           v-model="queryParams.itemCode"
@@ -52,7 +52,6 @@
       <el-form-item label="创建时间">
         <el-date-picker
           v-model="daterangePurchaseDate"
-          style="width: 240px"
           value-format="yyyy-MM-dd"
           type="daterange"
           range-separator="-"
@@ -187,7 +186,7 @@
         <el-row>
           <el-col :span="12">
               <el-form-item label="领料类型" prop="applyType">
-           <el-select v-model="form.applyType" placeholder="请选择领用类型">
+           <el-select style="width:100%;" v-model="form.applyType" placeholder="请选择领用类型">
                 <el-option
                   v-for="dict in dict.type.pro_requisition_type"
                   :key="dict.value"
@@ -198,7 +197,7 @@
         </el-form-item>
         </el-col>
         <el-col :span="12">
-        <el-form-item label="领用数量数量" prop="applyNum">
+        <el-form-item label="领用数量" prop="applyNum">
           <el-input v-model="form.applyNum" placeholder="请输入申请数量" />
         </el-form-item>
         </el-col>
@@ -211,7 +210,7 @@
           </el-col>
           <el-col :span="12">
         <el-form-item label="创建人" prop="createBy">
-          <el-input v-model="form.createBy" type="textarea" placeholder="请输入创始人" />
+          <el-input v-model="form.createBy" placeholder="请输入创始人" />
         </el-form-item>
           </el-col>
         </el-row>

src/views/mes/pro/return/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="产品编号" prop="itemCode">
         <el-input
           v-model="queryParams.itemCode"
@@ -60,7 +60,6 @@
       <el-form-item label="创建时间">
         <el-date-picker
           v-model="daterangePurchaseDate"
-          style="width: 240px"
           value-format="yyyy-MM-dd"
           type="daterange"
           range-separator="-"

src/views/mes/report/index.vue

@@ -118,7 +118,7 @@
           <el-input v-model="form.name" placeholder="请输入报表名称" />
         </el-form-item>
         <el-form-item label="报表类型" prop="reportType">
-          <el-select v-model="form.reportType" placeholder="请选择模板类型">
+          <el-select style="width:100%;" v-model="form.reportType" placeholder="请选择模板类型">
             <el-option
               v-for="dict in dict.type.sys_report_type"
               :key="dict.value"

src/views/mes/tm/toolrequest/index.vue

@@ -191,8 +191,8 @@
             </el-form-item>
           </el-col>
           <el-col v-if="optType === 'add'" :span="12">
-            <el-form-item label="任务排产单" prop="taskId">
-              <el-input v-model="form.taskId"  placeholder="请选择任务排产单"
+            <el-form-item label="任务排产单" prop="taskWorkunitId">
+              <el-input v-model="form.taskWorkunitId"  placeholder="请选择任务排产单"
                             disabled>
                 <el-button
                  v-if="optType === 'add'"
@@ -259,7 +259,7 @@
       </el-form>
       <el-divider content-position="center">刀模版申请详细</el-divider>
       <el-card shadow="always" class="box-card">
-        <itemline ref="line" :quantity="form.requestNum" :toolRequestId="form.toolRequestId" :taskId="form.taskWorkunitId" :optType="optType" @sum="handleSumNum"></itemline>
+        <itemline ref="line" :quantity="form.quantity" :toolRequestId="form.toolRequestId" :taskId="form.taskWorkunitId" :optType="optType" @sum="handleSumNum"></itemline>
       </el-card>
       <div slot="footer" class="dialog-footer">
         <el-button v-if="!form.toolRequestId" type="primary" @click="submitForm">确 定</el-button>
@@ -477,6 +477,7 @@ export default {
       this.form.processId = row.processId
       this.form.startTime = row.startTime
       this.form.endTime = row.endTime
+      this.form.quantity = row.quantity
       this.form.arrangeCode = row.arrangeCode
       this.form.workunitName = row.workunitName
     },

src/views/mes/tm/toolrequest/selectTask.vue

@@ -94,7 +94,7 @@
             >{{ "" }}</el-radio
           > -->
           <!-- 可以手动的修改label的值，从而控制选择哪一项 -->
-          <el-radio class="radio" v-model="selectedItemId" :label="scope.row.taskId"
+          <el-radio class="radio" v-model="selectedItemId" :label="scope.row.taskWorkunitId"
             >{{ "" }}</el-radio
           >
         </template>
@@ -106,13 +106,13 @@
         key="taskWorkunitId"
         prop="taskWorkunitId"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="排产数量"
         min-width="100"
         align="center"
         key="quantity"
         prop="quantity"
-      />
+      /> -->
       <el-table-column
         label="单位"
         align="center"
@@ -222,7 +222,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        statusArr: '',
+        // statusArr: '',
         workorderType: 'SELF',
         // statusStr: 'PREPARE,BEGINNING,ISSUEGENERATED'
       },
@@ -276,7 +276,7 @@ export default {
     handleRowChange(row) {
       if (row) {
         this.selectedRows = row;
-        this.selectedItemId = row.taskId
+        this.selectedItemId = row.taskWorkunitId
       }
     },
     //确定选中

src/views/mes/tm/warehouse/itemIndex.vue

@@ -58,7 +58,6 @@
 
 <script>
 import { lisWoreHouseDetail } from "@/api/mes/tm/warehouse";
-import { getTaskIdMaxProcessTool } from "@/api/mes/pro/protask";
 import ItemSelect from "./selectmachinesrecord.vue";
 export default {
   name: "TmToolRequestItem",
@@ -105,11 +104,7 @@ export default {
     };
   },
   watch: {
-     '$attrs.taskId'(newVal, oldVal){
-      if (this.$attrs.optType === 'add') {
-        this.getTaskList()
-      }
-     }
+
   },
   created() {
     if (this.$attrs.optType !== 'add') {
@@ -149,25 +144,6 @@ export default {
         this.loading = false;
       });
     },
-
-    /** 查询任务刀模板申请单列表 */
-    getTaskList() {
-      this.loading = true;
-      this.queryParams.taskId = this.$attrs.taskId;
-      this.queryParams.pageSize = 10000;
-      getTaskIdMaxProcessTool(this.queryParams).then(response => {
-        const datas = response.data.map(item => {
-           return {
-             ...item,
-             allQuantity: item.AllQuantity
-           }
-        });
-        this.tmToolRequestItemList = this.tmToolRequestItemList.concat(datas)
-        // this.total = response.total;
-        this.loading = false;
-        this.$emit('sum')
-      });
-    },
     handleRemove(row, index) {
       console.log(row,index)
       // this.tags.splice(this.tags.indexOf(tag), 1)

src/views/mes/wm/package/index.vue

@@ -135,18 +135,17 @@
         <el-row>
           <el-col :span="12">
             <el-row>
-              <el-col :span="16">
+              <el-col :span="24">
                 <el-form-item label="装箱单编号" prop="packageCode">
+                  <div style="display: flex;align-items: center;">
                     <el-input v-model="form.packageCode" placeholder="请输入装箱单编号" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item  label-width="80">
                     <el-switch v-model="autoGenFlag"
                       active-color="#13ce66"
                       active-text="自动生成"
+                      style="width: 175px;margin-left: 10px;"
                       @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
                    </el-switch>
+                  </div>
                 </el-form-item>
               </el-col>
             </el-row>

src/views/mes/wm/productrecpt/index.vue

@@ -144,18 +144,17 @@
     <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="入库单编号" prop="recptCode">
+              <div style="display: flex;align-items: center;">
                 <el-input v-model="form.recptCode" placeholder="请输入入库单编号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item  label-width="80">
                 <el-switch v-model="autoGenFlag"
                     active-color="#13ce66"
                     active-text="自动生成"
+                    style="width: 175px;margin-left: 10px;"
                     @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
                 </el-switch>
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="12">

src/views/mes/wm/warehouse/index.vue

@@ -118,18 +118,17 @@
     <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="仓库编码" prop="warehouseCode">
+              <div style="display: flex;align-items: center;">
                 <el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item  label-width="80">
                 <el-switch v-model="autoGenFlag"
                     active-color="#13ce66"
                     active-text="自动生成"
+                    style="width:175px;margin-left:10px;"
                     @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
                 </el-switch>
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="12">

src/views/monitor/logininfor/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="登录地址" prop="ipaddr">
         <el-input
           v-model="queryParams.ipaddr"

src/views/monitor/operlog/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="系统模块" prop="title">
         <el-input
           v-model="queryParams.title"

src/views/system/autocode/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="规则名称" prop="ruleName">
         <el-input
           v-model="queryParams.ruleName"

src/views/system/config/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="参数名称" prop="configName">
         <el-input
           v-model="queryParams.configName"

src/views/system/dept/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px" v-show="showSearch">
       <el-form-item label="部门名称" prop="deptName">
         <el-input
           v-model="queryParams.deptName"

src/views/system/dict/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="字典名称" prop="dictName">
         <el-input
           v-model="queryParams.dictName"

src/views/system/menu/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="菜单名称" prop="menuName">
         <el-input
           v-model="queryParams.menuName"
@@ -75,7 +75,7 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" fixed="right" width="250" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/system/post/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="岗位编码" prop="postCode">
         <el-input
           v-model="queryParams.postCode"

src/views/system/role/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px" 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>
@@ -15,7 +14,6 @@
           v-model="queryParams.roleKey"
           placeholder="请输入权限字符"
           clearable
-          style="width: 240px"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -24,7 +22,6 @@
           v-model="queryParams.status"
           placeholder="角色状态"
           clearable
-          style="width: 240px"
         >
           <el-option
             v-for="dict in dict.type.sys_normal_disable"
@@ -37,7 +34,6 @@
       <el-form-item label="创建时间">
         <el-date-picker
           v-model="dateRange"
-          style="width: 240px"
           value-format="yyyy-MM-dd"
           type="daterange"
           range-separator="-"