From 3d02306337c41316075a2063805f3ab04693454b Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 25 Oct 2019 09:24:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E9=94=80=E5=88=86=E9=A1=B5=E5=92=8C?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                          |  2 +-
 src/views/MarketingCenter/BidBond/index.vue   | 47 ++++++++-----------
 .../ComprehensiveInquiryMS/index.vue          | 17 ++-----
 .../ContractCapitalManagement/index.vue       |  2 +-
 .../ContractInformationManagement/index.vue   | 21 +++------
 .../MarketingCenter/InvoiceRecord/index.vue   | 20 +++-----
 .../MarketingCenter/PerformanceBond/index.vue |  8 ++--
 .../MarketingCenter/SafetyMargin/index.vue    |  6 +--
 8 files changed, 47 insertions(+), 76 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index f5d89e37..7218f9b2 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.0.110:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service
diff --git a/src/views/MarketingCenter/BidBond/index.vue b/src/views/MarketingCenter/BidBond/index.vue
index 531218a8..9e13f41f 100644
--- a/src/views/MarketingCenter/BidBond/index.vue
+++ b/src/views/MarketingCenter/BidBond/index.vue
@@ -2,40 +2,31 @@
   <div class="app-container">
     <!--顶栏结构-->
     <el-card>
-      <!--<el-radio v-model="radio" label="1">未收回</el-radio>-->
-      <!--<el-radio v-model="radio" label="2">已收回</el-radio>-->
-      <span>招标企业:</span>
-      <el-input v-model="TenderingEnterprise" clearable size="small" style="width:200px;margin: 3px 0" placeholder="请输入招标企业"/>
-      <span style="margin-left: 10px">保金类型:</span>
-      <el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择" size="small" style="width: 200px">
+      <el-input v-model="TenderingEnterprise" clearable size="small" style="width:150px;margin: 3px 0" placeholder="请输入招标企业"/>
+      <el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择保金类型" size="small" style="width: 150px">
         <el-option
           v-for="item in TypeOfGoldDeposit"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <span style="margin-left: 10px">投标人:</span>
-      <el-input v-model="Bidder" clearable size="small" style="width:200px" placeholder="请选择" @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1;searchPer()" @clear="clear()"/>
-      <el-row>
-        <span>开始日期: </span>
-        <el-date-picker
-          v-model="startTime"
-          style="width: 200px;margin: 3px 0"
-          value-format="yyyy-MM-dd"
-          size="small"
-          type="date"
-          placeholder="请选择开始日期"/>
-        <span style="margin-left: 10px">结束日期: </span>
-        <el-date-picker
-          v-model="endTime"
-          style="width: 200px;"
-          value-format="yyyy-MM-dd"
-          size="small"
-          type="date"
-          placeholder="请选择结束日期"/>
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
-        <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">新增</el-button>
-      </el-row>
+      <el-input v-model="Bidder" clearable size="small" style="width:150px" placeholder="请选择投标人" @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1;searchPer()" @clear="clear()"/>
+      <el-date-picker
+        v-model="startTime"
+        style="width: 150px;margin: 3px 0"
+        value-format="yyyy-MM-dd"
+        size="small"
+        type="date"
+        placeholder="请选择开始日期"/>
+      <el-date-picker
+        v-model="endTime"
+        style="width: 150px;"
+        value-format="yyyy-MM-dd"
+        size="small"
+        type="date"
+        placeholder="请选择结束日期"/>
+      <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
+      <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">新增</el-button>
     </el-card>
 
     <!--投标保证金表格-->
diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
index 1158cc16..371991a0 100644
--- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
+++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
@@ -2,32 +2,25 @@
   <div>
     <el-card>
       <el-row>
-        <span>项目名称：</span>
-        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin-bottom:10px" size="small">
+        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin-right:5px;width:150px" size="small">
           <el-option
             v-for="item in entryName"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span style="margin-left: 10px">机床型号：</span>
-        <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
-        <span style="margin-left: 10px">营销经理：</span>
-        <el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
-      </el-row>
-      <el-row>
-        <span>开始日期：</span>
+        <el-input v-model="machine" clearable size="small" style="margin-right:5px;width:150px" placeholder="请输入机床型号"/>
+        <el-input v-model="MarketingManagerValue" clearable size="small" style="margin-right:5px;width:150px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
         <el-date-picker
           v-model="startTime"
-          style="width: 200px;"
+          style="margin-right:5px;width:150px"
           value-format="yyyy-MM-dd"
           size="small"
           type="date"
           placeholder="请选择开始日期"/>
-        <span style="margin-left: 10px">结束日期：</span>
         <el-date-picker
           v-model="endTime"
-          style="width: 200px;"
+          style="width: 150px;"
           value-format="yyyy-MM-dd"
           size="small"
           type="date"
diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index bde67018..7e7e4ba4 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -24,7 +24,7 @@
         :expand-row-keys="expands"
         :data="tableData1"
         style="width: 100%;"
-        height="500px"
+        height="600px"
         highlight-current-row
         border
         stripe
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index b0b639d1..06681715 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -2,32 +2,25 @@
   <div class="app-container">
     <el-card style="background: rgb(233,240,250)">
       <div>
-        <span>项目名称：</span>
-        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:200px;margin-top: 3px;">
+        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:150px;margin-top: 3px;">
           <el-option
             v-for="item in entryName"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span style="margin-left: 10px">机床型号：</span>
