From 340a8b2c7a55c879e4a9d4642fae988c651853c7 Mon Sep 17 00:00:00 2001
From: yangjiahang <asdasd>
Date: Mon, 10 Feb 2020 10:37:04 +0800
Subject: [PATCH 1/2] a

---
 config/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/index.js b/config/index.js
index 7609b831..6427159f 100644
--- a/config/index.js
+++ b/config/index.js
@@ -7,8 +7,8 @@ const os = require('os')
 
 const networkInterfaces = os.networkInterfaces()
 
-const ip = networkInterfaces['WLAN'][1] ? networkInterfaces['WLAN'][1].address : networkInterfaces['WLAN'][0].address
-// const ip = '127.0.0.1'
+// const ip = networkInterfaces['WLAN'][1] ? networkInterfaces['WLAN'][1].address : networkInterfaces['WLAN'][0].address
+const ip = '127.0.0.1'
 module.exports = {
   dev: {
     // Paths

From ca18aeac28aa9cef8c03c5eaa9740063616f12c3 Mon Sep 17 00:00:00 2001
From: yangjiahang <asdasd>
Date: Mon, 10 Feb 2020 11:01:01 +0800
Subject: [PATCH 2/2] a

---
 src/views/Inventory/MaterialOut/index.vue     | 21 +++++++++++++++--
 .../ContractDetailsInquiry/index.vue          |  2 +-
 .../index.vue                                 | 23 ++++++++++++++++---
 .../OutsourcingTaskExecution/index.vue        | 16 ++++++-------
 4 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
index b9199e7f..303e2e83 100644
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -4,9 +4,9 @@
       <div style="margin-top: 8px;margin-bottom: 8px">
         <span style="margin: 5px">领料单编号:</span>
         <el-input v-model="pickingListNumber" clearable size="small" style="width:200px" />
-        <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
+        <el-button size="small" type="primary" icon="el-icon-search" style="margin: 0 0 0 10px" plain @click="searchList()">查询</el-button>
         <!--        <el-button size="small" type="warning" style="float: right;margin-right: 10px" @click="prepareConfirm()">备料确认</el-button>-->
-        <el-button :disabled="审批未通过===true" size="small" type="primary" style="float: right; margin-right: 30px" @click="inputPassword()">领料确认</el-button>
+        <el-button :disabled="审批未通过===true" size="small" type="primary" style="float: right; margin-right: 30px" class="button111" @click="inputPassword()">领料确认</el-button>
       </div>
     </el-card>
     <div style="width: 27%;float: left;margin-right: 16px">
@@ -680,3 +680,20 @@ export default {
     background: #E9F0F9 !important;
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
index dd0f8609..76c40d39 100644
--- a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
+++ b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
@@ -31,7 +31,7 @@
       <el-input v-model="totalProcessingHours" clearable size="small" style="margin-right:10px;width: 100px"/>
       <span>计划总工时（小时）:</span>
       <el-input v-model="totalPlannedHours" clearable size="small" style="margin-right:10px;width: 100px"/>
-      <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchTable()">查询</el-button>
+      <el-button size="small" type="primary" icon="el-icon-search" style="margin: 0 0 0 10px" plain @click="searchTable()">查询</el-button>
     </el-card>
     <el-card>
       <el-table :data="tableData" highlight-current-row border style="width: 100%;" size="mini" height="700">
diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
index 7c5c8d2a..d1ace90f 100644
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -5,7 +5,7 @@
         <el-row>
           <span>外协厂家:</span>
           <el-input v-model="ManufacturerName" size="small" placeholder="外协厂家" clearable style="width:200px"/>
-          <el-button type="success" class="el-icon-search" size="small" @click="pageCurrent=1;pageSize=20;getParts()">查询</el-button>
+          <el-button type="primary" class="el-icon-search" size="small" plain @click="pageCurrent=1;pageSize=20;getParts()">查询</el-button>
         </el-row>
         <el-table v-loading="loading" :data="tableData" size="mini" highlight-current-row height="500" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
           <el-table-column label="厂家" prop="外协厂家名称" align="center" width="230px">
@@ -55,7 +55,7 @@
       <el-col :span="8">
         <el-row>
           <span style="margin-top: 10px">开票明细:</span>
-          <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增</el-button>
+          <el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增</el-button>
         </el-row>
         <el-table v-loading="loading2" :data="tableData2" size="mini" stripe height="500" style="width: 100%" border element-loading-text="拼命加载中">
           <el-table-column label="发票号" prop="外协厂家名称" align="center" width="230px">
@@ -89,7 +89,7 @@
       <el-col :span="8">
         <el-row>
           <span style="margin-top: 10px">付款明细:</span>
-          <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增</el-button>
+          <el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增</el-button>
         </el-row>
         <el-table v-loading="loading3" :data="tableData3" size="mini" stripe height="500" style="width: 100%" border element-loading-text="拼命加载中">
           <el-table-column label="付款金额" prop="外协厂家名称" align="center" width="230px">
@@ -422,3 +422,20 @@ export default {
     background: #AEF199;
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index 2bfd12e4..e19386cd 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -3,7 +3,7 @@
     <el-card>
       <span>零件号:</span>
       <el-input v-model="partNumber" size="small" placeholder="零件号" clearable style="width:200px"/>
-      <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="getList()">查询</el-button>
+      <el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:10px" plain @click="getList()">查询</el-button>
       <el-button type="danger" plain size="mini" icon="el-icon-caret-right" style="float: right;margin-right:10px" @click="getBack()">打回车间</el-button>
       <el-table
         v-loading="loading1"
@@ -83,7 +83,7 @@
         <!--<el-input v-model="formNumber" size="small" placeholder="表单号" clearable style="width:200px;margin-bottom: 10px"/>-->
         <span>厂家:</span>
         <el-input v-model="manufacturers" size="small" placeholder="外协厂家" style="width:160px" clearable @keyup.enter.native="pageSize=20;pageList=1;fetchData()" @clear="pageSize=20;pageList=1;fetchData()"/>
-        <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="pageSize=20;pageList=1;fetchData()">查询</el-button>
+        <el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:10px" plain @click="pageSize=20;pageList=1;fetchData()">查询</el-button>
         <el-checkbox v-model="isChecked" size="small" label="编辑已提交"/>
         <el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增</el-button>
         <el-table v-loading="loading2" :data="List" highlight-current-row height="450" size="mini" stripe border @row-click="searchProcess" >
@@ -139,16 +139,16 @@
           <!--<el-tooltip :open-delay="1200" effect="dark" content="计算选入零件的价格" placement="top">-->
           <!--<el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 15px" @click="calculatingPrice">计算价格</el-button>-->
           <!--</el-tooltip>-->
-          <el-button type="warning" size="mini" icon="el-icon-arrow-down" style="margin-left:10px" @click="getSpareParts">选入零件</el-button>
-          <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;float: right" @click="exportTable('RWD')">导出任务单</el-button>
+          <el-button type="warning" size="mini" icon="el-icon-arrow-down" style="margin-left:10px" plain @click="getSpareParts">选入零件</el-button>
+          <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;float: right" plain @click="exportTable('RWD')">导出任务单</el-button>
           <el-tooltip :open-delay="1200" effect="dark" content="成交" placement="top">
-            <el-button type="success" size="mini" icon="el-icon-success" style="margin-left:10px;margin-top: 3px;float: right" @click="Deal">提交</el-button>
+            <el-button type="success" size="mini" icon="el-icon-success" style="margin-left:10px;margin-top: 3px;float: right" plain @click="Deal">提交</el-button>
           </el-tooltip>
           <el-tooltip :open-delay="1200" effect="dark" content="核对价格信息后确定" placement="top">
-            <el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 3px;float: right" @click="confirmPrice">保存</el-button>
+            <el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 3px;float: right" plain @click="confirmPrice">保存</el-button>
           </el-tooltip>
         </div>
-        <el-table v-loading="loading" :data="List3" :summary-method="getSummaries" height="488" stripe size="mini" show-summary border>
+        <el-table v-loading="loading" :data="List3" :summary-method="getSummaries" height="488" size="mini" show-summary border>
           <el-table-column label="零件图号" align="center" min-width="150px">
             <template slot-scope="scope">
               {{ 零件图号[scope.$index] }}
@@ -275,7 +275,7 @@
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="外协厂家" center width="500px" height="600px">
       <div align="center">
         <el-input v-model="input" size="small" clearable style="width:200px"/>
-        <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="searchData()">查询</el-button>
+        <el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:10px" plain @click="searchData()">查询</el-button>
       </div>
       <el-table :data="List2" max-height="370" stripe size="mini" highlight-current-row @row-click="handleCurrentChange3">
         <el-table-column label="外协厂家" align="center" >