lilei 2 днів тому
батько
коміт
e1f7a73e46

+ 25 - 0
src/config/report/salesReport.js

@@ -16,6 +16,31 @@ export default {
     permission: 'M_salesReport'
   },
   children: [
+    {
+      path: '/reportData/salesOrderTotal',
+      redirect: '/reportData/salesOrderTotal/list',
+      name: 'salesOrderTotal',
+      component: BlankLayout,
+      meta: {
+        title: '新客户首笔销售统计',
+        icon: 'profile',
+        permission: 'M_salesOrderTotalList'
+      },
+      hideChildrenInMenu: true,
+      children: [
+        {
+          path: 'list',
+          name: 'salesOrderTotalList',
+          component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesOrderTotal/list.vue'),
+          meta: {
+            title: '新客户首笔销售统计列表',
+            icon: 'profile',
+            hidden: true,
+            permission: 'M_salesOrderTotalList'
+          }
+        }
+      ]
+    },
     {
       path: '/reportData/salesOrderTotal',
       redirect: '/reportData/salesOrderTotal/list',

+ 12 - 1
src/views/salesManagement/pushOrderManagement/list.vue

@@ -95,8 +95,19 @@
                   <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="新客户首笔订单">
+                  <v-select
+                    v-model="queryParam.firstFlag"
+                    ref="firstFlag"
+                    id="pushOrder-firstFlag"
+                    code="FLAG"
+                    placeholder="请选择是否新客户首笔订单"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
             </template>
-            <a-col :md="isShowCustomerSearch?6:24" :sm="24" :style="{textAlign:isShowCustomerSearch?'':'center'}">
+            <a-col :md="6" :sm="24">
               <div class="table-page-search-submitButtons">
                 <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>

+ 15 - 2
src/views/salesManagement/waitDispatchNew/dsModal.vue

@@ -77,6 +77,16 @@
               </a-radio>
             </a-radio-group>
           </a-form-model-item>
+          <a-form-model-item label="新客户首笔订单" prop="firstFlag">
+            <a-radio-group v-model="form.firstFlag" id="dsModal-firstFlag">
+              <a-radio value="1" id="dsModal-firstFlag-1">
+                是
+              </a-radio>
+              <a-radio value="0" id="dsModal-firstFlag-2">
+                否
+              </a-radio>
+            </a-radio-group>
+          </a-form-model-item>
         </a-form-model>
         <div class="btn-cont">
           <a-button id="dsModal-back" @click="isShow = false">取消下推</a-button>
@@ -123,11 +133,13 @@ export default {
         receiverSn: '', // 收货客户sn
         receiverName: '', // 收货客户名称
         dealerRecevieAddressSn: '', // 地址sn
-        explainInfo: '' // 备注
+        explainInfo: '', // 备注
+        firstFlag: undefined // 新客户首笔订单
       },
       rules: {
         sendNo: [{ required: true, message: '请输入发货编号', trigger: 'change' }],
         printStatus: [{ required: true, message: '请选择备货打印', trigger: 'change' }],
+        firstFlag: [{ required: true, message: '请选择是否新客户首笔订单', trigger: 'change' }],
         dealerRecevieAddressSn: [ { required: true, message: '请选择收货地址', trigger: 'change' } ]
       },
       detailData: null, //  详情数据
@@ -228,7 +240,8 @@ export default {
         receiverSn: '',
         receiverName: '',
         dealerRecevieAddressSn: '',
-        explainInfo: ''
+        explainInfo: '',
+        firstFlag: undefined
       }
       if (!this.receiverDisabled) {
         this.$refs.dealerSubareaScopeList.resetForm()