创建合同流程更改

src/api/MarketingCenter/ContractInformationManagement.js

@@ -61,7 +61,7 @@ export function addList() {
     data: {
       type: '2',
       name: '基础表_合同信息表_增加数据',
-      param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&备注=' + arguments[8] + '&付款方式代码=' + arguments[9] + '&合同签订日期=' + arguments[10]
+      param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&备注=' + arguments[8] + '&付款方式代码=' + arguments[9] + '&合同签订日期=' + arguments[10] + '&招标保证金流水号=' + arguments[11]
     }
   })
 }
@@ -92,7 +92,7 @@ export function editchar() {
     data: {
       type: '2',
       name: '合同信息管理_合同信息_编辑',
-      param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&合同信息备注=' + arguments[8] + '&项目流水号=' + arguments[9] + '&付款方式代码=' + arguments[10] + '&合同签订日期=' + arguments[11]
+      param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&合同信息备注=' + arguments[8] + '&项目流水号=' + arguments[9] + '&付款方式代码=' + arguments[10] + '&合同签订日期=' + arguments[11] + '&招标保证金流水号=' + arguments[12]
     }
   })
 }
@@ -254,3 +254,14 @@ export function changeExecutionProgressID() {
     }
   })
 }
+export function selectBidBond() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '投标保证金管理_投标保证金查询',
+      param: '是否收回_check=' + arguments[0] + '&是否收回=' + arguments[1] + '&保金类型_check=' + arguments[2] + '&保金类型=' + arguments[3] + '&投标人_check=' + arguments[4] + '&投标人=' + arguments[5] + '&招标企业_check=' + arguments[6] + '&招标企业=' + arguments[7] + '&开始日期_check=' + arguments[8] + '&开始日期=' + arguments[9] + '&结束日期_check=' + arguments[10] + '&结束日期=' + arguments[11]
+    }
+  })
+}

src/views/MarketingCenter/ContractInformationManagement/index.vue

@@ -37,13 +37,14 @@
         :row-key="getRowKeys"
         :expand-row-keys="expands"
         style="width: 100%"
-        height="600"
+        height="460"
         border
+        size="mini"
         @row-click="fetchExecutionProgressdata"
         @expand-change="selectMachine">
         <el-table-column type="expand">
           <template slot-scope="scope">
-            <el-table :data="tableData2" border style="width: 600px; text-align: center">
+            <el-table :data="tableData2" border style="width: 600px; text-align: center" size="mini">
               <el-table-column label="设备型号" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.机床图号 }}
@@ -73,7 +74,23 @@
         </el-table-column>
         <el-table-column align="center" label="合同编号" width="150">
           <template slot-scope="scope">
-            {{ scope.row.合同编号 }}
+            <template>
+              <el-popover
+                placement="right"
+                title="投标保证金情况"
+                width="300"
+                trigger="hover">
+                <div v-show="!scope.row.招标企业" style="text-align: center">
+                  <h4>未缴纳投标保证金</h4>
+                </div>
+                <div v-show="scope.row.招标企业">
+                  <h4>招标企业： {{ scope.row.招标企业 }}</h4>
+                  <h4>投标保证金金额： {{ scope.row.保证金金额 }}</h4>
+                  <h4>是否收回： {{ parseInt(scope.row.是否收回) === 1 ? '未收回' : '已收回' }}</h4>
+                </div>
+                <el-tag slot="reference">{{ scope.row.合同编号 }}</el-tag>
+              </el-popover>
+            </template>
           </template>
         </el-table-column>
         <el-table-column align="center" label="项目名称" width="200">
@@ -234,6 +251,11 @@
               <el-input v-model="form.EntryName" size="small" placeholder="请输入项目名称" style="width:200px"/>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="投标保证金" prop="">
+              <el-input v-model="form.bidding" readonly clearable size="small" style="width:200px" placeholder="若缴纳保证金请选择" @dblclick.native="openBidding()" @clear="clearBidding()"/>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="已完成进度" prop="executionProgressID">
               <el-select v-model="form.executionProgressID" :disabled="infoDisable" placeholder="请输入目前执行进度" size="small" style="width: 200px">
@@ -420,6 +442,67 @@
       </div>
     </el-dialog>
 
