刘璐珈

src/views/MarketingCenter/BidBond/index.vue

@@ -76,6 +76,11 @@
             {{ scope.row.招标企业 }}
           </template>
         </el-table-column>
+        <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">
             <span style="width: 80px" size="mini">{{ Number(scope.row.保证金金额).toFixed(2) }}</span>
@@ -141,11 +146,7 @@
         <!--<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="项目名称" prop="项目名称" width="160" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.项目名称 }}
-          </template>
-        </el-table-column>
+
         <el-table-column align="center" label="联系人" width="80">
           <template slot-scope="scope">
             {{ scope.row.联系人 }}
@@ -664,10 +665,11 @@ export default {
           //   val.data[i].投标日期 = val.data[i].投标日期.substring(0, val.data[i].投标日期.length - 8)
           // }
           if (parseInt(val.data[i].是否收回) !== 2) {
-            val.data[i].应收回金额 = '未收回'
+            val.data[i].产品品种代码 = '未收回'
           } else {
-            val.data[i].应收回金额 = (val.data[i].应收回金额).toFixed(2)
+            val.data[i].产品品种代码 = (val.data[i].应收回金额).toFixed(2)
           }
+          val.data[i].应收回金额 = (val.data[i].应收回金额).toFixed(2)
           val.data[i].保证金金额 = (val.data[i].保证金金额).toFixed(2)
           val.data[i].中标服务费 = (val.data[i].中标服务费).toFixed(2)
           val.data[i].未收金额 = (val.data[i].未收金额).toFixed(2)
@@ -675,8 +677,8 @@ export default {
         }
         if (val.length !== 0) {
           import('@/vendor/Export2Excel').then(excel => {
-            const tHeader = ['投标结果', '公布日期', '招标企业', '项目名称', '保证金(万元)', '缴纳时间', '投标人', '中标服务费(万元)', '转履约金(万元)', '已收(万元)', '未收(万元)', '保证金备注']
-            const filterVal = ['投标结果', '公布日期', '招标企业', '项目名称', '保证金金额', '投标日期', '投标人', '中标服务费', '转履约保证金金额', '应收回金额', '未收金额', '备注']
+            const tHeader = ['投标结果', '公布日期', '招标企业', '项目名称', '保证金金额(万元)', '缴纳时间', '投标人', '中标服务费(万元)', '转履约保证金(万元)', '应收(万元)', '已收(万元)', '未收(万元)', '保证金备注']
+            const filterVal = ['投标结果', '公布日期', '招标企业', '项目名称', '保证金金额', '投标日期', '投标人', '中标服务费', '转履约保证金金额', '应收回金额', '产品品种代码', '未收金额', '备注']
             const list = val.data
             const data = this.formatJson(filterVal, list)
             excel.export_json_to_excel({

src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue

@@ -14,8 +14,8 @@
       </el-row>
     </el-card>
     <el-card>
-      <el-col :span="17.6">
-        <el-table v-loading="listLoading" :data="tableData1" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" stripe highlight-current-row style="margin-top: 3px" height="580" border size="mini" @row-click="selectMachine">
+      <el-col :span="17.8">
+        <el-table v-loading="listLoading" :data="tableData1" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" stripe highlight-current-row style="margin-top: 3px;width: 985px" height="580" border size="mini" @row-click="selectMachine">
           <el-table-column align="center" label="项目名称" prop="项目名称" width="130" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.项目名称 }}

src/views/MarketingCenter/ContractCapitalManagement/index.vue

@@ -325,14 +325,14 @@ export default {
         }
         if (val.length !== 0) {
           import('@/vendor/Export2Excel').then(excel => {
-            const tHeader = ['序号', '合同编号', '项目名称', '客户名称', '付款方式', '合同签订日期', '合同总金额(万元)', '到账金额(万元)', '未收金额(万元)', '营销经理']
-            const filterVal = ['序号', '合同编号', '项目名称', '客户名称', '付款方式', '合同签订日期', '合同总金额(万元)', '到账金额(万元)', '未收金额(万元)', '营销经理']
+            const tHeader = ['合同编号', '项目名称', '客户名称', '付款方式', '合同签订日期', '合同金额(万元)', '已收(万元)', '未收(万元)', '营销经理']
+            const filterVal = ['合同编号', '项目名称', '客户名称', '付款方式', '合同签订日期', '合同总金额(万元)', '到账金额(万元)', '未收金额(万元)', '营销经理']
             const list = val.data
             const data = this.formatJson(filterVal, list)
             excel.export_json_to_excel({
               header: tHeader,
               data,
-              filename: getNowShotTime(),
+              filename: '合同收款计划' + getNowShotTime(),
               autoWidth: true,
               bookType: 'xlsx'
             })

src/views/MarketingCenter/ContractInformationManagement/index.vue

@@ -331,8 +331,8 @@
       </div>
     </el-dialog>
     <!--新增机床对话框-->
-    <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="300px">
-      <el-form ref="form1" :model="form1" :rules="rules1" label-width="100px">
+    <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 280px" width="280px">
+      <el-form ref="form1" :model="form1" :rules="rules1" label-width="80px">
         <el-form-item label="机床型号" prop="设备型号">
           <el-input v-model="form1.设备型号" size="small" placeholder="请输入设备型号" style="width:130px"/>
         </el-form-item>
@@ -344,8 +344,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="callOff2('form1')">取消</el-button>
-        <el-button type="primary" @click="submitMachine('form1')">确 定</el-button>
+        <el-button size="small" icon="el-icon-circle-close" @click="callOff2('form1')">取消</el-button>
+        <el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submitMachine('form1')">确认</el-button>
       </div>
     </el-dialog>
 

src/views/MarketingCenter/InvoiceRecord/index.vue

@@ -513,8 +513,8 @@ export default {
         }
         if (val.length !== 0) {
           import('@/vendor/Export2Excel').then(excel => {
-            const tHeader = ['序号', '合同编号', '项目名称', '客户名称', '付款方式', '签订日期', '合同金额(万元)', '到账金额(万元)', '开票金额(万元)', '营销经理']
-            const filterVal = ['序号', '合同编号', '项目名称', '客户名称', '付款方式', '签订日期', '合同金额', '到账金额', '开票金额', '营销经理']
+            const tHeader = ['合同编号', '项目名称', '客户名称', '付款方式', '合同金额(万元)', '开票金额(万元)', '到账金额(万元)', '签订日期', '营销经理', '合同信息备注']
+            const filterVal = ['合同编号', '项目名称', '客户名称', '付款方式', '合同金额', '开票金额', '到账金额', '签订日期', '营销经理', '合同信息备注']
             const list = val.data
             const data = this.formatJson(filterVal, list)
             excel.export_json_to_excel({
@@ -882,5 +882,12 @@ export default {
   >>>.el-form-item {
     margin-bottom: 13px;
   }
+  .el-table td.gutter,.el-table th.gutter{
+    width: 15px;
+    border-right-width: 0;
+    border-bottom-width: 0;
+    padding: 30px;
+    background: white;
+  }
 </style>
 

src/views/MarketingCenter/MarginManagement/index.vue

@@ -24,7 +24,7 @@ export default {
   },
   data() {
     return {
-      handle: '',
+      handle: '投标保证金',
       tabName: '投标保证金'
     }
   },