Merge branch 'master' of https://gitee.com/vansfa/rt_companyUI

src/api/company/tcmScheduleReport.js

@@ -52,6 +52,13 @@ export function listSchedule(query) {
   })
 }
 
+export function getTcmScheduleList() {
+  return request({
+    url: '/company/tcmScheduleReport/getTcmScheduleList',
+    method: 'get'
+  })
+}
+
 // 查询中医档期管理列表
 export function listAllSchedule(query) {
   return request({

src/views/company/tcmScheduleReport/add.vue

@@ -318,7 +318,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {  getTcmScheduleReport, addTcmScheduleReport, updateTcmScheduleReport,listAllSchedule } from "@/api/company/tcmScheduleReport";
 
 export default {
-  name: "TcmScheduleReport",
+  name: "TcmScheduleAdd",
   components: { Treeselect },
   data() {
      const registerNumRule = (rule, value, callback) => {

src/views/company/tcmScheduleReport/companyReport.vue

@@ -68,7 +68,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>
       <el-table-column fixed label="总消费" width="90" align="center" prop="money"   >
@@ -174,7 +174,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { listAllSchedule, getTcmScheduleReport, exportCompanyScheduleReport,statisticsReportList } from "@/api/company/tcmScheduleReport";
 
 export default {
-  name: "TcmScheduleReport",
+  name: "TcmCompanyReport",
   components: { Treeselect },
   data() {
 

src/views/company/tcmScheduleReport/statisticsReport.vue

@@ -218,7 +218,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { listTcmScheduleReport,listAllSchedule, getTcmScheduleReport, exportTcmScheduleReport } from "@/api/company/tcmScheduleReport";
 
 export default {
-  name: "TcmScheduleReport",
+  name: "TcmScheduleStatistics",
   components: { Treeselect },
   data() {
 

src/views/store/components/productOrder.vue

@@ -103,6 +103,10 @@
                   {{order.deliveryId }}
                 </span>
             </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 }}
@@ -275,6 +279,16 @@
                     />
             </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="mark"  >
           <el-input v-model="editForm.mark" placeholder="请输入备注" />
         </el-form-item>
@@ -437,7 +451,7 @@
 
 <script>
 import {updateUser,getUser } from "@/api/users/user";
-
+import { getTcmScheduleList } from "@/api/company/tcmScheduleReport";
 import {getCustomerListBySearch } from "@/api/crm/customer";
 import ImageUpload from '@/components/ImageUpload'
 import {bindCustomer,getExpress, listStoreOrder, getStoreOrder, delStoreOrder, addStoreOrder, updateStoreOrder, exportStoreOrder,uploadCredentials } from "@/api/store/storeOrder";
@@ -449,6 +463,7 @@ export default {
     ImageUpload },
   data() {
     return {
+      scheduleOptions:[],
       dialogVisibleImage: false,
       customerInfo:null,
       customer:{
@@ -521,6 +536,7 @@ export default {
       },
       editForm:{
         orderType:null,
+        scheduleId:null,
         mark:"",
       },
       editRules:{
@@ -553,7 +569,9 @@ export default {
     this.getDicts("store_order_create_type").then((response) => {
       this.createTypeOptions = response.data;
     });
-   
+    getTcmScheduleList().then(response => {
+      this.scheduleOptions = response.data;
+    });
   },
   methods: {
     showImageDialog() {
@@ -749,6 +767,8 @@ export default {
         if(this.order.orderType!=null){
           this.editForm.orderType=this.order.orderType.toString();
         }
+        this.editForm.scheduleId=this.order.scheduleId;
+        
     },
     getOrder(orderId){
         this.orderId=orderId;

src/views/store/storeOrder/list.vue

@@ -144,6 +144,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>
@@ -286,7 +296,7 @@
 import {exportStoreOrderItems, createUserOrder,listStoreOrder, getStoreOrder, delStoreOrder, addStoreOrder, updateStoreOrder, exportStoreOrder } from "@/api/store/storeOrder";
 import { getUserList } from "@/api/users/user";
 import { getAddressList } from "@/api/users/userAddress";
-
+import { getTcmScheduleList } from "@/api/company/tcmScheduleReport";
 import productOrder from "../components/productOrder";
 import productSelect from "../components/productSelect";
 import addUser from "../components/addUser";
@@ -370,6 +380,7 @@ export default {
       createTimeRange:[],
       payTimeRange:[],
       deliveryImportTimeRange:[],
+      scheduleOptions:[],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -467,7 +478,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: {