-        <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
-        <span style="margin-left: 10px">营销经理：</span>
-        <el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
-      </div>
-      <div style="margin-top: 10px">
-        <span style="margin-top: 20px">开始日期：</span>
+        <el-input v-model="machine" clearable size="small" style="width:150px" placeholder="请输入机床型号"/>
+        <el-input v-model="MarketingManagerValue" clearable size="small" style="width:140px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
         <el-date-picker
           v-model="startTime"
-          style="width: 200px;"
+          style="width: 150px;"
           value-format="yyyy-MM-dd"
           size="small"
           type="date"
           placeholder="请选择开始日期"/>
-        <span style="margin-left: 10px">结束日期：</span>
         <el-date-picker
           v-model="endTime"
-          style="width: 200px;margin-bottom: 3px;"
+          style="width: 150px;margin-bottom: 3px;"
           value-format="yyyy-MM-dd"
           size="small"
           type="date"
@@ -44,7 +37,7 @@
         :expand-row-keys="expands"
         highlight-current-row
         style="width: 100%;margin: 3px 0px"
-        height="500"
+        height="700"
         border
         stripe
         size="mini"
@@ -146,7 +139,7 @@
         </el-table-column>
         <el-table-column align="center" label="发货节点" width="85">
           <template slot-scope="scope">
-            {{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.图纸会签节点 : '-' }}
+            {{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.发货节点 : '-' }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="安装调试节点" width="100">
diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue
index c0518427..2436c3c7 100644
--- a/src/views/MarketingCenter/InvoiceRecord/index.vue
+++ b/src/views/MarketingCenter/InvoiceRecord/index.vue
@@ -3,30 +3,24 @@
     <!--查询条件-->
     <el-card>
       <el-row>
-        <span>项目名称：</span>
-        <el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin-bottom: 10px" size="small" clearable>
+        <el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin-right: 5px" size="small" clearable>
           <el-option
             v-for="item in entryName"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span style="margin-left: 10px">营销经理：</span>
-        <el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clearPeople()"/>
-      </el-row>
-      <el-row>
-        <span>开始日期：</span>
+        <el-input v-model="MarketingManagerValue" clearable size="small" style="margin-right: 5px;width: 150px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clearPeople()"/>
         <el-date-picker
           v-model="startTime"
-          style="width: 200px;"
+          style="margin-right: 5px;width: 150px;"
           value-format="yyyy-MM-dd"
           size="small"
           type="date"
           placeholder="请选择开始日期"/>
-        <span style="margin-left: 10px">结束日期：</span>
         <el-date-picker
           v-model="endTime"
-          style="width: 200px;"
+          style="width: 150px;"
           value-format="yyyy-MM-dd"
           size="small"
           type="date"
@@ -40,8 +34,8 @@
         v-loading="listLoading1"
         :data="tableData1"
         highlight-current-row
-        style="width: 100%;margin-top: 3px"
-        height="460"
+        style="width: 1360px;margin-top: 3px"
+        height="550"
         border
         stripe
         size="mini"
@@ -88,7 +82,7 @@
             <el-input :disabled="scope.row.是是否禁用税率编辑" v-model="scope.row.税率" class="tableInput" size="mini" style="width:70px" placeholder="请填写税率" @click.native="unlockEditor(scope.row)" @blur="lockEditor(scope.row)" @change="revisionOfTaxRate(scope.row)"/>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同信息备注">
+        <el-table-column align="center" label="合同信息备注" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.合同信息备注 }}
           </template>
diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue
index 80892e18..f03eab2c 100644
--- a/src/views/MarketingCenter/PerformanceBond/index.vue
+++ b/src/views/MarketingCenter/PerformanceBond/index.vue
@@ -32,8 +32,8 @@
       <el-table
         v-loading="listLoading1"
         :data="tableData1"
-        style="width: 100%;margin-top: 3px;"
-        height="500"
+        style="margin-top: 3px;width: 1355px"
+        height="600"
         border
         stripe
         size="mini"
@@ -79,12 +79,12 @@
             {{ scope.row.电话 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同信息备注">
+        <el-table-column align="center" label="合同信息备注" width="130" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.合同信息备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="210px">
+        <el-table-column label="操作" align="center" width="210px">
           <template slot-scope="scope">
             <el-button
               :disabled="scope.row.是否禁用增加履约保证金"
diff --git a/src/views/MarketingCenter/SafetyMargin/index.vue b/src/views/MarketingCenter/SafetyMargin/index.vue
index c0876754..e17aaa69 100644
--- a/src/views/MarketingCenter/SafetyMargin/index.vue
+++ b/src/views/MarketingCenter/SafetyMargin/index.vue
@@ -33,7 +33,7 @@
       <el-table
         v-loading="listLoadingProject"
         :data="projectTableData"
-        style="width: 100%;margin-top: 3px;"
+        style="width: 1360px;margin-top: 3px;"
         height="650"
         border
         stripe
@@ -65,7 +65,7 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="客户名称" prop="客户名称" width="250" show-overflow-tooltip>
+        <el-table-column align="center" label="客户名称" prop="客户名称" width="200" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
           </template>
@@ -80,7 +80,7 @@
             {{ scope.row.电话 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同信息备注" >
+        <el-table-column align="center" label="合同信息备注" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.合同信息备注 }}
           </template>