添加弹出窗

src/components/icd/addDiagnose.vue

@@ -205,7 +205,6 @@
       },
       // 搜索框中输入文字 时 page=1 pageSize=30
       handleInputSearch() {
-        // debugger;
         clearTimeout(this.searchFlagTimer);
         let that = this;
         that.page = 1;

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,23 +107,8 @@
               </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">
+            <div class="button-container">
                    <el-button type="primary" size="small" @click="searchList"
               >查询</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

@@ -511,7 +511,6 @@
         this.updatedTree = true;
       },
       getTreeCheck() {
-      debugger
         //重构归并树
         let checkedTree = operationData.getSimpleCheckedNodes(
           this.$refs.tree.store
@@ -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();
   }
 };