+    <!--投标保证金选择-->
+    <el-dialog :visible.sync="dialogFormVisibleBidding" title="请选择投标保证金" center width="65%">
+      <span>招标企业：</span>
+      <el-input v-model="enterprise" size="small" style="width:200px" clearable/>
+      <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchBidding">查询</el-button>
+      <div style="margin-top: 15px">
+        <el-table
+          :data="tableDataBidding"
+          highlight-current-row
+          style="width: 100%"
+          height="400"
+          border
+          @row-click="biddingNum">
+          <el-table-column align="center" label="招标企业" width="300">
+            <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="120">
+            <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">
+              {{ scope.row.投标人 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="保金类型" width="150">
+            <template slot-scope="scope">
+              {{ scope.row.保证金类型 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="投标日期" width="150">
+            <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>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="offBidding">取消</el-button>
+        <el-button type="primary" @click="getBidding">确认</el-button>
+      </div>
+    </el-dialog>
+
     <!--客户选择-->
     <el-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="600px">
       <el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/>
@@ -464,7 +547,7 @@
 
 <script>
 import elInput from 'element-ui/packages/input'
-import { changeExecutionProgressID, initProject, searchTable1, fetchExecutionProgress, delList, addList, executionProgressID, editchar, getTree, tree, getTablePeople, fetchCustomerData, getFileData, deleteFileData, selectMachine, selectProvince, SelectMarketingManager, submitMachine, editMachine, delMachine, money } from '@/api/MarketingCenter/ContractInformationManagement'
+import { selectBidBond, changeExecutionProgressID, initProject, searchTable1, fetchExecutionProgress, delList, addList, executionProgressID, editchar, getTree, tree, getTablePeople, fetchCustomerData, getFileData, deleteFileData, selectMachine, selectProvince, SelectMarketingManager, submitMachine, editMachine, delMachine, money } from '@/api/MarketingCenter/ContractInformationManagement'
 import { upload, download } from '@/utils/request'
 export default {
   components: {
@@ -475,6 +558,10 @@ export default {
       a: 1,
       b: 1,
       c: 1,
+      enterpriseInput: '', // 表单承接招标企业的中间变量
+      biddingNumber: '',
+      dialogFormVisibleBidding: false,
+      enterprise: '', // 招标企业
       startTime: '',
       startTime_check: null,
       endTime: '',
@@ -539,8 +626,10 @@ export default {
         executionProgressID: 1, // 执行进度ID
         customerName: '', // 客户名称
         remark: '',
-        付款方式: 1
+        付款方式: 1,
+        bidding: ''
       },
+      tableDataBidding: [],
       executionProgressID: '',
       form1: {
         设备型号: '',
@@ -691,9 +780,11 @@ export default {
       this.temp = 1
       this.title = '增加'
       this.disabled = false
+      this.biddingNumber = ''
+      this.tableDataBidding = []
     },
     addTableData1() {
-      addList(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.form.付款方式, this.form.contractSigningDate).then(response => {
+      addList(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.form.付款方式, this.form.contractSigningDate, this.biddingNumber).then(response => {
         this.dialogFormVisible1 = false
         if (response.data[0].result === '1') {
           this.$message.success('添加成功')
@@ -744,12 +835,14 @@ export default {
       this.form.remark = row.合同信息备注
       this.CustomerCode = row.客户流水号
       this.form.付款方式 = parseInt(row.付款方式代码)
+      this.biddingNumber = parseInt(row.招标保证金流水号)
+      this.form.bidding = row.招标企业
       this.disabled = true
       this.temp = 2
       this.infoDisable = false
     },
     chaEdit() {
-      editchar(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.hetongID, this.form.付款方式, this.form.contractSigningDate).then(response => {
+      editchar(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.hetongID, this.form.付款方式, this.form.contractSigningDate, this.biddingNumber).then(response => {
         this.dialogFormVisible1 = false
         if (response.data[0].result === '1') {
           this.$message.success('信息更新成功')
@@ -884,6 +977,30 @@ export default {
           this.$message.error('信息更新失败')
         }
       })
+    },
+    openBidding() {
+      this.dialogFormVisibleBidding = true
+    },
+    searchBidding() {
+      selectBidBond(0, '', 0, '', 0, '', 1, this.enterprise, 0, '', 0, '').then(response => {
+        const data = response.data
+        for (let i = 0; i < data.length; i++) {
+          data[i].投标日期 = data[i].投标日期.substring(0, data[i].投标日期.length - 8)
+        }
+        this.tableDataBidding = data
+      })
+    },
+    biddingNum(row) {
+      this.biddingNumber = parseInt(row.招标保证金流水号)
+      this.enterpriseInput = row.招标企业
+    },
+    clearBidding() {
+      this.biddingNumber = ''
+      this.tableDataBidding = []
+    },
+    getBidding() {
+      this.form.bidding = this.enterpriseInput
+      this.dialogFormVisibleBidding = false
     }
   }
 }