From 5b94c5823d97d754f1c8980e39da78a482fd2c7d Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Fri, 20 Sep 2019 10:49:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/index.scss                         | 21 +++++++++++
 src/utils/request.js                          |  2 +-
 .../WorkshopProcessMaintenance/index.vue      |  8 ++---
 .../PartAssignment/index.vue                  | 36 ++++++++++++++-----
 .../PartWorkCraftSelect_rdlc/index.vue        |  6 ++--
 .../ProcessAdjustQuery/index.vue              |  4 +--
 .../ProcessQuotaEstablishment/index.vue       | 24 ++++++-------
 .../ProcessTaskAssignment/index.vue           |  2 +-
 8 files changed, 73 insertions(+), 30 deletions(-)

diff --git a/src/styles/index.scss b/src/styles/index.scss
index fea3945d..ba967790 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -155,6 +155,21 @@ el-card{
     border-color: rgb(45,114,213);
   }
 }
+.el-button--baocun{
+  background: #67C23A;
+  border-color: #67C23A;
+  color: white;
+  &:hover{
+    background: #67C23A;
+    border-color: #67C23A;
+    color: white;
+  }
+  &:focus{
+    background: #67C23A;
+    border-color: #67C23A;
+    color: white;
+  }
+}
 .el-button--primary{
   background: #ff9759;
   border-color: #ff9759;
@@ -174,3 +189,9 @@ el-card{
 .el-input--small .el-input__inner {
   height: 29px;
 }
+.el-breadcrumb__separator {
+  color: black;
+}
+.el-table td, .el-table th {
+  padding: 0;
+}
diff --git a/src/utils/request.js b/src/utils/request.js
index 8eaacaf2..b5b44666 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -23,7 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.0.103:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 
diff --git a/src/views/BasicData/WorkshopProcessMaintenance/index.vue b/src/views/BasicData/WorkshopProcessMaintenance/index.vue
index 66c5448b..65124cb9 100644
--- a/src/views/BasicData/WorkshopProcessMaintenance/index.vue
+++ b/src/views/BasicData/WorkshopProcessMaintenance/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row>
-      <el-col :span="6">
+      <el-col :span="7">
         <el-card>
           <span>工艺分类：</span>
           <el-button type="primary" style="margin: 3px" icon="el-icon-circle-plus-outline" size="small" @click="addProcessClassification()">新增</el-button>
@@ -9,14 +9,14 @@
           <el-button size="small" style="margin-left: 10px" type="danger" icon="el-icon-delete" @click="delProcessClassification()">删除</el-button>
         </el-card>
       </el-col>
-      <el-col :span="18">
+      <el-col :span="17">
         <el-card>
           <el-button type="primary" plain style="margin: 3px" icon="el-icon-circle-plus-outline" size="small" @click="addProcess">新增工艺名称</el-button>
         </el-card>
       </el-col>
     </el-row>
     <el-row>
-      <el-col :span="6">
+      <el-col :span="7">
         <el-card>
           <el-table
             v-loading="loading1"
@@ -45,7 +45,7 @@
         </el-card>
       </el-col>
 
-      <el-col :span="18">
+      <el-col :span="17">
         <el-card >
           <el-table
             :data="tableData2"
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index 1b282fee..43dbde7e 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -226,8 +226,8 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="250px" fixed="right">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
-            <el-button type="danger" size="mini" icon="el-icon-delete" style="margin-left: 15px" @click="handleDelete(scope.row)">删除</el-button>
+            <el-button type="warning" size="mini" icon="el-icon-edit" plain @click="handleEdit(scope.row)">编辑</el-button>
+            <el-button type="danger" size="mini" icon="el-icon-delete" style="margin-left: 15px" plain @click="handleDelete(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -264,7 +264,7 @@
             {{ scope.row.物料计划到货时间 }}
           </template>
         </el-table-column>
-        <el-table-column label="项目名称" align="center">
+        <el-table-column label="项目名称" align="center" min-width="150px">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
@@ -284,10 +284,18 @@
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="250px" fixed="right">
+        <el-table-column label="操作" align="center" width="150px" fixed="right">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit1(scope.row)">编辑</el-button>
-            <el-button type="danger" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)">移出</el-button>
+            <el-tooltip effect="dark" content="编辑" placement="top">
+              <div style="display: inline-block;margin-right: 10px">
+                <el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit1(scope.row)"/>
+              </div>
+            </el-tooltip>
+            <el-tooltip effect="dark" content="移出" placement="top">
+              <div style="display: inline-block">
+                <el-button type="text" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)"/>
+              </div>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
@@ -351,8 +359,16 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="250px" fixed="right">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit1(scope.row)">编辑</el-button>
-            <el-button type="danger" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)">移出</el-button>
+            <el-tooltip effect="dark" content="编辑" placement="top">
+              <div style="display: inline-block;margin-right: 10px">
+                <el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit1(scope.row)"/>
+              </div>
+            </el-tooltip>
+            <el-tooltip effect="dark" content="移出" placement="top">
+              <div style="display: inline-block">
+                <el-button type="text" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)"/>
+              </div>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
@@ -474,10 +490,12 @@
             <el-button
               size="mini"
               type="success"
