修改

mes/qd/src/api/wms/sb/sparepart.js

@@ -200,6 +200,14 @@ export function backConfirm(data) {
   })
 }
 
+export function importData(data) {
+  return request({
+    url: 'api/inbill/importData',
+    method: 'put',
+    data: data
+  })
+}
+
 export default { add, edit, del, getType, getBillDtl, disConfirm, insertDtl, getIODtl, commit, checkVehicle,
   deleteDisDtl, getDisDtl, createCode, divPoint, cancelCreate,
   divStruct, bucketDtl, updateTask, delTask, reIssueTask, confirmTask, cancelTask, confirm, backConfirm }

mes/qd/src/views/wms/sb/inbill/importOrder.vue

@@ -0,0 +1,82 @@
+<template>
+  <el-dialog
+    title="备件订单接口导入"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    :show-close="true"
+    width="500px"
+    v-loading.fullscreen.lock="fullscreenLoading"
+    @close="close"
+  >
+    <div class="head-container">
+      <div>
+        <!-- 搜索 -->
+        <el-date-picker
+          v-model="form.createTime"
+          type="daterange"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']"
+        />
+        <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="queryStruct">确认</el-button>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import DateRangePicker from '@/components/DateRangePicker/index'
+import sparePart from '@/api/wms/sb/sparepart'
+
+export default {
+  name: 'importOrder',
+  components: { rrOperation, pagination, DateRangePicker },
+  cruds() {
+  },
+  mixins: [presenter(), header()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      fullscreenLoading: false,
+      dialogVisible: false,
+      form :{}
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    close() {
+      this.form = {}
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged', this.rows)
+    },
+    queryStruct() {
+      debugger
+      this.fullscreenLoading = true
+      sparePart.importData(this.form).then(res => {
+        this.fullscreenLoading = false
+        this.crud.notify('导入成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      }).catch(() => {
+        this.fullscreenLoading = false
+      })
+    }
+  }
+}
+</script>
+

mes/qd/src/views/wms/sb/inbill/index.vue

@@ -95,11 +95,21 @@
               />
             </el-select>
           </el-form-item>
-          <rrOperation />
+          <rrOperation/>
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-arrow-down"
+          size="mini"
+          @click="Import"
+        >
+          导入入库单
+        </el-button>
         <el-button
           slot="right"
           class="filter-item"
@@ -136,7 +146,7 @@
         @select="handleSelectionChange"
         @select-all="onSelectAll"
       >
-        <el-table-column type="selection" width="55" />
+        <el-table-column type="selection" width="55"/>
         <el-table-column
           label="操作"
           width="115"
@@ -157,8 +167,8 @@
             <el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.bill_code }}</el-link>
           </template>
         </el-table-column>
-        <el-table-column show-overflow-tooltip :formatter="stateFormat" prop="bill_status" label="单据状态" />
-        <el-table-column prop="stor_name" label="仓库" />
+        <el-table-column show-overflow-tooltip :formatter="stateFormat" prop="bill_status" label="单据状态"/>
+        <el-table-column prop="stor_name" label="仓库"/>
         <el-table-column
           show-overflow-tooltip
           prop="bill_type"
@@ -166,30 +176,32 @@
           :formatter="bill_typeFormat"
           label="业务类型"
         />
-        <el-table-column show-overflow-tooltip width="135" prop="biz_date" label="业务日期" />
-        <el-table-column show-overflow-tooltip prop="create_mode" :formatter="create_modeFormat" label="生成方式" />
-        <el-table-column label="明细数" align="center" prop="detail_count" />
+        <el-table-column show-overflow-tooltip width="135" prop="biz_date" label="业务日期"/>
+        <el-table-column show-overflow-tooltip prop="create_mode" :formatter="create_modeFormat" label="生成方式"/>
+        <el-table-column label="明细数" align="center" prop="detail_count"/>
         <el-table-column label="总重量" align="center" prop="total_qty">
           <template slot-scope="scope">
             {{ fun(scope.row.total_qty) }}
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="制单人" align="center" prop="input_optname" />
-        <el-table-column label="制单时间" align="center" prop="input_time" width="150" />
-        <el-table-column label="修改人" align="center" prop="update_optname" />
-        <el-table-column label="修改时间" align="center" prop="update_time" width="150" />
-        <el-table-column label="分配人" align="center" prop="dis_optname" />
-        <el-table-column label="分配时间" align="center" prop="dis_time" width="150" />
-        <el-table-column label="确认人" align="center" prop="confirm_optname" width="150" />
-        <el-table-column label="确认时间" align="center" prop="confirm_time" width="150" />
+        <el-table-column label="备注" align="center" prop="remark"/>
+        <el-table-column label="制单人" align="center" prop="input_optname"/>
+        <el-table-column label="制单时间" align="center" prop="input_time" width="150"/>
+        <el-table-column label="修改人" align="center" prop="update_optname"/>
+        <el-table-column label="修改时间" align="center" prop="update_time" width="150"/>
+        <el-table-column label="分配人" align="center" prop="dis_optname"/>
+        <el-table-column label="分配时间" align="center" prop="dis_time" width="150"/>
+        <el-table-column label="确认人" align="center" prop="confirm_optname" width="150"/>
+        <el-table-column label="确认时间" align="center" prop="confirm_time" width="150"/>
       </el-table>
       <!--分页组件-->
-      <pagination />
+      <pagination/>
     </div>
-    <AddDialog @AddChanged="querytable" />
-    <ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable" />
-    <DivDialog :dialog-show.sync="divShow" :open-param="openParam" :bill-type="billType" :buss-config="bussConfig" @AddChanged="querytable" />
+    <AddDialog @AddChanged="querytable"/>
+    <importOrder :dialog-show.sync="importShow" @tableChanged="querytable"/>
+    <ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable"/>
+    <DivDialog :dialog-show.sync="divShow" :open-param="openParam" :bill-type="billType" :buss-config="bussConfig"
+               @AddChanged="querytable"/>
   </div>
 </template>
 
@@ -205,12 +217,23 @@ import pagination from '@crud/Pagination'
 import DateRangePicker from '@/components/DateRangePicker/index'
 import AddDialog from '@/views/wms/sb/inbill/AddDialog'
 import DivDialog from '@/views/wms/sb/inbill/DivDialog'
+import importOrder from '@/views/wms/sb/inbill/importOrder'
 import { mapGetters } from 'vuex'
 import crudStorattr from '@/api/wms/basedata/st/storattr'
 
 export default {
   name: 'Handle',
-  components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DateRangePicker, DivDialog },
+  components: {
+    ViewDialog,
+    AddDialog,
+    crudOperation,
+    rrOperation,
+    udOperation,
+    pagination,
+    DateRangePicker,
+    DivDialog,
+    importOrder
+  },
   cruds() {
     return CRUD({
       title: '',
@@ -240,6 +263,7 @@ export default {
       bussConfig: null,
       currentRow: null,
       viewShow: false,
+      importShow: false,
       mstrow: {},
       storlist: [],
       billtypelist: [],
@@ -273,10 +297,13 @@ export default {
     canUd(row) {
       return row.bill_status !== '10'
     },
-    toView(index,row){
+    toView(index, row) {
       this.mstrow = row
       this.viewShow = true
     },
+    Import() {
+      this.importShow = true
+    },
     handleSelectionChange(val, row) {
       if (val.length > 1) {
         this.$refs.table.clearSelection()