刘璐珈

2020-02-26 18:12:42 +08:00
parent 00a2116efe
commit 0b6cb6f55a
12 changed files with 460 additions and 254 deletions
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -4,8 +4,9 @@
      <div style="white-space: nowrap">
        <el-card>
          <el-row>
+            <span>零件图号:</span>
            <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:180px;margin: 3px 0"/>
-            <el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=100; pageCurrent=1;searchTable()">查询</el-button>
+            <el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
            <el-tooltip :open-delay="1200" effect="dark" content="已导出和未导出备料单" placement="top">
              <el-checkbox v-model="all" size="small">查询全部</el-checkbox>
            </el-tooltip>
@@ -31,11 +32,11 @@
        v-loading="loading"
        :data="tableData"
        :header-cell-style="{fontFamily:'YouYuan',fontSize:'14px',fontWeight:200}"
-        :row-class-name="tableRowClassName1"
        height="760"
        style="width: 1110px; margin: 3px 0"
        size="mini"
        border
+        stripe
        sortable
        highlight-current-row
        element-loading-text="拼命加载中"
@@ -161,7 +162,7 @@ export default {
      Data: [],
      tableData: [], // 表格数据
      total: null, // 总条数
-      pageSize: 100, // 每页显示条数
+      pageSize: 30, // 每页显示条数
      pageCurrent: 1, // 后台获取页
      ordername: '',
      order: ''
@@ -242,7 +243,6 @@ export default {
              材料: this.Data[i].材料,
              重量: this.Data[i].重量,
              批次数量: this.Data[i].批次数量,
-              是否加急: this.Data[i].是否加急,
              备料任务接受时间: this.Data[i].备料任务接受时间,
              备料任务分配时间: this.Data[i].备料任务分配时间
            })
@@ -306,12 +306,6 @@ export default {
      this.pageCurrent = val
      this.searchTable()
    },
