调整

src/components/SalesHeader/SalesHeader.vue

@@ -3,17 +3,17 @@
     <el-form ref="form" :rules="rules" label-position="left" :disabled="screenForm.disabled" label-width="120px" :model="screenForm" size="mini">
       <el-row :gutter="20">
         <el-col :xs="24" :ms="6" :lg="6">
-          <el-form-item label="销售订单号" prop="id">
+          <el-form-item label="销售订单号" >
             <el-input v-model="screenForm.id" disabled placeholder="销售订单号" size="mini" />
           </el-form-item>
         </el-col>
         <el-col :xs="24" :ms="6" :lg="6">
-          <el-form-item label="商家编号" prop="customerNumber">
+          <el-form-item label="商家编号" >
             <el-input v-model="screenForm.customerNumber" disabled placeholder="商家编号" size="mini" />
           </el-form-item>
         </el-col>
         <el-col :xs="24" :ms="6" :lg="6">
-          <el-form-item label="商家名称" prop="customerName">
+          <el-form-item label="商家名称" >
             <el-input v-model="screenForm.customerName" disabled placeholder="商家名称" size="mini" />
           </el-form-item>
         </el-col>
@@ -30,11 +30,11 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :ms="6" :lg="6">
-          <el-form-item label="发货仓库编号" prop="code">
-            <el-input v-model="screenForm.code" placeholder="发货仓库编号" size="mini" />
-          </el-form-item>
-        </el-col>
+<!--        <el-col :xs="24" :ms="6" :lg="6">-->
+<!--          <el-form-item label="发货仓库编号" prop="code">-->
+<!--            <el-input v-model="screenForm.code" placeholder="发货仓库编号" size="mini" />-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
         <el-col :xs="24" :ms="6" :lg="6">
           <el-form-item label="发货仓库名称" prop="stockType">
             <el-select v-model="screenForm.stockType" placeholder="请选择" clearable>
@@ -126,10 +126,10 @@ export default {
         notes: ''
       },
       rules: {
-        id: [
-          { required: true, message: '请输入销售订单号', trigger: 'blur' },
-
-        ],
+        // id: [
+        //   { required: true, message: '请输入销售订单号', trigger: 'blur' },
+        //
+        // ],
         cityId: [{
           required: true, message: '请输入市', trigger: 'blur'
         }],
@@ -142,11 +142,11 @@ export default {
         streetId: [{
           required: true, message: '请输入街道', trigger: 'blur'
         }],
-        customerNumber: [          { required: true, message: '请输入商家编号', trigger: 'blur' },
-        ],
-        customerName: [{
-          required: true, message: '请输入商家名称', trigger: 'blur'
-        }],
+        // customerNumber: [          { required: true, message: '请输入商家编号', trigger: 'blur' },
+        // ],
+        // customerName: [{
+        //   required: true, message: '请输入商家名称', trigger: 'blur'
+        // }],
         pickTime: [{
           required: true, message: '请输入配送日期', trigger: 'blur'
         }],

src/views/sales_control/sales_management/components/customer_sales_form.vue

@@ -158,13 +158,13 @@ export default {
       this.dataList.splice(index, 1)
       // this.$refs.multipleTable.clearSelection()
 
-      console.log(this.$refs.dia)
-      if (!this.dataList.length) {
-        this.$nextTick(() => {
-          Object.assign(this.$refs.header.$data, this.$refs.header.$options.data())
-          this.customerNumber = ''
-        })
-      }
+      // console.log(this.$refs.dia)
+      // if (!this.dataList.length) {
+      //   this.$nextTick(() => {
+      //     Object.assign(this.$refs.header.$data, this.$refs.header.$options.data())
+      //     this.customerNumber = ''
+      //   })
+      // }
     },
     delChange() {
 
@@ -177,12 +177,12 @@ export default {
             }
           })
         })
-        if (this.dataList.length == 1) {
-          this.$nextTick(() => {
-            Object.assign(this.$refs.header.$data, this.$refs.header.$options.data())
-            this.customerNumber = ''
-          })
-        }
+        // if (this.dataList.length == 1) {
+        //   this.$nextTick(() => {
+        //     Object.assign(this.$refs.header.$data, this.$refs.header.$options.data())
+        //     this.customerNumber = ''
+        //   })
+        // }
       }
 
     },

src/views/sales_control/sales_management/components/return_sales_form.vue

@@ -168,12 +168,12 @@ export default {
     },
     handleDel(item, index) {
       this.dataList.splice(index, 1)
-      if (!this.dataList.length){
-        this.$nextTick(()=>{
-          this.details = {}
-          this.customerNumber = ''
-        })
-      }
+      // if (!this.dataList.length){
+      //   this.$nextTick(()=>{
+      //     this.details = {}
+      //     this.customerNumber = ''
+      //   })
+      // }
     },
     delChange() {
       this.dataList.forEach((k, i) => {
@@ -183,12 +183,12 @@ export default {
             this.selection.splice(e, 1)
           }
         })
-        if (this.dataList.length ==1){
-          this.$nextTick(()=>{
-            this.details = {}
-            this.customerNumber = ''
-          })
-        }
+        // if (this.dataList.length ==1){
+        //   this.$nextTick(()=>{
+        //     this.details = {}
+        //     this.customerNumber = ''
+        //   })
+        // }
 
       })
     },

src/views/sales_control/sales_management/customer_sales_list.vue

@@ -23,7 +23,6 @@ import import_mixin from '@/components/template/import_mixin.js'
 import { delFrontOrder, exportCustomerFrontOrder, getFrontOrderList } from '@/api/sales'
 import customer_sales_form from '@/views/sales_control/sales_management/components/customer_sales_form'
 import customer_sales_details from '@/views/sales_control/sales_management/components/customer_sales_details'
-import { getcustomerFrontList, getFrontListCustomer } from '@/api/stock'
 
 export default {
   components: { TemplatePage, customer_sales_form, customer_sales_details },
@@ -82,14 +81,7 @@ export default {
     // 列表请求函数
     getList(...p) {
       this.recordSelected = []
-      let func = getcustomerFrontList
-      if (this.isFront === true) {
-        func = getcustomerFrontList
-      }
-      if (this.isFront === false) {
-        func = getFrontListCustomer
-      }
-      return func(...p)
+      return getFrontOrderList(...p)
     },
     // 列表导出函数
     exportList: exportCustomerFrontOrder,