样式

2019-09-18 12:24:50 +08:00
parent 93eb6ec5c5
commit faab73c1fa
58 changed files with 0 additions and 4278 deletions
--- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
+++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
@@ -2,11 +2,7 @@
  <div>
    <el-card>
      <span>项目名称：</span>
-<<<<<<< HEAD
      <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin: 3px" size="small">
-=======
-      <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin-right: 10px" size="small">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
        <el-option
          v-for="item in entryName"
          :key="item.value"
@@ -16,11 +12,7 @@
      <span style="margin-left: 10px">机床型号：</span>
      <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
      <span style="margin-left: 10px">销售经理：</span>
-<<<<<<< HEAD
      <el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
-=======
-      <el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
      <span style="margin-left: 10px">开始日期：</span>
      <el-date-picker
        v-model="startTime"
@@ -47,7 +39,6 @@
        :row-key="getRowKeys"
        :expand-row-keys="expands"
        highlight-current-row
-<<<<<<< HEAD
        style="width: 100%; margin-top: 3px"
        height="600"
        border
@@ -58,17 +49,6 @@
        <el-table-column type="expand" label="详情">
          <template slot-scope="scope">
            <el-table :data="tableData2" border stripe style="width: 400px; text-align: center" size="mini">
-=======
-        style="width: 100%"
-        height="300"
-        border
-        size="mini"
-        @row-click="fetchTableData"
-        @expand-change="selectMachine">
-        <el-table-column type="expand">
-          <template slot-scope="scope">
-            <el-table :data="tableData2" border style="width: 350px; text-align: center" size="mini">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              <el-table-column label="设备型号" align="center">
                <template slot-scope="scope">
                  {{ scope.row.机床图号 }}
@@ -82,22 +62,14 @@
            </el-table>
          </template>
        </el-table-column>
-<<<<<<< HEAD
        <el-table-column align="center" label="合同编号" width="130">
-=======
-        <el-table-column align="center" label="合同编号" width="150">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
          <template slot-scope="scope">
            <template>
              <el-tag slot="reference" type="small">{{ scope.row.合同编号 }}</el-tag>
            </template>
          </template>
        </el-table-column>
-<<<<<<< HEAD
        <el-table-column align="center" label="项目名称" width="150" show-overflow-tooltip>
-=======
-        <el-table-column align="center" label="项目名称" width="200">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
          <template slot-scope="scope">
            {{ scope.row.项目名称 }}
          </template>
