admin前端bug提交 10.24 zyp

src/api/company/schedule.js

@@ -50,4 +50,11 @@ export function exportSchedule(query) {
     method: 'get',
     params: query
   })
+}
+
+export function getTcmScheduleList() {
+  return request({
+    url: '/company/schedule/getTcmScheduleList',
+    method: 'get'
+  })
 }

src/views/company/schedule/config.vue

@@ -138,7 +138,7 @@
 import { listSchedule, getSchedule, delSchedule, addSchedule, updateSchedule, exportSchedule } from "@/api/company/schedule";
 
 export default {
-  name: "Schedule",
+  name: "ScheduleList",
   data() {
     return {
       // 遮罩层

src/views/company/schedule/statistics.vue

@@ -113,7 +113,7 @@
 
       <el-table-column fixed label="人均受线" width="90" align="center" prop="preMoney"   >
           <template slot-scope="scope">
-            {{!scope.row.money?0:(scope.row.totalNum/scope.row.cuCount).toFixed(2)}}
+            {{!scope.row.money?0:(scope.row.totalNum/scope.row.connectionNum).toFixed(2)}}
           </template>
       </el-table-column>
 
@@ -395,7 +395,7 @@ export default {
      // 监听companyIdArr
     'companyIdArr':'companyChange'
   },
-  name: "TcmScheduleReport",
+  name: "TcmScheduleStatistics",
   components: { Treeselect,companySchedule },
   data() {
     return {

src/views/qw/qwAccounts/index.vue

@@ -20,15 +20,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="手机号码" prop="phone">
-        <el-input
-          v-model="queryParams.phone"
-          placeholder="请输入手机号码"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>   
+
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -47,20 +39,33 @@
       </el-col>
     </el-row>
     <el-tabs type="card" v-model="queryParams.isAudit" @tab-click="handleClick">
-      <el-tab-pane label="待审核" name="0"></el-tab-pane>
       <el-tab-pane label="已通过" name="1"></el-tab-pane>
+      <el-tab-pane label="待审核" name="0"></el-tab-pane>
       <el-tab-pane label="已驳回" name="-1"></el-tab-pane>
     </el-tabs>
-    <el-table v-loading="loading" :data="accountList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="accountList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号"  width="55" type="index" align="center" />
       <el-table-column label="id" align="center" prop="id" />
       <el-table-column label="企微账号" align="center" prop="account" />
-      <el-table-column label="姓名" align="center" prop="nickName" />
-      <el-table-column label="手机号码" align="center" prop="phone" />
+      <el-table-column label="头像" align="center" width="120">
+        <template slot-scope="scope">
+          <el-popover
+            placement="right"
+            title=""
+            trigger="hover"
+          >
+            <img slot="reference" :src="scope.row.avatar" width="70">
+            <img :src="scope.row.avatar" style="max-width: 120px;">
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column label="昵称" align="center" prop="nickName" />
+      <el-table-column label="企业名称" align="center" prop="corpName" />
       <el-table-column label="归属公司" align="center" prop="companyName" />
       <el-table-column label="归属员工" align="center" prop="companyUserName" />
-      <el-table-column width="500" label="关联设备id" align="center" prop="deviceId"  v-if="queryParams.isAudit == 1"/>
+      <el-table-column width="300" label="关联设备id" align="center" prop="deviceId"  v-if="queryParams.isAudit == 1"/>
+      <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -161,7 +166,7 @@ export default {
         deviceId: null,
         deptId: null,
         companyUserId: null,
-        isAudit: 0,
+        isAudit: 1,
       },
       // 表单参数
       form: {},

src/views/store/components/productOrder.vue

@@ -147,6 +147,10 @@
                 <span slot="reference">{{order.userAddress}}</span>
               </el-popover>
             </el-descriptions-item>
+            <el-descriptions-item label="档期归属"  >
+              <el-tag prop="scheduleId" v-for="(item, index) in scheduleOptions"    v-if="order!=null&&order.scheduleId==item.id">{{item.name}}
+              </el-tag>
+            </el-descriptions-item>
             <el-descriptions-item label="用户备注"  >
                 <span v-if="order!=null">
                   {{order.mark}}
@@ -336,11 +340,21 @@
             <el-option key="1"  label="待发货" value="1" />
              <el-option key="2"  label="待收货" value="2" />
              <el-option key="3"  label="交易成功" value="3" />
-             <el-option key="-2"  label="退款中" value="-1" />
+             <el-option key="-1"  label="退款中" value="-1" />
              <el-option key="-2"  label="已退款" value="-2" />
              <el-option key="-3"  label="已取消" value="-3" />
            </el-select>
          </el-form-item>
+         <el-form-item label="档期归属" prop="scheduleId"  >
+            <el-select filterable style="width: 200px" v-model="editForm.scheduleId" placeholder="请选择档期" clearable size="small" >
+              <el-option
+                      v-for="item in scheduleOptions"
+                      :key="item.id"  
+                      :label="item.name"
+                      :value="item.id"
+                    />
+            </el-select>
+        </el-form-item>
          <el-form-item label="详情地址" prop="userAddress"  >
           <el-input v-model="editForm.userAddress" placeholder="请输入" />
         </el-form-item>
@@ -445,6 +459,7 @@
 
 <script>
 import {auditPayRemain,addTuiMoney,syncExpress,updateExpress,getEroOrder,refundOrderMoney, editTuiMoney,getExpress,finishOrder,listStoreOrder, getStoreOrder, delStoreOrder, addStoreOrder, updateStoreOrder, exportStoreOrder,updateDeliveryId, createErpOrder} from "@/api/store/storeOrder";
+import { getTcmScheduleList } from "@/api/company/schedule";
 export default {
   name: "order",
   data() {
@@ -453,6 +468,8 @@ export default {
       createTypeOptions:[],
       deliveryStatusOptions:[],
       deliveryTypeOptions:[],
+      scheduleOptions:[],
+      schedules:[],
       orderId:null,
       erpDialog:{
         title:"ERP订单信息",
@@ -478,6 +495,7 @@ export default {
         status:null,
         userAddress:null,
         // extendOrderId:null,
+        scheduleId:null,
         mark:"",
       },
 
@@ -528,6 +546,9 @@ export default {
     this.getDicts("store_order_create_type").then((response) => {
       this.createTypeOptions = response.data;
     });
+    getTcmScheduleList().then(response => {
+      this.scheduleOptions = response.data;
+    });
   },
   methods: {
     showImageDialog() {
@@ -703,6 +724,7 @@ export default {
         this.editForm.orderType=this.order.orderType.toString();
         this.editForm.status = this.order.status.toString();
         this.editForm.userAddress = this.order.userAddress.toString();
+        this.editForm.scheduleId = this.order.scheduleId;
         // this.editForm.extendOrderId = this.order.extendOrderId.toString();
         
     },

src/views/store/storeOrder/index.vue

@@ -156,6 +156,16 @@
           end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="档期归属" prop="scheduleId"  >
+            <el-select filterable style="width: 200px" v-model="queryParams.scheduleId" placeholder="请选择档期" clearable size="small" >
+              <el-option
+                      v-for="item in scheduleOptions"
+                      :key="item.id"  
+                      :label="item.name"
+                      :value="item.id"
+                    />
+            </el-select>
+        </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -473,7 +483,7 @@ import addUserAddress from "../components/addUserAddress";
 import { getToken } from "@/utils/auth";
 import QRCode from 'qrcodejs2'
 import { getCompanyList } from "@/api/company/company";
-
+import { getTcmScheduleList } from "@/api/company/schedule";
 import { treeselect } from "@/api/company/companyDept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -489,6 +499,7 @@ export default {
     return {
       importMsgOpen:false,
       importMsg:"",
+      scheduleOptions:[],
       deliveryPayStatusOptions:[],
       deliveryStatusOptions:[],
       companys:[],
@@ -660,7 +671,9 @@ export default {
     this.getDicts("store_delivery_pay_status").then((response) => {
       this.deliveryPayStatusOptions = response.data;
     });
-    
+    getTcmScheduleList().then(response => {
+      this.scheduleOptions = response.data;
+    });
     this.getList();
   },
   methods: {