lilei 2 rokov pred
rodič
commit
7a01466dbf

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1655945219541
+  "version": 1657264580502
 }

+ 37 - 18
src/views/reportData/salesDetailReport/list.vue

@@ -15,21 +15,26 @@
         @keyup.enter.native="handleSearch" >
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
-            <a-form-model-item label="审核时间" prop="time">
-              <rangeDate ref="rangeDate" @change="dateChange" />
+            <a-form-model-item label="创建时间">
+              <rangeDate ref="creatDate" v-model="creatTime" @change="creatDateChange" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="审核时间">
+              <rangeDate ref="rangeDate" v-model="time" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="出库时间">
-              <rangeDate ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
+              <rangeDate ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
             </a-form-item>
           </a-col>
-          <a-col :md="4" :sm="24">
-            <a-form-model-item label="客户名称">
-              <a-input id="salesDetailReportList-salesTargetName" v-model.trim="queryParam.salesTargetName" allowClear placeholder="请输入客户名称"/>
-            </a-form-model-item>
-          </a-col>
           <template v-if="advanced">
+            <a-col :md="4" :sm="24">
+              <a-form-model-item label="客户名称">
+                <a-input id="salesDetailReportList-salesTargetName" v-model.trim="queryParam.salesTargetName" allowClear placeholder="请输入客户名称"/>
+              </a-form-model-item>
+            </a-col>
             <a-col :md="4" :sm="24">
               <a-form-model-item label="客户类型">
                 <a-select id="salesDetailReportList-customerType" v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型">
@@ -189,8 +194,11 @@ export default {
       advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0,
       outWareTime: [],
+      time: [],
+      creatTime: [],
       queryParam: { //  查询条件
-        time: [],
+        createBeginDate: '',
+        createEndDate: '',
         beginDate: '',
         endDate: '',
         salesTargetName: '',
@@ -286,26 +294,33 @@ export default {
         }
       })
     },