+              plain
               @click="submit(scope.row)">确认</el-button>
             <el-button
               size="mini"
               type="danger"
+              plain
               @click="Delete(scope.row)">删除</el-button>
           </template>
         </el-table-column>
@@ -542,10 +560,12 @@
             <el-button
               size="mini"
               type="success"
+              plain
               @click="submit1(scope.row)">确认</el-button>
             <el-button
               size="mini"
               type="danger"
+              plain
               @click="Delete1(scope.row)">删除</el-button>
           </template>
         </el-table-column>
diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
index 0894e0cd..c68dcc20 100644
--- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
+++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card>
       <div>
-        <span style="margin-left: 0">机床号：</span>
+        <span style="margin-left: 10px">机床号：</span>
         <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin-top: 3px" clearable @change="machineChange">
           <el-option
             v-for="item in machineNumber"
@@ -33,11 +33,13 @@
         </el-select>
         <el-button type="success" size="small" style="margin-left: 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
       </div>
+    </el-card>
+    <el-card>
       <el-table
         v-loading="loading"
         :data="tableData"
         size="mini"
-        height="730"
+        height="530"
         border
         stripe
         highlight-current-row
diff --git a/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue b/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue
index b54e0131..0d010e04 100644
--- a/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue
@@ -25,7 +25,7 @@
       <el-col :span="12">
         <el-card >
           <div style="display: inline-block;margin: 3px">改前零件工艺</div>
-          <el-table id="div1" ref="div1" :data="tableData1" :row-class-name="tableRowClassName1" size="mini" border highlight-current-row stripe style="height:350px;overflow-y: auto;" @mouseenter.native="changeScrollBefore">
+          <el-table id="div1" ref="div1" :data="tableData1" :row-class-name="tableRowClassName1" size="mini" border highlight-current-row stripe style="height:300px;overflow-y: auto;" @mouseenter.native="changeScrollBefore">
             <el-table-column align="center" label="工序顺序" width="70px">
               <template slot-scope="scope">
                 {{ scope.row.工序顺序 }}
@@ -52,7 +52,7 @@
       <el-col :span="12">
         <el-card>
           <div style="display: inline-block;margin:3px">改后零件工艺</div>
-          <el-table id="div2" ref="div2" :data="tableData2" :row-class-name="tableRowClassName2" size="mini" border highlight-current-row stripe style="height:350px;overflow-y: scroll;" @mouseenter.native="changeScrollAfter">
+          <el-table id="div2" ref="div2" :data="tableData2" :row-class-name="tableRowClassName2" size="mini" border highlight-current-row stripe style="height:300px;overflow-y: scroll;" @mouseenter.native="changeScrollAfter">
             <el-table-column align="center" label="工序顺序" width="70px">
               <template slot-scope="scope">
                 {{ scope.row.工序顺序 }}
diff --git a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
index c47965ac..84714afd 100644
--- a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-card>
-      <el-radio-group v-model="radio" size="small" style="margin-top: 3px;" @change="checked = false;partNum=[];partNumValue = '';typeValue = '';Specifications = '';partName = '';material = '';materialName = '';prepareMateriel = '';spec = '';batchNum = '';searchPartsByMachineGroup();">
+    <el-card style="margin: 10px">
+      <el-radio-group v-model="radio" size="small" style="margin: 10px;" @change="checked = false;partNum=[];partNumValue = '';typeValue = '';Specifications = '';partName = '';material = '';materialName = '';prepareMateriel = '';spec = '';batchNum = '';searchPartsByMachineGroup();">
         <el-radio v-model="radio" :label="1" border>未编制</el-radio>
         <el-radio v-model="radio" :label="2" border style="margin-left: 0px">已编制</el-radio>
       </el-radio-group>
@@ -35,7 +35,7 @@
       <el-checkbox v-model="checked" :disabled="isShow2 || (parseInt(token) !== 6 && parseInt(token) !== 19)" size="small" style="margin-left:10px">是否核准</el-checkbox>
       <!--<el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整</el-button>-->
       <!--<el-button v-show="false" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">切换编辑模式</el-button>-->
