浏览代码

feat:首页统计数据对接

颜琼丽 1 天之前
父节点
当前提交
2a10d7e238

+ 4 - 3
jd-logistics-ui-v3/src/views/dashboard/PanelGroup.vue

@@ -18,7 +18,7 @@
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">京东订单数量</div>
-          <CountTo :start-val="0" :end-val="jdOrder" :duration="3000" class="card-panel-num" />
+          <CountTo :start-val="0" :end-val="jdOrder" :duration="2600" class="card-panel-num" />
         </div>
       </div>
     </el-col>
@@ -29,7 +29,7 @@
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">顺丰订单数量</div>
-          <CountTo :start-val="0" :end-val="sfOrder" :duration="3200" class="card-panel-num" />
+          <CountTo :start-val="0" :end-val="sfOrder" :duration="2600" class="card-panel-num" />
         </div>
       </div>
     </el-col>
@@ -42,7 +42,8 @@
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">总费用</div>
-          <CountTo :start-val="0" :end-val="totalAmount" :duration="3600" class="card-panel-num" />
+          <CountTo :start-val="0" :end-val="totalAmount" :duration="2600"
+                   :decimals="2" class="card-panel-num" />
         </div>
       </div>
     </el-col>

+ 5 - 2
jd-logistics-ui-v3/src/views/logistics/monthSummary/index.vue

@@ -348,7 +348,8 @@ const formKP = reactive({
   openBank: '',
   bankAccount: '',
   remark: '',
-  BigDecimal: 0
+  BigDecimal: 0,
+  summaryId:undefined
 });
 const rulesKP = {
   invoiceName: [
@@ -504,7 +505,8 @@ function handleKaipiao(row){
         openBank: response.data.openBank || '',
         bankAccount: response.data.bankAccount || '',
         remark: response.data.remark || '',
-        BigDecimal: row.payableAmount || 0
+        BigDecimal: row.payableAmount || 0,
+        summaryId: row.summaryId || 0
       });
       openKaipiao.value = true;
     });
@@ -523,6 +525,7 @@ function submitFormKP(){
     gmfMobile:`${formKP.phone}`,
     gmfEmail:`${formKP.email}`,
     bz:`${formKP.remark}`,
+    summaryId:formKP.summaryId
   }
   invoiceIssuance(obj).then(response => {
     proxy.$modal.msgSuccess("开票申请成功");

+ 8 - 8
jd-logistics-ui-v3/src/views/system/user/profile/index.vue

@@ -17,14 +17,14 @@
                         <svg-icon icon-class="user" />用户帐号
                         <div class="pull-right">{{ state.user.userName }}</div>
                      </li>
-                     <li class="list-group-item">
-                        <svg-icon icon-class="phone" />手机号码
-                        <div class="pull-right">{{ state.user.phonenumber }}</div>
-                     </li>
-                     <li class="list-group-item">
-                        <svg-icon icon-class="email" />用户邮箱
-                        <div class="pull-right">{{ state.user.email }}</div>
-                     </li>
+<!--                     <li class="list-group-item">-->
+<!--                        <svg-icon icon-class="phone" />手机号码-->
+<!--                        <div class="pull-right">{{ state.user.phonenumber }}</div>-->
+<!--                     </li>-->
+<!--                     <li class="list-group-item">-->
+<!--                        <svg-icon icon-class="email" />用户邮箱-->
+<!--                        <div class="pull-right">{{ state.user.email }}</div>-->
+<!--                     </li>-->
                      <li class="list-group-item">
                         <svg-icon icon-class="tree" />所属部门
                         <div class="pull-right" v-if="state.user.dept">{{ state.user.dept.deptName }} / {{ state.postGroup }}</div>

+ 6 - 6
jd-logistics-ui-v3/src/views/system/user/profile/userInfo.vue

@@ -3,12 +3,12 @@
       <el-form-item label="用户昵称" prop="nickName">
          <el-input v-model="form.nickName" maxlength="30" />
       </el-form-item>
-      <el-form-item label="手机号码" prop="phonenumber">
-         <el-input v-model="form.phonenumber" maxlength="11" />
-      </el-form-item>
-      <el-form-item label="邮箱" prop="email">
-         <el-input v-model="form.email" maxlength="50" />
-      </el-form-item>
+<!--      <el-form-item label="手机号码" prop="phonenumber">-->
+<!--         <el-input v-model="form.phonenumber" maxlength="11" />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="邮箱" prop="email">-->
+<!--         <el-input v-model="form.email" maxlength="50" />-->
+<!--      </el-form-item>-->
       <el-form-item label="性别">
          <el-radio-group v-model="form.sex">
             <el-radio value="0">男</el-radio>