Merge branch 'dev-market-20200813' of...

Merge branch 'dev-market-20200813' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-market-20200813

src/utils/goods/index.js

@@ -13,6 +13,17 @@ export const getGoodsList = (params) => {
     description: '商品列表查询',
   })
 };
+export const uploadExcel = data => {
+  // return utils.checkAuth(()=>{
+    return fetch({
+      headers,
+      url:  getBaseUrl(`store/goods/import`),
+      method: 'post',
+      data: data,
+      description: '上传excel文件',
+    })
+  // })
+}
 //
 export const batchOnOff = (params) => {
   return fetch({

src/views/goods/create-good.vue

@@ -106,7 +106,7 @@
                     placeholder="请输入批准文号"
                     style="width:50%;"
                 ></el-input>
-                <span class="fast-opt">快速录入</span>
+                <span class="fast-opt" @click="fastInput">快速录入</span>
                 <span class="word-num">(点击可快速录入下面的药品信息)</span>
               </el-col>
             </el-form-item>
@@ -679,6 +679,27 @@
           //this.totalRows = res.data.totalCount
         })
       },
+
+      //快速录入
+      fastInput(){
+        ///medications/query/{approvalnumber}
+        this.GET("store/medications/query/"+this.formData.approvalNumber).then(res => {
+            console.log(res)
+            if(res.code != '000000'){
+              return this.$message({
+                message: res.message,
+                type: 'error'
+              });
+            }
+            if(res.data == null){
+              return this.$message({
+                message: '未查询到数据，请手动输入',
+                type: 'error'
+              });
+            }
+
+        });
+      },
       getGoodsTypes(id,type){
         if(id == 5 ){
           this.isMedic = true;

src/views/goods/goods-manage.vue

@@ -75,7 +75,7 @@
             <span>{{scope.row.costPrice | rangePrice}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="createTime" label="发布时间" width="150" align="center">
+        <el-table-column prop="saleTime" label="发布时间" width="150" align="center">
 
         </el-table-column>
 
@@ -127,7 +127,7 @@
       <div class="batch-dia">
         <div class="batch-dia-item">
           <span class="s-l">1、下载模板</span>
-          <span class="s-r"><i class="el-icon-upload"></i>下载</span>
+          <span class="s-r" @click="uploadTemp"><i class="el-icon-upload"></i>下载</span>
         </div>
         <div class="batch-dia-item">
           <span class="s-l">2、根据模板填写信息</span>
@@ -138,12 +138,13 @@
           <span class="s-r">
             <el-upload
               class="upload-demo"
-              action="https://jsonplaceholder.typicode.com/posts/"
+              action="#"
               :on-preview="handlePreview"
               :on-remove="handleRemove"
               :before-remove="beforeRemove"
+              :before-upload="getBatchUpload"
               multiple
-              :limit="3"
+              :limit="1"
 
               :file-list="fileList">
                  <i class="el-icon-upload"></i>上传
@@ -162,7 +163,8 @@
   import { openLoading, closeLoading } from "../../utils/utils";
   import BreadCrumb from "@/components/breadcrumb.vue";
   import { getRangeList,updateRangeStatus} from "../../utils/yqrange/yqrangeApi";
-  import { getGoodsList,batchOnOff} from '@/utils/goods';
+  import { getGoodsList,batchOnOff,uploadExcel} from '@/utils/goods';
+  import { getBaseUrl } from '@/utils/index'
   var typeList = [{
           categoryName: "短信额度",
           id: 1,
@@ -210,12 +212,15 @@
         totalRows: 0,
         tableData: [],
         goodsTypes:[],
-        typeList: []
+        typeList: [],
+        //uploadUrl:getBaseUrl('store/goods/import'),
+        postData:{},
       }
     },
     created() {
       this.getLists()
       this.getLever()
+
     },
     filters:{
       rangeType(type){
@@ -255,6 +260,65 @@
         console.log(val)
         this.selectList = val
       },
+
+      //批量上传
+      getBatchUpload(file) {
+        let self = this;
+        let arr = file.type.split('/');
+        let ext = "." + arr[1];
+        let name = file.name;
+        let type = name.substring(name.lastIndexOf('.') + 1);
+        if (type !== 'xls' && type !== 'xlsx') {
+          self.$message({
+            message: '上传文件只能是 xls、xlsx格式!',
+            type: 'warning'
+          });
+         return;
+        }
+        let reader = new FileReader();
+        reader.onload = function (e) {
+            let fileJson = {
+                fileName: file.name,
+                file: e.target.result.substr(e.target.result.indexOf("base64,") + 7),
+                ext: ext
+            };
+
+            let fileArray = [{
+                type: 'patient',
+                base64: fileJson
+            }];
+
+            let req = {
+                fileArray: fileArray,
+                import_type: 2,
+            };
+            req.token = localStorage.getItem('storageToken');
+            self.postData = JSON.stringify(req);
+
+            uploadExcel(self.postData).then(res => {
+              if(res.code != '000000'){
+                return self.$message({
+                  message: '上传失败，请重新上传!',
+                  type: 'error'
+                });
+              }
+              self.$message({
+                message: '上传成功!',
+                type: 'success'
+              });
+              self.batchDialog = false
+              setTimeout(()=>{
+                self.getLists()
+              },2000)
+
+            })
+        };
+        reader.readAsDataURL(file);
+      },
+      uploadTemp(){
+        let url = ""
+        window.href = url
+      },
       getLever(id=0){
 
         this.GET("store/category/"+id).then(res => {