其它出库 导入execl sxm 2021-10-28

src/views/modules/common/excelUpload.vue

@@ -20,38 +20,34 @@
         url: '',
         num: 0,
         successNum: 0,
-        fileList: []
+        fileList: [],
+        rollList: {}
       }
     },
     methods: {
       init (id) {
-        this.url = this.$http.adornUrl(`/excel/file/upload?token=${this.$cookie.get('token')}&folder=`+this.folder)
-        console.log(this.url)
+        this.url = this.$http.adornUrl(`/file/excel/upload?token=${this.$cookie.get('token')}`)
         this.visible = true
       },
       // 上传之前
       beforeUploadHandle (file) {
-        // if (file.type !== 'image/jpg' && file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/gif') {
-        //   this.$message.error('只支持jpg、png、gif格式的图片！')
-        //   return false
-        // }
+        if (file.type !== "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" && file.type !== "application/vnd.ms-excel" ) {
+          this.$message.error('只支持xls、xlsx、格式的文件！')
+          return false
+        }
         this.num++
       },
       // 上传成功
       successHandle (response, file, fileList) {
-        this.fileList =   fileList.map(item => {
-          return item.response.ossEntity
-        })
-        this.successNum++
         if (response && response.code === 0) {
+          this.rollList = response
           this.childClick()
         } else {
           this.$message.error(response.msg)
         }
       },
       childClick () {
-        // childByValue是在父组件on监听的方法
-        this.$emit('childByValue', this.fileList)
+        this.$emit('excelUploadChild', this.rollList)
       }
     },
     created() {

src/views/modules/finishedProductWarehouse/otherOut.vue

@@ -5,26 +5,9 @@
          <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>
         </span>
     </div>
-    <el-button @click="searchList()" type="primary">{{buttons.search}}</el-button>
-    <el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}}
-    </el-button>
-    <el-button @click="userSetting" type="primary">{{ buttons.settingTable}}</el-button>
-    <el-form v-show="searchShow" :inline="true" :model="queryData" @keyup.enter.native="getDataList()">
-      <excelUpload></excelUpload>
-      <el-form-item label="呆滞天数">
-        <el-input oninput="value=value.replace(/[^\d]/g,'')" v-model="queryData.day" clearable>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="rollno">
-        <el-input v-model="queryData.rollno" clearable>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="partno">
-        <el-input v-model="queryData.partno" clearable>
-        </el-input>
-      </el-form-item>
+    <el-form :inline="true">
       <el-form-item>
-        <el-button @click="getDataList()" type="primary">{{ buttons.search }}</el-button>
+        <excelUpload  v-on:excelUploadChild="excelUploadChild"></excelUpload>
       </el-form-item>
     </el-form>
     <el-table
@@ -128,62 +111,20 @@
     })
   },
   activated() {
-      this.getDataList()
   },
+
   methods: {
-      childByValue(childValue) {
+    excelUploadChild(childValue) {
       // childValue就是子组件传过来的值
        console.log(childValue)
-        this.getDataList(childValue)
-      },
-      // 打开搜索页面
-      searchList() {
-        if (this.searchShow) {
-          this.searchShow = false
-          return
+      if (childValue.list.length>0){
+        this.dataList = childValue.list
+        this.$message.success("批量出库成功")
       }else {
-          this.searchShow = true
-        }
-      },
-      // 获取数据列表
-      getDataList() {
-        this.dataListLoading = true
-        let query = []
-        let f = {
-          queryAttributes: "parttypeFlag",
-          queryType: "string",
-          queryValue: "F",
-        }
-        query.push(f)
-        let toexpiredays = {
-          queryAttributes: "toexpiredays",
-          queryType: "number",
-          queryValue: this.queryData.day,
+        this.$message.warning("批量出库失败")
       }
-        query.push(toexpiredays)
-        if (this.queryData.rollno != '') {
-          let rollno = {
-            queryAttributes: "rollno",
-            queryType: "string",
-            queryValue: this.queryData.rollno,
-          }
-          query.push(rollno)
-        }
-        if (this.queryData.partno != '') {
-          let partno = {
-            queryAttributes: "partno",
-            queryType: "string",
-            queryValue: this.queryData.partno,
-          }
-          query.push(partno)
-        }
-        getCRollInfoList(query).then(({data}) => {
-          if (data && data.code === 0) {
-            this.dataList = data.list
-          }
-          this.dataListLoading = false
-        })
-       // this.searchShow = false
+
+
     },
     // 校验用户是否收藏
     favoriteIsOk() {

src/views/modules/job/schedule.vue

@@ -223,7 +223,7 @@
         var ids = id ? [id] : this.dataListSelections.map(item => {
           return item.jobId
         })
-        this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '恢复' : '批量恢复'}]操作?`, '提示', {
+        this.$confirm(`确定进行[${id ? '恢复' : '批量恢复'}]操作?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'