添加弹出窗

src/components/icd/addDiagnose.vue

 <template>
   <div class="add-diagnose-wrap">
-    
+
     <div class="fixed-wrap" v-show="showDiagnoseModal">
       <div class="fullscreen-bg"></div>
       <div class="add-diagnose-modal" >
@@ -12,11 +12,11 @@
         <div class="main-content">
           <div class="left-box left">
             <!-- 搜索列表 有搜索结果时-->
-            <div 
-              v-if="searchList && searchList.length > 0" 
+            <div
+              v-if="searchList && searchList.length > 0"
               class="search-list-wrap"
-              v-infinite-scroll="loadMore" 
-              :infinite-scroll-disabled="busy" 
+              v-infinite-scroll="loadMore"
+              :infinite-scroll-disabled="busy"
               infinite-scroll-distance="5"
               infinite-scroll-immediate-check="false"
             >
@@ -36,13 +36,13 @@
                 <p v-if="noMore" class="loading">没有更多了...</p>
               </ul>
             </div>
-            
+
             <!-- 常用诊断 -->
             <div v-if="!(searchList && searchList.length > 0)" class="common-diagnose">
               <p class="title">常用诊断<span class='no-result' v-if="hasNoResult">没有找到相关搜索结果</span></p>
               <ul class="list">
-                <li 
-                  v-for="item in commonList" 
+                <li
+                  v-for="item in commonList"
                   :class="returnEachCommonLiClass(item)"
                   @click="handleEachCommonLiClick(item)"
                 >
@@ -88,14 +88,14 @@
         </span>
       </el-dialog>
     </div>
-    
+
   </div>
 </template>
 
 <script>
-  import { 
+  import {
     getCommonDiagnoseList,
-    goToSearch, 
+    goToSearch,
   } from '@/utils/patients/patientsapi';
 
   export default {
@@ -138,7 +138,7 @@
     },
     watch: {
       showDiagnoseModal(val) {
-        
+
       }
     },
     methods: {
@@ -205,7 +205,6 @@
       },
       // 搜索框中输入文字 时 page=1 pageSize=30
       handleInputSearch() {
-        // debugger;
         clearTimeout(this.searchFlagTimer);
         let that = this;
         that.page = 1;
@@ -262,7 +261,7 @@
         }
         that.busy = true;
         that.page += 1;
-        
+
         // console.log('请求第几页数据： ', that.page)
         if(that.page > that.totalPageNum){
           // console.log('没有更多了。。。。。');
@@ -296,7 +295,7 @@
           })
         }, 500)
       },
-      
+
       handleInputSearchBlur(){
         this.searchList = [];
       },
@@ -340,8 +339,8 @@
         }
         return -1;
       },
-      
-    }, 
+
+    },
   }
 </script>
 