-      <div v-show="isShow">
+      <div v-show="isShow" style="margin-bottom: 10px;margin-left: 10px">
         <span style="margin-left: 0">种&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;类:</span>
         <el-input v-model="typeValue" placeholder="种类" size="small" readonly style="width:100px;margin-top: 5px"/>
         <span>零件名称:</span>
@@ -52,7 +52,7 @@
         <!--<span>规格:</span>-->
         <!--<el-input v-model="spec" :readonly="isShow2" style="width:100px" size="small" placeholder="规格"/>-->
       </div>
-      <div>
+      <div style="margin-left: 10px">
         <el-row>
           <el-col style="width:180px">
             <span style="margin-left: 0">物料类型:</span>
@@ -70,12 +70,12 @@
             <el-input-number v-model="diameter" size="small" controls-position="right" style="width:100px;margin-top: 7px"/>
             <span>长度:</span>
             <el-input-number v-model="height2" size="small" controls-position="right" style="width:100px;margin-top:3px;"/>
-            <el-button style="margin-top: 3px;margin-left: 10px;" type="primary" size="small" @click="Calculation1()">计算重量</el-button>
+            <el-button style="margin-top: 3px;margin-left: 10px;" type="success" size="small" @click="Calculation1()">计算重量</el-button>
             <span>重量:</span>
             <el-input v-model="weight" style="width:150px" size="small" placeholder="重量">
               <el-button slot="append" icon="el-icon-cjn-09" @click="saveWeight"/>
             </el-input>
-            <el-button style="margin-left: 10px;" type="primary" size="small" @click="insertThestring()">合并生产</el-button>
+            <el-button style="margin-left: 10px;" type="success" size="small" @click="insertThestring()">合并生产</el-button>
           </el-col>
 
           <el-col v-show="materielValue==='2'||materielValue==='9'||materielValue==='10'||materielValue==='11'" :span="20">
@@ -140,9 +140,9 @@
       </div>
     </el-card>
 
-    <el-card>
-      <el-row>
-        <span style="margin-left: 0">输入数值:</span>
+    <el-card style="margin: 10px">
+      <el-row style="margin-bottom: 10px">
+        <span style="margin-left: 10px">输入数值:</span>
         <el-input v-model="numVal" size="small" style="width:100px;margin-top: 3px" placeholder="输入数值"/>
         <span style="margin-left: 10px">选择参数:</span>
         <el-select v-model="selParaValue" size="small" style="width:100px" placeholder="选择参数">
@@ -154,7 +154,7 @@
         </el-select>
         <span>公差:</span>
         <el-input v-model="tolerance" size="small" style="width:100px" placeholder="公差"/>
-        <el-button style="margin-left: 10px" type="primary" size="small" @click="calTol()">计算公差</el-button>
+        <el-button style="margin-left: 10px" type="success" size="small" @click="calTol()">计算公差</el-button>
         <el-button-group v-if="isShow1" style="margin-left: 10px" >
           <el-button v-if="isShow1" type="info" size="small" icon="el-icon-document" @click="pasteTable">粘贴
           </el-button>
@@ -165,10 +165,10 @@
           </el-button>
           <el-button :disabled="disabled" type="danger" size="small" icon="el-icon-delete" @click="deleteTable">删除
           </el-button>
-          <el-button v-if="isShow1" type="primary" size="small" icon="el-icon-tickets" @click="copyAndSave">
+          <el-button v-if="isShow1" type="baocun" size="small" icon="el-icon-tickets" style="margin-left: 1px;margin-right: 1px" @click="copyAndSave">
             复制并保存
           </el-button>
-          <el-button :disabled="disabled" type="primary" size="small" icon="el-icon-tickets" @click="saveApprove">保存
+          <el-button :disabled="disabled" type="baocun" size="small" icon="el-icon-tickets" @click="saveApprove">保存
           </el-button>
         </el-button-group>
         <el-button v-if="!isShow1" type="warning" size="small" icon="el-icon-tickets" @click="saveCompiled">记录修改备注</el-button>
diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
index c15342af..dafc8ab6 100644
--- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
@@ -25,7 +25,7 @@
           :value="item.value"/>
       </el-select>
       <el-button type="primary" size="small" icon="el-icon-bangzhu" style="margin-left: 10px" @click="selectAll(tableData)">全选</el-button>
-      <el-button type="primary" size="small" icon="el-icon-upload" style="margin-left: 10px" @click="save">保存</el-button>
+      <el-button type="baocun" size="small" icon="el-icon-upload" style="margin-left: 10px" @click="save">保存</el-button>
     </el-card>
 
     <el-card>