Merge branch 'dev-add-one-field-1030' into dev-circle-eight-20201103

package-lock.json

@@ -2803,10 +2803,6 @@
         "loader-utils": "~0.2.5"
       }
     },
-    "file-saver": {
-      "version": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e",
-      "from": "github:eligrey/FileSaver.js#1.3.8"
-    },
     "filename-regex": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
@@ -4467,7 +4463,6 @@
       "integrity": "sha512-J9X76xnncMw+wIqb15HeWfPMqPwYxSpPY8yWPJ7rAZN/ZDzFkjCSZObryCyUe8zbrVRNiuCnIeQteCzMn7GnWw==",
       "requires": {
         "canvg": "1.5.3",
-        "file-saver": "github:eligrey/FileSaver.js#1.3.8",
         "html2canvas": "1.0.0-alpha.12",
         "omggif": "1.0.7",
         "promise-polyfill": "8.1.0",
@@ -4487,6 +4482,10 @@
             "base64-arraybuffer": "^0.1.5"
           }
         },
+        "file-saver": {
+          "version": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e",
+          "from": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e"
+        },
         "html2canvas": {
           "version": "1.0.0-alpha.12",
           "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.0.0-alpha.12.tgz",

src/router/router.js

@@ -17,6 +17,8 @@ const editCme = r => require.ensure([], () => r(require('../views/education/edit
 const editProfessionalExam = r => require.ensure([], () => r(require('../views/education/edit-professional-exam.vue')), 'edit-professional-exam')
 const subjectManager = r => require.ensure([], () => r(require('../views/education/subject-manager.vue')), 'subject-manager')
 const editSubject = r => require.ensure([], () => r(require('../views/education/edit-subject.vue')), 'edit-subject')
+const reportDownload = r => require.ensure([], () => r(require('../views/education/report-download.vue')), 'report-download')
+
 
 import patientsRouters from './patients'
 import followRouters from './follow'
@@ -111,8 +113,11 @@ export default [{
           path: '/edit-professional-exam',
           component: editProfessionalExam
         },{
-          path: '/subject-manager',
-          component: subjectManager
+            path: '/subject-manager',
+            component: subjectManager
+        },{
+            path: '/report-download',
+            component: reportDownload
         },{
           path: '/edit-subject',
           component: editSubject

src/utils-o/env-config.js

@@ -34,6 +34,7 @@ export const envConfig = {
     // reportUrl: 'https://uat-sc-report.yunqueyi.com/',
     excelUrl: 'https://uat-file.yunqueyi.com/File/template/portal/',
     itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
+    msUrl: 'https://dev-sc.yunqueyi.com/contents/',
   },
   dev: {
     baseUrl: 'https://dev-sc.yunqueyi.com/',
@@ -51,6 +52,7 @@ export const envConfig = {
     reportUrl: 'https://dev-sc-report.yunqueyi.com/',
     excelUrl: 'https://test-file.yunqueyi.com/File/template/portal/',
     itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
+    msUrl: 'https://dev-sc.yunqueyi.com/contents/',
   },
   test: {
     baseUrl: 'https://test1-sc.yunqueyi.com/',
@@ -68,6 +70,7 @@ export const envConfig = {
     reportUrl: 'https://test1-sc-report.yunqueyi.com/',
     excelUrl: 'https://test-file.yunqueyi.com/File/template/portal/',
     itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
+    msUrl: 'https://test1-sc.yunqueyi.com/contents/',
   },
   test2: {
     baseUrl: 'https://test2-work.yunqueyi.com/sc/',
@@ -84,6 +87,7 @@ export const envConfig = {
     reportUrl: 'https://test2-sc-report.yunqueyi.com/',
     excelUrl: 'https://test-file.yunqueyi.com/File/template/portal/',
     itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
+    msUrl: 'https://test2-sc.yunqueyi.com/contents/',
   },
   uat: {
     baseUrl: 'https://uat-sc.yunqueyi.com/',
@@ -101,6 +105,7 @@ export const envConfig = {
     reportUrl: 'https://uat-sc-report.yunqueyi.com/',
     excelUrl: 'https://test-file.yunqueyi.com/File/template/portal/',
     itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
+    msUrl: 'https://uat-sc.yunqueyi.com/contents/',
   },
   pro: {
     baseUrl: 'https://sc.yunqueyi.com/',
@@ -118,5 +123,6 @@ export const envConfig = {
     reportUrl: 'https://sc-report.yunqueyi.com/',
     excelUrl: 'https://file.yunqueyi.com/File/template/portal/',
     itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
+    msUrl: 'https://sc.yunqueyi.com/contents/',
   }
 }

src/utils-o/fetch.js

@@ -56,7 +56,7 @@ service.interceptors.request.use(config => {
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
       // config.headers['token'] = 'BFD804F3A3194FBBBE113962222839F6';
       // config.headers['token'] = 'F8209898391C40A0B8DBC1ED9E157291';
-      config.headers['token'] = 'F64D5633857D4E16B3C2CCE5E48B0D1E';
+      config.headers['token'] = 'AAAA3AA4233E45CCBE5CABD476C9D6F8';
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')
     }

src/utils/cme/cmeApi.js

@@ -15,6 +15,22 @@ export const getUserTypeReq = (type) => {
   })
 };
 
+// 获取动态slideBar
+export const getSlideData = (req) => {
+  console.log("getSlideData() : token = " + localStorage.getItem('storageToken') + ", device_ip =" +
+    localStorage.getItem("ipAddress") + ", browser_ver = " + localStorage.getItem("browser"));
+  return fetch({
+    headers,
+    url: getBaseUrl(`contents/login/menu/list`),
+    method: 'post',
+    data: req,
+    // token: localStorage.getItem('storageToken'),
+    // system_type: 22,
+    // device_ip: localStorage.getItem("ipAddress"),
+    // browser_ver: localStorage.getItem("browser"),
+  })
+};
+
 export const getSelectListReq = (type) => {
   return fetch({
     url: getBaseUrl(`cme/constants/list?code=${type}`),

src/utils/yqrange/yqrangeApi.js

@@ -240,7 +240,28 @@ export const saveRankConfig = (params) => {
     url: getBaseUrl(`circle/rank/config/save`),
     method: 'post',
     data: params,
-    description: '保存排行榜配置',
+    description: '保存排行榜配置'
+  })
+};
+
+export const getGoodsExportUrl = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl('store/goods/export'),
+    method: 'post',
+    data: params,
+    description: '商品导出',
+  })
+};
+
+export const getOrdersExportUrl = (params) => {
+  debugger
+  return fetch({
+    headers,
+    url: getBaseUrl('/store/orders/admin/export'),
+    method: 'get',
+    params: params,
+    description: '导出订单',
   })
 };
 

src/views/education/report-download.vue

+<template>
+  <div class="report-download-wrap">
+    <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond"></bread-crumb>
+
+    <div class="component-content screenSet" id="screenSet" style="min-height: 300px;">
+      <div class="header-title">汇总与明细表下载</div>
+
+      <el-form class="demo-form-inline" >
+        <el-form-item>
+          <el-button size="small" type="primary" @click="download">汇总与明细表下载</el-button>
+        </el-form-item>
+      </el-form>
+
+      <!-- 删除 弹窗 -->
+      <!-- <el-dialog
+        title="确认要删除该项目模版吗？"
+        :show-close=false
+        :visible.sync="deleteVisible"
+        :close-on-click-modal="false"
+        width="600px"
+        center>
+        <p style="text-align: center;">删除后该模版将不在列表显示</p>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="deleteVisible=false">取 消</el-button>
+          <el-button type="primary" @click="confirmDelete">删 除</el-button>
+        </span>
+      </el-dialog> -->
+
+    </div>
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "../../components/breadcrumb.vue";
+import dialog from "../../components/education/template/dialog";
+import { openLoading, closeLoading } from "../../utils/utils";
+import * as commonUtil from "../../utils/utils";
+let vm = null;
+export default {
+  data() {
+    return {
+      curmbFirst: "教培项目",
+      curmbSecond: "汇总与明细表下载",
+    }
+  },
+  components: {
+    BreadCrumb,
+    dialogCompont: dialog
+  },
+  created() {
+    vm = this;
+  },
+  mounte() {
+    // commonUtil.resizeHeight();
+  },
+  methods: {
+
+    // 查询列表
+    download() {
+      let req = {};
+      // req = vm.formInline;
+      openLoading(vm);
+      vm.POST("stats/export/whole", req).then(res => {
+        closeLoading(vm);
+        if (res.code == "000000") {
+          if(res.data == 1) {
+            vm.$message.success('下载成功，请移至“下载报告”页面的“导出列表”中查看');
+          } else {
+            vm.$message.error('下载失败，请联系管理员或拨打咨询电话：400-920-8877');
+          }
+        }
+      });
+    },
+    
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+  .report-download-wrap {
+    .component-content {
+      background: #fff;
+      padding: 10px;
+      .header-title {
+        padding: 10px 12px 10px 0;
+        font-size: 12px;
+        color: #449284;
+        border-bottom: 1px solid #efefef;
+      }
+      .demo-form-inline {
+        margin-top: 20px;
+      }
+    }
+  }
+</style>

src/views/goods/create-good.vue

@@ -402,6 +402,17 @@
                 </el-col>
               </el-form-item>
             </div>
+            <div class="inline">
+              <el-form-item label="第三方商品编码" prop="externalGoodsCode">
+                <el-col :span="20">
+                  <el-input
+                      size="small"
+                      v-model="formData.externalGoodsCode"
+                      placeholder="请输入第三方商品编码"
+                  ></el-input>
+                </el-col>
+              </el-form-item>
+            </div>
           </div>
         </el-form>
 
@@ -541,6 +552,7 @@
           decrStock:'',//减少库存
           incrStock:'',//增加库存
           storeId: '',
+          externalGoodsCode: '', 
         },
         showCropper: false,
         currentOption: {

src/views/goods/goods-manage.vue

@@ -33,13 +33,14 @@
           </el-col>
         </el-row>
         <el-row :gutter="30" type="flex" style="margin-top: 10px">
-          <el-col :span="18">
+          <el-col :span="12">
             <el-button type="primary" size="small" @click="batchOpt('on')">批量上架</el-button>
             <el-button type="primary" size="small" @click="batchOpt('off')">批量下架</el-button>
           </el-col>
 
-          <el-col :span="6" style="text-align: right">
-            <el-button type="primary" size="small" @click="batchOpt(3)">批量导入</el-button>
+          <el-col :span="12" style="text-align: right">
+            <el-button type="primary" size="small" @click="exportOpt">批量导出商品</el-button>
+            <el-button type="primary" size="small" @click="batchOpt(3)">批量导入商品</el-button>
             <el-button type="primary" size="small" @click="edit('add')">新建单个商品</el-button>
           </el-col>
         </el-row>
@@ -173,7 +174,7 @@
 <script>
   import { openLoading, closeLoading } from "../../utils/utils";
   import BreadCrumb from "@/components/breadcrumb.vue";
-  import { getRangeList,updateRangeStatus} from "../../utils/yqrange/yqrangeApi";
+  import { getRangeList,updateRangeStatus, getGoodsExportUrl, getOrdersExportUrl } from "../../utils/yqrange/yqrangeApi";
   import { getGoodsList,batchOnOff,uploadExcel} from '@/utils/goods';
   import { getBaseUrl } from '@/utils/index'
   var typeList = [{
@@ -406,7 +407,7 @@
               setTimeout(()=>{
                 this.getLists()
               },2000)
-              
+
             }
           })
         }
@@ -524,7 +525,6 @@
         this.getLists();
       },
 
-
       handleSizeChange(val) {
         this.searchForm.pageSize = val;
         this.searchForm.pageNo = 1;
@@ -534,6 +534,17 @@
         this.searchForm.pageNo = val;
         this.getLists();
       },
+      exportOpt() {
+        const { goodsIdList, goodsType, goodsName, storeId } = this.searchForm;
+
+        getGoodsExportUrl({ goodsIdList, goodsType, goodsName, storeId }).then(res => {
+          if (res.code != '000000') {
+            this.$message({ message: res.message, type: 'error' });
+            return;
+          }
+          window.open(res.data);
+        });
+      }
     },
   }
 </script>

src/views/goods/order-manage.vue

@@ -29,6 +29,7 @@
           <el-col :span="6" style="text-align: right">
             <el-button type="primary" size="small" @click="searchList">查询</el-button>
             <el-button type="default" size="small" @click="resetForm" style="margin-left:0;">重置</el-button>
+            <el-button type="primary" size="small" @click="exportOrder">导出订单</el-button>
           </el-col>
         </el-row>
       </el-form>
@@ -238,6 +239,7 @@
   // import { openLoading, closeLoading } from "../../utils/utils";
   import BreadCrumb from "@/components/breadcrumb.vue";
   import SendSetDialog from "@/components/shop/send-set-dialog";
+  import { getOrdersExportUrl } from "@/utils/yqrange/yqrangeApi";
   import { queryOrderList, updateExpress, refundApply } from "@/utils/shop";
   import { toDecimal2 } from '@/utils';
 
@@ -489,6 +491,17 @@
           }
         });
       },
+      exportOrder() {
+        const { goodsName, orderNo, receiver, orderDate, storeId } = this.searchForm;
+
+        getOrdersExportUrl({ goodsName, orderNo, receiver, orderDate, storeId }).then(res => {
+          if (res.code != '000000') {
+            this.$message({ message: res.message, type: 'error' });
+            return;
+          }
+          window.open(res.data);
+        });
+      }
     },
     filters: {
       toFixed2: function (value) {

src/views/shop/create-shop.vue

@@ -705,6 +705,7 @@
           //   adminList:this.formData.adminList,
           // }
           this.formData.storeType = Number(this.formData.storeType);
+          this.formData.storeEntry = 'PCKAIDIAN'; // 添加店铺渠道
           console.log('提交的数据',this.formData)
           saveStore(this.formData).then(res => {
             if (res.code == '000000') {