add：出入库回传

wms/nladmin-ui/src/utils/nladmin.js

@@ -234,14 +234,14 @@ export async function blobValidate(data) {
  * 注：prop,title有一个必传
  */
 export function flexWidth(prop, tableData, title, num = 0) {
+  if (!tableData || tableData.length === 0) { // 表格没数据不做处理
+    return
+  }
   let flexWidth = 0// 初始化表格列宽
   let columnContent = ''// 占位最宽的内容
   const canvas = document.createElement('canvas')
   const context = canvas.getContext('2d')
   context.font = '14px Microsoft YaHei'
-  if (tableData.length === 0) { // 表格没数据不做处理
-    return context.measureText(title).width + 20 + num + 'px'
-  }
   // 获取占位最宽的内容
   let index = 0
   for (let i = 0; i < tableData.length; i++) { // 循环表格内容，获取表格内容中最长的数据

wms/nladmin-ui/src/views/wms/st/inAndOutReturn/inandoutreturn.js

@@ -0,0 +1,43 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/iosReturn',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/iosReturn/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/iosReturn',
+    method: 'put',
+    data
+  })
+}
+
+export function upload(data) {
+  return request({
+    url: '/api/iosReturn/upload',
+    method: 'post',
+    data
+  })
+}
+
+export function disupload(data) {
+  return request({
+    url: '/api/iosReturn/disupload',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, upload, disupload }

wms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue

@@ -0,0 +1,355 @@
+<template>
+  <div v-loading.fullscreen.lock="fullscreenLoading" class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="90px"
+          label-suffix=":"
+        >
+          <el-form-item label="所属仓库">
+            <el-select
+              v-model="query.stor_id"
+              clearable
+              size="mini"
+              placeholder="全部"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in storlist"
+                :key="item.stor_id"
+                :label="item.stor_name"
+                :value="item.stor_id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="出入类型">
+            <el-select
+              v-model="query.io_type"
+              size="mini"
+              placeholder="出入类型"
+              class="filter-item"
+              @change="ioTypeChange"
+            >
+              <el-option
+                v-for="item in dict.io_type"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="业务类型">
+            <el-select
+              v-model="query.bill_type"
+              clearable
+              filterable
+              size="mini"
+              placeholder="业务类型"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in billtypelist"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="模糊查询">
+            <el-input
+              v-model="query.bill_code"
+              size="mini"
+              clearable
+              placeholder="出入库单号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="是否回传">
+            <el-select
+              v-model="query.is_upload"
+              clearable
+              size="mini"
+              placeholder="是否回传"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.is_upload"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="单据日期">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @input="onInput()"
+              @change="mytoQuery"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-position"
+          size="mini"
+          @click="upload"
+        >
+          回传
+        </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-position"
+          size="mini"
+          @click="disupload"
+        >
+          不回传
+        </el-button>
+      </crudOperation>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        size="mini"
+        :data="crud.data"
+        style="width: 100%;"
+        :highlight-current-row="true"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="is_upload" label="是否回传" :formatter="formatIsUpload" :min-width="flexWidth('is_upload',crud.data,'是否回传')" />
+        <el-table-column prop="bill_code" label="单据号" :min-width="flexWidth('bill_code',crud.data,'单据号')" />
+        <el-table-column prop="stor_name" label="仓库" :min-width="flexWidth('stor_name',crud.data,'仓库')" />
+        <el-table-column prop="bill_type" :formatter="bill_typeFormat" label="业务类型" :min-width="flexWidth('bill_type',crud.data,'业务类型')" />
+        <el-table-column prop="biz_date" label="业务日期" :min-width="flexWidth('biz_date',crud.data,'业务日期')" />
+        <el-table-column prop="total_qty" label="总重量" :min-width="100" :formatter="crud.formatNum3" />
+        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
+        <el-table-column :formatter="create_modeFormat" prop="create_mode" label="生成方式" :min-width="flexWidth('create_mode',crud.data,'生成方式')" />
+        <el-table-column label="明细数" align="center" prop="detail_count" :min-width="flexWidth('detail_count',crud.data,'明细数')" />
+        <el-table-column prop="input_optname" label="制单人" :min-width="flexWidth('input_optname',crud.data,'制单人')" />
+        <el-table-column prop="input_time" label="制单时间" :min-width="flexWidth('input_time',crud.data,'制单时间')" />
+        <el-table-column prop="confirm_optname" label="完成人" :min-width="flexWidth('confirm_optname',crud.data,'完成人')" />
+        <el-table-column prop="confirm_time" label="完成时间" :min-width="flexWidth('confirm_time',crud.data,'完成时间')" />
+        <el-table-column prop="update_optname" label="回传人" :min-width="flexWidth('update_optname',crud.data,'回传人')" />
+        <el-table-column prop="update_time" label="回传时间" :min-width="flexWidth('update_time',crud.data,'回传时间')" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import inandoutreturn from '@/views/wms/st/inAndOutReturn/inandoutreturn'
+import CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+import crudUserStor from '@/views/wms/basedata/bsrealstorattr/bsrealstorattr'
+import Date from '@/utils/datetime'
+
+export default {
+  name: 'Return',
+  components: { crudOperation, rrOperation, pagination },
+  cruds() {
+    return CRUD({
+      title: '出入库单回传', idField: 'iostorinv_id', url: 'api/iosReturn', crudMethod: { ...inandoutreturn },
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        reset: true,
+        download: false
+      },
+      query: { io_type: '0', bill_status: '99' },
+      queryOnPresenterCreated: false
+    })
+  },
+  mixins: [presenter(), header(), crud()],
+  // 数据字典
+  dicts: ['ST_CREATE_MODE', 'io_type', 'is_upload', 'ST_INV_IN_TYPE', 'ST_INV_OUT_TYPE'],
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      permission: {},
+      mstrow: {},
+      fullscreenLoading: false,
+      storlist: [],
+      query_flag: true,
+      billtypelist: [],
+      showDtlLoading: false
+    }
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  created() {
+    crudUserStor.getStor().then(res => {
+      this.storlist = res
+    })
+    // debugger
+    this.billtypelist = this.dict.ST_INV_OUT_TYPE
+    this.crud.query.createTime = [new Date().daysAgo(30), new Date()]
+    this.initQuery()
+  },
+  methods: {
+    [CRUD.HOOK.beforeRefresh]() {
+      if (this.query_flag) {
+        this.crud.query.begin_time = (new Date().daysAgo(30)).strftime('%F', 'zh')
+        this.crud.query.end_time = (new Date()).strftime('%F', 'zh')
+        this.query_flag = false
+      }
+    },
+    /* 搜索框出入类型 默认出库*/
+    initQuery() {
+      this.query.io_type = '1'
+      this.query.is_upload = '0'
+      this.crud.toQuery()
+    },
+    mytoQuery(array1) {
+      if (array1 === null) {
+        this.crud.query.begin_time = ''
+        this.crud.query.end_time = ''
+      } else {
+        this.crud.query.begin_time = array1[0]
+        this.crud.query.end_time = array1[1]
+      }
+      this.crud.toQuery()
+    },
+    onInput() {
+      this.$forceUpdate()
+    },
+    querytable() {
+      this.onSelectAll()
+      this.crud.toQuery()
+    },
+    bill_typeFormat(row) {
+      if (this.query.io_type === '0') {
+        return this.dict.label.ST_INV_IN_TYPE[row.bill_type]
+      }
+      if (this.query.io_type === '1') {
+        return this.dict.label.ST_INV_OUT_TYPE[row.bill_type]
+      }
+    },
+    ioTypeChange(value) {
+      if (value === '1') {
+        this.billtypelist = this.dict.ST_INV_OUT_TYPE
+      } else {
+        this.billtypelist = this.dict.ST_INV_IN_TYPE
+      }
+      this.crud.toQuery()
+    },
+    create_modeFormat(row) {
+      return this.dict.label.ST_CREATE_MODE[row.create_mode]
+    },
+    upload() {
+      const res = this.$refs.table.selection
+      if (!res || res.length < 1) {
+        this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      const upload_flag = res.some(row => row.is_upload === '1')
+      if (upload_flag) {
+        this.$confirm('存在已经回传的单据, 是否继续回传?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.fullscreenLoading = true
+          const data = {}
+          data.rows = res
+          inandoutreturn.upload(data).then(res => {
+            this.fullscreenLoading = false
+            this.crud.notify('单据回传成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+            this.crud.toQuery()
+          }).catch(() => {
+            this.fullscreenLoading = false
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消回传'
+          })
+        })
+      } else {
+        this.fullscreenLoading = true
+        const data = {}
+        data.rows = res
+        inandoutreturn.upload(data).then(res => {
+          this.fullscreenLoading = false
+          this.crud.notify('单据回传成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.crud.toQuery()
+        }).catch(() => {
+          this.fullscreenLoading = false
+        })
+      }
+    },
+    disupload() {
+      const res = this.$refs.table.selection
+      if (!res || res.length < 1) {
+        this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      this.fullscreenLoading = true
+      const data = {}
+      data.rows = res
+      inandoutreturn.disupload(data).then(res => {
+        this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      }).finally(() => {
+        this.fullscreenLoading = false
+        this.crud.toQuery()
+      })
+    },
+    formatIsUpload(row) {
+      if (row.is_upload === '0') {
+        return '否'
+      } else if (row.is_upload === '1') {
+        return '是'
+      }
+    },
+    formatUploadMes(row) {
+      if (row.upload_mes === '0') {
+        return '否'
+      } else if (row.upload_mes === '1') {
+        return '是'
+      }
+    },
+    formatUploadSap(row) {
+      if (row.upload_sap === '0') {
+        return '否'
+      } else if (row.upload_sap === '1') {
+        return '是'
+      }
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 10px;
+}
+</style>