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

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

@@ -111,30 +111,30 @@
     </el-row>
     <el-table v-loading="loading" :data="feedbackList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="报工类型" align="center" prop="feedbackType">
+      <el-table-column label="报工类型" align="center" width="80" prop="feedbackType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mes_feedback_type" :value="scope.row.feedbackType"/>
         </template>
       </el-table-column>
-      <el-table-column label="工作站" width="120px" align="center" prop="workstationName" />
-      <el-table-column label="生产工单编号" width="150px" align="center" prop="workorderCode" />
-      <el-table-column label="产品物料编码" width="120px" align="center" prop="itemCode" />
-      <el-table-column label="产品物料名称" width="150px" align="center" prop="itemName" />
-      <el-table-column label="规格型号" align="center" prop="specification" />
-      <el-table-column label="报工数量" align="center" prop="quantityFeedback" />   
-      <el-table-column label="报工人" align="center" prop="nickName" />
+      <el-table-column label="工作站" width="120" align="center" prop="workstationName" />
+      <el-table-column label="生产工单编号" width="150" align="center" prop="workorderCode" />
+      <el-table-column label="产品物料编码" width="120" align="center" prop="itemCode" />
+      <el-table-column label="产品物料名称" min-width="250" show-overflow-tooltip align="center" prop="itemName" />
+      <el-table-column label="规格型号" width="100" align="center" prop="specification" />
+      <el-table-column label="报工数量" width="100" align="center" prop="quantityFeedback" />   
+      <el-table-column label="报工人" width="100" align="center" prop="nickName" />
       <el-table-column label="报工时间" align="center" prop="feedbackTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.feedbackTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="审核人" align="center" prop="recordNick" />
-      <el-table-column label="状态" align="center" prop="status">
+      <el-table-column label="审核人" width="100" align="center" prop="recordNick" />
+      <el-table-column label="状态" width="80" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="100px" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" fixed="right" width="160px" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

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

@@ -105,7 +105,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="工艺路线编号" align="center" prop="routeCode">
+      <el-table-column label="工艺路线编号" width="150" align="center" prop="routeCode">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -115,9 +115,9 @@
           >
         </template>
       </el-table-column>
-      <el-table-column label="工艺路线名称" align="center" prop="routeName" />
-      <el-table-column label="工艺路线说明" align="center" prop="routeDesc" />
-      <el-table-column label="是否启用" align="center" prop="enableFlag">
+      <el-table-column label="工艺路线名称" min-width="200" align="center" prop="routeName" show-overflow-tooltip />
+      <el-table-column label="工艺路线说明" min-width="200" align="center" prop="routeDesc" show-overflow-tooltip />
+      <el-table-column label="是否启用" width="80" align="center" prop="enableFlag">
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.sys_yes_no"
@@ -125,10 +125,12 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
       <el-table-column
         label="操作"
         align="center"
+        width="120"
+        fixed="right"
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">

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

@@ -156,9 +156,10 @@
       />
       <el-table-column
         label="工艺名称"
-        width="140"
+        width="200"
         align="center"
         prop="routeName"
+        show-overflow-tooltip
       />
       <el-table-column
         label="工序名称"
@@ -174,7 +175,7 @@
       /> -->
       <el-table-column
         label="产品名称"
-        width="180"
+        width="200"
         align="center"
         prop="itemName"
         :show-overflow-tooltip="true"

src/views/mes/qt/factoryQuote/index.vue

@@ -329,16 +329,20 @@ export default {
       this.$confirm('审批工厂报价', '', {
         confirmButtonText: '通过',
         cancelButtonText: '驳回',
+        cancelButtonClass: 'cancel-red',
+        distinguishCancelAndClose: 1
       }).then(() => {
         updateFactoryQuote({id: row.id, state: '2'}).then(() => {
           this.$message.success('操作成功')
           this.getList()
         })
-      }).catch(() => {
+      }).catch((action) => {
+        if (action === 'cancel') {
           updateFactoryQuote({id: row.id, state: '0'}).then(() => {
             this.$message.success('操作成功')
             this.getList()
           })
+        }
       })
     },
     /** 修改按钮操作 */
@@ -402,3 +406,10 @@ export default {
   }
 }
 </script>
+
+<style>
+.cancel-red {
+  background: #F56C6C;
+  color: #ffffff;
+}
+</style>

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

@@ -125,9 +125,9 @@
 
     <el-table v-loading="loading" :data="toolList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="编号" align="center" prop="toolCode" >
+      <el-table-column label="编号" width="80" align="center" prop="toolCode" >
       </el-table-column>
-      <el-table-column label="名称" align="center" prop="toolName" :show-overflow-tooltip="true">
+      <el-table-column label="名称" min-width="180" align="center" prop="toolName" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -136,12 +136,12 @@
           >{{scope.row.toolName}}</el-button>
         </template>
       </el-table-column>
-      <el-table-column label="品牌" align="center" prop="brand" :show-overflow-tooltip="true"/>
-      <el-table-column label="型号" align="center" prop="spec" :show-overflow-tooltip="true"/>
-      <el-table-column label="类型" align="center" prop="toolTypeName" />
-      <el-table-column label="库存数量" align="center" prop="quantity" />
-      <el-table-column label="可用数量" align="center" prop="quantityAvail" />
-      <el-table-column label="保养维护类型" width="100px" align="center" prop="maintenType">
+      <el-table-column label="品牌" width="80" align="center" prop="brand" :show-overflow-tooltip="true"/>
+      <el-table-column label="型号" width="80" align="center" prop="spec" :show-overflow-tooltip="true"/>
+      <el-table-column label="类型" width="80" align="center" prop="toolTypeName" />
+      <el-table-column label="库存数量" width="100" align="center" prop="quantity" />
+      <el-table-column label="可用数量" width="100" align="center" prop="quantityAvail" />
+      <el-table-column label="保养维护类型" width="120" align="center" prop="maintenType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mes_mainten_type" :value="scope.row.maintenType"/>
         </template>
@@ -157,7 +157,7 @@
           <dict-tag :options="dict.type.mes_tool_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="120" fixed="right" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

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

@@ -117,7 +117,7 @@
           <dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
         </template>
       </el-table-column>      
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="200" fixed="right" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"