new

2019-09-18 10:15:45 +08:00
parent 02d1678fff 4a39ba8190
commit 93eb6ec5c5
61 changed files with 7778 additions and 24 deletions
--- a/src/views/MarketingCenter/PerformanceBond/index.vue
+++ b/src/views/MarketingCenter/PerformanceBond/index.vue
@@ -2,7 +2,11 @@
  <div>
    <el-card>
      <span>项目名称：</span>
+<<<<<<< HEAD
      <el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin: 3px" size="small" clearable>
+=======
+      <el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin-right: 10px" size="small" clearable>
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
        <el-option
          v-for="item in entryName"
          :key="item.value"
@@ -32,6 +36,7 @@
      <el-table
        v-loading="listLoading1"
        :data="tableData1"
+<<<<<<< HEAD
        style="width: 100%;margin-top: 3px;"
        height="600"
        border
@@ -45,6 +50,20 @@
          </template>
        </el-table-column>
        <el-table-column align="center" label="项目名称" width="150" show-overflow-tooltip>
+=======
+        style="width: 100%"
+        height="400"
+        border
+        size="mini"
+        highlight-current-row
+        @row-click="fetchTableData2">
+        <el-table-column align="center" label="合同编号" width="200">
+          <template slot-scope="scope">
+            <el-tag type="primary">{{ scope.row.合同编号 }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="项目名称" width="200">
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
          <template slot-scope="scope">
            {{ scope.row.项目名称 }}
          </template>
@@ -54,27 +73,47 @@
            {{ scope.row.执行进度名 }}
          </template>
        </el-table-column>
+<<<<<<< HEAD
        <el-table-column align="center" label="合同签订日期" width="100">
+=======
+        <el-table-column align="center" label="合同签订日期">
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
          <template slot-scope="scope">
            {{ scope.row.合同签订日期 }}
          </template>
        </el-table-column>
+<<<<<<< HEAD
        <el-table-column align="center" label="销售经理" width="90">
+=======
+        <el-table-column align="center" label="销售经理" width="80">
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
          <template slot-scope="scope">
            {{ scope.row.姓名 }}
          </template>
        </el-table-column>
+<<<<<<< HEAD
        <el-table-column align="center" label="客户名称" width="200" show-overflow-tooltip>
+=======
+        <el-table-column align="center" label="客户名称">
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
          <template slot-scope="scope">
            {{ scope.row.客户名称 }}
          </template>
        </el-table-column>
+<<<<<<< HEAD
        <el-table-column align="center" label="联系人" width="80" show-overflow-tooltip>
+=======
+        <el-table-column align="center" label="联系人" width="80">
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
          <template slot-scope="scope">
            {{ scope.row.联系人 }}
          </template>
        </el-table-column>
+<<<<<<< HEAD
        <el-table-column align="center" label="联系电话" width="130" show-overflow-tooltip>
+=======
+        <el-table-column align="center" label="联系电话" width="100">
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
          <template slot-scope="scope">
            {{ scope.row.电话 }}
          </template>
@@ -84,24 +123,40 @@
            {{ scope.row.合同信息备注 }}
          </template>
        </el-table-column>
+<<<<<<< HEAD
        <el-table-column label="操作" fixed="right" align="center" width="300px">
+=======
+        <el-table-column label="操作" fixed="right" align="center" width="260px">
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
          <template slot-scope="scope">
            <el-button
              :disabled="scope.row.是否禁用增加履约保证金"
              size="mini"
+<<<<<<< HEAD
              type="text"
+=======
+              type="primary"
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              icon="el-icon-circle-plus-outline"
              @click.stop="openPerformanceBondDialog(scope.row); flag = 1">履约保证金</el-button>
            <el-button
              :disabled="scope.row.是否禁用增加履约保函"
              size="mini"
+<<<<<<< HEAD
              type="text"
+=======
+              type="primary"
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              icon="el-icon-circle-plus-outline"
              @click.stop="addPerformanceGuarantee(scope.row)">履约保函</el-button>
          </template>
        </el-table-column>
      </el-table>
+<<<<<<< HEAD
      <div class="block" style="margin-top: 3px;">
+=======
+      <div class="block" style="margin-top: 10px;">
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
        <el-pagination
          :current-page="PageCurrent"
          :page-sizes="[10, 20, 30, 40]"
@@ -114,14 +169,23 @@
    </el-card>
    <el-card>
      <template>
+<<<<<<< HEAD
        <el-tabs v-model="activeName" type="card" style="margin: 0px">
+=======
+        <el-tabs v-model="activeName" type="card">
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
          <el-tab-pane :disabled="performanceBondDisabled" label="履约保证金" name="first">
            <el-table
              v-loading="listLoading2"
              :data="tableData2"
              highlight-current-row
+<<<<<<< HEAD
              style="width: 100%;margin-top: 3px;"
              height="130"
+=======
+              style="width: 100%"
+              height="100"
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              border
              size="mini">
              <el-table-column align="center" label="履约保证金金额">
@@ -179,6 +243,7 @@
                  </el-popover>
                </template>
              </el-table-column>
+<<<<<<< HEAD
              <el-table-column label="操作" fixed="right" align="center" width="200px">
                <template slot-scope="scope">
                  <el-tooltip class="item" effect="dark" content="收回" placement="top">
@@ -213,13 +278,36 @@
                        @click.stop="delPerformanceBond(scope.row)"/>
                    </div>
                  </el-tooltip>
+=======
+              <el-table-column label="操作" fixed="right" align="center" width="260px">
+                <template slot-scope="scope">
+                  <el-button
+                    :disabled="scope.row.是否禁用收回"
+                    size="mini"
+                    type="success"
+                    @click.stop="takeBack(scope.row)">收回</el-button>
+                  <el-button
+                    :disabled="scope.row.是否禁用编辑"
+                    size="mini"
+                    type="warning"
+                    @click.stop="openEditPerformanceBondDialog(scope.row); flag = 2">编辑</el-button>
+                  <el-button
+                    :disabled="scope.row.是否禁用删除"
+                    size="mini"
+                    type="danger"
+                    @click.stop="delPerformanceBond(scope.row)">删除</el-button >
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                </template>
              </el-table-column>
            </el-table>
          </el-tab-pane>
          <el-tab-pane :disabled="performanceGuaranteeDisabled" label="履约保函" name="second">
            <div v-show="performanceGuaranteeShow">
+<<<<<<< HEAD
              <el-button type="danger" icon="el-icon-delete" plain size="small" style="float: right;display: inline-block" @click="delPerformanceGuarantee">删除</el-button>
+=======
+              <el-button type="danger" icon="el-icon-delete" size="small" style="float: right;display: inline-block" @click="delPerformanceGuarantee">删除</el-button>
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              <div style="width: 150px; height: 150px; margin: auto;left: 50%;right: 50%">
                <el-upload
                  :on-preview="handlePictureCardPreview"
@@ -528,7 +616,11 @@ export default {
    },
    openPerformanceBondDialog(row) {
      this.addForm('form2')
+<<<<<<< HEAD
      this.title1 = '新增履约保证金'
+=======
+      this.title1 = '增加履约保证金'
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
      this.dialogFormVisible1 = true
      this.projectId = row.项目流水号
      this.tableData2 = []