-    tableRowClassName1({ row }) {
-      console.log(row)
-      if (row.是否加急 === '1') {
-        return 'isUrgentItem'
-      }
-    },
    exportExcel() {
      if (this.partName !== '' && this.partName !== null) {
        this.partNamecheck = true
@@ -365,8 +359,4 @@ export default {
    }
  }
 </style>
-<style>
-  .el-table .isUrgentItem{
-    background: #FF9797;
-  }
-</style>
+
--- a/src/views/ManufacturingCenter/MaterialArrival/index.vue
+++ b/src/views/ManufacturingCenter/MaterialArrival/index.vue
@@ -22,7 +22,7 @@
          </el-select>
          <el-input v-model="Partpaint" placeholder="零件号" clearable size="small" style="width: 180px;margin:0px 10px;"/>
          <el-button type="primary" plain class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
-          <el-button :disabled="Name===0" type="success" plain class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
+          <el-button :disabled="Name===1" type="success" plain class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
        </el-card>
        <el-row>
          <el-card style="width: 850px; margin-left: 0px;display: inline-block;" >
@@ -283,7 +283,6 @@ export default {
      this.processSerialNumber = ''
      this.radio = true
      this.tableData1 = []
-      this.Name = 0
      this.row2 = row
      gettabledata1(row.工艺计划流水号).then(response => {
        if (response.data.length !== 0) {
@@ -346,9 +345,7 @@ export default {
    },
    getRow(row) {
      this.processSerialNumber = row.工序流水号
-      console.log(row.完成日期, 222)
-      row.完成日期 ? this.Name = 0 : this.Name = 1
-      console.log(this.Name, 111)
+      row.完成日期 ? this.Name = 1 : this.Name = 0
    },
    handleSizeChange(val) {
      this.pageSize = val
--- a/src/views/MarketingCenter/BidBond/index.vue
+++ b/src/views/MarketingCenter/BidBond/index.vue
@@ -66,26 +66,41 @@
            {{ !scope.row.公布日期 ? '未公布' : scope.row.公布日期.substring(0 , scope.row.公布日期.length - 8) }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="招标企业" prop="招标企业" width="140" show-overflow-tooltip>
+        <el-table-column align="center" label="招标企业" prop="招标企业" width="160" show-overflow-tooltip>
          <template slot-scope="scope">
            {{ scope.row.招标企业 }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="联系人" width="80">R
+        <el-table-column align="center" label="项目名称" prop="项目名称" width="160" show-overflow-tooltip>
          <template slot-scope="scope">
-            {{ scope.row.联系人 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="联系电话" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.联系电话 }}
+            {{ scope.row.项目名称 }}
          </template>
        </el-table-column>
+        <!--<el-table-column align="center" label="联系人" width="80">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.联系人 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <!--<el-table-column align="center" label="联系电话" width="100">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.联系电话 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
        <el-table-column align="center" label="保证金金额(万元)" width="100">
          <template slot-scope="scope">
            <span style="width: 80px" size="mini">{{ Number(scope.row.保证金金额).toFixed(2) }}</span>
          </template>
        </el-table-column>
+        <el-table-column align="center" label="投标日期" width="86">
+          <template slot-scope="scope">
+            {{ scope.row.投标日期.substring(0, scope.row.投标日期.length - 8) }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="投标人" prop="投标人" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.投标人 }}
+          </template>
+        </el-table-column>
        <el-table-column align="center" label="中标服务费(万元)" width="100">
          <template slot-scope="scope">
            {{ Number(scope.row.中标服务费).toFixed(2) }}
@@ -112,40 +127,30 @@
            {{ Number(scope.row.未收金额).toFixed(2) }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="投标人" prop="投标人" width="80">
-          <template slot-scope="scope">
-            {{ scope.row.投标人 }}
-          </template>
-        </el-table-column>
        <el-table-column align="center" label="保金类型" width="80">
          <template slot-scope="scope">
            {{ scope.row.保证金类型 }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="投标日期" width="86">
-          <template slot-scope="scope">
-            {{ scope.row.投标日期.substring(0, scope.row.投标日期.length - 8) }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="计划收回日期" width="86">
-          <template slot-scope="scope">
-            {{ !scope.row.预计收回日期 ? '结果未公布' : scope.row.预计收回日期.substring(0, scope.row.预计收回日期.length - 8) }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="实际收回日期" width="86">
-          <template slot-scope="scope">
-            {{ !scope.row.实际收回日期 ? '未收回' : scope.row.实际收回日期.substring(0, scope.row.实际收回日期.length - 8) }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="状态" width="80">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.预计收回日期===''||scope.row.预计收回日期===null" slot="reference" size="mini" style="width: 66px">未公布</el-tag>
-            <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.是否收回)===2" slot="reference" type="success" size="mini" style="width: 66px">已收回</el-tag>
-            <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===0" slot="reference" type="primary" size="mini" style="width: 66px">未开始</el-tag>
-            <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===1" slot="reference" type="warning" size="mini" style="width: 66px">即将拖期</el-tag>
-            <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===2" slot="reference" type="danger" size="mini" style="width: 66px">已拖期</el-tag>
-          </template>
-        </el-table-column>
+        <!--<el-table-column align="center" label="计划收回日期" width="86">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ !scope.row.预计收回日期 ? '结果未公布' : scope.row.预计收回日期.substring(0, scope.row.预计收回日期.length - 8) }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <!--<el-table-column align="center" label="实际收回日期" width="86">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ !scope.row.实际收回日期 ? '未收回' : scope.row.实际收回日期.substring(0, scope.row.实际收回日期.length - 8) }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <!--<el-table-column align="center" label="状态" width="80">-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-tag v-if="scope.row.预计收回日期===''||scope.row.预计收回日期===null" slot="reference" size="mini" style="width: 66px">未公布</el-tag>-->
+        <!--<el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.是否收回)===2" slot="reference" type="success" size="mini" style="width: 66px">已收回</el-tag>-->
+        <!--<el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===0" slot="reference" type="primary" size="mini" style="width: 66px">未开始</el-tag>-->
+        <!--<el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===1" slot="reference" type="warning" size="mini" style="width: 66px">即将拖期</el-tag>-->
+        <!--<el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===2" slot="reference" type="danger" size="mini" style="width: 66px">已拖期</el-tag>-->
+        <!--</template>-->
+        <!--</el-table-column>-->
        <el-table-column align="center" label="备注" width="100px" show-overflow-tooltip>
          <template slot-scope="scope">
            {{ scope.row.备注 }}
@@ -267,6 +272,14 @@
            type="date"
            placeholder="收回日期"/>
        </el-form-item>
+        <el-form-item label="回收金额(万元)" prop="回收金额">
+          <el-input
+            v-model="form1.回收金额"
+            :disabled =
+              "size=&quot;small&quot;"
+            style="width: 160px"
+            placeholder=""/>
+        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button size="small" icon="el-icon-circle-close" @click="callOff('form1')">取消</el-button>
@@ -321,18 +334,23 @@
            </el-form-item>
          </el-col>
        </el-row>
-        <!--<el-row>-->
-        <!--<el-col :span="12">-->
-        <!--<el-form-item label="投标日期" prop="投标日期">-->
-        <!--<el-date-picker-->
-        <!--v-model="form2.投标日期"-->
-        <!--style="width: 200px;"-->
-        <!--value-format="yyyy-MM-dd"-->
-        <!--size="small"-->
-        <!--type="date"-->
-        <!--placeholder="投标日期"/>-->
-        <!--</el-form-item>-->
-        <!--</el-col>-->
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="投标日期" prop="投标日期">
+              <el-date-picker
+                v-model="form2.投标日期"
+                style="width: 200px;"
+                value-format="yyyy-MM-dd"
+                size="small"
+                type="date"
+                placeholder="投标日期"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="备注">
+              <el-input v-model="form2.备注" size="small" placeholder="请输入备注" style="width: 200px;"/>
+            </el-form-item>
+          </el-col>
        <!--<el-col :span="12">-->
        <!--<el-form-item label="公布后X天收回" prop="提前X天提醒我">-->
        <!--<el-input-number v-model="form2.提前X天提醒我" :step="1" style="width: 200px" size="small"/>-->
@@ -349,13 +367,6 @@
        <!--&lt;!&ndash;placeholder="收回日期"/>&ndash;&gt;-->
        <!--&lt;!&ndash;</el-form-item>&ndash;&gt;-->
        <!--&lt;!&ndash;</el-col>&ndash;&gt;-->
-        <!--</el-row>-->
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="备注" prop="备注">
-              <el-input v-model="form2.备注" size="small" placeholder="请输入备注" style="width: 560px;"/>
-            </el-form-item>
-          </el-col>
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -376,7 +387,8 @@
            placeholder="请选择结果公布日期"/>
        </el-form-item>
        <el-form-item label="中标服务费(万元)" prop="中标服务费">
-          <el-input-number :disabled="tenderResultDisabled" v-model="Timeform.中标服务费" :precision="2" :min="0.00" :max="tenderResultMax" style="width: 200px" size="small"/>
+          <el-input-number :disabled="tenderResultDisabled" v-model="Timeform.中标服务费" :precision="2" :min="0.00" style="width: 200px" size="small"/>
+          <!--:max="tenderResultMax"-->
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -390,7 +402,7 @@
        <el-row>
          <el-col :span="12">
            <el-form-item label="项目名称" prop="项目名称">
-              <el-select v-model="PerformanceBondform.项目名称" filterable clearable placeholder="请选择项目名称" style="width: 200px" size="small">
+              <el-select v-model="PerformanceBondform.项目名称" :disabled = "true" filterable clearable placeholder="请选择项目名称" style="width: 200px" size="small">
                <el-option
                  v-for="item in entryName"
                  :key="item.value"
@@ -402,7 +414,7 @@
        </el-row>
        <el-row>
          <el-form-item label="保证金金额(万元)" prop="保证金金额">
-            <el-input-number v-model="PerformanceBondform.保证金金额" :precision="2" :step="1" :min="0" style="width: 200px" size="small"/>
+            <el-input-number v-model="PerformanceBondform.保证金金额" :precision="2" :step="1" :min="0" :max="PerformanceBondform.保证金金额max" style="width: 200px" size="small"/>
          </el-form-item>
        </el-row>
        <el-row>
@@ -542,7 +554,8 @@ export default {
      dialogFormVisible1: false,
      dialogTimeVisible: false,
      form1: {
-        收回日期: ''
+        收回日期: '',
+        回收金额: 0
      },
      Timeform: {
        投标结果公布日期: '',
@@ -553,7 +566,8 @@ export default {
        保证金类型: 1,
        收回条件: 1,
        截止时间: 15,
-        保证金金额: ''
+        保证金金额: '',
+        保证金金额max: 0
      },
      form2: {
        招标企业: '',
@@ -702,8 +716,10 @@ export default {
      this.peoplename = ''
    },
    TakeBack(row) {
+      console.log(row, 1111)
      this.addForm('form1')
      this.timetime = row.投标日期
+      this.form1.回收金额 = row.应收回金额
      this.changeTime()
      this.dialogFormVisible1 = true
      this.code = row.招标保证金流水号
@@ -740,10 +756,23 @@ export default {
      this.dialogFormVisible2 = false
    },
    ComplianceGold(row) {
+      console.log(row, 999)
+      if (row.项目流水号 === '') {
+        this.$message.error('请先将保证金绑定合同')
+        return
+      }
+      this.entryName = []
+      console.log(this.entryName)
      this.addForm('PerformanceBondform')
+      this.entryName.push({
+        value: parseInt(row.项目流水号),
+        label: row.项目名称
+      })
+      this.PerformanceBondform.项目名称 = parseInt(this.entryName[0].value)
      this.code = row.招标保证金流水号
      this.dialogPerformanceBondVisible = true
      this.PerformanceBondform.保证金金额 = row.应收回金额
+      this.PerformanceBondform.保证金金额max = Number(row.应收回金额)
    },
    addBidBond() {
      this.addForm('form2')
@@ -802,6 +831,7 @@ export default {
    changeTenderResult(row) {
      this.code = row.招标保证金流水号
      // this.tenderResultMax = Number(row.应收回金额)).toFixed(2)
+      this.Timeform.中标服务费 = 0
      this.tenderResultMax = parseFloat(row.应收回金额)
      if (row.投标结果 === '1') {
        this.radio = '1'
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -8,7 +8,7 @@
      <!--:label="item.label"-->
      <!--:value="item.value"/>-->
      <!--</el-select>-->
-      <el-input v-model="customerName" clearable size="small" style="width:220px;" placeholder="请输入客户名称或项目名称"/>
+      <el-input v-model="customerName" clearable size="small" style="width:220px;" placeholder="客户名称/项目名称/合同编号"/>
      <el-select v-show="false" v-model="customerName" filterable placeholder="请输入客户名称" style="margin: 3px;width: 220px " size="small" clearable>
        <el-option
          v-for="item in customerNames"
@@ -588,7 +588,7 @@ export default {
 <style lang="scss">
  .subTableHeader {
    th {
-      background: #8ff4ea !important;
+      background: #7eaced !important;
      color: black;
    }

--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -9,7 +9,7 @@
        <!--:label="item.label"-->
        <!--:value="item.value"/>-->
        <!--</el-select>-->
-        <el-input v-model="customerName1" clearable size="small" style="width:220px;" placeholder="请输入客户名称或项目名称"/>
+        <el-input v-model="customerName1" clearable size="small" style="width:220px;" placeholder="请输入客户名称/项目名称/合同编号"/>
        <span style="font-size: 13px;margin-left: 10px">签订日期</span>
        <el-date-picker
          v-model="dateRange"
@@ -376,20 +376,21 @@
    </el-dialog>

    <!--投标保证金选择-->
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisibleBidding" title="请选择投标保证金" center width="65%">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisibleBidding" title="请选择投标保证金" center width="1000px">
      <el-input v-model="enterprise" size="small" style="width:200px" placeholder="招标企业" clearable/>
      <el-button type="search" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchBidding">查询</el-button>
      <div style="margin-top: 15px">
        <el-table
          :data="tableDataBidding"
+          :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
          highlight-current-row
          style="width: 100%"
          height="400"
          border
          stripei
-          size="m9ini"
+          size="mini"
          @row-click="biddingNum">
-          <el-table-column align="center" label="招标企业" width="220">
+          <el-table-column align="center" label="招标企业" width="200">
            <template slot-scope="scope">
              {{ scope.row.招标企业 }}
            </template>
@@ -399,12 +400,12 @@
              {{ scope.row.联系人 }}
            </template>
          </el-table-column>
-          <el-table-column align="center" label="联系电话" width="100" show-overflow-tooltip>
+          <el-table-column align="center" label="联系电话" width="110" show-overflow-tooltip>
            <template slot-scope="scope">
              {{ scope.row.联系电话 }}
            </template>
          </el-table-column>
-          <el-table-column align="center" label="保证金金额(万元)" width="95">
+          <el-table-column align="center" label="保证金(万元)" width="120">
            <template slot-scope="scope">
              {{ Number(scope.row.保证金金额).toFixed(2) }}
            </template>
@@ -979,6 +980,7 @@ export default {
      })
    },
    handleEdit(row) {
+      console.log(row)
      this.editForm(row, 'form')
      this.title = '编辑合同'
      this.dialogFormVisible1 = true
@@ -998,7 +1000,7 @@ export default {
      this.CustomerCode = row.客户流水号
      this.form.付款方式 = parseInt(row.付款方式代码)
      this.biddingNumber = row.招标保证金流水号
-      this.form.bidding = row.招标企业
+      this.form.bidding = Number(row.保证金金额).toFixed(2)
      this.form.contractAmount = row.合同总金额
      this.disabled = true
      this.temp = 2
--- a/src/views/MarketingCenter/CreateProject/index.vue
+++ b/src/views/MarketingCenter/CreateProject/index.vue
@@ -518,17 +518,16 @@ export default {
  }
  .subTableHeader {
    th {
-      background: #8ff4ea !important;
-      color: black;
+      background: #7eaced !important;
+      color: #FFFFFF;
    }

    tr.el-table__row td {
-      background-color: #ffffff !important;
+      background-color: #d8e5f6 !important;
    }

    tr.el-table__row.el-table__row--striped td {
      background: #e9f0f9 !important;
    }
-
  }
 </style>
--- a/src/views/MarketingCenter/PerformanceBond/index.vue
+++ b/src/views/MarketingCenter/PerformanceBond/index.vue
@@ -8,7 +8,7 @@
      <!--:label="item.label"-->
      <!--:value="item.value"/>-->
      <!--</el-select>-->
-      <el-input v-model="customerName" clearable size="small" style="width:220px;margin: 3px 0" placeholder="请输入客户名称或项目名称"/>
+      <el-input v-model="customerName" clearable size="small" style="width:220px;margin: 3px 0" placeholder="客户名称\项目名称\合同编号"/>
      <span style="font-size: 13px;margin-left: 10px">签订日期</span>
      <el-date-picker
        v-model="dateRange"
@@ -52,12 +52,12 @@
        size="mini"
        highlight-current-row
        @row-click="fetchTableData2">
-        <el-table-column align="center" label="合同编号" prop="合同编号" width="150">
+        <el-table-column align="center" label="合同编号" prop="合同编号" width="120">
          <template slot-scope="scope">
            <span size="mini" type="primary">{{ scope.row.合同编号 }}</span>
          </template>
        </el-table-column>
-        <el-table-column align="center" label="项目名称" prop="项目名称" width="150" show-overflow-tooltip>
+        <el-table-column align="center" label="项目名称" prop="项目名称" width="140" show-overflow-tooltip>
          <template slot-scope="scope">
            {{ scope.row.项目名称 }}
          </template>
@@ -72,32 +72,32 @@
            {{ scope.row.合同签订日期 }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="销售经理" prop="姓名" width="100">
+        <el-table-column align="center" label="销售经理" prop="姓名" width="90">
          <template slot-scope="scope">
            {{ scope.row.姓名 }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="客户名称" prop="客户名称" width="200" show-overflow-tooltip>
+        <el-table-column align="center" label="客户名称" prop="客户名称" width="220" show-overflow-tooltip>
          <template slot-scope="scope">
            {{ scope.row.客户名称 }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="联系人" width="80" show-overflow-tooltip>
+        <el-table-column align="center" label="联系人" width="90" show-overflow-tooltip>
          <template slot-scope="scope">
            {{ scope.row.联系人 }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="联系电话" width="130" show-overflow-tooltip>
+        <el-table-column align="center" label="联系电话" width="110" show-overflow-tooltip>
          <template slot-scope="scope">
            {{ scope.row.电话 }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="合同信息备注" width="130" show-overflow-tooltip>
+        <el-table-column align="center" label="合同信息备注" width="175" show-overflow-tooltip>
          <template slot-scope="scope">
            {{ scope.row.合同信息备注 }}
          </template>
        </el-table-column>
-        <el-table-column label="操作" align="center" fixed="right" width="210px">
+        <el-table-column label="操作" align="center" width="190px">
          <template slot-scope="scope">
            <el-button
              :disabled="scope.row.是否禁用增加履约保证金"
@@ -255,7 +255,7 @@
      </template>
    </el-card>

-    <el-dialog v-el-drag-dialog :visible.sync="dialogTimeVisible" title="实际收回日期" center style="min-height: 300px" width="50%">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogTimeVisible" title="实际收回日期" center style="min-height: 300px" width="400px">
      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
        <el-form-item label="实际收回日期" prop="实际收回日期">
          <el-date-picker
@@ -268,8 +268,10 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button @click="callOffTime('form')">取消</el-button>
-        <el-button type="primary" @click="submitTime('form')">确 定</el-button>
+        <el-button size="small" icon="el-icon-circle-close" @click="callOffTime('form')">取消</el-button>
+        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submitTime('form')">确 定</el-button>
+        <!--<el-button @click="callOffTime('form')">取消</el-button>-->
+        <!--<el-button type="primary" @click="submitTime('form')">确 定</el-button>-->
      </div>
    </el-dialog>

@@ -277,7 +279,7 @@
      <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="105px" class="demo-ruleForm">
        <el-row>
          <el-col :span="12">
-            <el-form-item label="保证金(万元)" prop="保证金金额">
+            <el-form-item label="履约金(万元)" prop="保证金金额">
              <el-input-number v-model="form2.保证金金额" :precision="2" :min="0" :step="1" style="width: 150px" size="small"/>
            </el-form-item>
          </el-col>
@@ -894,5 +896,23 @@ export default {
 </script>

 <style scoped>
-
+  .el-form--label-left >>> .el-form-item__label {
+    text-align: right;
+  }
+  >>>.el-dialog--center .el-dialog__body {
+    text-align: initial;
+    padding: 20px 20px 20px
+  }
+  >>>.el-dialog__header {
+    padding: 20px 20px 0px;
+  }
+  >>>.el-dialog__footer {
+    padding: 0px 20px 20px;
+    /*text-align: right;*/
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+  }
+  >>>.el-form-item {
+    margin-bottom: 13px;
+  }
 </style>
--- a/src/views/MarketingCenter/SafetyMargin/index.vue
+++ b/src/views/MarketingCenter/SafetyMargin/index.vue
@@ -2,14 +2,27 @@
  <div class="app-container">
    <!--顶栏结构-->
    <el-card>
-      <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称:" size="small" style="margin:3px;">
-        <el-option
-          v-for="item in entryName"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <el-input v-model="customerName" clearable size="small" style="width:150px;margin: 3px 0" placeholder="请输入客户名称"/>
+      <!--<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称:" size="small" style="margin:3px;">-->
+      <!--<el-option-->
+      <!--v-for="item in entryName"-->
+      <!--:key="item.value"-->
+      <!--:label="item.label"-->
+      <!--:value="item.value"/>-->
+      <!--</el-select>-->
+      <el-input v-model="customerName" clearable size="small" style="width:220px;margin: 3px 0" placeholder="客户名称\项目名称\合同编号"/>
+      <span style="font-size: 13px;margin-left: 10px">签订日期</span>
+      <el-date-picker
+        v-model="dateRange"
+        :picker-options="pickerOptions"
+        size="small"
+        type="daterange"
+        align="center"
+        style="width: 240px;margin: 3px 0"
+        value-format="yyyy-MM-dd"
+        format="yyyy-MM-dd"
+        range-separator="～"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"/>
      <!--      <span style="margin-left: 10px">开始日期：</span>-->
      <!--      <el-date-picker-->
      <!--        v-model="startTime"-->
@@ -40,52 +53,92 @@
        size="mini"
        highlight-current-row
        @row-click="fetchTableData1">
-        <el-table-column align="center" label="合同编号" prop="合同编号" width="150">
+        <el-table-column align="center" label="合同编号" prop="合同编号" width="120">
          <template slot-scope="scope">
            <span size="mini" type="primary">{{ scope.row.合同编号 }}</span>
          </template>
        </el-table-column>
-        <el-table-column align="center" label="项目名称" prop="项目名称" width="160" show-overflow-tooltip>
+        <el-table-column align="center" label="项目名称" prop="项目名称" width="120" show-overflow-tooltip>
          <template slot-scope="scope">
            {{ scope.row.项目名称 }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="已完成进度" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.执行进度名 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="合同签订日期" width="130">
-          <template slot-scope="scope">
-            {{ scope.row.合同签订日期 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="销售经理" prop="姓名" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.姓名 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="客户名称" prop="客户名称" width="200" show-overflow-tooltip>
+        <!--<el-table-column align="center" label="已完成进度" width="100">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.执行进度名 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <!--<el-table-column align="center" label="合同签订日期" width="110">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.合同签订日期 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <!--<el-table-column align="center" label="销售经理" prop="姓名" width="90">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.姓名 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <el-table-column align="center" label="客户名称" prop="客户名称" width="220" show-overflow-tooltip>
          <template slot-scope="scope">
            {{ scope.row.客户名称 }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="联系人" width="100" show-overflow-tooltip>
+        <el-table-column align="center" label="安全金(万元)" prop="安全金" width="110" show-overflow-tooltip>
          <template slot-scope="scope">
-            {{ scope.row.联系人 }}
+            {{ Number(scope.row.保证金金额).toFixed(2) }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="联系电话" width="150" show-overflow-tooltip>
+        <el-table-column align="center" label="缴纳时间" width="87" show-overflow-tooltip>
          <template slot-scope="scope">
-            {{ scope.row.电话 }}
+            {{ scope.row.交付日期 }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="合同信息备注" show-overflow-tooltip>
+        <el-table-column align="center" label="扣款金额(万元)" prop="扣款金额" width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ Number(scope.row.扣款金额).toFixed(2) }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="扣款原因" prop="扣款原因" width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.扣款原因 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="应收(万元)" align="center" width="100">
+          <template slot-scope="scope">
+            {{ Number(scope.row.应收回金额).toFixed(2) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="已收(万元)" align="center" width="100">
+          <template slot-scope="scope">
+            {{ Number(scope.row.已收金额).toFixed(2) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="营销经理" align="center" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.姓名 }}
+          </template>
+        </el-table-column>
+        <!--<el-table-column align="center" label="联系人" width="90" show-overflow-tooltip>-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.联系人 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <!--<el-table-column align="center" label="联系电话" width="120" show-overflow-tooltip>-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.电话 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <el-table-column align="center" label="合同信息备注" width="120" show-overflow-tooltip>
          <template slot-scope="scope">
            {{ scope.row.合同信息备注 }}
          </template>
        </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="150px">
+        <el-table-column align="center" width="120" label="备注">
+          <template slot-scope="scope">
+            {{ scope.row.备注 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="180px">
          <template slot-scope="scope">
            <el-button
              :disabled="scope.row.是否禁用增加安全保证金"
@@ -94,6 +147,49 @@
              icon="el-icon-circle-plus-outline"
              @click.stop="addSafetyMargin(scope.row);flag1 = 1">安全保证金
            </el-button>
+            <el-tooltip :open-delay="1000" class="item" effect="dark" content="收回" placement="top">
+              <div style="display: inline-block">
+                <el-button
+                  :disabled="scope.row.是否禁用收回 || !scope.row.是否禁用增加安全保证金"
+                  size="mini"
+                  type="text"
+                  icon="el-icon-money"
+                  @click.stop="TakeBack(scope.row);flag1 = 5"/>
+              </div>
+            </el-tooltip>
+            <el-tooltip :open-delay="1000" class="item" effect="dark" content="扣款" placement="top">
+              <div style="display: inline-block">
+                <el-button
+                  :disabled="scope.row.是否禁用扣款|| !scope.row.是否禁用增加安全保证金"
+                  size="mini"
+                  type="text"
+                  style="margin-left: 8px"
+                  icon="el-icon-coin"
+                  @click.stop="Withdrawing(scope.row);flag1 = 3"/>
+              </div>
+            </el-tooltip>
+            <el-tooltip :open-delay="1000" class="item" effect="dark" content="编辑" placement="top">
+              <div style="display: inline-block">
+                <el-button
+                  :disabled="scope.row.是否禁用编辑|| !scope.row.是否禁用增加安全保证金"
+                  size="mini"
+                  type="text"
+                  style="margin-left: 8px"
+                  icon="el-icon-edit-outline"
+                  @click.stop="editSafetyMargin(scope.row);flag1 = 2"/>
+              </div>
+            </el-tooltip>
+            <!--<el-tooltip :open-delay="1000" class="item" effect="dark" content="删除" placement="top">-->
+            <!--<div style="display: inline-block">-->
+            <!--<el-button-->
+            <!--:disabled="scope.row.是否禁用删除|| !scope.row.是否禁用增加安全保证金"-->
+            <!--size="mini"-->
+            <!--type="text"-->
+            <!--style="margin-left: 8px"-->
+            <!--icon="el-icon-delete"-->
+            <!--@click.stop="delSafetyMargin(scope.row)"/>-->
+            <!--</div>-->
+            <!--</el-tooltip>-->
          </template>
        </el-table-column>
      </el-table>
@@ -113,6 +209,7 @@
    <el-card>
      <el-table
        v-loading="tableData1Loading"
+        v-show="false"
        :data="tableData1"
        style="width: 100%"
        highlight-current-row
@@ -125,17 +222,17 @@
        <!--{{ scope.row.项目名称 }}-->
        <!--</template>-->
        <!--</el-table-column>-->
-        <el-table-column align="center" label="保证金金额" width="100">
+        <el-table-column align="center" label="保证金(万元)" width="110">
          <template slot-scope="scope">
            <el-tag type="primary" size="mini">{{ Number(scope.row.保证金金额).toFixed(2) }}</el-tag>
          </template>
        </el-table-column>
-        <el-table-column align="center" label="交付日期" width="120">
+        <el-table-column align="center" label="交付日期" width="86">
          <template slot-scope="scope">
            {{ scope.row.交付日期 }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="收回条件" width="100">
+        <el-table-column align="center" label="收回条件" width="86">
          <template slot-scope="scope">
            {{ scope.row.执行进度名 }}
          </template>
@@ -145,19 +242,19 @@
            后{{ scope.row.提前x天提醒 }}天内收回
          </template>
        </el-table-column>
-        <el-table-column align="center" label="扣款金额" width="100">
+        <el-table-column align="center" label="扣款金额(万元)" width="120">
          <template slot-scope="scope">
            {{ Number(scope.row.扣款金额).toFixed(2) }}
          </template>
        </el-table-column>
-        <el-table-column :label="AmountReceivable" align="center" width="120">
+        <el-table-column :label="AmountReceivable" align="center" width="110">
          <template slot-scope="scope">
            {{ Number(scope.row.应收回金额).toFixed(2) }}
          </template>
        </el-table-column>
-        <el-table-column label="实际收回金额" align="center" width="120">
+        <el-table-column label="已收(万元)" align="center" width="110">
          <template slot-scope="scope">
-            {{ scope.row.实际收回日期 === '' || scope.row.实际收回日期 === null ? '0' : Number(scope.row.应收回金额).toFixed(2) }}
+            {{ Number(scope.row.已收金额).toFixed(2) }}
          </template>
        </el-table-column>
        <!--<el-table-column align="center" label="计划收回日期" width="150">-->
@@ -165,13 +262,13 @@
        <!--{{ scope.row.预计收回日期 }}-->
        <!--</template>-->
        <!--</el-table-column>-->
-        <el-table-column align="center" label="是否收回" width="100">
+        <el-table-column align="center" label="是否收回" width="90">
          <template slot-scope="scope">
            <el-tag v-if="parseInt(scope.row.是否收回) === 2" slot="reference" size="mini" type="success" style="width: 66px">已收回</el-tag>
            <el-tag v-else-if="parseInt(scope.row.是否收回) === 1" slot="reference" type="danger" size="mini" style="width: 66px">未收回</el-tag>
          </template>
        </el-table-column>
-        <el-table-column align="center" label="实际收回日期" width="130">
+        <el-table-column align="center" label="收回日期" width="86">
          <template slot-scope="scope">
            {{ scope.row.实际收回日期 === '' || scope.row.实际收回日期 === null ? '未收回' : scope.row.实际收回日期 }}
          </template>
@@ -204,12 +301,12 @@
            </el-popover>
          </template>
        </el-table-column>
-        <el-table-column align="center" label="备注">
+        <el-table-column align="center" width="190" label="备注">
          <template slot-scope="scope">
            {{ scope.row.备注 }}
          </template>
        </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="200">
+        <el-table-column label="操作" align="center" width="130">
          <template slot-scope="scope">
            <el-tooltip :open-delay="1000" class="item" effect="dark" content="收回" placement="top">
              <div style="display: inline-block">
@@ -227,7 +324,7 @@
                  :disabled="scope.row.是否禁用扣款"
                  size="mini"
                  type="text"
-                  style="margin-left: 20px"
+                  style="margin-left: 8px"
                  icon="el-icon-coin"
                  @click.stop="Withdrawing(scope.row);flag1 = 3"/>
              </div>
@@ -238,7 +335,7 @@
                  :disabled="scope.row.是否禁用编辑"
                  size="mini"
                  type="text"
-                  style="margin-left: 20px"
+                  style="margin-left: 8px"
                  icon="el-icon-edit-outline"
                  @click.stop="editSafetyMargin(scope.row);flag1 = 2"/>
              </div>
@@ -249,7 +346,7 @@
                  :disabled="scope.row.是否禁用删除"
                  size="mini"
                  type="text"
-                  style="margin-left: 20px"
+                  style="margin-left: 8px"
                  icon="el-icon-delete"
                  @click.stop="delSafetyMargin(scope.row)"/>
              </div>
@@ -271,11 +368,11 @@

    <!--新增编辑保证金信息对话框-->
    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="600px">
-      <el-form ref="form" :model="form" :rules="rules1" label-position="left" label-width="95px" class="demo-ruleForm">
+      <el-form ref="form" :model="form" :rules="rules1" label-position="left" label-width="105px" class="demo-ruleForm">
        <el-row>
          <el-col :span="12">
-            <el-form-item label="保证金金额" prop="保证金金额">
-              <el-input-number v-model="form.保证金金额" :precision="2" :step="1" style="width: 150px" size="small"/>
+            <el-form-item label="保证金(万元)" prop="保证金金额">
+              <el-input-number v-model="form.保证金金额" :precision="2" :step="1" :min="0" style="width: 150px" size="small"/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
@@ -302,62 +399,64 @@
        <!--placeholder="请选择计划收回日期"/>-->
        <!--</el-form-item>-->
        <!--</el-col>-->
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="收回条件" prop="收回条件">
-              <el-select v-model="form.收回条件" filterable placeholder="请选择收回条件" style="width: 150px" size="small">
-                <el-option
-                  v-for="item in plannedTime"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="截止时间" prop="提前X天提醒我">
-              <el-input-number v-model="form.提前X天提醒我" placeholder="请输入截止时间" style="width: 150px" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <!--<el-row>-->
+        <!--<el-col :span="12">-->
+        <!--<el-form-item label="收回条件" prop="收回条件">-->
+        <!--<el-select v-model="form.收回条件" filterable placeholder="请选择收回条件" style="width: 150px" size="small">-->
+        <!--<el-option-->
+        <!--v-for="item in plannedTime"-->
+        <!--:key="item.value"-->
+        <!--:label="item.label"-->
+        <!--:value="item.value"/>-->
+        <!--</el-select>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <!--<el-col :span="12">-->
+        <!--<el-form-item label="截止时间" prop="提前X天提醒我">-->
+        <!--<el-input-number v-model="form.提前X天提醒我" placeholder="请输入截止时间" style="width: 150px" size="small"/>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <!--</el-row>-->
        <el-row>
          <el-col :span="12">
            <el-form-item label="备注" prop="备注">
-              <el-input v-model="form.备注" type="textarea" autosize size="small" placeholder="请输入备注" style="width:400px"/>
+              <el-input v-model="form.备注" type="textarea" autosize size="small" placeholder="请输入备注" style="width:430px"/>
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button @click="callOff('form')">取消</el-button>
-        <el-button type="primary" @click="submit1('form')">确 定</el-button>
+        <el-button size="small" icon="el-icon-circle-close" @click="callOff('form')">取消</el-button>
+        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit1('form')">确 定</el-button>
+        <!--<el-button @click="callOff('form')">取消</el-button>-->
+        <!--<el-button type="primary" @click="submit1('form')">确 定</el-button>-->
      </div>
    </el-dialog>

    <!--扣款记录增加-->
-    <el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="800px">
+    <el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="600px">
      <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="120px" class="demo-ruleForm">
        <el-row>
          <el-col :span="12">
            <el-form-item label="项目名称" prop="项目名称">
-              <el-input v-model="projectName" size="small" placeholder="请输入项目名称" style="width:200px" disabled/>
+              <el-input v-model="projectName" size="small" placeholder="请输入项目名称" style="width:140px" disabled/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="被扣款人" prop="被扣款人">
-              <el-input v-model="form2.被扣款人" size="small" placeholder="请输入被扣款人" style="width:200px"/>
+              <el-input v-model="form2.被扣款人" size="small" placeholder="请输入被扣款人" style="width:140px"/>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
-            <el-form-item label="剩余金额" prop="剩余金额">
-              <el-input v-model="SurplusAmount" size="small" placeholder="请输入剩余金额" style="width:200px" disabled/>
+            <el-form-item label="剩余金额(万元)" prop="剩余金额">
+              <el-input v-model="SurplusAmount" size="small" placeholder="请输入剩余金额" style="width:140px" disabled/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
-            <el-form-item label="扣款金额" prop="扣款金额">
-              <el-input-number v-model="form2.扣款金额" :min="0" :max="maxMoney" :precision="2" :step="1" size="small" style="width: 200px" placeholder="请输入本次付款金额"/>
+            <el-form-item label="扣款金额(万元)" prop="扣款金额">
+              <el-input-number v-model="form2.扣款金额" :min="0" :precision="2" :step="1" size="small" style="width: 140px" placeholder="请输入本次付款金额"/>
            </el-form-item>
          </el-col>
        </el-row>
@@ -367,7 +466,7 @@
              <el-date-picker
                v-model="form2.扣款日期"
                :picker-options="pickerOptions1"
-                style="width: 200px;"
+                style="width: 140px;"
                value-format="yyyy-MM-dd"
                size="small"
                type="date"
@@ -376,14 +475,14 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="扣款原因" prop="扣款原因">
-              <el-input v-model="form2.扣款原因" size="small" placeholder="扣款原因" style="width: 200px"/>
+              <el-input v-model="form2.扣款原因" size="small" placeholder="扣款原因" style="width: 140px"/>
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button @click="callOff('form2')">取消</el-button>
-        <el-button type="primary" @click="submit1('form2')">确 定</el-button>
+        <el-button size="small" icon="el-icon-circle-close" @click="callOff('form2')">取消</el-button>
+        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit1('form2')">确 定</el-button>
      </div>
    </el-dialog>

@@ -430,20 +529,25 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button @click="callOff('form3')">取消</el-button>
-        <el-button type="primary" @click="submit1('form3')">确 定</el-button>
+        <el-button size="small" icon="el-icon-circle-close" @click="callOff('form3')">取消</el-button>
+        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit1('form3')">确 定</el-button>
+        <!--<el-button @click="callOff('form3')">取消</el-button>-->
+        <!--<el-button type="primary" @click="submit1('form3')">确 定</el-button>-->
      </div>
    </el-dialog>

    <!--收回安全保证金-->
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="收回" center style="min-height: 300px" width="40%">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="收回" center style="min-height: 300px" width="400px">
      <el-form ref="form4" :model="form4" :rules="rules4" label-position="left" label-width="120px" class="demo-ruleForm">
        <el-form-item label="项目名称" prop="项目名称">
          <el-input v-model="projectName" size="small" placeholder="请输入项目名称" style="width:200px" disabled/>
        </el-form-item>
-        <el-form-item label="剩余金额" prop="剩余金额">
+        <el-form-item label="应收金额(万元)" prop="剩余金额">
          <el-input v-model="form4.剩余金额" size="small" placeholder="请输入项目名称" style="width:200px" disabled/>
        </el-form-item>
+        <el-form-item label="回收金额(万元)" prop="回收金额">
+          <el-input-number v-model="form4.回收金额" :min="0" :max="form4.剩余金额" :precision="2" :step="1" size="small" style="width: 200px" placeholder="请输入回收金额"/>
+        </el-form-item>
        <el-form-item label="收回日期" prop="收回日期">
          <el-date-picker
            v-model="form4.收回日期"
@@ -456,8 +560,10 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button @click="callOff('form4')">取消</el-button>
-        <el-button type="primary" @click="submit1('form4')">确 定</el-button>
+        <el-button size="small" icon="el-icon-circle-close" @click="callOff('form4')">取消</el-button>
+        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit1('form4')">确 定</el-button>
+        <!--<el-button @click="callOff('form4')">取消</el-button>-->
+        <!--<el-button type="primary" @click="submit1('form4')">确 定</el-button>-->
      </div>
    </el-dialog>

@@ -541,9 +647,37 @@ export default {
      }
    }
    return {
+      dateRange: '',
+      check1: '',
+      pickerOptions: {
+        shortcuts: [{
+          text: '上季度',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 30 * 3)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '过去半年',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 366 / 2)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '过去一年',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 365)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
      customerName: '',
      customerName_check: '',
-      pickerOptions: {},
      pickerOptions1: {},
      pickerOptions2: {},
      timetime: '',
@@ -561,7 +695,7 @@ export default {
      startTime_check: '',
      endTime_check: '',
      disabled: false,
-      AmountReceivable: '应收回金额',
+      AmountReceivable: '应收回(万元)',
      WithdrawingCode: '',
      SurplusAmount: '',
      maxMoney: null,
@@ -614,7 +748,8 @@ export default {
      },
      form4: {
        收回日期: '',
-        剩余金额: ''
+        剩余金额: '',
+        回收金额: ''
      },
      rules1: { // 表单验证规则
        项目名称: [{ required: true, message: '请选择项目', trigger: 'change' }],
@@ -640,7 +775,9 @@ export default {
        扣款日期: [{ required: true, message: '请选择扣款日期', trigger: 'change' }]
      },
      rules4: { // 表单验证规则
-        收回日期: [{ required: true, message: '请选择收回日期', trigger: 'change' }]
+        收回日期: [{ required: true, message: '请选择收回日期', trigger: 'change' }],
+        回收金额: [{ required: true, message: '请输入回收金额', trigger: 'blur' },
+          { required: true, trigger: 'blur', validator: validateValue }]
      }
    }
  },
@@ -700,8 +837,10 @@ export default {
      } else {
        this.customerName_check = 1
      }
+      // llj新增
+      this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
      this.listLoadingProject = true
-      searchTableDataProject(this.PageCurrentProject, this.PageSizeProject, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.customerName_check, this.customerName).then(response => {
+      searchTableDataProject(this.PageCurrentProject, this.PageSizeProject, this.entryNameValue, this.entryNameValue_check, this.check1, this.check1, this.dateRange[0], this.dateRange[1], this.customerName_check, this.customerName).then(response => {
        this.tableData1 = []
        this.tableData2 = []
        this.listLoadingProject = false
@@ -710,7 +849,9 @@ export default {
          data.rows[i].合同签订日期 = data.rows[i].合同签订日期.substring(0, data.rows[i].合同签订日期.length - 8)
          parseInt(data.rows[i].安全保证金类型) === 1 ? data.rows[i].是否禁用增加安全保证金 = true : data.rows[i].是否禁用增加安全保证金 = false
        }
+
        this.projectTableData = data.rows
+        console.log(this.projectTableData, 909090)
        this.totalProject = data.total
      })
    },
@@ -880,6 +1021,7 @@ export default {
        if (response.data[0].result === '1') {
          this.$message.success('扣款成功')
          this.title = ''
+          this.searchTableDataProject()
          this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.projectCode], ['tableData1', 'total', 'tableData1Loading'])
          this.getTable(searchTable2, [this.PageCurrent2, this.PageSize2, this.code], ['tableData2', 'total2', 'tableData2Loading'])
        } else {
@@ -902,6 +1044,7 @@ export default {
        this.dialogFormVisible3 = false
        if (response.data[0].result === '1') {
          this.$message.success('信息更新成功')
+          this.searchTableDataProject()
          this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.projectCode], ['tableData1', 'total', 'tableData1Loading'])
          this.getTable(searchTable2, [this.PageCurrent2, this.PageSize2, this.code], ['tableData2', 'total2', 'tableData2Loading'])
        } else {
@@ -916,12 +1059,14 @@ export default {
      this.changeTime2()
      this.form4.剩余金额 = parseFloat(row.应收回金额)
      this.dialogFormVisible4 = true
+      this.form4.回收金额 = 0
    },
    submitTakeBack() {
-      TakeBack(this.code, this.form4.收回日期).then(response => {
+      TakeBack(this.code, this.form4.收回日期, this.form4.回收金额).then(response => {
        this.dialogFormVisible4 = false
        if (response.data[0].result === '1') {
          this.$message.success('信息更新成功')
+          this.searchTableDataProject()
          this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.projectCode], ['tableData1', 'total', 'tableData1Loading'])
        } else {
          this.$message.error('信息更新失败')
@@ -936,5 +1081,23 @@ export default {
  .el-date-picker{
    width:50px
  }
-
+  .el-form--label-left >>> .el-form-item__label {
+    text-align: right;
+  }
+  >>>.el-dialog--center .el-dialog__body {
+    text-align: initial;
+    padding: 20px 20px 20px
+  }
+  >>>.el-dialog__header {
+    padding: 20px 20px 0px;
+  }
+  >>>.el-dialog__footer {
+    padding: 0px 20px 20px;
+    /*text-align: right;*/
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+  }
+  >>>.el-form-item {
+    margin-bottom: 13px;
+  }
 </style>
--- a/src/views/MarketingCenter/ShippingInquiries/index.vue
+++ b/src/views/MarketingCenter/ShippingInquiries/index.vue
@@ -4,10 +4,14 @@
      <el-input v-model="invoiceNumber" placeholder="发货单号和收货单位" clearable style="width: 200px;margin-right: 10px" size="small" @keyup.enter.native="openSearch"/>
      <!--<el-input v-model="receivingUnit" placeholder="请输入收货单位" clearable style="width: 150px;margin-right: 10px" size="mini"/>-->
      <el-button type="primary" icon="el-icon-search" size="mini" style="margin-left: 10px" plain @click="openSearch">查询</el-button>
+      <InputNumberNew
+        v-model="invoiceNumber"
+        placeholder="请输入数字"
+      />
    </el-card>
    <el-card>
-      <el-col :span="10">
-        <el-table :data="tableDataSearchList" style="width: 100%" height="600" border stripe size="mini" highlight-current-row @row-click="searchListItem">
+      <el-col :span="12">
+        <el-table :data="tableDataSearchList" style="width: 100%" height="640" border stripe size="mini" highlight-current-row @row-click="searchListItem">
          <el-table-column align="center" label="状态" width="60px">
            <template slot-scope="scope">
              <span v-if="scope.row.是否发出.toString() === '1'" style="color: green">已发出</span>
@@ -19,12 +23,12 @@
              {{ scope.row.发货单编号 }}
            </template>
          </el-table-column>
-          <el-table-column align="center" label="发货单名" width="100px">
+          <el-table-column align="center" label="发货单名" width="90px">
            <template slot-scope="scope">
              {{ scope.row.发货单名称 }}
            </template>
          </el-table-column>
-          <el-table-column align="center" label="收货单位" width="180px" show-overflow-tooltip="">
+          <el-table-column align="center" label="收货单位" width="160px" show-overflow-tooltip="">
            <template slot-scope="scope">
              {{ scope.row.收货单位 }}
            </template>
@@ -39,7 +43,7 @@
              {{ scope.row.收货地址 }}
            </template>
          </el-table-column>
-          <el-table-column align="center" label="联系电话" width="110px">
+          <el-table-column align="center" label="联系电话" width="100px">
            <template slot-scope="scope">
              {{ scope.row.联系电话 }}
            </template>
@@ -59,12 +63,12 @@
              {{ scope.row.司机电话 }}
            </template>
          </el-table-column>
-          <el-table-column align="center" label="制单人" width="100px">
+          <el-table-column align="center" label="制单人" width="80px">
            <template slot-scope="scope">
              {{ scope.row.制单人 }}
            </template>
          </el-table-column>
-          <el-table-column align="center" label="发货时间" width="110px">
+          <el-table-column align="center" label="发货时间" width="90px">
            <template slot-scope="scope">
              <span v-if="scope.row.发出时间 === null"/>
              <span v-else>{{ scope.row.发出时间.substr(0,10) }}</span>
@@ -72,49 +76,51 @@
          </el-table-column>
        </el-table>
      </el-col>
-      <el-col :span="14">
-        <el-table v-loading="listLoading" :data="tableData" highlight-current-row style="width: 100%" height="560" border size="mini">
-          <el-table-column align="center" label="货品类别" width="80">
-            <template slot-scope="scope">
-              <span effect="dark" size="small" type="success">{{ scope.row.货品类别 }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="货品编号">
-            <template slot-scope="scope">
-              {{ scope.row.货品编号 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="货品名称" width="150px">
-            <template slot-scope="scope">
-              {{ scope.row.货品名称 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="货品规格">
-            <template slot-scope="scope">
-              {{ scope.row.货品规格 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="货品型号">
-            <template slot-scope="scope">
-              {{ scope.row.货品型号 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="数量" width="100">
-            <template slot-scope="scope">
-              <!--<template v-if="disabledPick === false">-->
-              <!--<el-input-number v-model="scope.row.数量" :min="1" label="描述文字" size="mini" controls-position="right" style="width:100px" @change="handleChange"/>-->
-              <!--</template>-->
+      <el-col :span="12">
+        <el-card>
+          <el-table v-loading="listLoading" :data="tableData" highlight-current-row style="width: 100%" height="640" border size="mini">
+            <el-table-column align="center" label="货品类别" width="80">
              <template slot-scope="scope">
-                {{ scope.row.数量 }}
+                <span effect="dark" size="small" type="success">{{ scope.row.货品类别 }}</span>
              </template>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="设计者" width="80">
-            <template slot-scope="scope">
-              {{ scope.row.设计者 }}
-            </template>
-          </el-table-column>
-        </el-table>
+            </el-table-column>
+            <el-table-column align="center" label="货品编号">
+              <template slot-scope="scope">
+                {{ scope.row.货品编号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="货品名称" width="150px">
+              <template slot-scope="scope">
+                {{ scope.row.货品名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="货品规格">
+              <template slot-scope="scope">
+                {{ scope.row.货品规格 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="货品型号">
+              <template slot-scope="scope">
+                {{ scope.row.货品型号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="数量" width="100">
+              <template slot-scope="scope">
+                <!--<template v-if="disabledPick === false">-->
+                <!--<el-input-number v-model="scope.row.数量" :min="1" label="描述文字" size="mini" controls-position="right" style="width:100px" @change="handleChange"/>-->
+                <!--</template>-->
+                <template slot-scope="scope">
+                  {{ scope.row.数量 }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="设计者" width="80">
+              <template slot-scope="scope">
+                {{ scope.row.设计者 }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
      </el-col>
    </el-card>
  </div>
--- a/src/views/WorkshopProcurement/OfflineProcurement/index.vue
+++ b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
@@ -150,7 +150,7 @@
      <!--</div>-->
    </el-card>
    <el-card style="width: 1137px">
-      <el-table v-loading="" :data="tableData3" highlight-current-row border style="width: 100%;margin-top: 10px" height="300px" size="mini">
+      <el-table v-loading="" :data="tableData3" highlight-current-row border style="width: 100%;max-height: 300px;margin-top: 10px" size="mini">
        <el-table-column label="采购状态" align="center" width="90">
          <template slot-scope="scope">
            <span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到货</span>
@@ -489,7 +489,6 @@ export default {
    },
    handleSelectionChange(val) {
      this.materielGroup = []
-      this.Number = []
      for (let i = 0; i < val.length; i++) {
        this.materielGroup.push(val[i].工艺计划流水号)
        this.Number.push(val[i].批次数量)
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
@@ -193,7 +193,7 @@
              <el-date-picker v-model="form1.invoiceTime" size="small" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期"/>
            </el-form-item>
            <el-form-item label="到票金额" prop="money">
-              <el-input v-model="form1.money" type="number" size="small" placeholder="开票金额"/>
+              <el-input v-model="form1.money" size="small" placeholder="开票金额"/>
            </el-form-item>
            <el-form-item label="备注" prop="remark">
              <el-input v-model="form1.remark" size="small"/>