add：新需求

2026-07-02 16:32:16 +08:00
parent 8e0a89b485
commit e10092b8eb
27 changed files with 2004 additions and 61 deletions
--- a/mes/qd/src/api/wms/pcs/otherorderproc.js
+++ b/mes/qd/src/api/wms/pcs/otherorderproc.js
@@ -0,0 +1,58 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/otherIosInProc',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/otherIosInProc/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/otherIosInProc',
+    method: 'put',
+    data
+  })
+}
+
+export function getProcStatus() {
+  return request({
+    url: 'api/otherIosInProc/getProcStatus',
+    method: 'get'
+  })
+}
+
+export function importData(data) {
+  return request({
+    url: 'api/otherIosInProc/importData',
+    method: 'put',
+    data: data
+  })
+}
+
+export function finish(data) {
+  return request({
+    url: 'api/otherIosInProc/finish',
+    method: 'put',
+    data: data
+  })
+}
+
+export function saveRemark(data) {
+  return request({
+    url: 'api/otherIosInProc/saveRemark',
+    method: 'post',
+    data: data
+  })
+}
+
+export default { add, edit, del, getProcStatus, importData, finish, saveRemark }
--- a/mes/qd/src/views/wms/pcs/otherorderproc/importOrder.vue
+++ b/mes/qd/src/views/wms/pcs/otherorderproc/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 crudOrderproc from "@/api/wms/pcs/orderproc";
+
+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
+      crudOrderproc.importData(this.form).then(res => {
+        this.fullscreenLoading = false
+        this.crud.notify('导入成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      }).catch(() => {
+        this.fullscreenLoading = false
+      })
+    }
+  }
+}
+</script>
+
--- a/mes/qd/src/views/wms/pcs/otherorderproc/index.vue
+++ b/mes/qd/src/views/wms/pcs/otherorderproc/index.vue
@@ -0,0 +1,269 @@
+<template>
+  <div 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="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="订单编号">
+            <el-input
+              v-model="query.vbillcode"
+              clearable
+              size="mini"
+              placeholder="订单编号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="单据状态">
+            <el-select
+              v-model="query.proc_status"
+              clearable
+              size="mini"
+              placeholder="单据状态"
+              class="filter-item"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in procStatusList"
+                :label="item.name"
+                :value="item.code"
+              />
+            </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']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="物料名称">
+            <el-input
+              v-model="query.material_code"
+              clearable
+              size="mini"
+              placeholder="物料名称、编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="供应商">
+            <label slot="label">供&nbsp;&nbsp;应&nbsp;商:</label>
+            <el-input
+              v-model="query.supp_code"
+              clearable
+              size="mini"
+              placeholder="供应商名称、编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="物料类别">
+            <treeselect
+              v-model="query.material_type_id"
+              :load-options="loadClass"
+              :options="classes"
+              style="width: 230px;"
+              placeholder="请选择物料类别"
+              size="mini"
+            />
+          </el-form-item>
+          <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"
+          type="primary"
+          icon="el-icon-check"
+          size="mini"
+          @click="finish"
+          :disabled="crud.selections.length !== 1"
+        >
+          强制完成
+        </el-button>
+      </crudOperation>
+      <!--表格渲染-->
+      <el-table ref="table" :max-height="590" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column fixed type="selection" width="55" />
+        <el-table-column v-if="false" prop="id" label="id" />
+        <el-table-column prop="dbilldate" label="订单日期" width="100" :formatter="planend_timeFormat" />
+        <el-table-column prop="vbillcode" label="订单编号" min-width="100px" />
+        <el-table-column prop="crowno" label="明细行号" />
+        <el-table-column prop="material_code" label="物料编码" width="160" />
+        <el-table-column prop="material_name" label="物料名称" min-width="120" />
+        <el-table-column prop="vbatchcode" label="批次" min-width="120" />
+        <el-table-column prop="nnum" label="采购重量" width="120px" :formatter="crud.formatNum3"/>
+        <el-table-column prop="receive_qty" label="到货重量" width="100px" :formatter="crud.formatNum3"/>
+        <el-table-column prop="instor_qty" label="入库重量" width="100px" :formatter="crud.formatNum3"/>
+        <el-table-column prop="surplus_qty" label="剩余重量" width="100px" :formatter="crud.formatNum3"/>
+        <el-table-column prop="vnote" label="备注" min-width="120" />
+        <el-table-column prop="proc_status" label="处理状态" :formatter="formaterStatus" />
+        <el-table-column prop="input_optname" label="导入人" />
+        <el-table-column prop="input_time" label="导入时间" width="150px" />
+        <el-table-column prop="update_optname" label="更新人" />
+        <el-table-column prop="update_time" label="更新时间" width="150px" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+    <importOrder :dialog-show.sync="viewShow" @tableChanged="querytable" />
+  </div>
+</template>
+
+<script>
+import crudOrderproc from '@/api/wms/pcs/otherorderproc'
+import CRUD, { presenter, header, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import importOrder from '@/views/wms/pcs/orderproc/importOrder'
+import DateRangePicker from '@/components/DateRangePicker'
+import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import crudClassstandard from '@/api/wms/basedata/master/classstandard'
+import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
+
+export default {
+  name: 'Otherorderproc',
+  components: { importOrder, pagination, crudOperation, rrOperation, udOperation, DateRangePicker, Treeselect },
+  mixins: [presenter(), header(),crud()],
+  cruds() {
+    return CRUD({
+      title: '其他采购订单导入',
+      url: 'api/otherIosInProc',
+      idField: 'id',
+      sort: 'id,desc',
+      props: {
+        // 每页数据条数
+        size: 20
+      },
+      crudMethod: { ...crudOrderproc },
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        download: false,
+        reset: true
+      }
+    })
+  },
+  data() {
+    return {
+      classes: [],
+      viewShow : false,
+      class_idStr: null,
+      procStatusList: [],
+      permission: {
+      }
+    }
+  },
+  created() {
+    const param = {
+      'materOpt_code': '00'
+    }
+    crudMaterialbase.getMaterOptType(param).then(res => {
+      this.class_idStr = res.class_idStr
+      this.crud.query.class_idStr = res.class_idStr
+      this.crud.toQuery()
+      this.queryClassId()
+    })
+    crudOrderproc.getProcStatus().then(res => {
+      this.procStatusList = res
+    })
+  },
+  methods: {
+    hand(value) {
+      this.crud.toQuery()
+    },
+    queryClassId() {
+      const param = {
+        'class_idStr': this.class_idStr
+      }
+      crudClassstandard.queryClassById(param).then(res => {
+        this.classes = res.content.map(obj => {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          return obj
+        })
+      })
+    },
+    // 获取弹窗内部门数据
+    loadClass({ action, parentNode, callback }) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
+          parentNode.children = res.content.map(function(obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 100)
+        })
+      }
+    },
+    querytable() {
+      this.crud.toQuery()
+    } ,
+    Import() {
+      this.viewShow = true
+    },
+    finish() {
+      const _selectData = this.$refs.table.selection
+      if (!_selectData || _selectData.length !== 1) {
+        this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      const row = _selectData[0]
+      if (row.proc_status === '09') {
+        this.crud.notify('此订单已完成', CRUD.NOTIFICATION_TYPE.ERROR)
+        return false
+      }
+      crudOrderproc.finish(_selectData[0]).then(res => {
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      })
+    },
+    planend_timeFormat(row) {
+      return row.dbilldate.substring(0, 10)
+    },
+    formaterStatus(row, column) {
+      for (const item of this.procStatusList) {
+        if (item.code === row.proc_status) {
+          return item.name
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
--- a/mes/qd/src/views/wms/pcs/receivemst/AddShowDialog.vue
+++ b/mes/qd/src/views/wms/pcs/receivemst/AddShowDialog.vue
@@ -200,7 +200,7 @@
      </el-table-column>
    </el-table>

-    <DtlShowDialog :dialog-show.sync="dtlShowDialog" @tableChanged="tableChanged" />
+    <DtlShowDialog :dialog-show.sync="dtlShowDialog" :receive-type="receive_type_param" @tableChanged="tableChanged" />
  </el-dialog>
 </template>

@@ -243,6 +243,7 @@ export default {
      statusList: [],
      storList: [],
      flagnow: false,
+      receive_type_param: null,
      rules: {
        receive_date: [
          { required: true, message: '到货单日期不能为空', trigger: 'blur' }
@@ -320,6 +321,7 @@ export default {
      this.$emit('update:dialogShow', false)
    },
    insertEvent() {
+      this.receive_type_param = this.form.receive_type
      this.dtlShowDialog = true
    },

--- a/mes/qd/src/views/wms/pcs/receivemst/DtlShowDialog.vue
+++ b/mes/qd/src/views/wms/pcs/receivemst/DtlShowDialog.vue
@@ -7,6 +7,7 @@
    :show-close="false"
    width="70%"
    @close="close"
+    @open="open"
  >
    <div class="head-container">
      <div v-if="crud.props.searchToggle">
@@ -115,6 +116,10 @@ export default {
    dialogShow: {
      type: Boolean,
      default: false
+    },
+    receiveType: {
+      type: String,
+      default: ''
    }
  },
  data() {
@@ -134,8 +139,14 @@ export default {
    crudOrderproc.getProcStatus().then(res => {
      this.procStatusList = res
    })
+    this.crud.query.receive_type = this.receiveType
+    this.crud.toQuery()
  },
  methods: {
+    open() {
+      this.crud.query.receive_type = this.receiveType
+      this.crud.toQuery()
+    },
    handleClose(done) {
      this.$confirm('确认关闭？')
        .then(_ => {
--- a/mes/qd/src/views/wms/pcs/receivemst/index.vue
+++ b/mes/qd/src/views/wms/pcs/receivemst/index.vue
@@ -106,6 +106,23 @@
              />
            </el-select>
          </el-form-item>
+          <el-form-item label="业务类型" prop="receive_type">
+            <el-select
+              v-model="query.receive_type"
+              clearable
+              size="mini"
+              placeholder="请选择业务类型"
+              class="filter-item"
+              style="width: 210px;"
+            >
+              <el-option
+                v-for="item in dict.ST_INV_TYPE_RC"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
          <el-form-item label="物料批次">
            <label slot="label">批&nbsp;&nbsp;&nbsp;&nbsp;次:</label>

@@ -238,6 +255,7 @@
        <el-table-column v-if="false" prop="receive_id" label="到货单标识" />
        <el-table-column prop="status" label="状态" :formatter="formatStatusName" />
        <el-table-column prop="vbillcode" label="订单编号" min-width="100" />
+        <el-table-column prop="receive_type" label="业务类型" min-width="100" :formatter="formatIosType" />
        <el-table-column prop="receive_code" label="到货单号" width="160px">
          <template slot-scope="scope">
            <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.receive_code }}</el-link>
@@ -277,7 +295,7 @@ import { downloadFile } from '@/utils'

 export default {
  name: 'Receivemst',
-  dicts: ['purchase_organize', 'use_dept'],
+  dicts: ['purchase_organize', 'use_dept', 'ST_INV_TYPE_RC'],
  components: { pagination, crudOperation, rrOperation, udOperation, DateRangePicker, AddShowDialog },
  mixins: [presenter(), header(), crud(), form()],
  cruds() {
@@ -452,6 +470,9 @@ export default {
    },
    handStatus(val) {
      this.query.status = val
+    },
+    formatIosType(row) {
+      return this.dict.label.ST_INV_TYPE_RC[row.receive_type]
    }
  }
 }