Browse Source

Merge branch 'develop_yh22' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh22

lilei 1 year ago
parent
commit
85e85d4839

+ 2 - 2
src/views/allocationManagement/allocationList/list.vue

@@ -227,7 +227,7 @@ export default {
         { title: '省份', dataIndex: 'provinceName', align: 'center', width: '80px', customRender: function (text) { return text || '--' }, fixed: 'left' },
         { title: '省份', dataIndex: 'provinceName', align: 'center', width: '80px', customRender: function (text) { return text || '--' }, fixed: 'left' },
         { title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center', width: '120px', fixed: 'left' },
         { title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center', width: '120px', fixed: 'left' },
         { title: '发货单号', scopedSlots: { customRender: 'sendBillNo' }, width: '120px', align: 'center' },
         { title: '发货单号', scopedSlots: { customRender: 'sendBillNo' }, width: '120px', align: 'center' },
-        { title: '客户类型', dataIndex: 'dealerInfo.dealerLevelDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户类型', dataIndex: 'dealerLevelDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收货客户名称', dataIndex: 'receiverName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '收货客户名称', dataIndex: 'receiverName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '所在区域', dataIndex: 'subareaArea.subareaName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所在区域', dataIndex: 'subareaArea.subareaName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所在分区', dataIndex: 'subareaArea.subareaAreaName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所在分区', dataIndex: 'subareaArea.subareaAreaName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
@@ -312,7 +312,7 @@ export default {
       this.queryParam.beginDate = getDate.getThreeMonthDays().starttime
       this.queryParam.beginDate = getDate.getThreeMonthDays().starttime
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.time = [
       this.queryParam.time = [
-        getDate.getCurrMonthDays().starttime,
+        getDate.getThreeMonthDays().starttime,
         getDate.getCurrMonthDays().endtime
         getDate.getCurrMonthDays().endtime
       ]
       ]
       this.$refs.rangeDate.resetDate(this.queryParam.time)
       this.$refs.rangeDate.resetDate(this.queryParam.time)

+ 51 - 20
src/views/salesManagement/salesOrderWarehouse/list.vue

@@ -3,25 +3,32 @@
     <a-spin :spinning="spinning" tip="Loading...">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
       <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-form-model
+          id="salesOrderWarehouseList-form"
+          ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
+          :rules="rules"
+          :model="queryParam"
+          @keyup.enter.native="handleSearch">
           <a-row :gutter="15">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
-              <a-form-item label="创建时间">
-                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
-              </a-form-item>
+              <a-form-model-item label="创建时间" prop="time">
+                <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange" />
+              </a-form-model-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
-              <a-form-item label="客户名称">
+              <a-form-model-item label="客户名称">
                 <dealerSubareaScopeList ref="dealerSubareaScopeList" id="salesManagementList-buyerName" @change="custChange" />
                 <dealerSubareaScopeList ref="dealerSubareaScopeList" id="salesManagementList-buyerName" @change="custChange" />
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
-              <a-form-item label="销售单号">
+              <a-form-model-item label="销售单号">
                 <a-input id="salesOrderWarehouseList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
                 <a-input id="salesOrderWarehouseList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
-              <a-form-item label="业务状态">
+              <a-form-model-item label="业务状态">
                 <v-select
                 <v-select
                   v-model="queryParam.billStatus"
                   v-model="queryParam.billStatus"
                   ref="billStatus"
                   ref="billStatus"
@@ -29,7 +36,7 @@
                   code="SALES_BILL_STATUS"
                   code="SALES_BILL_STATUS"
                   placeholder="请选择业务状态"
                   placeholder="请选择业务状态"
                   allowClear></v-select>
                   allowClear></v-select>
-              </a-form-item>
+              </a-form-model-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
               <a-form-model-item label="地区" prop="shippingAddrProvinceSn">
@@ -42,7 +49,7 @@
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesOrderWarehouseList-refresh">查询</a-button>
+              <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesOrderWarehouseList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesOrderWarehouseList-reset">重置</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesOrderWarehouseList-reset">重置</a-button>
               <a-button
               <a-button
                 style="margin-left: 10px"
                 style="margin-left: 10px"
@@ -55,8 +62,8 @@
               >导出</a-button>
               >导出</a-button>
             </a-col>
             </a-col>
           </a-row>
           </a-row>
-        </a-form>
-      </div>
+          </a-form>
+        </a-form-model></div>
       <!-- alert -->
       <!-- alert -->
       <a-alert type="info" style="margin-bottom:10px">
       <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
         <div slot="message">
@@ -108,11 +115,11 @@ export default {
     return {
     return {
       spinning: false,
       spinning: false,
       tableHeight: 0,
       tableHeight: 0,
-      time: [
-        moment(getDate.getCurrMonthDays().starttime, 'YYYY-MM-DD'),
-        moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
-      ],
       queryParam: { //  查询条件
       queryParam: { //  查询条件
+        time: [
+          moment(getDate.getCurrMonthDays().starttime, 'YYYY-MM-DD'),
+          moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
+        ],
         beginDate: getDate.getThreeMonthDays().starttime,
         beginDate: getDate.getThreeMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
         endDate: getDate.getCurrMonthDays().endtime,
         buyerSn: '', //  客户名称
         buyerSn: '', //  客户名称
@@ -126,6 +133,9 @@ export default {
       loading: false,
       loading: false,
       totalData: null,
       totalData: null,
       showExport: false,
       showExport: false,
+      rules: {
+        'time': [{ required: true, message: '请选择退货完成时间', trigger: 'change' }]
+      },
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {
         this.disabled = true
         this.disabled = true
@@ -169,6 +179,18 @@ export default {
     }
     }
   },
   },
   methods: {
   methods: {
+    // 查询
+    handleSearch () {
+      const _this = this
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          _this.$refs.table.refresh(true)
+        } else {
+          _this.$message.error('请选择创建时间')
+          return false
+        }
+      })
+    },
     custChange (val) {
     custChange (val) {
       this.queryParam.buyerSn = val.key
       this.queryParam.buyerSn = val.key
     },
     },
@@ -195,12 +217,21 @@ export default {
     },
     },
     //  时间  change
     //  时间  change
     dateChange (date) {
     dateChange (date) {
-      this.queryParam.beginDate = date[0]
-      this.queryParam.endDate = date[1]
+      if (date[0] && date[1]) {
+        this.queryParam.time = date
+      } else {
+        this.queryParam.time = []
+      }
+      this.queryParam.beginDate = date[0] || ''
+      this.queryParam.endDate = date[1] || ''
     },
     },
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {
-      this.$refs.rangeDate.resetDate(this.time)
+      this.queryParam.time = [
+        getDate.getCurrMonthDays().starttime,
+        getDate.getCurrMonthDays().endtime
+      ]
+      this.$refs.rangeDate.resetDate(this.queryParam.time)
       this.$refs.dealerSubareaScopeList.resetForm()
       this.$refs.dealerSubareaScopeList.resetForm()
       this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
       this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime