优化调整

src/api/api.js

@@ -104,6 +104,7 @@ const getVisitInfo = (params)=>getAction("/sys/visitInfo",params);
 const queryUserByDepId = (params)=>getAction("/sys/user/queryUserByDepId",params);
 
 // 重复校验
+const validateUserName = (params)=>getAction("/sys/user/validateUserName",params);  // 用户账号
 const duplicateCheck = (params)=>getAction("/sys/duplicate/check",params);
 // 加载分类字典
 const loadCategoryData = (params)=>getAction("/sys/category/loadAllData",params);
@@ -170,6 +171,7 @@ export {
   getLoginfo,
   getVisitInfo,
   queryUserByDepId,
+  validateUserName,
   duplicateCheck,
   queryTreeListForRole,
   queryTreeListByTypeForRole,

src/views/benefiting/ReconciliationDetails.vue

@@ -16,6 +16,11 @@
                 <a-input v-model="model.orderNum" placeholder="订单编号"></a-input>
               </a-form-model-item>
             </a-col>
+            <a-col :span="12" v-if="model.balanceNum">
+              <a-form-model-item label="结算单号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input v-model="model.balanceNum" placeholder="结算单号"></a-input>
+              </a-form-model-item>
+            </a-col>
             <a-col :span="12">
               <a-form-model-item label="提交时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-input v-model="model.createTime" placeholder="提交时间"></a-input>

src/views/benefiting/ReconciliationList.vue

@@ -100,6 +100,12 @@ import { httpAction } from '@/api/manage'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 
 const columns = [
+{
+    title: '结算单号',
+    dataIndex: 'balanceNum',
+    key: 'balanceNum',
+    align: 'center',
+  },
   {
     title: '订单编号',
     dataIndex: 'orderNum',
@@ -245,10 +251,10 @@ export default {
       this.model.id = record.id
     },
     handleOk(e) {
-      if (!this.model.remarks) {
-        this.$message.warning('请填写备注')
-        return false
-      }
+      // if (!this.model.remarks) {
+      //   this.$message.warning('请填写备注')
+      //   return false
+      // }
       const that = this
       this.confirmLoading = true
       let method = 'post'

src/views/benefiting/SettlementDetails.vue

@@ -357,11 +357,11 @@ export default {
         this.confirmLoading = false
         return false
       }
-      if (!this.model.remarks) {
-        this.$message.warning('请填写备注')
-        this.confirmLoading = false
-        return false
-      }
+      // if (!this.model.remarks) {
+      //   this.$message.warning('请填写备注')
+      //   this.confirmLoading = false
+      //   return false
+      // }
       this.model.shareBenefitIds = this.selectedRowKeys.toString()
       httpAction(this.url.add, this.model, method)
         .then((res) => {

src/views/shops/modules/SelectShopsModal.vue

@@ -28,8 +28,8 @@
         <a-table size="small" bordered rowKey="id" :columns="columns" :dataSource="dataSource1"
           :pagination="ipagination" :loading="loading" @change="handleTableChange">
           <span slot="action" slot-scope="text, record">
-            <a href="javascript:;" @click="theSelected(record)" v-if="record.bindPartners === 'Y'">选择</a>
-            <a href="javascript:;" v-else disabled>已绑定</a>
+            <a href="javascript:;" @click="theSelected(record)" v-if="record.bindPartners === 'Y' && record.auditStatus === 'auditPass' && record.shopStatus === 'normal'">选择</a>
+            <a href="javascript:;" v-else disabled>选择</a>
           </span>
         </a-table>
       </div>
@@ -152,8 +152,8 @@ export default {
       }
       var params = this.getQueryParams() //查询条件
       params.communityCode = this.communityCode
-      params.auditStatus = 'auditPass'
-      params.shopStatus = 'normal'
+      // params.auditStatus = 'auditPass'
+      // params.shopStatus = 'normal'
       getAction(this.url.list, params).then((res) => {
         if (res.success) {
           this.dataSource1 = res.result.records

src/views/statistical/IndexChart.vue

@@ -44,23 +44,25 @@
     <a-row :gutter="24">
       <a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '20px' }">
         <div class="t-box">
-          <h3 class="box-title">最新成交订单</h3>
+          <h3 class="box-title">今日成交订单</h3>
           <div class="order">
             <div class="order-title"><span
-                style="width: 30%;">订单编号</span><span>提交时间</span><span>买家名称</span><span>订单金额</span></div>
-            <vue-seamless-scroll :data="data.shareOrder" class="seamless-warp" :class-option="defineScroll">
+                style="width: 30%;">订单编号</span><span>提交时间</span><span>买家名称</span><span>分利金额</span></div>
+            <vue-seamless-scroll :data="data.shareOrder" class="seamless-warp" :class-option="defineScroll" v-if="data.shareOrder && data.shareOrder.length > 0">
               <div v-for="(item, index) in data.shareOrder" :key="index" class="item">
                 <span
-                  style="width: 30%;">{{ item.order_num }}</span><span>{{ item.create_time }}</span><span>{{ item.buyer_name }}</span><span>¥{{ item.total_money }}</span>
+                  style="width: 30%;">{{ item.order_num }}</span><span>{{ item.create_time }}</span><span>{{ item.buyer_name }}</span><span>¥{{ item.share_money }}</span>
               </div>
             </vue-seamless-scroll>
+            <a-empty v-else style="margin-top: 46px;"/>
           </div>
         </div>
       </a-col>
       <a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '20px' }">
         <div class="t-box">
           <h3 class="box-title">月成交金额</h3>
-          <line-chart-multid :dataSource="dataList1" :fields="dayFields1" style="padding: 0;" />
+          <line-chart-multid :dataSource="dataList1" :fields="dayFields1" style="padding: 0;" v-if="dataList1 && dataList1.length > 0"/>
+          <a-empty v-else style="margin-top: 46px;"/>
         </div>
       </a-col>
     </a-row>
@@ -69,14 +71,16 @@
         <div class="t-box">
           <h3 class="box-title">月成交订单数量</h3>
           <div>
-            <line-chart-multid :dataSource="dataList2" :fields="dayFields2" style="padding: 0;" />
+            <line-chart-multid :dataSource="dataList2" :fields="dayFields2" style="padding: 0;" v-if="dataList2 && dataList2.length > 0"/>
+            <a-empty v-else style="margin-top: 46px;"/>
           </div>
         </div>
       </a-col>
       <a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '20px' }">
         <div class="t-box">
           <h3 class="box-title">入驻商铺新增数量</h3>
-          <bar :dataSource="dataList3" style="padding:0;" />
+          <bar :dataSource="dataList3" style="padding:0;" v-if="dataList3 && dataList3.length > 0"/>
+            <a-empty v-else style="margin-top: 46px;"/>
         </div>
       </a-col>
     </a-row>
@@ -85,14 +89,16 @@
         <div class="t-box">
           <h3 class="box-title">巡报订单数量</h3>
           <div>
-            <line-chart-multid :dataSource="dataList4" :fields="dayFields4" style="padding: 0;" />
+            <line-chart-multid :dataSource="dataList4" :fields="dayFields4" style="padding: 0;" v-if="dataList4 && dataList4.length > 0"/>
+              <a-empty v-else style="margin-top: 46px;"/>
           </div>
         </div>
       </a-col>
       <a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '20px' }">
         <div class="t-box">
           <h3 class="box-title">巡报订单金额</h3>
-          <line-chart-multid :dataSource="dataList5" :fields="dayFields5" style="padding: 0;" />
+          <line-chart-multid :dataSource="dataList5" :fields="dayFields5" style="padding: 0;" v-if="dataList5 && dataList5.length > 0"/>
+          <a-empty v-else style="margin-top: 46px;"/>
         </div>
       </a-col>
     </a-row>
@@ -193,7 +199,7 @@ export default {
     onChange(date, dateString) {
       if (dateString) {
         this.time = dateString.replace('-', '')
-      }else{
+      } else {
         this.time = ''
         this.getDataStatistics()
       }

src/views/system/modules/UserModal.vue

@@ -143,7 +143,7 @@
   import { getAction } from '@/api/manage'
   import { addUser,editUser,queryUserRole,queryall } from '@/api/api'
   import { disabledAuthFilter } from "@/utils/authFilter"
-  import { duplicateCheck } from '@/api/api'
+  import { duplicateCheck,validateUserName } from '@/api/api'
 
   export default {
     name: "UserModal",
@@ -393,12 +393,9 @@
           }else{
             if(new RegExp(/^1[3|4|5|6|7|8|9][0-9]\d{8}$/).test(value)){
               var params = {
-                tableName: 'sys_user',
-                fieldName: 'phone',
-                fieldVal: value,
-                dataId: this.userId
+                loginName: value,
               };
-              duplicateCheck(params).then((res) => {
+              validateUserName(params).then((res) => {
                 if (res.success) {
                   callback()
                 } else {