From 0f22206b3a2cc13e1d49f2995fb5bd792565f93b Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 20 Sep 2019 09:21:46 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=90=88=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                                            | 2 +-
 .../MarketingCenter/ContractInformationManagement/index.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 8eaacaf2..ca0340f5 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://localhost:8005/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index da725a88..7c4a51fd 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -3,7 +3,7 @@
     <el-card style="background: rgb(233,240,250)">
       <div>
         <span>项目名称：</span>
-        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="margin-top: 3px;">
+        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:200px;margin-top: 3px;">
           <el-option
             v-for="item in entryName"
             :key="item.value"

From 2557283319b7c6c26c8352f95c3a588d76581667 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 20 Sep 2019 09:43:36 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2(=E8=BD=A6)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcurementContractEnquiry/index.vue           | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
index 0a89ab42..c8a10f6b 100644
--- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>合同号:</span>
+      <span>合 &nbsp;同 &nbsp;号:</span>
       <el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable>
         <el-option
           v-for="item in contractNum"
@@ -15,9 +15,9 @@
       <span>采购员:</span>
       <el-input v-model="buyerName" placeholder="请双击选择" size="small" clearable style="width:120px" @dblclick.native="initBuyer();dialogVisible2=true;submitDisable=true"/>
       <span>供应商:</span>
-      <el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
+      <el-input v-model="supplierName" placeholder="供应商" size="small" clearable/><br>
       <span>审批情况:</span>
-      <el-select v-model="approvalValue" placeholder="审批情况" size="small" clearable>
+      <el-select v-model="approvalValue" placeholder="审批情况" size="small" clearable style="margin-top: 5px">
         <el-option
           v-for="item in approval"
           :key="item.value"
@@ -28,7 +28,7 @@
         type="success"
         size="small"
         icon="el-icon-search"
-        style="margin-left:10px"
+        style="margin-left:10px;margin-top: 5px"
         @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
     </el-card>
 
