From e693487479e10b54d367ba2f2cca694e10442df4 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Tue, 19 Nov 2019 11:29:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E5=8E=82=E5=AE=B6=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                             |  2 +-
 .../Outsourcing/InterBudgetaryBudgets/index.vue  | 16 ----------------
 .../Outsourcing/OutFactoryMaintenance/index.vue  | 14 +++++++-------
 3 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index fc41e22d..2cb92ad8 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -26,7 +26,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.110:8002/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service
diff --git a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
index 26d63a9c..66d17f75 100644
--- a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
+++ b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
@@ -1,20 +1,11 @@
 <template>
   <div>
-
     <el-card>
       <el-row>
         <el-radio-group v-show="false" v-model="radio" style="margin: 10px;" @change="radioChange">
           <el-radio :label="1">未编制</el-radio>
           <el-radio :label="2">已编制</el-radio>
         </el-radio-group>
-        <!--<span>项目名称:</span>-->
-        <!--<el-select v-model="entryNameValue" clearable filterable size="small" style="margin-bottom:10px" placeholder="项目名称" @change="typeChange()">-->
-        <!--<el-option-->
-        <!--v-for="item in entryName"-->
-        <!--:key="item.value"-->
-        <!--:label="item.label"-->
-        <!--:value="item.value"/>-->
-        <!--</el-select>-->
         <span>机床名称:</span>
         <el-select v-model="toolNumValue" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="typeChange1()">
           <el-option
@@ -26,13 +17,6 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
           </el-option>
         </el-select>
-        <!--<el-select v-model="toolNumValue" clearable filterable size="small" placeholder="机床号" style="margin-bottom:10px" @change="typeChange1()">-->
-        <!--<el-option-->
-        <!--v-for="item in toolNum"-->
-        <!--:key="item.value"-->
-        <!--:label="item.label"-->
-        <!--:value="item.value"/>-->
-        <!--</el-select>-->
         <span>分组:</span>
         <el-select v-model="NumValue" clearable filterable size="small" style="margin-bottom:10px" placeholder="机床组号">
           <el-option
diff --git a/src/views/Outsourcing/OutFactoryMaintenance/index.vue b/src/views/Outsourcing/OutFactoryMaintenance/index.vue
index f9a00bb6..6eacc4ac 100644
--- a/src/views/Outsourcing/OutFactoryMaintenance/index.vue
+++ b/src/views/Outsourcing/OutFactoryMaintenance/index.vue
@@ -3,10 +3,10 @@
 
     <el-card>
       <span>厂家名称:</span>
-      <el-input v-model="ManufacturerName" clearable size="small" style="width:200px"/>
-      <span>电话:</span>
-      <el-input v-model="phNumber" size="small" clearable style="width:200px"/>
-      <el-button type="success" class="el-icon-search" size="small" @click="pageCurrent=1;pageSize=10;searchTable()">查询</el-button>
+      <el-input v-model="ManufacturerName" clearable size="small" style="width:200px" @keyup.enter.native="pageCurrent=1;pageSize=50;searchTable()" @clear="pageCurrent=1;pageSize=50;searchTable()"/>
+      <!--<span>电话:</span>-->
+      <!--<el-input v-model="phNumber" size="small" clearable style="width:200px"/>-->
+      <!--<el-button type="success" class="el-icon-search" size="small" @click="pageCurrent=1;pageSize=50;searchTable()">查询</el-button>-->
       <el-tooltip :open-delay="1200" effect="dark" content="新增外协厂家" placement="top">
         <el-button type="primary" class="el-icon-circle-plus-outline" size="small" @click="editType1('form');param = 0">新增</el-button>
       </el-tooltip>
@@ -68,7 +68,7 @@
         <el-pagination
           v-if="!loading0"
           :current-page="pageCurrent"
-          :page-sizes="[10, 20, 30, 40]"
+          :page-sizes="[50, 100]"
           :page-size="pageSize"
           :total="total"
           layout="total, sizes, prev, pager, next, jumper"
@@ -167,7 +167,7 @@ export default {
       attention: '', // 关注
       num11: '',
       tableData: [], // 表格数据
-      pageSize: 10,
+      pageSize: 50,
       pageCurrent: 1,
       total: 0,
       CoManufacturerFlowNumber: '', // 外协厂家流水号
@@ -302,7 +302,7 @@ export default {
             type: 'success'
           })
           this.pageCurrent = 1
-          this.pageSize = 10
+          this.pageSize = 50
           this.searchTable()
         } else {
           this.$message.error('信息增加失败')