Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

2019-10-28 13:52:16 +08:00
parent 4360f4ab54 096fe8686e
commit df888712b4
18 changed files with 2661 additions and 85 deletions
--- a/src/views/Inventory/OfflinePartsStorage/index.vue
+++ b/src/views/Inventory/OfflinePartsStorage/index.vue
@@ -237,6 +237,7 @@ export default {
    },
    // 查询离线合同明细
    async searchContractDetail() {
+      this.table1 = []
      if (this.contractValue && this.searchType === '2') {
        this.qrCode = this.contractValue
      } else if (!this.supplierValue) {
--- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
+++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
@@ -175,7 +175,7 @@ export default {
  },
  created() {
    this.getMachine()
-    this.searchTable()
+    // this.searchTable()
    this.searchTable2()
  },
  methods: {
--- a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue
--- a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
@@ -341,7 +341,6 @@
        </el-form-item>
      </el-form>
    </el-dialog>
-
    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="工艺选择" center width="800px">
      <el-form ref="form" :model="form" label-position="left" label-width="125px" class="demo-ruleForm">
        <el-row>
@@ -396,7 +395,6 @@
        </el-table>
      </el-form>
    </el-dialog>
-
    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="已完工艺选择" center width="800px">
      <el-form ref="form1" :model="form1" label-position="left" label-width="80px" class="demo-ruleForm">
        <el-row>
@@ -471,7 +469,6 @@
        </el-table>
      </el-form>
    </el-dialog>
-
    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="工艺定额人员" center style="min-height: 300px">
      <el-table :data="tableData3" size="mini" style="width: 97%;max-height: 300px" height="300" highlight-current-row border @row-click="selectPerson">
        <el-table-column align="center" label="考勤编号" width="150">
--- a/src/views/ManufacturingCenter/Querybd/index.vue
+++ b/src/views/ManufacturingCenter/Querybd/index.vue
@@ -186,7 +186,8 @@
  </div>
 </template>

-<script>import { SelectMachine } from '@/api/ManufacturingCenter/ParseQuery'
+<script>
+import { SelectMachine } from '@/api/ManufacturingCenter/ParseQuery'
 import request from '@/utils/request'
 export default {
  data() {
--- a/src/views/ManufacturingCenter/ShopScheduling/index.vue
+++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue
@@ -0,0 +1,306 @@
+<template>
+  <div>
+    <el-row>
+      <el-col style="width: 650px">
+        <el-card style="height: 800px">
+          <el-row style="margin-top: 5px">
+            <el-select v-model="PersonValue" filterable placeholder="操作者" size="small" style="width: 100px;float: right" @change="searchTableData2">
+              <el-option
+                v-for="item in Person"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+          </el-row>
+          <el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName" height="710" highlight-current-row size="mini" style="width: 100%" border @row-click="getGongxu">
+            <el-table-column
+              label="序号"
+              type="index"
+              align="center"
+              width="50"/>
+            <el-table-column label="图号及规格" align="center" width="190px">
+              <template slot-scope="scope">
+                {{ scope.row.图号及规格 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="制品名称" align="center" width="120px">
+              <template slot-scope="scope">
+                {{ scope.row.零件名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="数量" align="center" width="70px">
+              <template slot-scope="scope">
+                {{ scope.row.投产数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="计划开始" align="center" width="90px">
+              <template slot-scope="scope">
+                {{ scope.row.计划开始时间 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="计划完成" align="center" width="90px">
+              <template slot-scope="scope">
+                {{ scope.row.计划结束时间 }}
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="block" style="margin-top: 10px;">
+            <el-pagination
+              :current-page="pageCurrent"
+              :page-sizes="[50, 100, 200, 500, 1000]"
+              :page-size="pageSize"
+              :total="total"
+              :pager-count="5"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col style="width: 650px">
+        <el-card style="height: 800px">
+          <el-table :data="tableData2" height="380" highlight-current-row size="mini" style="width: 100%" border stripe @row-dblclick="XuanChu">
+            <el-table-column label="零件图号" align="center" width="190px">
+              <template slot-scope="scope">
+                {{ scope.row.零件图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="制品名称" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.零件名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="工序名" align="center" width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.工艺名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="数量" align="center" width="70px">
+              <template slot-scope="scope">
+                {{ scope.row.投产数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作者" align="center" width="70px">
+              <template slot-scope="scope">
+                {{ scope.row.姓名 }}
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-table :data="tableData3" :row-class-name="tableData3ClassName" height="393" size="mini" style="width: 100%" border @row-dblclick="XuanRu">
+            <el-table-column label="序号" align="center" width="50px">
+              <template slot-scope="scope">
+                {{ scope.row.工序顺序 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="工序名" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.工艺名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作者" align="center" width="90px">
+              <template slot-scope="scope">
+                {{ scope.row.姓名 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="排产时间" align="center" width="120px">
+              <template slot-scope="scope">
+                {{ scope.row.排产时间 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="完成日期" align="center" width="120px">
+              <template slot-scope="scope">
+                {{ scope.row.完成日期 }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+<script>
+import { getPerson, getParts, getGongxu, XuanRu, XuanChu, searchTableData2, panDuan } from '@/api/ManufacturingCenter/ShopScheduling'
+export default {
+  data() {
+    return {
+      index: 0,
+      工艺计划流水号: '',
+      PersonValue: '',
+      Person: [],
+      loading1: false,
+      loading2: false,
+      loading3: false,
+      tableData1: [],
+      tableData2: [],
+      tableData3: [],
+      total: 0, // 总条数
+      pageSize: 500,
+      pageCurrent: 1
+    }
+  },
+  created() {
+    this.getPerson()
+    this.getParts()
+  },
+  methods: {
+    getPerson() {
+      this.PersonValue = ''
+      this.Person = []
+      getPerson().then(response => {
+        response.data.map(v => {
+          this.Person.push({
+            label: v.姓名,
+            value: v.人员编号
+          })
+        })
+        this.PersonValue = this.Person[0].value
+        this.searchTableData2()
+      })
+    },
+    getParts() {
+      this.tableData1 = []
+      this.loading1 = true
+      getParts(this.pageCurrent, this.pageSize).then(response => {
+        response.data.rows.map(v => {
+          this.tableData1.push({
+            工艺计划流水号: v.工艺计划流水号,
+            图号及规格: v.图号及规格,
+            零件名称: v.零件名称,
+            投产数量: v.投产数量,
+            计划开始时间: v.计划开始时间 ? v.计划开始时间.split(' ')[0] : '',
+            计划结束时间: v.计划结束时间 ? v.计划结束时间.split(' ')[0] : '',
+            状态: v.状态
+          })
+        })
+        this.total = response.data.total
+        this.loading1 = false
+      })
+    },
+    getGongxu(row) {
+      this.loading3 = true
+      this.tableData3 = []
+      this.index = row.index
+      this.工艺计划流水号 = row.工艺计划流水号
+      getGongxu(row.工艺计划流水号).then(response => {
+        response.data.map(v => {
+          this.tableData3.push({
+            工序流水号: v.工序流水号,
+            工序状态: v.工序状态,
+            工序顺序: v.工序顺序,
+            工艺名称: v.工艺名称,
+            姓名: parseInt(v.工序间是否外协) === 2 ? '外协' : v.姓名,
+            排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '',
+            完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : '',
+            工序间是否外协: v.工序间是否外协
+          })
+        })
+        this.loading3 = false
+      })
+    },
+    tableData1ClassName({ row, rowIndex }) {
+      row.index = rowIndex
+      if (row.状态 === '1') {
+        return 'CJPClingjianjinxing'
+      }
+    },
+    tableData3ClassName({ row, rowIndex }) {
+      if (row.工序状态 === 4) {
+        return 'CJPCgongxuwancheng'
+      }
+      if (row.工序间是否外协 === 2) {
+        return 'CJPCxujianwaixie'
+      }
+    },
+    searchTableData2() {
+      this.loading2 = true
+      this.tableData2 = []
+      searchTableData2(this.PersonValue).then(response => {
+        this.tableData2 = response.data
+        this.loading2 = false
+      })
+    },
+    XuanRu(row) {
+      if (row.工序状态 !== 4 && row.工序间是否外协 !== 2) {
+        XuanRu(this.PersonValue, row.工序流水号).then(response => {
+          if (response.data[0].result === '1') {
+            this.tableData1[this.index].状态 = '1'
+            this.loading3 = true
+            this.tableData3 = []
+            getGongxu(this.工艺计划流水号).then(response => {
+              response.data.map(v => {
+                this.tableData3.push({
+                  工序流水号: v.工序流水号,
+                  工序状态: v.工序状态,
+                  工序顺序: v.工序顺序,
+                  工艺名称: v.工艺名称,
+                  姓名: parseInt(v.工序间是否外协) === 2 ? '外协' : v.姓名,
+                  排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '',
+                  完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : '',
+                  工序间是否外协: v.工序间是否外协
+                })
+              })
+              this.loading3 = false
+            })
+            this.searchTableData2()
+          }
+        })
+      }
+    },
+    XuanChu(row) {
+      XuanChu(row.工序流水号).then(response => {
+        if (response.data[0].result === '1') {
+          panDuan(row.工艺计划流水号).then(res => {
+            if (res.data[0].状态 === 0) {
+              this.tableData1.map(v => {
+                if (parseInt(v.工艺计划流水号) === parseInt(res.data[0].工艺计划流水号)) {
+                  v.状态 = ''
+                }
+              })
+            }
+          })
+          this.loading3 = true
+          this.tableData3 = []
+          getGongxu(this.工艺计划流水号).then(response => {
+            response.data.map(v => {
+              this.tableData3.push({
+                工序流水号: v.工序流水号,
+                工序状态: v.工序状态,
+                工序顺序: v.工序顺序,
+                工艺名称: v.工艺名称,
+                姓名: parseInt(v.工序间是否外协) === 2 ? '外协' : v.姓名,
+                排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '',
+                完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : '',
+                工序间是否外协: v.工序间是否外协
+              })
+            })
+            this.loading3 = false
+          })
+          this.searchTableData2()
+        }
+      })
+    },
+    handleSizeChange(val) {
+      this.tableData3 = []
+      this.pageSize = val
+      this.getParts()
+    },
+    handleCurrentChange(val) {
+      this.tableData3 = []
+      this.pageCurrent = val
+      this.getParts()
+    }
+  }
+}
+</script>
+
+<style>
+  .CJPCgongxuwancheng{
+    background: #d8e5f6 !important;
+  }
+  .CJPClingjianjinxing{
+    background: #9bd7fc !important;
+  }
+  .CJPCxujianwaixie{
+    background: #e6eaee !important;
+  }
+</style>
--- 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>

    <!--投标保证金表格-->
--- 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"
--- 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
--- 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">
--- 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>
--- 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.是否禁用增加履约保证金"
--- 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>