update:修改类型设置、工装台账、维护保养页面样式

src/api/mes/tm/tmToolRequestUse.js

@@ -25,6 +25,16 @@ export function getTmToolRequestList(toolRequestId) {
   })
 }
 
+// 关联台账信息
+export function getTmToolSnList(query) {
+  return request({
+    url: "/mes/tm/tool/list",
+    method: "get",
+    params: query
+  });
+}
+
+
 
 // 新增刀模板领用单
 export function addTmToolRequestUse(data) {

src/views/mes/tm/maintenance/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-item label="维护保养编号" prop="toolMaintenanceCode">
-        <el-input
-          v-model="queryParams.toolMaintenanceCode"
-          placeholder="请输入维护保养编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="维护保养编号" prop="toolMaintenanceCode">
+            <el-input
+              v-model="queryParams.toolMaintenanceCode"
+              placeholder="请输入维护保养编号"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="单据状态" prop="maintenanceStatus">
+            <el-select v-model="queryParams.maintenanceStatus" placeholder="请选择单据状态" clearable>
+              <el-option
+                v-for="dict in dict.type.mes_maintenance_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="物料编码" prop="itemCode">
+            <el-input
+              v-model="queryParams.itemCode"
+              placeholder="请输入物料编码"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="工装夹具名称" prop="toolName">
+            <el-input
+              v-model="queryParams.toolName"
+              placeholder="请输入工装夹具名称"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="SN编码" prop="toolCode">
+            <el-input
+              v-model="queryParams.toolCode"
+              placeholder="请输入SN编码"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="存放位置" prop="location">
+            <el-input
+              v-model="queryParams.location"
+              placeholder="请输入存放位置"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <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-item label="单据状态" prop="maintenanceStatus">
         <el-select v-model="queryParams.maintenanceStatus" placeholder="请选择单据状态" clearable>
-          <el-option 
+          <el-option
           v-for="dict in dict.mes_maintenance_status"
           :key="dict.value"
-          :label="dict.label" 
+          :label="dict.label"
           :value="dict.value" />
         </el-select>
       </el-form-item> -->
-          <el-form-item label="单据状态" prop="maintenanceStatus">
-        <el-select v-model="queryParams.maintenanceStatus" placeholder="请选择单据状态" clearable>
-          <el-option
-            v-for="dict in dict.type.mes_maintenance_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-         </el-form-item>
-      <el-form-item label="物料编码" prop="itemCode">
-        <el-input
-          v-model="queryParams.itemCode"
-          placeholder="请输入物料编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工装夹具名称" prop="toolName">
-        <el-input
-          v-model="queryParams.toolName"
-          placeholder="请输入工装夹具名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="SN编码" prop="toolCode">
-        <el-input
-          v-model="queryParams.toolCode"
-          placeholder="请输入SN编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="存放位置" prop="location">
-        <el-input
-          v-model="queryParams.location"
-          placeholder="请输入存放位置"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </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>
 
     <el-row :gutter="10" class="mb8">
@@ -109,14 +126,14 @@
           v-hasPermi="['tm:maintenance:edit']"
         >结束维护</el-button>
       </el-col>
-      
+
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="maintenanceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="维护保养单号" align="center" prop="toolMaintenanceCode" />
-<!-- 
+<!--
        <el-table-column label="单据状态" align="center" prop="maintenanceStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mes_maintenance_status" :value="scope.row.maintenanceStatus"/>
@@ -134,14 +151,14 @@
         </template>
       </el-table-column>
 
-       
+
       <el-table-column label="物料编码" align="center" prop="itemCode" />
       <el-table-column label="工装夹具名称" align="center" prop="toolName" />
       <el-table-column label="SN编码" align="center" prop="toolCode" />
       <el-table-column label="存放位置" align="center" prop="location" />
       <el-table-column label="维护人" align="center" prop="processPerson" />
-      
-      
+
+
         <el-table-column label="开始时间" align="center" prop="startTime" />
         <el-table-column label="结束时间" align="center" prop="endTime" />
      <el-table-column label="维护时间" align="center" prop="processTime" />
@@ -164,7 +181,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -175,10 +192,10 @@
 
     <!-- 添加或修改要维护刀模板对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form 
-      ref="form" 
-      :model="form" 
-      :rules="rules" 
+      <el-form
+      ref="form"
+      :model="form"
+      :rules="rules"
       :disabled="form.toolMaintenanceId&&optType!='add'"
       label-width="80px" >
         <!-- <el-form-item label="单据状态">
@@ -196,7 +213,7 @@
                   icon="el-icon-search"
                   @click="handleBrandSelect"
                    :disabled="form.toolMaintenanceId"
-                   
+
                 ></el-button>
               </el-input>
               <BrandSelect
@@ -204,9 +221,9 @@
               @onSelected="onBrandSelected"
             ></BrandSelect>
             </el-form-item>
- 
 
-        
+
+
         <el-form-item label="名称" prop="toolName">
           <el-input v-model="form.toolName" readonly="readonly" />
         </el-form-item>
@@ -214,15 +231,15 @@
           <el-input v-model="form.toolCode" readonly="readonly" />
         </el-form-item>
         <el-form-item label="存放位置" prop="location" >
-          <el-input 
-          v-model="form.location" 
+          <el-input
+          v-model="form.location"
            readonly="readonly"
-          
+
           ></el-input>
         </el-form-item>
-        
+
         <el-form-item label="维护类型" prop="maintenanceType">
-              <el-select v-model="form.maintenanceType" placeholder="请选择维护类型">
+              <el-select style="width:100%;" v-model="form.maintenanceType" placeholder="请选择维护类型">
                 <el-option
                   v-for="dict in dict.type.mes_course_type"
                   :key="dict.value"
@@ -232,7 +249,7 @@
               </el-select>
             </el-form-item>
       </el-form>
-      
+
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm" v-if="optType != 'view'">确 定</el-button>
         <el-button @click="cancel" v-if="optType != 'view'">取 消</el-button>
@@ -251,28 +268,28 @@
           <el-input v-model="form.toolCode" readonly="readonly" />
         </el-form-item>
         <el-form-item label="存放位置" prop="location">
-          <el-input 
+          <el-input
           v-model="form.location" placeholder="请选择维护类型"
         ></el-input>
         </el-form-item>
         <el-form-item label="维护人" prop="processPerson">
           <el-input v-model="form.processPerson" readonly="readonly" />
         </el-form-item>
-        
+
        <el-form-item label="维护时间" prop="processTime">
           <el-input v-model="form.processTime" readonly="readonly" />
         </el-form-item>
         <el-form-item label="开始时间" prop="startTime">
           <el-input v-model="form.startTime" readonly="readonly" />
         </el-form-item>
-        
-        
+
+
            <el-form-item label="结束时间" prop="endTime">
           <el-input v-model="form.endTime" readonly="readonly" />
         </el-form-item>
-       
-        
-        
+
+
+
          <!-- <el-form-item label="维护状态">
           <el-radio-group v-model="form.processStatus">
             <el-radio label="1">请选择字典生成</el-radio>
@@ -291,8 +308,8 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-      
-      
+
+
         <el-form-item label="维护描述" prop="remark">
           <el-input v-model="form.remark" placeholder />
         </el-form-item>
@@ -303,9 +320,9 @@
       </div>
     </el-dialog>
 
-    
 
-  
+
+
   </div>
 </template>
 
@@ -339,20 +356,20 @@ export default {
      // 是否显示弹出层
       opena: false,
       selections: [],
-      
+
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         toolMaintenanceId: null,
-        toolMaintenanceCode: null, 
+        toolMaintenanceCode: null,
         toolId: null,
-        maintenanceStatus: null, 
-        maintenanceType: null,       
-        itemCode: null,        
-        toolName: null,        
-        toolCode: null,        
-        location: null, 
+        maintenanceStatus: null,
+        maintenanceType: null,
+        itemCode: null,
+        toolName: null,
+        toolCode: null,
+        location: null,
         processId: null,
         processPerson: null,
         lifeTime: null,
@@ -373,7 +390,7 @@ export default {
     this.getList();
   },
   methods: {
-   
+
     /** 查询要维护刀模板列表 */
     getList() {
       this.loading = true;
@@ -389,19 +406,19 @@ export default {
       this.opena = false;
       this.reset();
     },
-    
+
     // 表单重置
     reset() {
       this.form = {
         toolMaintenanceId: null,
-        toolMaintenanceCode: null, 
+        toolMaintenanceCode: null,
         toolId: null,
-        maintenanceStatus: null, 
-        maintenanceType: null,       
-        itemCode: null,        
-        toolName: null,        
-        toolCode: null,        
-        location: null, 
+        maintenanceStatus: null,
+        maintenanceType: null,
+        itemCode: null,
+        toolName: null,
+        toolCode: null,
+        location: null,
         processId: null,
         processPerson: null,
         lifeTime: null,
@@ -420,7 +437,7 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    
+
      handleBrandSelect(){
       this.$refs.brSelect.showFlag = true;
     },
@@ -436,7 +453,7 @@ export default {
 
 
 
- 
+
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.toolMaintenanceId)
@@ -455,10 +472,10 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
        if (this.selections.some(v => v.endTime)) {
-        return 
+        return
       }
        if (this.selections.some(v => v.startTime==null)) {
-        return 
+        return
       }
       this.reset();
       const toolMaintenanceId = row.toolMaintenanceId || this.ids
@@ -466,7 +483,7 @@ export default {
         this.form = response.data;
         this.opena = true;
         this.title = "结束维护";
-        
+
       });
     },
     //  查询明细按钮操作
@@ -480,9 +497,9 @@ export default {
         this.optType = "view";
       });
     },
- 
 
-   
+
+
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
@@ -506,7 +523,7 @@ export default {
     /** 维护 */
     handleDelete(row) {
       if (this.selections.some(v => v.startTime)) {
-        return 
+        return
       }
       const toolMaintenanceId = row.toolMaintenanceId || this.ids;
       this.$modal.confirm('是否确认要维护刀模板编号为"' + toolMaintenanceId + '"的数据项？').then(function() {

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

@@ -2,7 +2,7 @@
   <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-col :span="6">
           <el-form-item label="工装夹具编码" prop="toolCode">
             <el-input
               v-model="queryParams.toolCode"
@@ -12,7 +12,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="工装夹具名称" prop="toolName">
             <el-input
               v-model="queryParams.toolName"
@@ -22,7 +22,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="工装夹具类型" prop="toolTypeId">
             <el-select v-model="form.toolTypeId" placeholder="请选择类型">
               <el-option
@@ -34,10 +34,8 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
         <el-col :span="6">
-          <el-form-item label="品牌" label-width="60px" prop="brand">
+          <el-form-item label="品牌"  prop="brand">
             <el-input
               v-model="queryParams.brand"
               placeholder="请输入品牌"
@@ -47,7 +45,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="型号" label-width="60px" prop="spec">
+          <el-form-item label="型号"  prop="spec">
             <el-input
               v-model="queryParams.spec"
               placeholder="请输入型号"
@@ -57,7 +55,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="状态" label-width="60px" prop="status">
+          <el-form-item label="状态"  prop="status">
             <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
               <el-option
                 v-for="dict in dict.type.mes_tool_status"
@@ -217,7 +215,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="工装夹具类型" prop="toolTypeId">
-              <el-select v-model="form.toolTypeId" @change="onToolTypeChanged" placeholder="请选择类型">
+              <el-select style="width:100%;" v-model="form.toolTypeId" @change="onToolTypeChanged" placeholder="请选择类型">
                 <el-option
                   v-for="dict in toolTypeOptions"
                   :key="dict.toolTypeId"
@@ -295,7 +293,7 @@
             <el-form-item  label="数量" prop="quantity">
               <!-- <el-input v-if="form.codeFlag=='Y'" readonly v-model="form.quantity" /> -->
               <!-- <el-input-number :min="0" @blur="onQuantityChanged" v-else v-model="form.quantity"  /> -->
-               <el-input-number :min="0" @blur="onQuantityChanged" disabled v-model="form.quantity"  />
+               <el-input-number style="width:100%;" :min="0" @blur="onQuantityChanged" disabled v-model="form.quantity"  />
             </el-form-item>
           </el-col>
         </el-row>
@@ -307,7 +305,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="保养维护类型" prop="maintenType">
-              <el-select v-model="form.maintenType" placeholder="请选择保养维护类型">
+              <el-select style="width:100%;" v-model="form.maintenType" placeholder="请选择保养维护类型">
                 <el-option
                   v-for="dict in dict.type.mes_mainten_type"
                   :key="dict.value"

src/views/mes/tm/toolrequest/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="toolRequestCode">
         <el-input
           v-model="queryParams.toolRequestCode"

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

@@ -79,7 +79,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="tooltypeList" @selection-change="handleSelectionChange">      
+    <el-table v-loading="loading" :data="tooltypeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="类型编码" align="center" prop="toolTypeCode" >
         <template slot-scope="scope">
@@ -129,7 +129,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -142,26 +142,25 @@
     <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="类型编码" prop="toolTypeCode">
-              <el-input v-model="form.toolTypeCode" placeholder="请输入类型编码" />
+              <div style="display: flex;align-items: center;">
+                <el-input v-model="form.toolTypeCode" placeholder="请输入类型编码" />
+                <el-switch v-model="autoGenFlag"
+                  style="margin-left:10px;width: 175px;"
+                    active-color="#13ce66"
+                    active-text="自动生成"
+                    @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
+                </el-switch>
+              </div>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-switch v-model="autoGenFlag"
-                active-color="#13ce66"
-                active-text="自动生成"
-                @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">               
-            </el-switch>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="类型名称" prop="toolTypeName">
               <el-input v-model="form.toolTypeName" placeholder="请输入类型名称" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="是否编码管理" prop="codeFlag">
               <el-radio-group v-model="form.codeFlag" disabled v-if="optType=='view'">
                     <el-radio
@@ -179,9 +178,9 @@
                 </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="form.codeFlag=='Y'">
+          <el-col :span="12" v-if="form.codeFlag=='Y'">
             <el-form-item label="保养维护类型" prop="maintenType">
-              <el-select v-model="form.maintenType" placeholder="请选择保养维护类型">
+              <el-select style="width:100%;" v-model="form.maintenType" placeholder="请选择保养维护类型">
                 <el-option
                   v-for="dict in dict.type.mes_mainten_type"
                   :key="dict.value"
@@ -191,18 +190,16 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="form.codeFlag=='Y'">
+          <el-col :span="12" v-if="form.codeFlag=='Y'">
             <el-form-item label="保养周期" prop="maintenPeriod">
               <el-input v-model="form.maintenPeriod" placeholder="请输入保养周期" />
             </el-form-item>
           </el-col>
-        </el-row>        
-        <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
             </el-form-item>
-          </el-col>          
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">