@@ -132,57 +104,33 @@
            {{ 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="230" show-overflow-tooltip>
-=======
-        <el-table-column align="center" label="客户名称" width="230">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
          <template slot-scope="scope">
            {{ scope.row.客户名称 }}
          </template>
        </el-table-column>
-<<<<<<< HEAD
        <el-table-column align="center" label="联系人" width="90" 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>
        </el-table-column>
-<<<<<<< HEAD
        <el-table-column align="center" label="合同信息备注" width="auto">
-=======
-        <el-table-column align="center" label="合同信息备注" width="142">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
          <template slot-scope="scope">
            {{ scope.row.合同信息备注 }}
          </template>
        </el-table-column>
      </el-table>
-<<<<<<< HEAD
      <div class="block">
-=======
-      <div class="block" style="margin-top: 10px;">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
        <el-pagination
          :current-page="PageCurrent"
          :page-sizes="[10, 20, 30, 40]"
@@ -196,28 +144,17 @@

    <!--营销经理选择-->
    <el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="30%">
-<<<<<<< HEAD
      <span>责权省份: </span>
      <el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" size="small" @change="changeProvince">
-=======
-      <span>责权省份</span>
-      <el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
        <el-option
          v-for="item in Province"
          :key="item.value"
          :label="item.label"
          :value="item.value"/>
      </el-select>
-<<<<<<< HEAD
      <div style="margin-top: 5px">
        <el-table :data="tableData3" border stripe style="width: 100%; text-align: center;" size="mini" highlight-current-row @row-click="handleChange">
          <el-table-column label="营销经理" align="center" >
-=======
-      <div style="margin-top: 15px">
-        <el-table :data="tableData3" border style="width: 100%; text-align: center;" size="mini" highlight-current-row @row-click="handleChange">
-          <el-table-column label="销售经理" align="center" >
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
            <template slot-scope="scope">
              {{ scope.row.姓名 }}
            </template>
@@ -236,7 +173,6 @@
    </el-dialog>
    <el-card class="box-card">
      <div class="block" style="border: 1px solid rgb(220, 223, 230)">
-<<<<<<< HEAD
        <el-carousel :autoplay="true" trigger="click" height="100px">
          <el-carousel-item>
            <el-button type="text" style="margin: 3px;padding: 0px;" @click="goToContractCapitalManagement">收款情况</el-button>
@@ -247,17 +183,6 @@
              height="100"
              border
              stripe
-=======
-        <el-carousel :autoplay="true" trigger="click" height="350px">
-          <el-carousel-item>
-            <el-button type="text" style="margin-left: 15px;margin-top: 15px" @click="goToContractCapitalManagement">收款情况</el-button>
-            <el-table
-              v-loading="listLoadingContractCapitalManagement"
-              :data="tableDataContractCapitalManagement"
-              style="width: 99%;margin-left: 10px;margin-right: 10px"
-              height="300"
-              border
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              size="mini">
              <el-table-column align="center" label="付款方式" width="100">
                <template slot-scope="scope">
@@ -319,7 +244,6 @@
            </el-table>
          </el-carousel-item>
          <el-carousel-item>
-<<<<<<< HEAD
            <el-button type="text" style="margin: 3px;padding: 0px;" @click="goToInvoiceRecord">开票情况</el-button>
            <el-table
              v-loading="listLoadingInvoiceRecord"
@@ -328,26 +252,13 @@
              height="100"
              border
              stripe
-=======
-            <el-button type="text" style="margin-left: 15px;margin-top: 15px" @click="goToInvoiceRecord">开票情况</el-button>
-            <el-table
-              v-loading="listLoadingInvoiceRecord"
-              :data="tableDataInvoiceRecord"
-              style="width: 99%;margin-left: 10px;margin-right: 10px"
-              height="300"
-              border
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              size="mini">
              <el-table-column
                align="center"
                label="序号"
                type="index"
                width="50"/>
-<<<<<<< HEAD
              <el-table-column align="center" label="发票抬头" width="200">
-=======
-              <el-table-column align="center" label="发票抬头" width="180">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                <template slot-scope="scope">
                  {{ scope.row.客户名称 }}
                </template>
@@ -395,26 +306,16 @@
            </el-table>
          </el-carousel-item>
          <el-carousel-item>
-<<<<<<< HEAD
            <el-button type="text" style="margin: 3px;padding: 0px;" @click="goToInvoiceDeliveryManagement">发货情况</el-button>
-=======
-            <el-button type="text" style="margin-left: 15px;margin-top: 15px" @click="goToInvoiceDeliveryManagement">发货情况</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
            <el-table
              v-loading="tableDataLoadingDeliveryManagement"
              id="tb"
              :data="tableDataDeliveryManagement"
              highlight-current-row
-<<<<<<< HEAD
              style="width: 99%"
              height="100"
              border
              stripe
-=======
-              style="width: 99%;margin-left: 10px;margin-right: 10px"
-              height="300"
-              border
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              size="mini"
            >
              <el-table-column align="center" label="发货单号">
@@ -465,7 +366,6 @@
            </el-table>
          </el-carousel-item>
          <el-carousel-item>
-<<<<<<< HEAD
            <el-button type="text" style="margin: 3px;padding: 0px;" @click="goToBidBond">投标保证金</el-button>
            <el-table
              v-loading="tableData1LoadingBidBond"
@@ -474,15 +374,6 @@
              height="100"
              border
              stripe
-=======
-            <el-button type="text" style="margin-left: 15px;margin-top: 15px" @click="goToBidBond">投标保证金</el-button>
-            <el-table
-              v-loading="tableData1LoadingBidBond"
-              :data="tableDataBidBond"
-              style="width: 99%;margin-left: 10px;margin-right: 10px"
-              height="300"
-              border
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              size="mini">
              <el-table-column align="center" label="投标结果" width="190">
                <template slot-scope="scope">
@@ -580,25 +471,15 @@
            </el-table>
          </el-carousel-item>
          <el-carousel-item>
-<<<<<<< HEAD
            <el-button type="text" style="margin: 3px;padding: 0px;" @click="goToPerformanceBond">履约保证金</el-button>
-=======
-            <el-button type="text" style="margin-left: 15px;margin-top: 15px" @click="goToPerformanceBond">履约保证金</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
            <el-table
              v-loading="listLoadingPerformanceBond"
              v-show="showPerformanceBond"
              :data="tableDataPerformanceBond"
-<<<<<<< HEAD
              style="width: 99%"
              height="100"
              border
              stripe
-=======
-              style="width: 99%;margin-left: 10px;margin-right: 10px"
-              height="300"
-              border
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              size="mini">
              <el-table-column align="center" label="履约保证金金额">
                <template slot-scope="scope">
@@ -663,7 +544,6 @@
            </div>
          </el-carousel-item>
          <el-carousel-item>
-<<<<<<< HEAD
            <el-button type="text" style="margin: 3px;padding: 0px;" @click="goToSafetyMargin">安全保证金</el-button>
            <el-table
              v-loading="listLoadingSafetyMargin"
@@ -672,15 +552,6 @@
              height="100"
              border
              stripe
-=======
-            <el-button type="text" style="margin-left: 15px;margin-top: 15px" @click="goToSafetyMargin">安全保证金</el-button>
-            <el-table
-              v-loading="listLoadingSafetyMargin"
-              :data="tableDataSafetyMargin"
-              style="width: 99%;margin-left: 10px;margin-right: 10px"
-              height="300"
-              border
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              size="mini">
              <el-table-column align="center" label="保证金金额" width="100">
                <template slot-scope="scope">