@@ -416,7 +415,7 @@
             .common-diagnose{
               width: 100%; height: 300px;
               .title{
-                color: #303133; 
+                color: #303133;
                 font-size: 16px;
                 line-height: 40px;
                 margin-top: 10px;
@@ -432,7 +431,7 @@
                 overflow-y: scroll;
                 .scroll-bar;
                 padding: 10px;
-                border: 1px solid #DCDFE6; 
+                border: 1px solid #DCDFE6;
                 li{
                   height: 35px; line-height: 35px; padding: 0 15px;
                   background: #fff;
@@ -461,7 +460,7 @@
               .scroll-bar;
               .search-list{
                 border-radius: 4px;
-                width: 100%; 
+                width: 100%;
                 padding: 10px;
                 li{
                   position: relative;
@@ -494,7 +493,7 @@
                       .code{
                         float: left;
                       }
-                      
+
                     }
                   }
                   .right{
@@ -502,7 +501,7 @@
                     right: 0;
                     top: 50%;
                     margin-top: -13px;
-                    // width: 0px; 
+                    // width: 0px;
                     // float: left;
                     display: inline-block;
                     vertical-align: middle;
@@ -515,7 +514,7 @@
                   .code{
                     line-height: 30px;
                   }
-                  
+
                 }
                 .loading{
                     color: #ccc;
@@ -532,7 +531,7 @@
             height: 300px;
             margin-left: 30px;
             .title{
-              color: #303133; 
+              color: #303133;
               font-size: 16px;
               line-height: 40px;
               margin-top: 10px;
@@ -543,7 +542,7 @@
               width: 450px;
               height: 250px;
               padding: 10px;
-              border: 1px solid #DCDFE6; 
+              border: 1px solid #DCDFE6;
               .scroll-bar;
               .el-tag {
                 margin: 0 10px 10px 0;;
@@ -558,14 +557,14 @@
               }
             }
           }
-          
+
         }
       }
       .dialog-footer{
         text-align: center;
         margin: 20px auto;
       }
-      
+
     }
     .tips-wrap {
         .know-confirm{

src/utils/yqrange/yqrangeApi.js

@@ -255,7 +255,6 @@ export const getGoodsExportUrl = (params) => {
 };
 
 export const getOrdersExportUrl = (params) => {
-  debugger
   return fetch({
     headers,
     url: getBaseUrl('/store/orders/admin/export'),

src/views/goods/order-manage.vue

@@ -107,24 +107,9 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <!--          <el-col :span="6">-->
-          <!--            <el-form-item label="订单类型">-->
-          <!--              <el-select-->
-          <!--                v-model="searchForm.saleType"-->
-          <!--                placeholder="请选择订单类型"-->
-          <!--                size="small"-->
-          <!--                clearable>-->
-          <!--                <el-option-->
-          <!--                  v-for="item in saleTypeList"-->
-          <!--                  :key="item.value"-->
-          <!--                  :label="item.label"-->
-          <!--                  :value="item.value"-->
-          <!--                ></el-option>-->
-          <!--              </el-select>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
           <el-col :span="6" style="text-align: right">
-            <el-button type="primary" size="small" @click="searchList"
+            <div class="button-container">
+                   <el-button type="primary" size="small" @click="searchList"
               >查询</el-button
             >
             <el-button
@@ -137,6 +122,14 @@
             <el-button type="primary" size="small" @click="exportOrder"
               >导出订单</el-button
             >
+            </div>
+          <div class="button-container">
+            <el-button type="primary" size="small" @click="ExportLogisticsFlag=true">导入物流单号</el-button>
+            <el-button type="primary" size="small" @click="exportOrder"
+              >批量取消订单</el-button
+            >
+          </div>
+
           </el-col>
         </el-row>
       </el-form>
@@ -610,6 +603,40 @@
         >
       </span>
     </el-dialog>
+
+    <!-- 导入物流单号 dialog-->
+    <el-dialog
+      class="exportlogistics-dialog"
+      title="导入物流单号"
+      :visible="ExportLogisticsFlag"
+      @close="ExportLogisticsFlag = false"
+      width="600px"
+    >
+      <el-form
+        label-width="120px"
+      >
+        <el-form-item label="导入文档：">
+          <el-upload class="upload-excel"
+            action="#"
+            accept=".xlsx"
+            multiple
+            :limit="1"
+            :before-upload="uploadExcel"
+          >
+            <el-button type="primary" size="small">选择文件</el-button>
+          </el-upload>
+        </el-form-item>
+         <el-form-item label="模板：">
+           <a class="importUrl" :href="importUrl"> 物流单号修改模板.xlxs</a>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button size="small" @click="cancelExportLogistics">取消</el-button>
+        <el-button size="small" type="primary" @click="confirmExportLogistics">确认</el-button>
+      </div>
+    </el-dialog>
+
+
   </div>
 </template>
 <script>
@@ -656,6 +683,8 @@ export default {
         pageSize: 10,
         saleType: 0,
       },
+      // 确认物流
+      ExportLogisticsFlag:false,
       totalRows: 0,
       tableData: [],
       closeTradeDialog: false,
@@ -750,6 +779,7 @@ export default {
       brokerList: [],
       brokerOwnerList: [],
       showOrderNoFlag: false,
+      importUrl:"",
       pickerOptions1: {
         disabledDate: (time) => {
           return time.getTime() > new Date().getTime(); //减去一天的时间代表可以选择同一天;
@@ -765,6 +795,50 @@ export default {
     this.brokerOwnerListAll();
   },
   methods: {
+    // 取消导入物流信息
+    cancelExportLogistics(){
+      this.ExportLogisticsFlag=false
+    },
+
+    uploadExcel(file) {
+      vm.dialogFail = false;
+      vm.uploadType = "person";
+      let arr = file.type.split("/");
+      let ext = "." + arr[1];
+      let name = file.name;
+      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: "",
+            base64: fileJson
+          }
+        ];
+        let req = {
+          fileArray: fileArray,
+          scopeOfAdministrative: vm.getScope("administrative"),
+          scopeOfDepartment: vm.getScopeDepartment()
+        };
+        let projectId = vm.projectId;
+        console.log("req", req);
+        let reqStr = JSON.stringify(req);
+        openLoading(vm);
+        uploadPersonExcel(reqStr, projectId).then(res => {
+          closeLoading(vm);
+          vm.setDialog(res);
+        });
+      };
+      reader.readAsDataURL(file);
+    },
+    //确认导入物流信息
+    confirmExportLogistics(){
+      this.ExportLogisticsFlag=false
+    },
     searchList() {
       this.searchForm.orderBeginTime = this.createRangeTime[0];
       this.searchForm.orderEndTime = this.createRangeTime[1];
@@ -1114,6 +1188,9 @@ export default {
   .order-manage-content {
     background: #fff;
     padding: 10px;
+    .button-container{
+      margin-bottom: 10px;
+    }
     .header-title {
       padding: 10px 12px;
       font-size: 13px;
@@ -1205,4 +1282,10 @@ export default {
     width: 193px;
   }
 }
+.exportlogistics-dialog{
+
+}
+.importUrl{
+  color: #449284;
+}
 </style>

src/views/yqrange/edit-range.vue

@@ -171,7 +171,7 @@
     uploadPersonExcel
   } from "@/utils/education/educationApi";
   import Sortable from "sortablejs";
-  
+
   let vm = null;
   export default {
     components: {
@@ -198,7 +198,7 @@
           callback(new Error(`请输入0~100正整数`));
         }
       };
-  
+
       let checkOrgListName = (rule, value, callback) => {
         console.log(rule, value, callback);
         // const val = parseFloat(value);
@@ -210,7 +210,7 @@
         //   callback(new Error(`请输入0~100正整数`));
         // }
       };
-      
+
       return {
 
         idTypeProject: "",
@@ -238,7 +238,7 @@
         },
         projectId: null,
         peopleLevel: null,
-     
+
         orgListIndex: 0,
         pickerOptions0: {
           disabledDate: time => {
@@ -260,7 +260,7 @@
           }
         },
         fileList: [],
-     
+
         //设定机构 数据
         getRowKeys(row) {
           return row.id;
@@ -410,9 +410,9 @@
             this.formOrganization.pageNum = 1;
           this.formOrganization.name = "";
           this.formOrganization.administrativeIdList = ["0"];
-          this.formOrganization.level = "-1"; 
+          this.formOrganization.level = "-1";
       },
- 
+
       //初始化范围树
       setTreeData(administrative) {
         let treeIdList = [];
@@ -502,7 +502,7 @@
           halfCheckedTree
         );
         //重构内容
-  
+
         this.allSelectedKeys = allSelectedKeys;
         this.initCheckList(allSelectedKeys);
         //console.log("allSelectedKeys", allSelectedKeys);
@@ -511,7 +511,6 @@
         this.updatedTree = true;
       },
       getTreeCheck() {
-      debugger
         //重构归并树
         let checkedTree = operationData.getSimpleCheckedNodes(
           this.$refs.tree.store
@@ -535,7 +534,7 @@
         console.log(treeKeyList);
         this.$refs.tree.setCheckedKeys(treeKeyList);
       },
-  
+
       //删除label节点 同步树结构
       handleCloseTree(tag) {
         if (this.status4Flag != 1) {
@@ -617,7 +616,7 @@
         );
         console.log("选", this.changedPerson, "没", this.changedPerson2);
       },
-  
+
       //改变小生态 table check
       selectionChangeEcology(rows) {
         this.changedEcology = [];
@@ -775,7 +774,7 @@
           if (res.code == "000000") {
             this.tableOrganization = res.data.organizationList;
             this.totalOrganization = res.data.total;
-  
+
             vm.initOrganizationStatus();
           } else {
             vm.$message(res.message);
@@ -800,7 +799,7 @@
           if (res.code == "000000") {
             this.tableOrganization = res.data.organizationList;
             this.totalOrganization = res.data.total;
-  
+
             vm.initOrganizationStatus();
           } else {
             vm.$message(res.message);
@@ -844,7 +843,7 @@
         console.log("scope", scope);
         return scope;
       },
-  
+
       //选择搜索机构方式
       searchPeople() {
         this.formPerson.pageNum = 1;
@@ -857,7 +856,7 @@
           this.getPeopleChoose();
         }
       },
- 
+
       //判断项目范围选择
       showScopeType() {
         if (this.projectStatus == "" || this.projectStatus == 1) {
@@ -916,7 +915,7 @@
         this.changedOrganization = [];
         this.changedOrganization2 = [];
       },
- 
+
       initTags(value) {
         //console.log('value',value,'optionsComponent',this.optionsComponent);
         this.tagsComponent = [];
@@ -937,13 +936,13 @@
         }
         console.log("this.optionsComponent值：", this.optionsComponent);
       },
- 
+
       // add 校验输入是否为整数
       checkIntFun(str) {
         let r = /^\+?[0-9]*$/;
         return r.test(str);
       },
- 
+
       hideErrorInfo(str) {
         if (str) {
           this.customError[str] = {
@@ -954,14 +953,14 @@
           this.customError = {};
         }
       },
-  
+
       dioErrorPop(str) {
         return this.$message({
           message: str,
           type: "warning"
         });
       },
-  
+
    blurName() {
         vm.visibleName = false;
         setTimeout(function() {
@@ -1338,4 +1337,3 @@
     left: 0;
   }
   </style>
-  
\ No newline at end of file

static/UEditor/third-party/video-js/video.dev.js

@@ -4414,12 +4414,12 @@ vjs.SeekBar.prototype.onMouseMove = function(event){
 };
 
 vjs.SeekBar.prototype.onMouseUp = function(event){
-    debugger
+
   vjs.Slider.prototype.onMouseUp.call(this, event);
 
   this.player_.scrubbing = false;
   if (this.videoWasPlaying) {
-      debugger
+
     this.player_.play();
   }
 };