发货记录

src/views/MarketingCenter/SafetyMargin/index.vue

@@ -10,22 +10,23 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <span style="margin-left: 10px">开始日期：</span>
-      <el-date-picker
-        v-model="startTime"
-        style="width: 200px;"
-        value-format="yyyy-MM-dd"
-        size="small"
-        type="date"
-        placeholder="请选择开始日期"/>
-      <span style="margin-left: 10px">结束日期：</span>
-      <el-date-picker
-        v-model="endTime"
-        style="width: 200px;"
-        value-format="yyyy-MM-dd"
-        size="small"
-        type="date"
-        placeholder="请选择结束日期"/>
+      <el-input v-model="customerName" clearable size="small" style="width:150px;margin: 3px 0" placeholder="请输入客户名称"/>
+      <!--      <span style="margin-left: 10px">开始日期：</span>-->
+      <!--      <el-date-picker-->
+      <!--        v-model="startTime"-->
+      <!--        style="width: 200px;"-->
+      <!--        value-format="yyyy-MM-dd"-->
+      <!--        size="small"-->
+      <!--        type="date"-->
+      <!--        placeholder="请选择开始日期"/>-->
+      <!--      <span style="margin-left: 10px">结束日期：</span>-->
+      <!--      <el-date-picker-->
+      <!--        v-model="endTime"-->
+      <!--        style="width: 200px;"-->
+      <!--        value-format="yyyy-MM-dd"-->
+      <!--        size="small"-->
+      <!--        type="date"-->
+      <!--        placeholder="请选择结束日期"/>-->
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSizeProject = 30;PageCurrentProject = 1;searchTableDataProject()">查询</el-button>
     </el-card>
 
@@ -541,6 +542,8 @@ export default {
       }
     }
     return {
+      customerName: '',
+      customerName_check: '',
       pickerOptions: {},
       pickerOptions1: {},
       pickerOptions2: {},
@@ -693,8 +696,13 @@ export default {
       } else {
         this.endTime_check = 1
       }
+      if (this.customerName === '' || this.customerName === null) {
+        this.customerName_check = 0
+      } else {
+        this.customerName_check = 1
+      }
       this.listLoadingProject = true
-      searchTableDataProject(this.PageCurrentProject, this.PageSizeProject, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime).then(response => {
+      searchTableDataProject(this.PageCurrentProject, this.PageSizeProject, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.customerName_check, this.customerName).then(response => {
         this.tableData1 = []
         this.tableData2 = []
         this.listLoadingProject = false