瀏覽代碼

no message

linwenxin 1 年之前
父節點
當前提交
99cfbb5b70

+ 5 - 0
src/api/workOrderPool.js

@@ -1,6 +1,11 @@
 import request, { postBlob, getBlob, handleImport } from '@/utils/request'
 
 
+
+export function orderBaseImport(data) {
+  return handleImport('/order/base/import', data.formdata, data.id || '')
+}
+
 export function orderBaseSettleNormConfirm(data) {
   return request({
     url: `/order/base/settle/norm/confirm`,

+ 9 - 1
src/components/template/import_mixin.js

@@ -7,6 +7,12 @@ export default {
             action={'_'}
             show-file-list={false}
             http-request={data => {
+              const loading = this.$loading({
+                lock: true,
+                text: '正在导入',
+                spinner: 'el-icon-loading',
+                background: 'rgba(0, 0, 0, 0.7)'
+              })
               fun1 && fun1()
               var formdata = new FormData()
               formdata.append('file', data.file)
@@ -21,6 +27,7 @@ export default {
                 .then(res => {
                   fun2 && fun2()
                   this.$refs.pageRef.refreshList()
+                  loading.close()
                   this.$message({
                     type: 'success',
                     message: '导入成功!'
@@ -28,6 +35,7 @@ export default {
                 })
                 .catch(err => {
                   fun2 && fun2()
+                  loading.close()
                   this.$message({
                     type: 'error',
                     message: err.message || '导入失败'
@@ -35,7 +43,7 @@ export default {
                 })
             }}
           >
-            <span style={{color:'#fff !important'}}>{name}</span>
+            <span class="teshudeshangchuananniu">{name}</span>
           </el-upload>
         )
     }

+ 10 - 6
src/components/template/template-page-1.vue

@@ -194,13 +194,13 @@ export default {
     this.getZfireParamList()
   },
   methods: {
-    insertionData(...p){
+    insertionData(...p) {
       this.$refs.zjpage.insertionData(...p)
     },
-    deleteRowData(...p){
+    deleteRowData(...p) {
       this.$refs.zjpage.deleteRowData(...p)
     },
-    tableForm(){
+    tableForm() {
       return this.$refs.zjpage.$refs.tableForm
     },
     getTimeDay(num = 0) {
@@ -492,7 +492,7 @@ export default {
       }
       const loading = this.$loading({
         lock: true,
-        text: 'Loading',
+        text: '正在导出',
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
@@ -523,8 +523,8 @@ export default {
           return item
         })
       }
-      var newPms = {} 
-      var res = await this.getList(pms, (data)=>{
+      var newPms = {}
+      var res = await this.getList(pms, (data) => {
         newPms = data
       })
       // alert('接收到数据断点')
@@ -674,4 +674,8 @@ export default {
   margin-left: 0 !important;
   margin-right: 10px !important;
 }
+
+::v-deep .teshudeshangchuananniu {
+  color: #fff !important;
+}
 </style>

+ 29 - 34
src/views/workOrder/workOrderPool/index.vue

@@ -37,11 +37,12 @@ import { EventBus } from '@/utils/eventBus'
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
 import { listPageV2 } from "@/api/workOrder/orderType";
-import { orderBaseList, orderBaseListExport, orderBaseStatusCount } from "@/api/workOrderPool.js"
+import { orderBaseList, orderBaseListExport, orderBaseStatusCount, orderBaseImport } from "@/api/workOrderPool.js"
 import workOrderInfo from './detailModule/workOrderInfo/index.vue'
 import Detail from './detail'
 import Reassignment from "./components/reassignment/index.vue"
 import Reschedule from "./components/reschedule/index.vue"
+import { commonTemplateDownload } from '@/api/common.js'
 export default {
   components: {
     TemplatePage,
@@ -118,6 +119,33 @@ export default {
           ],
           [
             {
+              name: '导入工单',
+              click: () => { }
+            },
+            {
+              name: '导入模板',
+              render: () => {
+                return this.importButton(orderBaseImport, '导入模板')
+              }
+            },
+            {
+              name: '工单导入模板',
+              click: () => {
+                commonTemplateDownload({ name: '工单导入模板.xlsx' }, `${this.$route.meta.title}`)
+                  .then(res => {
+                    this.$message({
+                      message: '下载成功',
+                      type: 'success'
+                    })
+                  })
+                  .catch(err => {
+                    this.$message.error('下载失败')
+                  })
+              }
+            },
+          ],
+          [
+            {
               name: '批量操作',
               click: () => { }
             },
@@ -307,38 +335,5 @@ export default {
 }
 </script>
 
-<style>
-#pane-workOrderInfo {
-  width: 100%;
-  height: 100%;
-}
-</style>
 <style lang="scss" scoped>
-.worker {
-  display: flex;
-  justify-content: space-between;
-
-  .worker_left {
-    font-size: 12px;
-    font-weight: 400;
-    text-align: left;
-    color: #666;
-    line-height: 28px;
-    margin-right: 10px;
-  }
-
-  .worker_right {
-    flex: 1;
-
-    ::v-deep .el-button {
-      margin: 0 10px 10px 0px;
-    }
-  }
-}
-
-.creatOrderPopuc {
-  ::v-deep &>.zj-page-container {
-    height: calc(100vh - 165px) !important;
-  }
-}
 </style>