更新

src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue

@@ -10,18 +10,30 @@
             :value="item.value"/>
         </el-select>
         <el-input v-model="customerName1" clearable size="small" style="width:200px;margin: 0px 10px" placeholder="合同编号或客户名称" @keyup.enter.native="PageSize = 30;PageCurrent = 1;fetchTableData1()"/>
+        <el-date-picker
+          v-model="dateRange"
+          :picker-options="pickerOptions"
+          size="small"
+          type="daterange"
+          align="center"
+          style="width: 240px;margin: 3px 0"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          range-separator="～"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
         <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
       </el-row>
     </el-card>
     <el-card>
-      <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>
+      <el-col :span="16.5">
+        <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: 935px" height="580" border size="mini" @row-click="selectMachine">
+          <el-table-column align="center" label="项目名称" prop="项目名称" width="110" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.项目名称 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="客户名称" prop="客户名称" width="150" show-overflow-tooltip>
+          <el-table-column align="center" label="客户名称" prop="客户名称" width="130" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.客户名称 }}
             </template>
@@ -80,23 +92,33 @@
             @current-change="handleCurrentChange"/>
         </div>
       </el-col>
-      <el-col :span="6.3">
+      <el-col :span="6.5">
         <el-table :data="tableData2" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" class="subTableHeader" border style="text-align: center" size="mini">
-          <el-table-column label="设备型号" align="center" width="100" show-overflow-tooltip>
+          <el-table-column label="机床图号" align="center" width="80" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.机床图号 }}
             </template>
           </el-table-column>
-          <el-table-column label="设备名称" align="center" min-width="180" show-overflow-tooltip>
+          <el-table-column label="机床名称" align="center" width="140" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.机床名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="设备状态" align="center" width="80">
+          <el-table-column label="数量" align="center" width="50">
+            <template slot-scope="scope">
+              {{ scope.row.机床数量 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="进程" align="center" width="60">
             <template slot-scope="scope">
               {{ scope.row.机床状态 }}
             </template>
           </el-table-column>
+          <el-table-column label="发货时间" align="center" width="90">
+            <template slot-scope="scope">
+              {{ scope.row.发出时间.split(' ')[2] + '/' + scope.row.发出时间.split(' ')[0] + '/' + scope.row.发出时间.split(' ')[1] }}
+            </template>
+          </el-table-column>
         </el-table>
       </el-col>
     </el-card>
@@ -613,6 +635,34 @@ export default {
   },
   data() {
     return {
+      dateRange: '',
+      pickerOptions: {
+        shortcuts: [{
+          text: '上季度',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 30 * 3)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '过去半年',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 366 / 2)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '过去一年',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 365)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
       customerName1: '',
       customerName1_check: '',
       tableDataLoadingDeliveryManagement: false,
@@ -696,6 +746,9 @@ export default {
       this.peoplename = row.姓名
     },
     fetchTableData1() {
+      this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
+      this.startTime = this.dateRange[0] ? this.dateRange[0] : null
+      this.endTime = this.dateRange[1] ? this.dateRange[1] : null
       if (this.customerName1 === '' || this.customerName1 === null) { this.customerName1_check = 0 } else { this.customerName1_check = 1 }
       if (this.entryNameValue === '' || this.entryNameValue === null) { this.entryNameValue_check = 0 } else { this.entryNameValue_check = 1 }
       if (this.MarketingManagerValue === '' || this.MarketingManagerValue === null) { this.peopleid_check = 0 } else { this.peopleid_check = 1 }