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/BidBond/index.vue
+++ b/src/views/MarketingCenter/BidBond/index.vue
@@ -4,10 +4,17 @@
    <el-card>
      <!--<el-radio v-model="radio" label="1">未收回</el-radio>-->
      <!--<el-radio v-model="radio" label="2">已收回</el-radio>-->
+<<<<<<< HEAD
      <span>招标企业：</span>
      <el-input v-model="TenderingEnterprise" clearable size="small" style="width:150px;margin: 3px" placeholder="请输入招标企业"/>
      <span style="margin-left: 10px">保金类型：</span>
      <el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择" size="small" style="width: 150px">
+=======
+      <span style="margin-left: 10px">招标企业：</span>
+      <el-input v-model="TenderingEnterprise" clearable size="small" style="width:140px" placeholder="请输入招标企业"/>
+      <span style="margin-left: 20px">保金类型：</span>
+      <el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择" size="small" style="margin-left: 10px;width: 100px">
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
        <el-option
          v-for="item in TypeOfGoldDeposit"
          :key="item.value"
@@ -15,7 +22,11 @@
          :value="item.value"/>
      </el-select>
      <span style="margin-left: 10px">投标人：</span>
+<<<<<<< HEAD
      <el-input v-model="Bidder" clearable size="small" style="width:150px" placeholder="请选择" readonly @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1;searchPer()" @clear="clear()"/>
+=======
+      <el-input v-model="Bidder" clearable size="small" style="width:100px" placeholder="请选择" readonly @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1;searchPer()" @clear="clear()"/>
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
      <span style="margin-left: 10px">开始日期：</span>
      <el-date-picker
        v-model="startTime"
@@ -41,6 +52,7 @@
      <el-table
        v-loading="tableData1Loading"
        :data="tableData1"
+<<<<<<< HEAD
        style="width: 100%; margin-top: 3px"
        height="770"
        highlight-current-row=""
@@ -48,6 +60,13 @@
        stripe
        size="mini">
        <el-table-column align="center" label="投标结果" width="200">
+=======
+        style="width: 100%"
+        height="600"
+        border
+        size="mini">
+        <el-table-column align="center" label="投标结果" width="190">
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
          <template slot-scope="scope">
            <el-radio-group v-model="scope.row.投标结果" @change="changeTenderResult(scope.row)">
              <el-radio :disabled="scope.row.是否禁用已中标" label="1">已中标</el-radio>
@@ -55,7 +74,11 @@
            </el-radio-group>
          </template>
        </el-table-column>
+<<<<<<< HEAD
        <el-table-column align="center" label="公布日期" width="90">
+=======
+        <el-table-column align="center" label="公布日期" width="100">
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
          <template slot-scope="scope">
            {{ !scope.row.公布日期 ? '未公布' : scope.row.公布日期.substring(0 , scope.row.公布日期.length - 8) }}
          </template>
@@ -70,7 +93,11 @@
            {{ scope.row.联系人 }}
          </template>
        </el-table-column>
+<<<<<<< HEAD
        <el-table-column align="center" label="联系电话" width="100">
+=======
+        <el-table-column align="center" label="联系电话" width="120">
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
          <template slot-scope="scope">
            {{ scope.row.联系电话 }}
          </template>
@@ -140,6 +167,7 @@
            {{ scope.row.备注 }}
          </template>
        </el-table-column>
+<<<<<<< HEAD
        <el-table-column label="操作" fixed="right" align="center" width="200">
          <template slot-scope="scope">
            <el-tooltip effect="dark" content="收回" placement="top">
@@ -189,6 +217,38 @@
        </el-table-column>
      </el-table>
      <div class="block">
+=======
+        <el-table-column label="操作" fixed="right" align="center" width="400">
+          <template slot-scope="scope">
+            <el-button
+              :disabled="scope.row.是否禁用"
+              size="mini"
+              type="success"
+              icon="el-icon-edit"
+              @click.stop="TakeBack(scope.row);flag1 = 1">收回</el-button>
+            <el-button
+              :disabled="scope.row.是否禁用履约"
+              size="mini"
+              type="info"
+              icon="el-icon-edit"
+              @click.stop="ComplianceGold(scope.row)">履约</el-button>
+            <el-button
+              :disabled="scope.row.是否禁用编辑"
+              size="mini"
+              type="primary"
+              icon="el-icon-edit"
+              @click.stop="editBidBond(scope.row);flag1 = 3">编辑</el-button>
+            <el-button
+              :disabled="scope.row.是否禁用删除"
+              size="mini"
+              type="danger"
+              icon="el-icon-delete"
+              @click.stop="delBidBond(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
        <el-pagination
          :current-page="PageCurrent"
          :page-sizes="[10, 20, 30, 40]"
@@ -213,7 +273,11 @@
            @node-click="handleNodeClick"
          />
        </div>
+<<<<<<< HEAD
        <el-table :data="ListPeople" highlight-current-row height="400" size="mini" stripe style="width: 400px;float: left;margin-left: 30px" @row-click="handleChange" >
+=======
+        <el-table :data="ListPeople" highlight-current-row height="400" size="mini" style="width: 400px;float: left;margin-left: 30px" @row-click="handleChange">
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
          <el-table-column label="考勤编号" align="center" >
            <template slot-scope="scope">
              {{ scope.row.考勤编号 }}
@@ -241,7 +305,11 @@
    </el-dialog>

    <!--收回投标保证金-->
+<<<<<<< HEAD
    <el-dialog :visible.sync="dialogFormVisible1" title="收回投标保证金" center style="min-height: 300px" width="20%">
+=======
+    <el-dialog :visible.sync="dialogFormVisible1" title="收回" center style="min-height: 300px" width="20%">
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
      <el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px" class="demo-ruleForm">
        <el-form-item label="实际收回日期" prop="收回日期">
          <el-date-picker
@@ -301,7 +369,11 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="投标人" prop="投标人">
+<<<<<<< HEAD
              <el-input v-model="form2.投标人" size="small" placeholder="请输入投标人" style="width: 200px;" clearable readonly @dblclick.native="dialogFormVisiblePeople = true;flag2 = 2;searchPer()" @clear="clear()"/>
+=======
+              <el-input v-model="form2.投标人" size="small" placeholder="请输入投标人" style="width: 200px;" clearable readonly @dblclick.native="dialogFormVisiblePeople = true;flag2 = 2" @clear="clear()"/>
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
            </el-form-item>
          </el-col>
        </el-row>
@@ -684,7 +756,11 @@ export default {
    },
    addBidBond() {
      this.addForm('form2')
+<<<<<<< HEAD
      this.title = '新增投标保证金'
+=======
+      this.title = '增加'
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
      this.dialogFormVisible2 = true
    },
    addTableData1() {
@@ -701,7 +777,11 @@ export default {
    },
    editBidBond(row) {
      this.editForm(row, 'form2')
+<<<<<<< HEAD
      this.title = '编辑投标保证金'
+=======
+      this.title = '编辑'
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
      this.dialogFormVisible2 = true
      this.form2.招标企业 = row.招标企业
      this.form2.联系人 = row.联系人