@@ -88,10 +88,10 @@
             {{ scope.row.未通过原因 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center">
+        <el-table-column label="操作" align="center" min-width="100px">
           <template slot-scope="scope">
-            <el-button type="warning" size="mini" @click="exportTable()">打印</el-button>
-            <el-button type="danger" size="mini" @click="Disable(scope.row)">禁用</el-button>
+            <el-button type="warning" plain size="mini" @click="exportTable()">打印</el-button>
+            <el-button type="danger" plain size="mini" @click="Disable(scope.row)">禁用</el-button>
           </template>
         </el-table-column>
       </el-table>

From 5f9bf325d92acf34032116c0ea59504131f71bbc Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 20 Sep 2019 10:22:11 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E5=90=88=E5=90=8C(?=
 =?UTF-8?q?=E8=BD=A6)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OfflineContract1/index.vue                | 37 ++++++++++++++-----
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/views/WorkshopProcurement/OfflineContract1/index.vue b/src/views/WorkshopProcurement/OfflineContract1/index.vue
index c0bb6a4e..cc3eb5aa 100644
--- a/src/views/WorkshopProcurement/OfflineContract1/index.vue
+++ b/src/views/WorkshopProcurement/OfflineContract1/index.vue
@@ -44,12 +44,12 @@
               <el-tag v-else type="success" size="small">充足</el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="物料名称" min-width="150" align="center">
+          <el-table-column label="物料名称" min-width="180" align="center">
             <template slot-scope="scope">
               {{ scope.row.物料名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="物料型号" min-width="150" align="center">
+          <el-table-column label="物料型号" show-overflow-tooltip min-width="150" align="center">
             <template slot-scope="scope">
               {{ scope.row.物料型号 }}
             </template>
@@ -78,13 +78,14 @@
               <span v-else>{{ scope.row.安全库存量 }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="设置" min-width="100" align="center">
+          <el-table-column label="设置" min-width="100" align="center" fixed="right">
             <template slot-scope="scope">
-              <el-button v-if="scope.row.changeSafeValue" type="mini" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
+              <el-button v-if="scope.row.changeSafeValue" type="mini" plain size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
               <el-button
                 v-else
                 type="primary"
                 size="mini"
+                plain
                 icon="el-icon-edit"
                 @click="scope.row.changeSafeValue=!scope.row.changeSafeValue">设置</el-button>
             </template>
@@ -176,11 +177,23 @@
             {{ scope.row.规定到货时间.split(' ')[0] }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="200" fixed="right">
+        <el-table-column label="操作" align="center" width="150" fixed="right">
           <template slot-scope="scope">
-            <el-button :disabled="parseInt(scope.row.离线合同状态)!==1" type="primary" size="mini" icon="el-icon-edit" @click="editOfflineContract(scope.row)"/>
-            <el-button :disabled="parseInt(scope.row.离线合同状态)!==1" type="danger" size="mini" icon="el-icon-delete" @click="deleteOfflineContract(scope.row)"/>
-            <el-button type="warning" size="mini" icon="el-icon-download" @click="exportExcel(scope.row)"/>
+            <el-tooltip effect="dark" content="编辑" placement="top">
+              <div style="display: inline-block">
+                <el-button :disabled="parseInt(scope.row.离线合同状态)!==1" size="mini" type="text" icon="el-icon-edit-outline" style="margin-left: 20px" @click="editOfflineContract(scope.row)"/>
+              </div>
+            </el-tooltip>
+            <el-tooltip effect="dark" content="删除" placement="top">
+              <div style="display: inline-block">
+                <el-button :disabled="parseInt(scope.row.离线合同状态)!==1" size="mini" type="text" icon="el-icon-delete" style="margin-left: 20px" @click="deleteOfflineContract(scope.row)"/>
+              </div>
+            </el-tooltip>
+            <el-tooltip effect="dark" content="导出" placement="top">
+              <div style="display: inline-block">
+                <el-button size="mini" type="text" icon="el-icon-download" style="margin-left: 20px" @click="exportExcel(scope.row)"/>
+              </div>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
@@ -242,9 +255,13 @@
             {{ scope.row.到货数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" min-width="100">
+        <el-table-column label="操作" align="center" min-width="100" fixed="right">
           <template slot-scope="scope">
-            <el-button :disabled="disable" type="danger" size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
+            <el-tooltip effect="dark" content="移除" placement="top">
+              <div style="display: inline-block">
+                <el-button :disabled="disable" size="mini" type="text" icon="el-icon-delete" @click="deleteMateriel(scope.row)"/>
+              </div>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>

From 88620d598b134e95676c2f1fff5bdf6a6deaab15 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 20 Sep 2019 10:27:44 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=A0=B8=E7=AE=97=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WorkshopProcurement/AccountingPrice/index.vue      | 10 +++++-----
 .../WorkshopProcurement/OfflineContract1/index.vue     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/WorkshopProcurement/AccountingPrice/index.vue b/src/views/WorkshopProcurement/AccountingPrice/index.vue
index 77854230..a8e42110 100644
--- a/src/views/WorkshopProcurement/AccountingPrice/index.vue
+++ b/src/views/WorkshopProcurement/AccountingPrice/index.vue
@@ -26,12 +26,12 @@
         min-height="540px"
         height="540px"
         border>
-        <el-table-column align="center" label="采购合同编号">
+        <el-table-column align="center" label="采购合同编号" width="150">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="供应商">
+        <el-table-column align="center" label="供应商" show-overflow-tooltip width="100">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -41,7 +41,7 @@
             {{ scope.row.物料型号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件名称" width="170px">
+        <el-table-column align="center" label="零件名称" width="120px">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
           </template>
@@ -51,7 +51,7 @@
             {{ scope.row.数量 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="重量或面积" width="150px">
+        <el-table-column align="center" label="重量或面积" width="100px">
           <template slot-scope="scope">
             {{ scope.row.重量或面积 }}
           </template>
@@ -66,7 +66,7 @@
             <el-input v-model="scope.row.单价" size="mini" width="80px" align="center" @change="update(scope.row)"/>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="总额" width="100px">
+        <el-table-column align="center" label="总额">
           <template slot-scope="scope">
             {{ scope.row.金额 }}
           </template>
diff --git a/src/views/WorkshopProcurement/OfflineContract1/index.vue b/src/views/WorkshopProcurement/OfflineContract1/index.vue
index cc3eb5aa..28e6402c 100644
--- a/src/views/WorkshopProcurement/OfflineContract1/index.vue
+++ b/src/views/WorkshopProcurement/OfflineContract1/index.vue
@@ -78,7 +78,7 @@
               <span v-else>{{ scope.row.安全库存量 }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="设置" min-width="100" align="center" fixed="right">
+          <el-table-column label="设置" min-width="100" align="center">
             <template slot-scope="scope">
               <el-button v-if="scope.row.changeSafeValue" type="mini" plain size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
               <el-button