+    creatDateChange (date) {
+      this.creatTime = date
+      this.queryParam.createBeginDate = date[0] || ''
+      this.queryParam.createEndDate = date[1] || ''
+    },
     //  创建时间  change
     dateChange (date) {
-      this.queryParam.time = date
+      this.time = date
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
     outWareDateChange (date) {
+      this.outWareTime = date
       this.queryParam.outWarehouseBeginDate = date[0]
       this.queryParam.outWarehouseEndDate = date[1]
     },
     //  查询
     handleSearch () {
-      this.$refs.ruleForm.validate(valid => {
-        if (valid) {
-          this.$refs.table.refresh(true)
-        } else {
-          console.log('error submit!!')
-          return false
-        }
-      })
+      const str = JSON.stringify(this.queryParam)
+      const ret = str.replace(/\[|\]/g, '"').replace(/"},"/g, '","').replace(/"}/g, '","').match(/"\:".*?","/g)
+      const ret1 = ret.filter(item => item != '":"","')
+      console.log(ret1)
+      if (ret1.length) {
+        this.$refs.table.refresh(true)
+      } else {
+        this.$message.info('请至少输入一个查询条件')
+      }
     },
     //  重置
     resetSearchForm () {
@@ -317,6 +332,10 @@ export default {
       this.outWareTime = []
       this.queryParam.outWarehouseBeginDate = ''
       this.queryParam.outWarehouseEndDate = ''
+      this.$refs.creatDate.resetDate()
+      this.creatTime = []
+      this.queryParam.createBeginDate = ''
+      this.queryParam.createEndDate = ''
       this.queryParam.salesTargetName = ''
       this.queryParam.salesTargetType = undefined
       this.queryParam.provinceSn = undefined

+ 40 - 18
src/views/reportData/salesReport/list.vue

@@ -15,21 +15,26 @@
         @keyup.enter.native="handleSearch" >
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
-            <a-form-model-item label="审核时间" prop="time">
-              <rangeDate ref="rangeDate" @change="dateChange" />
+            <a-form-model-item label="创建时间">
+              <rangeDate ref="creatDate" v-model="creatTime" @change="creatDateChange" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="审核时间">
+              <rangeDate ref="rangeDate" v-model="time" @change="dateChange" />
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="出库时间">
-              <rangeDate ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
+              <rangeDate ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
             </a-form-item>
           </a-col>
-          <a-col :md="4" :sm="24">
-            <a-form-model-item label="客户名称">
-              <a-input id="salesReportList-salesTargetName" v-model.trim="queryParam.salesTargetName" allowClear placeholder="请输入客户名称"/>
-            </a-form-model-item>
-          </a-col>
           <template v-if="advanced">
+            <a-col :md="4" :sm="24">
+              <a-form-model-item label="客户名称">
+                <a-input id="salesReportList-salesTargetName" v-model.trim="queryParam.salesTargetName" allowClear placeholder="请输入客户名称"/>
+              </a-form-model-item>
+            </a-col>
             <a-col :md="4" :sm="24">
               <a-form-model-item label="客户类型">
                 <a-select id="salesReportList-salesTargetType" v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型">
@@ -153,7 +158,8 @@ export default {
       advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
-        time: [],
+        createBeginDate: '',
+        createEndDate: '',
         beginDate: '',
         endDate: '',
         outWarehouseBeginDate: '',
@@ -167,6 +173,8 @@ export default {
         salesBillNo: '',
         salesManName: ''
       },
+      creatTime: [],
+      time: [],
       outWareTime: [],
       rules: {
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
@@ -237,37 +245,51 @@ export default {
         }
       })
     },
+    creatDateChange (date) {
+      this.creatTime = date
+      this.queryParam.createBeginDate = date[0] || ''
+      this.queryParam.createEndDate = date[1] || ''
+    },
     //  创建时间  change
     dateChange (date) {
-      this.queryParam.time = date
+      this.time = date
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
     outWareDateChange (date) {
+      this.outWareTime = date
       this.queryParam.outWarehouseBeginDate = date[0]
       this.queryParam.outWarehouseEndDate = date[1]
     },
     //  查询
     handleSearch () {
-      this.$refs.ruleForm.validate(valid => {
-        if (valid) {
-          this.$refs.table.refresh(true)
-        } else {
-          console.log('error submit!!')
-          return false
+      let hasVal = false
+      for (const key in this.queryParam) {
+        if (this.queryParam[key]) {
+          hasVal = true
+          break
         }
-      })
+      }
+      if (hasVal) {
+        this.$refs.table.refresh(true)
+      } else {
+        this.$message.info('请至少输入一个查询条件')
+      }
     },
     //  重置
     resetSearchForm () {
       this.$refs.rangeDate.resetDate()
-      this.queryParam.time = []
+      this.time = []
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
       this.$refs.outWareRangeDate.resetDate('')
       this.outWareTime = []
       this.queryParam.outWarehouseBeginDate = ''
       this.queryParam.outWarehouseEndDate = ''
+      this.$refs.creatDate.resetDate()
+      this.creatTime = []
+      this.queryParam.createBeginDate = ''
+      this.queryParam.createEndDate = ''
 
       this.queryParam.salesTargetName = ''
       this.queryParam.salesTargetType = undefined

+ 2 - 1
src/views/salesManagement/salesReturn/detail.vue

@@ -25,9 +25,10 @@
                 <span v-else>--</span>
               </a-descriptions-item>
               <a-descriptions-item label="联系电话">{{ detailData&&detailData.contactTel || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="备注">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
               <a-descriptions-item label="退货单号">{{ detailData&&detailData.salesReturnNo || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="销售单号">{{ detailData&&detailData.salesBillNo || '--' }}</a-descriptions-item>
               <a-descriptions-item label="业务状态">{{ detailData&&detailData.stateDictValue || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="备注">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
             </a-descriptions>
           </a-collapse-panel>
         </a-collapse>

+ 2 - 2
vue.config.js

@@ -211,8 +211,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.16.151:8503/qpls-md',
-        target: 'http://p.iscm.360arrow.com/qpls-md',
+        target: 'http://192.168.0.215:8076/qpls-md',
+        // target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,